diff --git a/.doit.db.db b/.doit.db.db
index 39b8106..9202335 100644
Binary files a/.doit.db.db and b/.doit.db.db differ
diff --git a/templates/base.tmpl b/templates/base.tmpl
index 5eabc59..dfa8211 100644
--- a/templates/base.tmpl
+++ b/templates/base.tmpl
@@ -3,7 +3,9 @@
 <%namespace name="mastodon" file="mastodon.tmpl" import="*" />
 ${set_locale(lang)}
 ${base.html_headstart()}
-${mastodon.extra_head()}
+%if theme_config.get('mastodon_timeline_init'):
+    ${mastodon.extra_head()}
+%endif
 <%block name="extra_head">
 ### Leave this block alone.
 </%block>
@@ -79,12 +81,15 @@ bg-dark
                 <%block name="content"></%block>
                 <!--End of body content-->
 	    </div>
-	    
-            <div class="col-lg-5 col-xl-4">
-                <!--Mastodon content-->
-		${mastodon.timeline()}
-	        <!--End of Mastodon content-->
-	    </div>
+
+            %if theme_config.get('mastodon_timeline_init'):
+                <div class="col-lg-5 col-xl-4">
+		    <img src="/assets/img/mastodon.svg" width="35" height="35" alt="Mastodon" class="d-inline-block align-top">
+                    <!--Mastodon content-->
+		    ${mastodon.timeline()}
+	            <!--End of Mastodon content-->
+	        </div>
+	    %endif
 	    
             <footer id="footer">
                 ${content_footer}
@@ -104,7 +109,9 @@ ${base.late_load_js()}
         </script>
         <!-- end fancy dates -->
     %endif
-    ${mastodon.extra_js()}
+    %if theme_config.get('mastodon_timeline_init'):
+        ${mastodon.extra_js()}
+    %endif
     <%block name="extra_js"></%block>
     <script>
     baguetteBox.run('div#content', {