diff --git a/src/Classes/settingsClass.ts b/src/Classes/settingsClass.ts
index 06489cb..6967793 100644
--- a/src/Classes/settingsClass.ts
+++ b/src/Classes/settingsClass.ts
@@ -59,11 +59,16 @@ export default class settingsClass {
    */
   createSettingsEntry(settingGroupName: string): VisualObjectInstanceEnumerationObject {
     const settingNames: string[] = Object.keys(this.settings[settingGroupName]);
-    const toggledSettings: Record<string, string[]> = Object.keys(settingsPaneToggles).includes(settingGroupName) ? settingsPaneToggles[settingGroupName] : {};
     const settingsGrouped: boolean = Object.keys(settingsPaneGroupings).includes(settingGroupName);
-    const paneGroupings: Record<string, string[]> = settingsGrouped ? JSON.parse(JSON.stringify(settingsPaneGroupings[settingGroupName])) : { "all": settingNames };
+    const paneGroupings: Record<string, string[]>
+      = settingsGrouped ? JSON.parse(JSON.stringify(settingsPaneGroupings[settingGroupName]))
+                        : { "all": settingNames };
+   
+    if (Object.keys(settingsPaneToggles).includes(settingGroupName)) {
+      const toggledSettings: Record<string, Record<string, string[]>>
+        = settingsGrouped ? settingsPaneToggles[settingGroupName]
+                          : { "all": settingsPaneToggles[settingGroupName]};
     
-    if (Object.keys(toggledSettings).length > 0) {
       Object.keys(toggledSettings).forEach(toggleGroup => {
         const possibleSettings: string[] = paneGroupings[toggleGroup];
         let settingsToRemove: string[] = new Array<string>();
diff --git a/src/defaultSettings.ts b/src/defaultSettings.ts
index b365eec..7d7c5e8 100644
--- a/src/defaultSettings.ts
+++ b/src/defaultSettings.ts
@@ -163,6 +163,24 @@ export const settingsPaneGroupings = {
 }
 
 export const settingsPaneToggles = {
+  outliers: {
+    "Astronomical Points": {
+      "astronomical": ["ast_colour_improvement", "ast_colour_deterioration", "ast_colour_neutral_low", "ast_colour_neutral_high"]
+    },
+    "Shifts": {
+      "shift": ["shift_n", "shift_colour_improvement", "shift_colour_deterioration", "shift_colour_neutral_low", "shift_colour_neutral_high"]
+    },
+    "Trends": {
+      "trend": ["trend_n", "trend_colour_improvement", "trend_colour_deterioration", "trend_colour_neutral_low", "trend_colour_neutral_high"]
+    },
+    "Two-In-Three": {
+      "two_in_three": ["twointhree_colour_improvement", "twointhree_colour_deterioration", "twointhree_colour_neutral_low", "twointhree_colour_neutral_high"]
+    }
+  },
+  nhs_icons: {
+    "show_variation_icons": ["variation_icons_locations", "variation_icons_scaling"],
+    "show_assurance_icons": ["assurance_icons_locations", "assurance_icons_scaling"]
+  },
   lines: {
     "Main": {
       "show_main": ["width_main", "type_main", "colour_main"]