diff --git a/default.hbs b/default.hbs
index 98dfee2f..4baecf75 100644
--- a/default.hbs
+++ b/default.hbs
@@ -35,7 +35,7 @@
                             {{navigation}}
                         </div>
                         <div class="mb-3 mt-3">
-                            {{> "social-links" }}
+                            {{!-- {{> "social-links" }} --}}
                         </div>
                     </div>
                 </div>
diff --git a/package.json b/package.json
index 9b5e19e6..9dcfc35b 100644
--- a/package.json
+++ b/package.json
@@ -64,98 +64,6 @@
         "defaults"
     ],
     "config": {
-        "custom": {
-            "social_link_1": {
-                "type": "text"
-            },
-            "social_icon_1": {
-                "type": "select",
-                "options": [
-                    "Facebook",
-                    "Github",
-                    "LinkedIn",
-                    "Reddit",
-                    "Tiktok",
-                    "Twitch",
-                    "Twitter",
-                    "Yelp",
-                    "Youtube"
-                ],
-                "default": "Facebook"
-            },
-            "social_link_2": {
-                "type": "text"
-            },
-            "social_icon_2": {
-                "type": "select",
-                "options": [
-                    "Facebook",
-                    "Github",
-                    "LinkedIn",
-                    "Reddit",
-                    "Tiktok",
-                    "Twitch",
-                    "Twitter",
-                    "Yelp",
-                    "Youtube"
-                ],
-                "default": "Twitter"
-            },
-            "social_link_3": {
-                "type": "text"
-            },
-            "social_icon_3": {
-                "type": "select",
-                "options": [
-                    "Facebook",
-                    "Github",
-                    "LinkedIn",
-                    "Reddit",
-                    "Tiktok",
-                    "Twitch",
-                    "Twitter",
-                    "Yelp",
-                    "Youtube"
-                ],
-                "default": "LinkedIn"
-            },
-            "social_link_4": {
-                "type": "text"
-            },
-            "social_icon_4": {
-                "type": "select",
-                "options": [
-                    "Facebook",
-                    "Github",
-                    "LinkedIn",
-                    "Reddit",
-                    "Tiktok",
-                    "Twitch",
-                    "Twitter",
-                    "Yelp",
-                    "Youtube"
-                ],
-                "default": "Github"
-            },
-            "social_link_5": {
-                "type": "text"
-            },
-            "social_icon_5": {
-                "type": "select",
-                "options": [
-                    "Facebook",
-                    "Github",
-                    "LinkedIn",
-                    "Reddit",
-                    "Tiktok",
-                    "Twitch",
-                    "Twitter",
-                    "Yelp",
-                    "Youtube"
-                ],
-                "default": "Youtube"
-            }
-        },
         "card_assets": true,
         "posts_per_page": 15,
         "image_sizes": {
diff --git a/page.hbs b/page.hbs
index 62d7c284..45b0ea87 100644
--- a/page.hbs
+++ b/page.hbs
@@ -2,21 +2,23 @@
 
 {{#post}}
 <article class="{{post_class}}">
-    <header>
-        <h1 class="font-bold text-4xl">{{title}}</h1>
-        {{#if custom_excerpt}}
-            <p class="italic mt-5 mb-5">{{custom_excerpt}}</p>
-        {{/if}}
+    {{#match @page.show_title_and_feature_image}}
+        <header>
+            <h1 class="font-bold text-4xl">{{title}}</h1>
+            {{#if custom_excerpt}}
+                <p class="italic mt-5 mb-5">{{custom_excerpt}}</p>
+            {{/if}}
 
-        {{#if feature_image}}
-            <figure class="mt-5 mb-5">
-                <img src="{{feature_image}}" alt="{{#if feature_image_alt}}{{feature_image_alt}}{{else}}{{title}}{{/if}}" />
-                {{#if feature_image_caption}}
-                    <figcaption class="text-sm">{{feature_image_caption}}</figcaption>
-                {{/if}}
-            </figure>
-        {{/if}}
-    </header>
+            {{#if feature_image}}
+                <figure class="mt-5 mb-5">
+                    <img src="{{feature_image}}" alt="{{#if feature_image_alt}}{{feature_image_alt}}{{else}}{{title}}{{/if}}" />
+                    {{#if feature_image_caption}}
+                        <figcaption class="text-sm">{{feature_image_caption}}</figcaption>
+                    {{/if}}
+                </figure>
+            {{/if}}
+        </header>
+    {{/match}}
 
 
     <article class="prose prose-neutral mt-5">