diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1f04ee14..2a933b2a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,12 @@
 
 ## [Unreleased]
 
+## [0.4.0] - 2020-01-11
+
+- Added search
+- Some styling improvements
+- Better organization of scripts + more scripts
+
 ## [0.3.0] - 2020-01-09
 
 - Added support for grouping
@@ -27,7 +33,8 @@
 
 ## All releases
 
-- [Unreleased] : https://github.com/undergroundwires/privacy.sexy/compare/v0.3.0...HEAD
+- [Unreleased] : https://github.com/undergroundwires/privacy.sexy/compare/v0.4.0...HEAD
+- [v0.4.0] : https://github.com/undergroundwires/privacy.sexy/compare/v0.3.0...v0.4.0
 - [v0.3.0] : https://github.com/undergroundwires/privacy.sexy/compare/v0.2.0...v0.3.0
 - [v0.2.0] : https://github.com/undergroundwires/privacy.sexy/compare/v0.1.0...v0.2.0
 - [v0.1.0] : https://github.com/undergroundwires/privacy.sexy/releases/tag/v0.1.0
diff --git a/src/App.vue b/src/App.vue
index 72e9da75..6f7a6cdd 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,9 +1,8 @@
 <template>
   <div id="app">
       <div class="wrapper">
-          <TheHeader class="row"
-                     github-url="https://github.com/undergroundwires/privacy.sexy" />
-          <!-- <TheSearchBar> </TheSearchBar> -->
+          <TheHeader class="row" />
+          <TheSearchBar class="row" />
           <TheScripts class="row"/>
           <TheCodeArea class="row" theme="xcode" />
           <TheCodeButtons class="row" />
@@ -15,20 +14,20 @@
 <script lang="ts">
 import { Component, Vue, Prop  } from 'vue-property-decorator';
 import { ApplicationState, IApplicationState } from '@/application/State/ApplicationState';
-import TheHeader from './presentation/TheHeader.vue';
-import TheFooter from './presentation/TheFooter.vue';
-import TheCodeArea from './presentation/TheCodeArea.vue';
-import TheCodeButtons from './presentation/TheCodeButtons.vue';
-import TheSearchBar from './presentation/TheSearchBar.vue';
-import TheScripts from './presentation/Scripts/TheScripts.vue';
+import TheHeader from '@/presentation/TheHeader.vue';
+import TheFooter from '@/presentation/TheFooter.vue';
+import TheCodeArea from '@/presentation/TheCodeArea.vue';
+import TheCodeButtons from '@/presentation/TheCodeButtons.vue';
+import TheSearchBar from '@/presentation/TheSearchBar.vue';
+import TheScripts from '@/presentation/Scripts/TheScripts.vue';
 
 @Component({
   components: {
     TheHeader,
     TheCodeArea,
     TheCodeButtons,
-    TheSearchBar,
     TheScripts,
+    TheSearchBar,
     TheFooter,
   },
 })
diff --git a/src/application/Parser/ApplicationParser.ts b/src/application/Parser/ApplicationParser.ts
index 7e732d20..03195e22 100644
--- a/src/application/Parser/ApplicationParser.ts
+++ b/src/application/Parser/ApplicationParser.ts
@@ -4,8 +4,6 @@ import applicationFile from 'js-yaml-loader!./../application.yaml';
 import { parseCategory } from './CategoryParser';
 
 export function parseApplication(): Application {
-    const name = applicationFile.name as string;
-    const version = applicationFile.version as number;
     const categories = new Array<Category>();
     if (!applicationFile.actions || applicationFile.actions.length <= 0) {
         throw new Error('Application does not define any action');
@@ -14,6 +12,10 @@ export function parseApplication(): Application {
         const category = parseCategory(action);
         categories.push(category);
     }
-    const app = new Application(name, version, categories);
+    const app = new Application(
+        applicationFile.name,
+        applicationFile.repositoryUrl,
+        applicationFile.version,
+        categories);
     return app;
 }
diff --git a/src/application/State/Filter/FilterResult.ts b/src/application/State/Filter/FilterResult.ts
new file mode 100644
index 00000000..e02b9204
--- /dev/null
+++ b/src/application/State/Filter/FilterResult.ts
@@ -0,0 +1,18 @@
+import { IFilterResult } from './IFilterResult';
+import { IScript } from '@/domain/Script';
+import { ICategory } from '@/domain/ICategory';
+
+export class FilterResult implements IFilterResult {
+    constructor(
+        public readonly scriptMatches: ReadonlyArray<IScript>,
+        public readonly categoryMatches: ReadonlyArray<ICategory>,
+        public readonly query: string) {
+        if (!query) { throw new Error('Query is empty or undefined'); }
+        if (!scriptMatches) { throw new Error('Script matches is undefined'); }
+        if (!categoryMatches) { throw new Error('Category matches is undefined'); }
+    }
+    public hasAnyMatches(): boolean {
+        return this.scriptMatches.length > 0
+         || this.categoryMatches.length > 0;
+    }
+}
diff --git a/src/application/State/Filter/IFilterMatches.ts b/src/application/State/Filter/IFilterResult.ts
similarity index 75%
rename from src/application/State/Filter/IFilterMatches.ts
rename to src/application/State/Filter/IFilterResult.ts
index 75207088..dc8308eb 100644
--- a/src/application/State/Filter/IFilterMatches.ts
+++ b/src/application/State/Filter/IFilterResult.ts
@@ -1,7 +1,8 @@
 import { IScript, ICategory } from '@/domain/ICategory';
 
-export interface IFilterMatches {
-    readonly scriptMatches: ReadonlyArray<IScript>;
+export interface IFilterResult {
     readonly categoryMatches: ReadonlyArray<ICategory>;
+    readonly scriptMatches: ReadonlyArray<IScript>;
     readonly query: string;
+    hasAnyMatches(): boolean;
 }
diff --git a/src/application/State/Filter/IUserFilter.ts b/src/application/State/Filter/IUserFilter.ts
index b0e49f37..ae159d9c 100644
--- a/src/application/State/Filter/IUserFilter.ts
+++ b/src/application/State/Filter/IUserFilter.ts
@@ -1,8 +1,8 @@
-import { IFilterMatches } from './IFilterMatches';
+import { IFilterResult } from './IFilterResult';
 import { ISignal } from '@/infrastructure/Events/Signal';
 
 export interface IUserFilter {
-    readonly filtered: ISignal<IFilterMatches>;
+    readonly filtered: ISignal<IFilterResult>;
     readonly filterRemoved: ISignal<void>;
     setFilter(filter: string): void;
     removeFilter(): void;
diff --git a/src/application/State/Filter/UserFilter.ts b/src/application/State/Filter/UserFilter.ts
index 6a61be9c..ae4e1df9 100644
--- a/src/application/State/Filter/UserFilter.ts
+++ b/src/application/State/Filter/UserFilter.ts
@@ -1,10 +1,11 @@
-import { IFilterMatches } from './IFilterMatches';
+import { FilterResult } from './FilterResult';
+import { IFilterResult } from './IFilterResult';
 import { Application } from '../../../domain/Application';
 import { IUserFilter } from './IUserFilter';
 import { Signal } from '@/infrastructure/Events/Signal';
 
 export class UserFilter implements IUserFilter {
-    public readonly filtered = new Signal<IFilterMatches>();
+    public readonly filtered = new Signal<IFilterResult>();
     public readonly filterRemoved = new Signal<void>();
 
     constructor(private application: Application) {
@@ -16,14 +17,17 @@ export class UserFilter implements IUserFilter {
             throw new Error('Filter must be defined and not empty. Use removeFilter() to remove the filter');
         }
         const filteredScripts = this.application.getAllScripts().filter(
-            (script) => script.name.toLowerCase().includes(filter.toLowerCase()) ||
+            (script) =>
+            script.name.toLowerCase().includes(filter.toLowerCase()) ||
             script.code.toLowerCase().includes(filter.toLowerCase()));
+        const filteredCategories = this.application.getAllCategories().filter(
+            (script) => script.name.toLowerCase().includes(filter.toLowerCase()));
 
-        const matches: IFilterMatches = {
-            scriptMatches: filteredScripts,
-            categoryMatches: null,
-            query: filter,
-        };
+        const matches = new FilterResult(
+            filteredScripts,
+            filteredCategories,
+            filter,
+        );
 
         this.filtered.notify(matches);
     }
diff --git a/src/application/application.yaml b/src/application/application.yaml
index fb16c5ff..604da2ba 100644
--- a/src/application/application.yaml
+++ b/src/application/application.yaml
@@ -1,5 +1,6 @@
 name: privacy.sexy
-version: 0.3.0
+version: 0.4.0
+repositoryUrl: https://github.com/undergroundwires/privacy.sexy
 actions:
     -
         category: Privacy cleanup
@@ -255,18 +256,81 @@ actions:
                         name: Clear main telemetry file
                         recommend: true
                         code: echo "" > %ProgramData%\Microsoft\Diagnosis\ETLTraces\AutoLogger\AutoLogger-Diagtrack-Listener.etl
+            -
+                name: Clear credentials from Windows Credential Manager
+                recommend: false
+                code: |-
+                    cmdkey.exe /list > "%TEMP%\List.txt"
+                    findstr.exe Target "%TEMP%\List.txt" > "%TEMP%\tokensonly.txt"
+                    FOR /F "tokens=1,2 delims= " %%G IN (%TEMP%\tokensonly.txt) DO cmdkey.exe /delete:%%H
+                    del "%TEMP%\List.txt" /s /f /q
+                    del "%TEMP%\tokensonly.txt" /s /f /q
             -
                 name: Empty trash bin
+                recommend: false
                 code: rd /s %systemdrive%\$Recycle.bin
+
     -
         category: Disable OS data collection
         children:
             -
-                name: Disable ad customization with Advertising ID
-                recommend: true
-                code: |-
-                    reg add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\AdvertisingInfo" /v "Enabled" /t REG_DWORD /d 0 /f 
-                    reg add "HKLM\SOFTWARE\Policies\Microsoft\Windows\AdvertisingInfo" /v "DisabledByGroupPolicy" /t REG_DWORD /d 1 /f 
+                category: Disable Windows telemetry & data collection
+                children:
+                    -
+                        name: Disable Customer Experience Improvement (CEIP/SQM)
+                        recommend: true
+                        code: reg add "HKLM\Software\Policies\Microsoft\SQMClient\Windows" /v "CEIPEnable" /t REG_DWORD /d "0" /f
+                    -
+                        name: Disable Application Impact Telemetry (AIT)
+                        recommend: true
+                        code: reg add "HKLM\Software\Policies\Microsoft\Windows\AppCompat" /v "AITEnable" /t REG_DWORD /d "0" /f
+                    -
+                        name: Disable diagnostics telemetry
+                        recommend: true
+                        code: |-
+                            reg add "HKLM\SYSTEM\ControlSet001\Services\DiagTrack" /v "Start" /t REG_DWORD /d 4 /f 
+                            reg add "HKLM\SYSTEM\ControlSet001\Services\dmwappushsvc" /v "Start" /t REG_DWORD /d 4 /f 
+                            reg add "HKLM\SYSTEM\CurrentControlSet\Services\dmwappushservice" /v "Start" /t REG_DWORD /d 4 /f 
+                            reg add "HKLM\SYSTEM\CurrentControlSet\Services\diagnosticshub.standardcollector.service" /v "Start" /t REG_DWORD /d 4 /f
+                            sc config DiagTrack start=disabled
+                            sc config dmwappushservice start=disabled
+                            sc config diagnosticshub.standardcollector.service start=disabled
+                            sc config diagsvc start=disabled REM Disable Diagnostic Execution Service
+                    -
+                        name: Disable Customer Experience Improvement Program
+                        recommend: true
+                        code: |-
+                            schtasks /change /TN "\Microsoft\Windows\Customer Experience Improvement Program\Consolidator" /DISABLE
+                            schtasks /change /TN "\Microsoft\Windows\Customer Experience Improvement Program\KernelCeipTask" /DISABLE
+                            schtasks /change /TN "\Microsoft\Windows\Customer Experience Improvement Program\UsbCeip" /DISABLE
+                    -
+                        name: Disabling Data Logging Services
+                        recommend: true
+                        code: |-
+                            schtasks /change /TN "\Microsoft\Windows\Customer Experience Improvement Program\Consolidator" /DISABLE
+                            schtasks /change /TN "\Microsoft\Windows\Customer Experience Improvement Program\KernelCeipTask" /DISABLE
+                            schtasks /change /TN "\Microsoft\Windows\Customer Experience Improvement Program\UsbCeip" /DISABLE
+                    -
+                        name: Disable telemetry in data collection policy
+                        recommend: true
+                        code: |-
+                            reg add "HKLM\SOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\Policies\DataCollection" /v "AllowTelemetry" /d 0 /t REG_DWORD /f
+                            reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\DataCollection" /v "AllowTelemetry" /t REG_DWORD /d 0 /f
+                            reg add "HKLM\SOFTWARE\Policies\Microsoft\Windows\DataCollection" /v "AllowTelemetry" /t REG_DWORD /d 0 /f
+                            reg add "HKLM\SOFTWARE\Policies\Microsoft\Windows\DataCollection" /v "LimitEnhancedDiagnosticDataWindowsAnalytics" /t REG_DWORD /d 0 /f
+                            reg add "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\DataCollection" /v "AllowTelemetry" /t REG_DWORD /d 0 /f 
+                    -
+                        name: Disable license telemetry
+                        recommend: true
+                        code: reg add "HKLM\Software\Policies\Microsoft\Windows NT\CurrentVersion\Software Protection Platform" /v "NoGenTicket" /t "REG_DWORD" /d "1" /f
+                    -
+                        name: Disable error reporting
+                        recommend: true
+                        code: |-
+                            reg add "HKLM\SOFTWARE\Policies\Microsoft\Windows\Windows Error Reporting" /v "Disabled" /t REG_DWORD /d "1" /f
+                            reg add "HKLM\SOFTWARE\Microsoft\Windows\Windows Error Reporting" /v "Disabled" /t "REG_DWORD" /d "1" /f
+                            sc config WerSvc start=disabled
+                            sc config wercplsupport start=disabled
             -
                 name: Disable online device metadata collection
                 recommend: true
@@ -279,20 +343,6 @@ actions:
                 code: |-
                     reg add "HKCU\SOFTWARE\Microsoft\Personalization\Settings" /v "AcceptedPrivacyPolicy" /t REG_DWORD /d 0 /f
                     reg add "HKU\DefaultUser\Software\Microsoft\Personalization\Settings" /v "AcceptedPrivacyPolicy" /d "0" /t REG_DWORD /f
-            -
-                name: Disable windows telemetry & data collection
-                recommend: true
-                code: |-
-                    reg add "HKLM\SOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\Policies\DataCollection" /v "AllowTelemetry" /d 0 /t REG_DWORD /f
-                    reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\DataCollection" /v "AllowTelemetry" /t REG_DWORD /d 0 /f
-                    reg add "HKLM\SOFTWARE\Policies\Microsoft\Windows\DataCollection" /v "AllowTelemetry" /t REG_DWORD /d 0 /f
-                    reg add "HKLM\SOFTWARE\Policies\Microsoft\Windows\DataCollection" /v "LimitEnhancedDiagnosticDataWindowsAnalytics" /t REG_DWORD /d 0 /f
-                    reg add "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\DataCollection" /v "AllowTelemetry" /t REG_DWORD /d 0 /f 
-                    reg add "HKLM\SYSTEM\ControlSet001\Services\DiagTrack" /v "Start" /t REG_DWORD /d 4 /f 
-                    reg add "HKLM\SYSTEM\ControlSet001\Services\dmwappushsvc" /v "Start" /t REG_DWORD /d 4 /f 
-                    reg add "HKLM\SYSTEM\CurrentControlSet\Services\dmwappushservice" /v "Start" /t REG_DWORD /d 4 /f 
-                    reg add "HKLM\SYSTEM\CurrentControlSet\Services\diagnosticshub.standardcollector.service" /v "Start" /t REG_DWORD /d 4 /ff
-                    reg add "HKLM\SOFTWARE\Policies\Microsoft\Windows\AppCompat" /v "AITEnable" /t REG_DWORD /d 0 /f
             -
                 name: Disable Windows feedback
                 recommend: true
@@ -465,6 +515,7 @@ actions:
                             reg add "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Search" /v "CortanaEnabled" /t REG_DWORD /d 0 /f 
                             reg add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Search" /v "CortanaEnabled" /t REG_DWORD /d 0 /f 
                             reg add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Search" /v "CanCortanaBeEnabled" /t REG_DWORD /d 0 /f
+                            reg add "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Search" /v BingSearchEnabled /t REG_DWORD /d 0 /f
                             reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\Windows Search" /v "AllowCloudSearch" /t REG_DWORD /d 0 /f
                             reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\Windows Search" /v "AllowCortana" /t REG_DWORD /d 0 /f
                             reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\Windows Search" /v "AllowCortanaAboveLock" /t REG_DWORD /d 0 /f
@@ -491,18 +542,36 @@ actions:
                         name: Disable language detection
                         recommend: true
                         code: reg add "HKLM\SOFTWARE\Policies\Microsoft\Windows\Windows Search" /v AlwaysUseAutoLangDetection /t REG_DWORD /d 0 /f
-                name: Turn Off Suggested Content in Settings app
-                recommend: true
-                docs: https://www.tenforums.com/tutorials/100541-turn-off-suggested-content-settings-app-windows-10-a.html
-                code: |-
-                    reg add HKU\DefaultUser\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager /v "SubscribedContent-338393Enabled" /d "0" /t REG_DWORD /f
-                    reg add HKU\DefaultUser\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager /v "SubscribedContent-353694Enabled" /d "0" /t REG_DWORD /f
-                    reg add HKU\DefaultUser\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager /v "SubscribedContent-353696Enabled" /d "0" /t REG_DWORD /f
             -
+                category: Disable targeted ads & marketing
+                children: 
+                    -
+                        name: Disable ad customization with Advertising ID
+                        recommend: true
+                        code: |-
+                            reg add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\AdvertisingInfo" /v "Enabled" /t REG_DWORD /d 0 /f 
+                            reg add "HKLM\SOFTWARE\Policies\Microsoft\Windows\AdvertisingInfo" /v "DisabledByGroupPolicy" /t REG_DWORD /d 1 /f
+                    -
+                        name: Disable targeted tips
+                        recommend: true
+                        code: |-
+                            reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CloudContent" /v "DisableSoftLanding" /t REG_DWORD /d 1 /f
+                            reg add "HKLM\Software\Policies\Microsoft\Windows\CloudContent" /v "DisableWindowsSpotlightFeatures" /t "REG_DWORD" /d "1" /f
+                            reg add "HKLM\Software\Policies\Microsoft\Windows\CloudContent" /v "DisableWindowsConsumerFeatures" /t "REG_DWORD" /d "1" /f
+                    - 
+                        name: Turn Off Suggested Content in Settings app
+                        recommend: true
+                        docs: https://www.tenforums.com/tutorials/100541-turn-off-suggested-content-settings-app-windows-10-a.html
+                        code: |-
+                            reg add HKU\DefaultUser\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager /v "SubscribedContent-338393Enabled" /d "0" /t REG_DWORD /f
+                            reg add HKU\DefaultUser\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager /v "SubscribedContent-353694Enabled" /d "0" /t REG_DWORD /f
+                            reg add HKU\DefaultUser\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager /v "SubscribedContent-353696Enabled" /d "0" /t REG_DWORD /f
+            -                
                 name: Disable biometrics
                 recommend: true
                 code: |-
                     reg add "HKLM\SOFTWARE\Policies\Microsoft\Biometrics" /v "Enabled" /t REG_DWORD /d 0 /f 
+                    reg add "HKLM\SOFTWARE\Policies\Microsoft\Biometrics\Credential Provider" /v "Enabled" /t "REG_DWORD" /d "0" /f
                     reg add "HKLM\SYSTEM\CurrentControlSet\Services\WbioSrvc" /v "Start" /t REG_DWORD /d 4 /f 
             -
                 name: Disable Wi-Fi sense
@@ -526,10 +595,6 @@ actions:
                 code: |-
                     reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\Maps" /v "AllowUntriggeredNetworkTrafficOnSettingsPage" /t REG_DWORD /d 0 /f
                     reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\Maps" /v "AutoDownloadAndUpdateMapData" /t REG_DWORD /d 0 /f
-            -
-                name: Disable targeted tips
-                recommend: true
-                code: reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CloudContent" /v "DisableSoftLanding" /t REG_DWORD /d 1 /f
             -
                 name: Disable steps recorder
                 recommend: true
@@ -562,6 +627,9 @@ actions:
                     reg add "HKLM\SOFTWARE\Policies\Microsoft\Windows\PreviewBuilds" /v "AllowBuildPreview" /t REG_DWORD /d 0 /f
                     reg add "HKLM\SOFTWARE\Policies\Microsoft\Windows\PreviewBuilds" /v "EnableConfigFlighting" /t REG_DWORD /d 0 /f
                     reg add "HKLM\SOFTWARE\Policies\Microsoft\Windows\PreviewBuilds" /v "EnableExperimentation" /t REG_DWORD /d 0 /f
+                    reg add "HKLM\SOFTWARE\Microsoft\PolicyManager\default\System\AllowExperimentation" /v "value" /t "REG_DWORD" /d 0 /f
+                    reg add "HKLM\SOFTWARE\Microsoft\WindowsSelfHost\UI\Visibility" /v "HideInsiderPage" /t "REG_DWORD" /d "1" /f
+                    sc config wisvc start=disabled
             -
                 name: Disable the Windows Connect Now wizard
                 recommend: false
@@ -674,7 +742,7 @@ actions:
                         code: |-
                             sc stop "VSStandardCollectorService150" 
                             net stop VSStandardCollectorService150 2>nul
-                            sc config "VSStandardCollectorService150" start= disabled
+                            sc config "VSStandardCollectorService150" start=disabled
                     - 
                         category: Configure Windows Defender
                         children:
@@ -734,6 +802,8 @@ actions:
                 recommend: true
                 docs: https://docs.microsoft.com/en-us/deployoffice/compat/manage-the-privacy-of-data-monitored-by-telemetry-in-office
                 code: |-
+                    reg add "HKCU\SOFTWARE\Policies\Microsoft\Office\15.0\osm" /v "Enablelogging" /t REG_DWORD /d 0 /f 
+                    reg add "HKCU\SOFTWARE\Policies\Microsoft\Office\15.0\osm" /v "EnableUpload" /t REG_DWORD /d 0 /f 
                     reg add "HKCU\SOFTWARE\Policies\Microsoft\Office\16.0\osm" /v "Enablelogging" /t REG_DWORD /d 0 /f 
                     reg add "HKCU\SOFTWARE\Policies\Microsoft\Office\16.0\osm" /v "EnableUpload" /t REG_DWORD /d 0 /f 
             -
@@ -817,34 +887,37 @@ actions:
                 name: Disable Google update service
                 recommend: true
                 code: |-
-                    sc config gupdate start= disabled
-                    sc config gupdatem start= disabled
+                    sc config gupdate start=disabled
+                    sc config gupdatem start=disabled
                     schtasks /Change /DISABLE /TN "GoogleUpdateTaskMachineCore"
                     schtasks /Change /DISABLE /TN "GoogleUpdateTaskMachineUA"
             -
                 name: Disable Adobe Acrobat update service
                 recommend: true
                 code: |-
-                    sc config AdobeARMservice start= disabled
-                    schtasks /Change /DISABLE /TN "Adobe Acrobat Update Task"
+                    sc config AdobeARMservice start=disabled
+                    sc config adobeupdateservice start=disabled
+                    sc config adobeflashplayerupdatesvc start=disabled
+                    schtasks /change /tn "Adobe Acrobat Update Task" /disable
+                    schtasks /change /tn "Adobe Flash Player Updater" /disable
             -
                 name: Disable Razer Game Scanner Service
                 recommend: true
                 code: |-
                     sc stop "Razer Game Scanner Service"
-                    sc config "Razer Game Scanner Service" start= disabled
+                    sc config "Razer Game Scanner Service" start=disabled
             -
                 name: Disable Logitech Gaming Registry Service 
                 recommend: true
                 code: |-
                     sc stop "LogiRegistryService"
-                    sc config "LogiRegistryService" start= disabled 
+                    sc config "LogiRegistryService" start=disabled 
             -
                 name: Disable Dropbox auto update service
                 recommend: true
                 code: |-
-                    sc config dbupdate start= disabled
-                    sc config dbupdatem start= disabled
+                    sc config dbupdate start=disabled
+                    sc config dbupdatem start=disabled
                     schtasks /Change /DISABLE /TN "DropboxUpdateTaskMachineCore"
                     schtasks /Change /DISABLE /TN "DropboxUpdateTaskMachineUA" 
             -
@@ -862,6 +935,10 @@ actions:
                             reg add "HKEY_CURRENT_USER\Software\Policies\Microsoft\WindowsMediaPlayer" /v "PreventMusicFileMetadataRetrieval" /t REG_DWORD /d 1 /f
                             reg add "HKEY_CURRENT_USER\Software\Policies\Microsoft\WindowsMediaPlayer" /v "PreventRadioPresetsRetrieval" /t REG_DWORD /d 1 /f
                             reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\WMDRM" /v "DisableOnline" /t REG_DWORD /d 1 /f
+                    -
+                        name: Disable dows Media Player Network Sharing Service
+                        recommend: true
+                        code: sc config WMPNetworkSvc start=disabled
     -
         category: Security improvements
         children:         
@@ -984,6 +1061,14 @@ actions:
                 name: Disable scheduled On Demand anti malware scanner (MRT)
                 recommend: false
                 code: reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\MRT" /v "DontOfferThroughWUAU" /t REG_DWORD /d 1 /f
+            -
+                name: Disable automatic updates
+                recommend: false
+                code: |-
+                    reg add "HKLM\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU" /v "NoAutoUpdate" /t "REG_DWORD" /d "0" /f
+                    reg add "HKLM\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU" /v "AUOptions" /t "REG_DWORD" /d "2" /f
+                    reg add "HKLM\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU" /v "ScheduledInstallDay" /t "REG_DWORD" /d "0" /f
+                    reg add "HKLM\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU" /v "ScheduledInstallTime" /t "REG_DWORD" /d "3" /f
     -
         category: UI for privacy
         children:         
@@ -1025,15 +1110,447 @@ actions:
                         reg delete HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\Explorer\HomeFolderDesktop\NameSpace\DelegateFolders\{3134ef9c-6b18-4996-ad04-ed5912e00eb5} /f
                         reg delete HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\HomeFolderDesktop\NameSpace\DelegateFolders\{3134ef9c-6b18-4996-ad04-ed5912e00eb5} /f
                     )
+    -
+        category: Disable OS services
+        children:
+            -
+                name: Delivery Optimization (P2P Windows Updates)
+                recommend: true
+                code: sc config DoSvc start=disabled
+            -
+                name: Microsoft Windows Live ID Service
+                recommend: true
+                code: sc config wlidsvc start=demand
+            -
+                name: Program Compatibility Assistant Service
+                recommend: true
+                code: sc config PcaSvc start=disabled
+            -
+                name: Downloaded Maps Manager
+                recommend: true
+                code: sc config MapsBroker start=disabled
+            -
+                name: Microsoft Retail Demo experience
+                recommend: true
+                code: sc config RetailDemo start=disabled
+            -
+                name: Mail, contact, calendar & user data synchronization. 
+                recommend: false
+                code: |-
+                    sc config OneSyncSvc start=disabled
+                    sc config UnistoreSvc start=disabled
+            -
+                name: Contact data indexing
+                recommend: false
+                code: |-
+                    sc config PimIndexMaintenanceSvc start=disabled
+            -
+                name: App user data access
+                recommend: false
+                code: sc config UserDataSvc start=disabled
+            -
+                name: Text messaging
+                recommend: false
+                code: sc config MessagingService start=disabled
+    -
+        category: Uninstall apps
+        children:
+            -
+                category: Provisioned Windows apps
+                children:
+                    -
+                        name: Microsoft 3D Builder
+                        code: PowerShell -Command "Get-AppxPackage Microsoft.3DBuilder | Remove-AppxPackage"
+                    -
+                        category: Bing
+                        children:
+                            -
+                                name: Bing Weather
+                                recommend: true
+                                code: PowerShell -Command "Get-AppxPackage Microsoft.BingWeather | Remove-AppxPackage"
+                            -
+                                name: Bing Sports
+                                recommend: true
+                                code: PowerShell -Command "Get-AppxPackage Microsoft.BingSports | Remove-AppxPackage"
+                            -
+                                name: Bing News
+                                recommend: true
+                                code: PowerShell -Command "Get-AppxPackage Microsoft.BingNews | Remove-AppxPackage"
+                            -
+                                name: Bing Finance
+                                recommend: true
+                                code: PowerShell -Command "Get-AppxPackage Microsoft.BingFinance | Remove-AppxPackage"
+                    -
+                        name: App Installer
+                        code: PowerShell -Command "Get-AppxPackage Microsoft.DesktopAppInstaller | Remove-AppxPackage"
+                    -
+                        name: Get Help
+                        code: PowerShell -Command "Get-AppxPackage Microsoft.GetHelp | Remove-AppxPackage"
+                    -
+                        name: Microsoft Tips
+                        code: PowerShell -Command "Get-AppxPackage Microsoft.Getstarted | Remove-AppxPackage"
+                    -
+                        category: Extensions
+                        children:
+                            -
+                                name: HEIF Image Extensions
+                                code: PowerShell -Command "Get-AppxPackage Microsoft.HEIFImageExtension | Remove-AppxPackage"
+                            -
+                                name: VP9 Video Extensions	
+                                code: PowerShell -Command "Get-AppxPackage Microsoft.VP9VideoExtensions | Remove-AppxPackage"
+                            -
+                                name: Web Media Extensions	
+                                code: PowerShell -Command "Get-AppxPackage Microsoft.WebMediaExtensions | Remove-AppxPackage"
+                            -
+                                name: Webp Image Extension	
+                                code: PowerShell -Command "Get-AppxPackage Microsoft.WebpImageExtension | Remove-AppxPackage"
+                    -
+                        name: Microsoft Messaging
+                        code: PowerShell -Command "Get-AppxPackage Microsoft.Messaging | Remove-AppxPackage"
+                    -
+                        category: Mixed Reality
+                        children:
+                            -
+                                name: Mixed Reality Portal
+                                code: PowerShell -Command "Get-AppxPackage Microsoft.MixedReality.Portal | Remove-AppxPackage"
+                            -
+                                name: Mixed Reality Viewer
+                                code: PowerShell -Command "Get-AppxPackage Microsoft.Microsoft3DViewer | Remove-AppxPackage"
+            
+                    -
+                        category: Microsoft Office
+                        children:
+                            -
+                                name: My Office
+                                recommend: true
+                                code: PowerShell -Command "Get-AppxPackage Microsoft.MicrosoftOfficeHub | Remove-AppxPackage"
+                            -
+                                name: OneNote
+                                code: PowerShell -Command "Get-AppxPackage Microsoft.Office.OneNote | Remove-AppxPackage"
+                            -
+                                name: Sway
+                                docs: https://docs.microsoft.com/en-us/windows/application-management/apps-in-windows-10
+                                code: PowerShell -Command "Get-AppxPackage Microsoft.Office.Sway | Remove-AppxPackage"
+                    -
+                        name: Feedback Hub
+                        recommend: true
+                        code: PowerShell -Command "Get-AppxPackage Microsoft.WindowsFeedbackHub | Remove-AppxPackage"
+                    -
+                        name: Windows Alarms & Clock
+                        code: PowerShell -Command "Get-AppxPackage Microsoft.WindowsAlarms | Remove-AppxPackage"
+                    -
+                        name: Windows Camera
+                        code: PowerShell -Command "Get-AppxPackage Microsoft.WindowsCamera | Remove-AppxPackage"
+                    -
+                        name: Paint 3D
+                        code: PowerShell -Command "Get-AppxPackage Microsoft.MSPaint | Remove-AppxPackage"
+                    -
+                        name: Windows Maps
+                        recommend: true
+                        code: PowerShell -Command "Get-AppxPackage Microsoft.WindowsMaps | Remove-AppxPackage"
+                    -
+                        name: Minecraft
+                        code: PowerShell -Command "Get-AppxPackage Microsoft.MinecraftUWP | Remove-AppxPackage"
+                    -
+                        name: Microsoft Store
+                        code: PowerShell -Command "Get-AppxPackage Microsoft.WindowsStore | Remove-AppxPackage"
+                    -
+                        name: Microsoft People
+                        code: PowerShell -Command "Get-AppxPackage Microsoft.People | Remove-AppxPackage"
+                    -
+                        name: Microsoft Pay
+                        code: PowerShell -Command "Get-AppxPackage Microsoft.Wallet | Remove-AppxPackage"
+                    -
+                        name: Store Purchase App
+                        code: PowerShell -Command "Get-AppxPackage Microsoft.StorePurchaseApp | Remove-AppxPackage"
+                    -
+                        name: Snip & Sketch
+                        code: PowerShell -Command "Get-AppxPackage Microsoft.ScreenSketch | Remove-AppxPackage"
+                    -
+                        name: Print3D
+                        code: PowerShell -Command "Get-AppxPackage Microsoft.Print3D | Remove-AppxPackage"
+                    -
+                        name: Paid Wi-Fi & Cellular
+                        code: PowerShell -Command "Get-AppxPackage Microsoft.OneConnect | Remove-AppxPackage"
+                    -
+                        name: Microsoft Solitaire Collection
+                        code: PowerShell -Command "Get-AppxPackage Microsoft.MicrosoftSolitaireCollection | Remove-AppxPackage"
+                    -
+                        name: Microsoft Sticky Notes
+                        code: PowerShell -Command "Get-AppxPackage Microsoft.MicrosoftStickyNotes | Remove-AppxPackage"
+                    -
+                        category: Xbox
+                        children:
+                            -
+                                name: Xbox
+                                code: PowerShell -Command "Get-AppxPackage Microsoft.XboxApp | Remove-AppxPackage"
+                            -
+                                name: Xbox TCUI
+                                code: PowerShell -Command "Get-AppxPackage Microsoft.Xbox.TCUI | Remove-AppxPackage"
+                            -
+                                name: Xbox Game Bar
+                                code: PowerShell -Command "Get-AppxPackage Microsoft.XboxGameOverlay | Remove-AppxPackage"
+                            -
+                                name: Xbox Gaming Overlay
+                                code: PowerShell -Command "Get-AppxPackage Microsoft.XboxGamingOverlay | Remove-AppxPackage"
+                            -
+                                name: Xbox Identity Provider
+                                code: PowerShell -Command "Get-AppxPackage Microsoft.XboxIdentityProvider | Remove-AppxPackage"
+                            -
+                                name: Xbox Speech To Text Overlay
+                                code: PowerShell -Command "Get-AppxPackage Microsoft.XboxSpeechToTextOverlay | Remove-AppxPackage"
+                    -
+                        name: Mail and Calendar
+                        code: PowerShell -Command "Get-AppxPackage microsoft.windowscommunicationsapps | Remove-AppxPackage"
+                    -
+                        category: Zune
+                        children:
+                            -
+                                name: Music
+                                code: PowerShell -Command "Get-AppxPackage Microsoft.ZuneMusic | Remove-AppxPackage"
+                            -
+                                name: Video
+                                code: PowerShell -Command "Get-AppxPackage Microsoft.ZuneVideo | Remove-AppxPackage"
+                    -
+                        name: Windows Calculator
+                        code: PowerShell -Command "Get-AppxPackage Microsoft.WindowsCalculator | Remove-AppxPackage"
+                    -
+                        name: Microsoft Photos
+                        code: PowerShell -Command "Get-AppxPackage Microsoft.Windows.Photos | Remove-AppxPackage"
+                    -
+                        name: Skype
+                        code: PowerShell -Command "Get-AppxPackage Microsoft.SkypeApp | Remove-AppxPackage"
+                    -
+                        name: Windows Voice Recorder
+                        code: PowerShell -Command "Get-AppxPackage Microsoft.WindowsSoundRecorder | Remove-AppxPackage"
+                    -
+                        category: Phone
+                        children:
+                            -
+                                name: Windows Phone
+                                code: |-
+                                    PowerShell -Command "Get-AppxPackage Microsoft.WindowsPhone | Remove-AppxPackage"
+                                    PowerShell -Command "Get-AppxPackage Microsoft.Windows.Phone | Remove-AppxPackage"
+                            -
+                                name: Comms Phone
+                                code: PowerShell -Command "Get-AppxPackage Microsoft.CommsPhone | Remove-AppxPackage"
+                            -
+                                name: Your Phone
+                                code: PowerShell -Command "Get-AppxPackage Microsoft.YourPhone | Remove-AppxPackage"
+            -
+                category: Installed Windows apps
+                children:
+                    -
+                        name: Microsoft Advertising
+                        recommend: true
+                        code: PowerShell -Command "Get-AppxPackage Microsoft.Advertising.Xaml | Remove-AppxPackage"
+                    -
+                        name: Remote Desktop
+                        code: PowerShell -Command "Get-AppxPackage Microsoft.RemoteDesktop | Remove-AppxPackage"
+                    -
+                        name: Network Speed Test
+                        recommend: true
+                        code: PowerShell -Command "Get-AppxPackage Microsoft.NetworkSpeedTest | Remove-AppxPackage"
+                    -
+                        category: Third party
+                        children:
+                            -
+                                name: Shazam
+                                code: PowerShell -Command "Get-AppxPackage ShazamEntertainmentLtd.Shazam | Remove-AppxPackage"
+                            -
+                                name: Candy Crush Saga
+                                code: |-
+                                    PowerShell -Command "Get-AppxPackage king.com.CandyCrushSaga | Remove-AppxPackage"
+                                    PowerShell -Command "Get-AppxPackage king.com.CandyCrushSodaSaga | Remove-AppxPackage"
+                            -
+                                name: Flipboard
+                                code: PowerShell -Command "Get-AppxPackage Flipboard.Flipboard | Remove-AppxPackage"
+                            -
+                                name: Twitter
+                                code: PowerShell -Command "Get-AppxPackage 9E2F88E3.Twitter | Remove-AppxPackage"
+                            -
+                                name: iHeartRadio
+                                code: PowerShell -Command "Get-AppxPackage ClearChannelRadioDigital.iHeartRadio | Remove-AppxPackage"
+                            -
+                                name: Duolingo
+                                code: PowerShell -Command "Get-AppxPackage D5EA27B7.Duolingo-LearnLanguagesforFree | Remove-AppxPackage"
+                            -
+                                name: Photoshop Express
+                                code: PowerShell -Command "Get-AppxPackage AdobeSystemIncorporated.AdobePhotoshop | Remove-AppxPackage"
+                            -
+                                name: Pandora
+                                code: PowerShell -Command "Get-AppxPackage PandoraMediaInc.29680B314EFC2 | Remove-AppxPackage"
+                            -
+                                name: Eclipse Manager
+                                code: PowerShell -Command "Get-AppxPackage 46928bounde.EclipseManager | Remove-AppxPackage"
+                            -
+                                name: Code Writer
+                                code: PowerShell -Command "Get-AppxPackage ActiproSoftwareLLC.562882FEEB491 | Remove-AppxPackage"
+            -
+                category: System apps
+                children:
+                    -
+                        name: File Picker
+                        code: PowerShell -Command "Get-AppxPackage 1527c705-839a-4832-9118-54d4Bd6a0c89 | Remove-AppxPackage"
+                    -
+                        name: File Explorer
+                        code: PowerShell -Command "Get-AppxPackage c5e2524a-ea46-4f67-841f-6a9465d9d515 | Remove-AppxPackage"
+                    -
+                        name: App Resolver UX
+                        code: PowerShell -Command "Get-AppxPackage E2A4F912-2574-4A75-9BB0-0D023378592B | Remove-AppxPackage"
+                    -
+                        name: Add Suggested Folders To Library
+                        recommend: true
+                        code: |-
+                            PowerShell -Command "Get-AppxPackage F46D4000-FD22-4DB4-AC8E-4E1DDDE828FE | Remove-AppxPackage"
+                            PowerShell -Command "Get-AppxPackage InputApp | Remove-AppxPackage"
+                    -
+                        name: Microsoft.AAD.Broker.Plugin
+                        recommend: true
+                        code: PowerShell -Command "Get-AppxPackage Microsoft.AAD.Broker.Plugin | Remove-AppxPackage"
+                    -
+                        name: Microsoft.AccountsControl
+                        code: PowerShell -Command "Get-AppxPackage Microsoft.AccountsControl | Remove-AppxPackage"
+                    -
+                        name: Microsoft.AsyncTextService
+                        code: PowerShell -Command "Get-AppxPackage Microsoft.AsyncTextService | Remove-AppxPackage"
+                    -
+                        category: Hello setup UI
+                        children:
+                            -
+                                name: Bio enrollment
+                                recommend: true
+                                code: PowerShell -Command "Get-AppxPackage Microsoft.BioEnrollment | Remove-AppxPackage"
+                            -
+                                name: Cred Dialog Host
+                                code: PowerShell -Command "Get-AppxPackage Microsoft.CredDialogHost | Remove-AppxPackage"
+                            -
+                                name: EC App
+                                code: PowerShell -Command "Get-AppxPackage Microsoft.ECApp | Remove-AppxPackage"
+                            -
+                                name: Lock App
+                                code: PowerShell -Command "Get-AppxPackage Microsoft.LockApp | Remove-AppxPackage"
+                    -
+                        category: Microsoft Edge
+                        children:
+                            -
+                                name: Microsoft Edge
+                                recommend: true
+                                code: PowerShell -Command "Get-AppxPackage Microsoft.MicrosoftEdge | Remove-AppxPackage"
+                            -
+                                name: Microsoft Edge Dev Tools Client
+                                recommend: true
+                                code: PowerShell -Command "Get-AppxPackage Microsoft.MicrosoftEdgeDevToolsClient | Remove-AppxPackage"
+                            -
+                                name: Microsoft PPI Projection
+                                recommend: true
+                                code: PowerShell -Command "Get-AppxPackage Microsoft.PPIProjection | Remove-AppxPackage"
+                            -
+                                name: Win32 Web View Host
+                                recommend: true
+                                code: PowerShell -Command "Get-AppxPackage Microsoft.Win32WebViewHost | Remove-AppxPackage"
+                            -
+                                name: ChxApp
+                                recommend: true
+                                code: PowerShell -Command "Get-AppxPackage Microsoft.Windows.Apprep.ChxApp | Remove-AppxPackage"
+                            -
+                                name: Assigned Access Lock App
+                                recommend: true
+                                code: PowerShell -Command "Get-AppxPackage Microsoft.Windows.AssignedAccessLockApp | Remove-AppxPackage"
+                            -
+                                name: Capture Picker
+                                recommend: true
+                                code: PowerShell -Command "Get-AppxPackage Microsoft.Windows.CapturePicker | Remove-AppxPackage"
+                            -
+                                name: Cloud Experience Host
+                                recommend: true
+                                code: PowerShell -Command "Get-AppxPackage Microsoft.Windows.CloudExperienceHost | Remove-AppxPackage"
+                            -
+                                name: Content Delivery Manager
+                                recommend: true
+                                code: PowerShell -Command "Get-AppxPackage Microsoft.Windows.ContentDeliveryManager | Remove-AppxPackage"
+                    -
+                        category: Cortana
+                        children:
+                            -
+                                name: Cortana
+                                recommend: true
+                                code: PowerShell -Command "Get-AppxPackage Microsoft.Windows.Cortana | Remove-AppxPackage"
+                            -
+                                name: Holographic First Run
+                                recommend: true
+                                code: PowerShell -Command "Get-AppxPackage Microsoft.Windows.Holographic.FirstRun | Remove-AppxPackage"
+                            -
+                                name: OOBE Network Captive Port
+                                recommend: true
+                                code: PowerShell -Command "Get-AppxPackage Microsoft.Windows.OOBENetworkCaptivePort | Remove-AppxPackage"
+                            -
+                                name: OOBE Network Connection Flow
+                                recommend: true
+                                code: PowerShell -Command "Get-AppxPackage Microsoft.Windows.OOBENetworkConnectionFlow | Remove-AppxPackage"
+                            -
+                                name: Parental Controls
+                                recommend: true
+                                code: PowerShell -Command "Get-AppxPackage Microsoft.Windows.ParentalControls | Remove-AppxPackage"
+                    -
+                        category: People Hub
+                        children:
+                            -
+                                name: People Experience Host
+                                recommend: true
+                                code: PowerShell -Command "Microsoft.Windows.PeopleExperienceHost | Remove-AppxPackage"
+                            -
+                                name: Pinning Confirmation Dialog
+                                recommend: true
+                                code: PowerShell -Command "Microsoft.Windows.PinningConfirmationDialog | Remove-AppxPackage"
+                            -
+                                name: Sec Health UI
+                                recommend: true
+                                code: PowerShell -Command "Microsoft.Windows.SecHealthUI | Remove-AppxPackage"
+                            -
+                                name: Secondary Tile Experience
+                                recommend: true
+                                code: PowerShell -Command "Microsoft.Windows.SecondaryTileExperience | Remove-AppxPackage"
+                            -
+                                name: Secure Assessment Browser
+                                recommend: true
+                                code: PowerShell -Command "Microsoft.Windows.SecureAssessmentBrowser | Remove-AppxPackage"
+                    -
+                        name: Start
+                        code: PowerShell -Command "Microsoft.Windows.ShellExperienceHost | Remove-AppxPackage"
+                    -
+                        category: Windows Feedback
+                        children:
+                            -
+                                name: Windows Feedback
+                                recommend: true
+                                code: PowerShell -Command "Microsoft.WindowsFeedback | Remove-AppxPackage"
+                            -
+                                name: Xbox Game Callable UI
+                                recommend: true
+                                code: PowerShell -Command "Microsoft.XboxGameCallableUI | Remove-AppxPackage"
+                            -
+                                name: CBS Preview
+                                recommend: true
+                                code: PowerShell -Command "Windows.CBSPreview | Remove-AppxPackage"
+                    -
+                        name: Contact Support
+                        code: PowerShell -Command "Windows.ContactSupport | Remove-AppxPackage"
+                    -
+                        name: Settings
+                        code: PowerShell -Command "Windows.immersivecontrolpanel | Remove-AppxPackage"
+                    -
+                        name: Windows Print 3D
+                        code: PowerShell -Command "Windows.Print3D | Remove-AppxPackage"
+                    -
+                        name: Print UI
+                        code: PowerShell -Command "Windows.PrintDialog | Remove-AppxPackage"
+            -
+                name: App Connector
+                code: PowerShell -Command "Get-AppxPackage Microsoft.Appconnector | Remove-AppxPackage"
     -
         category: Advanced settings
-        children:         
-            # -
-            #     name: Run script on start-up (EXPERIMENTAL)
-            #     recommend: false
-            #     code: |-
-            #         del /f /q %AppData%\Microsoft\Windows\Start Menu\Programs\Startup\privacy-cleanup.bat
-            #         copy "%~dpnx0" "%AppData%\Microsoft\Windows\Start Menu\Programs\Startup\privacy-cleanup"
+        children:   
             -
                 name: Change NTP (time) server to pool.ntp.org
                 recommend: false
@@ -1044,10 +1561,16 @@ actions:
                     reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\W32time\TimeProviders\NtpClient" /v "EventLogFlags" /t REG_DWORD /d 0 /f
                     reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\W32time\TimeProviders\NtpClient" /v "ResolvePeerBackoffMaxTimes" /t REG_DWORD /d 7 /f
                     reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\W32time\TimeProviders\NtpClient" /v "ResolvePeerBackoffMinutes" /t REG_DWORD /d 15 /f
-                    reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\W32time\TimeProviders\NtpClient" /v "SpecialPollInterval" /t REG_DWORD /d 1024 /f
+                    reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\W32time\TimeProviders\NtpClient" /v "SpecialPollInterval" /t REG_DWORD /d 1024 /f      
             -
-                name: Apply settings for all future users (EXPERIMENTAL)
+                name: Run script on start-up [EXPERIMENTAL]
+                recommend: false
+                code: |-
+                    del /f /q %AppData%\Microsoft\Windows\Start Menu\Programs\Startup\privacy-cleanup.bat
+                    copy "%~dpnx0" "%AppData%\Microsoft\Windows\Start Menu\Programs\Startup\privacy-cleanup.bat"
+            -
+                name: Apply settings for all future users [EXPERIMENTAL]
                 recommend: false
                 code: |-
                     REG UNLOAD HKU\DefaultUser
-                    reg load HKU\DefaultUser %SystemDrive%\Users\Default\NTUSER.DAT
+                    reg load HKU\DefaultUser %SystemDrive%\Users\Default\NTUSER.DAT
\ No newline at end of file
diff --git a/src/application/application.yaml.d.ts b/src/application/application.yaml.d.ts
index 1f4d9320..7a181a38 100644
--- a/src/application/application.yaml.d.ts
+++ b/src/application/application.yaml.d.ts
@@ -20,6 +20,7 @@ declare module 'js-yaml-loader!*' {
     interface ApplicationYaml {
         name: string;
         version: number;
+        repositoryUrl: string;
         actions: ReadonlyArray<YamlCategory>;
     }
 
diff --git a/src/domain/Application.ts b/src/domain/Application.ts
index 4610222b..5f11eef3 100644
--- a/src/domain/Application.ts
+++ b/src/domain/Application.ts
@@ -11,14 +11,12 @@ export class Application implements IApplication {
 
     constructor(
         public readonly name: string,
+        public readonly repositoryUrl: string,
         public readonly version: number,
         public readonly categories: ReadonlyArray<ICategory>) {
-        if (!name) {
-            throw Error('Application has no name');
-        }
-        if (!version) {
-            throw Error('Version cannot be zero');
-        }
+        if (!name) { throw Error('Application has no name'); }
+        if (!repositoryUrl) { throw Error('Application has no repository url'); }
+        if (!version) { throw Error('Version cannot be zero'); }
         this.flattened = flatten(categories);
         if (this.flattened.allCategories.length === 0) {
             throw new Error('Application must consist of at least one category');
@@ -48,6 +46,10 @@ export class Application implements IApplication {
     public getAllScripts(): IScript[] {
         return this.flattened.allScripts;
     }
+
+    public getAllCategories(): ICategory[] {
+        return this.flattened.allCategories;
+    }
 }
 
 function ensureNoDuplicates<TKey>(entities: ReadonlyArray<IEntity<TKey>>) {
diff --git a/src/domain/IApplication.ts b/src/domain/IApplication.ts
index c714662c..b5146c8e 100644
--- a/src/domain/IApplication.ts
+++ b/src/domain/IApplication.ts
@@ -3,6 +3,7 @@ import { ICategory } from '@/domain/ICategory';
 
 export interface IApplication {
     readonly name: string;
+    readonly repositoryUrl: string;
     readonly version: number;
     readonly categories: ReadonlyArray<ICategory>;
     readonly totalScripts: number;
@@ -12,6 +13,7 @@ export interface IApplication {
     findCategory(categoryId: number): ICategory | undefined;
     findScript(scriptId: string): IScript | undefined;
     getAllScripts(): ReadonlyArray<IScript>;
+    getAllCategories(): ReadonlyArray<ICategory>;
 }
 
 export { IScript } from '@/domain/IScript';
diff --git a/src/global.d.ts b/src/global.d.ts
index 18887b01..03b846c8 100644
--- a/src/global.d.ts
+++ b/src/global.d.ts
@@ -37,6 +37,18 @@ declare module 'liquor-tree' {
         children: ReadonlyArray<ILiquorTreeNewNode> | undefined;
         data: ICustomLiquorTreeData;
     }
+    
+    // https://amsik.github.io/liquor-tree/#Component-Options
+    export interface ILiquorTreeOptions {
+        multiple: boolean;
+        checkbox: boolean;
+        checkOnSelect: boolean;
+        autoCheckChildren: boolean;
+        parentSelect: boolean;
+        keyboardNavigation: boolean;
+        deletion: (node: ILiquorTreeExistingNode) => void;
+        filter: ILiquorTreeFilter;
+    }
 
     // https://github.com/amsik/liquor-tree/blob/master/src/lib/Node.js
     interface ILiquorTreeNodeState {
@@ -58,7 +70,7 @@ declare module 'liquor-tree' {
     // https://github.com/amsik/liquor-tree/blob/master/src/components/TreeRoot.vue
     interface ILiquorTreeFilter {
         emptyText: string;
-        matcher(query: string, node: ILiquorTreeNewNode): boolean;
+        matcher(query: string, node: ILiquorTreeExistingNode): boolean;
     }
 
     const LiquorTree: PluginObject<any> & VueClass<any>;
diff --git a/src/presentation/Scripts/Cards/CardListItem.vue b/src/presentation/Scripts/Cards/CardListItem.vue
index 44050f14..9bd05d28 100644
--- a/src/presentation/Scripts/Cards/CardListItem.vue
+++ b/src/presentation/Scripts/Cards/CardListItem.vue
@@ -52,7 +52,6 @@ export default class CardListItem extends StatefulVue {
     this.cardTitle = value ? await this.getCardTitleAsync(value) : undefined;
   }
 
-
   private async getCardTitleAsync(categoryId: number): Promise<string | undefined> {
       const state = await this.getCurrentStateAsync();
       const category = state.app.findCategory(this.categoryId);
diff --git a/src/presentation/Scripts/Grouping/TheGrouper.vue b/src/presentation/Scripts/Grouping/TheGrouper.vue
index 8f6d30bb..27b8b008 100644
--- a/src/presentation/Scripts/Grouping/TheGrouper.vue
+++ b/src/presentation/Scripts/Grouping/TheGrouper.vue
@@ -4,12 +4,12 @@
         <span class="part">
             <span 
                 class="part"
-                v-bind:class="{ 'disabled': isGrouped, 'enabled': !isGrouped}"
-                @click="!isGrouped ? toggleGrouping() : undefined">Cards</span>
+                v-bind:class="{ 'disabled': cardsSelected, 'enabled': !cardsSelected}"
+                @click="groupByCard()">Cards</span>
             <span class="part">|</span>
             <span class="part"
-                v-bind:class="{ 'disabled': !isGrouped, 'enabled': isGrouped}"
-                @click="isGrouped ? toggleGrouping() : undefined">None</span>
+                v-bind:class="{ 'disabled': noneSelected, 'enabled': !noneSelected}"
+                @click="groupByNone()">None</span>
             </span>
     </div>
 </template>
@@ -20,14 +20,35 @@ import { StatefulVue } from '@/presentation/StatefulVue';
 import { IApplicationState } from '@/application/State/IApplicationState';
 import { Grouping } from './Grouping';
 
+const DefaultGrouping = Grouping.Cards;
+
 @Component
 export default class TheGrouper extends StatefulVue {
-    public currentGrouping: Grouping;
-    public isGrouped = true;
 
-    public toggleGrouping() {
-        this.currentGrouping = this.currentGrouping === Grouping.None ? Grouping.Cards : Grouping.None;
-        this.isGrouped = this.currentGrouping === Grouping.Cards;
+    public cardsSelected = false;
+    public noneSelected = false;
+
+    private currentGrouping: Grouping;
+
+    public mounted() {
+        this.changeGrouping(DefaultGrouping);
+    }
+
+    public groupByCard() {
+        this.changeGrouping(Grouping.Cards);
+    }
+
+    public groupByNone() {
+        this.changeGrouping(Grouping.None);
+    }
+
+    private changeGrouping(newGrouping: Grouping) {
+        if (this.currentGrouping === newGrouping) {
+            return;
+        }
+        this.currentGrouping = newGrouping;
+        this.cardsSelected = newGrouping === Grouping.Cards;
+        this.noneSelected = newGrouping === Grouping.None;
         this.$emit('groupingChanged', this.currentGrouping);
     }
 }
diff --git a/src/presentation/Scripts/ScriptsTree/ScriptNodeParser.ts b/src/presentation/Scripts/ScriptsTree/ScriptNodeParser.ts
index bf25782f..91157d54 100644
--- a/src/presentation/Scripts/ScriptsTree/ScriptNodeParser.ts
+++ b/src/presentation/Scripts/ScriptsTree/ScriptNodeParser.ts
@@ -1,41 +1,46 @@
-import { IApplicationState, IUserSelection } from '@/application/State/IApplicationState';
+import { IApplication } from './../../../domain/IApplication';
 import { ICategory, IScript } from '@/domain/ICategory';
 import { INode } from './SelectableTree/INode';
 
-export function parseAllCategories(state: IApplicationState): INode[] | undefined {
+export function parseAllCategories(app: IApplication): INode[] | undefined {
   const nodes = new Array<INode>();
-  for (const category of state.app.categories) {
-    const children = parseCategoryRecursively(category, state.selection);
+  for (const category of app.categories) {
+    const children = parseCategoryRecursively(category);
     nodes.push(convertCategoryToNode(category, children));
   }
   return nodes;
 }
 
-export function parseSingleCategory(categoryId: number, state: IApplicationState): INode[] | undefined {
-  const category = state.app.findCategory(categoryId);
+export function parseSingleCategory(categoryId: number, app: IApplication): INode[] | undefined {
+  const category = app.findCategory(categoryId);
   if (!category) {
     throw new Error(`Category with id ${categoryId} does not exist`);
   }
-  const tree = parseCategoryRecursively(category, state.selection);
+  const tree = parseCategoryRecursively(category);
   return tree;
 }
 
+export function getScriptNodeId(script: IScript): string {
+  return script.id;
+}
+export function getCategoryNodeId(category: ICategory): string {
+  return `Category${category.id}`;
+}
+
 function parseCategoryRecursively(
-  parentCategory: ICategory,
-  selection: IUserSelection): INode[] {
+  parentCategory: ICategory): INode[] {
   if (!parentCategory) { throw new Error('parentCategory is undefined'); }
-  if (!selection) { throw new Error('selection is undefined'); }
 
   const nodes = new Array<INode>();
   if (parentCategory.subCategories && parentCategory.subCategories.length > 0) {
     for (const subCategory of parentCategory.subCategories) {
-      const subCategoryNodes = parseCategoryRecursively(subCategory, selection);
+      const subCategoryNodes = parseCategoryRecursively(subCategory);
       nodes.push(convertCategoryToNode(subCategory, subCategoryNodes));
     }
   }
   if (parentCategory.scripts && parentCategory.scripts.length > 0) {
     for (const script of parentCategory.scripts) {
-      nodes.push(convertScriptToNode(script, selection));
+      nodes.push(convertScriptToNode(script));
     }
   }
   return nodes;
@@ -44,19 +49,17 @@ function parseCategoryRecursively(
 function convertCategoryToNode(
   category: ICategory, children: readonly INode[]): INode {
   return {
-    id: `${category.id}`,
+    id: getCategoryNodeId(category),
     text: category.name,
-    selected: false,
     children,
     documentationUrls: category.documentationUrls,
   };
 }
 
-function convertScriptToNode(script: IScript, selection: IUserSelection): INode {
+function convertScriptToNode(script: IScript): INode {
   return {
-    id: `${script.id}`,
+    id: getScriptNodeId(script),
     text: script.name,
-    selected: selection.isSelected(script),
     children: undefined,
     documentationUrls: script.documentationUrls,
   };
diff --git a/src/presentation/Scripts/ScriptsTree/ScriptsTree.vue b/src/presentation/Scripts/ScriptsTree/ScriptsTree.vue
index 03e1db70..fe267464 100644
--- a/src/presentation/Scripts/ScriptsTree/ScriptsTree.vue
+++ b/src/presentation/Scripts/ScriptsTree/ScriptsTree.vue
@@ -1,12 +1,12 @@
 <template>
     <span id="container">
         <span v-if="nodes != null && nodes.length > 0">
-            <SelectableTree
-              :nodes="nodes"
-              :selectedNodeIds="selectedNodeIds"
-              :filterPredicate="filterPredicate"
-              :filterText="filterText"
-              v-on:nodeSelected="checkNodeAsync($event)">
+            <SelectableTree 
+                :initialNodes="nodes"
+                :selectedNodeIds="selectedNodeIds"
+                :filterPredicate="filterPredicate"
+                :filterText="filterText"
+                v-on:nodeSelected="checkNodeAsync($event)">
             </SelectableTree>
         </span>
         <span v-else>Nooo 😢</span>
@@ -19,9 +19,10 @@
   import { Category } from '@/domain/Category';
   import { IRepository } from '@/infrastructure/Repository/IRepository';
   import { IScript } from '@/domain/IScript';
+  import { ICategory } from '@/domain/ICategory';
   import { IApplicationState, IUserSelection } from '@/application/State/IApplicationState';
-  import { IFilterMatches } from '@/application/State/Filter/IFilterMatches';
-  import { parseAllCategories, parseSingleCategory } from './ScriptNodeParser';
+  import { IFilterResult } from '@/application/State/Filter/IFilterResult';
+  import { parseAllCategories, parseSingleCategory, getScriptNodeId, getCategoryNodeId } from './ScriptNodeParser';
   import SelectableTree, { FilterPredicate } from './SelectableTree/SelectableTree.vue';
   import { INode } from './SelectableTree/INode';
 
@@ -33,15 +34,15 @@
   export default class ScriptsTree extends StatefulVue {
     @Prop() public categoryId?: number;
 
-    public nodes?: INode[] = null;
-    public selectedNodeIds?: string[] = null;
+    public nodes?: ReadonlyArray<INode> = null;
+    public selectedNodeIds?: ReadonlyArray<string> = [];
     public filterText?: string = null;
 
-    private matches?: IFilterMatches;
+    private filtered?: IFilterResult;
 
     public async mounted() {
-      // React to state changes
       const state = await this.getCurrentStateAsync();
+      // React to state changes
       state.selection.changed.on(this.handleSelectionChanged);
       state.filter.filterRemoved.on(this.handleFilterRemoved);
       state.filter.filtered.on(this.handleFiltered);
@@ -54,7 +55,7 @@
             return; // only interested in script nodes
         }
         const state = await this.getCurrentStateAsync();
-        if (node.selected) {
+        if (!this.selectedNodeIds.some((id) => id === node.id)) {
             state.selection.addSelectedScript(node.id);
         } else {
             state.selection.removeSelectedScript(node.id);
@@ -65,40 +66,36 @@
     public async initializeNodesAsync(categoryId?: number) {
       const state = await this.getCurrentStateAsync();
       if (categoryId) {
-        this.nodes = parseSingleCategory(categoryId, state);
+        this.nodes = parseSingleCategory(categoryId, state.app);
       } else {
-        this.nodes = parseAllCategories(state);
+        this.nodes = parseAllCategories(state.app);
       }
+      this.selectedNodeIds = state.selection.selectedScripts
+        .map((script) => getScriptNodeId(script));
     }
 
     public filterPredicate(node: INode): boolean {
-      return this.matches.scriptMatches.some((script: IScript) => script.id === node.id);
+      return this.filtered.scriptMatches.some(
+        (script: IScript) => node.id === getScriptNodeId(script))
+        || this.filtered.categoryMatches.some(
+          (category: ICategory) => node.id === getCategoryNodeId(category));
     }
 
-    private handleSelectionChanged(selectedScripts: ReadonlyArray<IScript>) {
-      this.nodes = this.nodes.map((node: INode) => updateNodeSelection(node, selectedScripts));
+    private handleSelectionChanged(selectedScripts: ReadonlyArray<IScript>): void {
+      this.selectedNodeIds = selectedScripts
+          .map((node) => node.id);
     }
 
     private handleFilterRemoved() {
       this.filterText = '';
     }
 
-    private handleFiltered(matches: IFilterMatches) {
-      this.filterText = matches.query;
-      this.matches = matches;
+    private handleFiltered(result: IFilterResult) {
+      this.filterText = result.query;
+      this.filtered = result;
     }
   }
 
-  function updateNodeSelection(node: INode, selectedScripts: ReadonlyArray<IScript>): INode {
-    return {
-      id: node.id,
-      text: node.text,
-      selected: selectedScripts.some((script) => script.id === node.id),
-      children: node.children ? node.children.map((child) => updateNodeSelection(child, selectedScripts)) : [],
-      documentationUrls: node.documentationUrls,
-      };
-  }
-
 </script>
 
 <style scoped lang="scss">
diff --git a/src/presentation/Scripts/ScriptsTree/SelectableTree/INode.ts b/src/presentation/Scripts/ScriptsTree/SelectableTree/INode.ts
index 4781c8a8..6b35663e 100644
--- a/src/presentation/Scripts/ScriptsTree/SelectableTree/INode.ts
+++ b/src/presentation/Scripts/ScriptsTree/SelectableTree/INode.ts
@@ -3,5 +3,4 @@ export interface INode {
     readonly text: string;
     readonly documentationUrls: ReadonlyArray<string>;
     readonly children?: ReadonlyArray<INode>;
-    readonly selected: boolean;
 }
diff --git a/src/presentation/Scripts/ScriptsTree/SelectableTree/Node.vue b/src/presentation/Scripts/ScriptsTree/SelectableTree/Node.vue
index dc784e32..ccbf36b9 100644
--- a/src/presentation/Scripts/ScriptsTree/SelectableTree/Node.vue
+++ b/src/presentation/Scripts/ScriptsTree/SelectableTree/Node.vue
@@ -7,7 +7,7 @@
             <a :href="url"
                 :alt="url"
                 target="_blank" class="docs"
-                  v-tooltip.top-center="url"
+                v-tooltip.top-center="url"
                 v-on:click.stop>
                 <font-awesome-icon :icon="['fas', 'info-circle']" />
                 </a>
diff --git a/src/presentation/Scripts/ScriptsTree/SelectableTree/NodeTranslator.ts b/src/presentation/Scripts/ScriptsTree/SelectableTree/NodeTranslator.ts
new file mode 100644
index 00000000..c9891ca9
--- /dev/null
+++ b/src/presentation/Scripts/ScriptsTree/SelectableTree/NodeTranslator.ts
@@ -0,0 +1,32 @@
+import { ILiquorTreeNewNode, ILiquorTreeExistingNode } from 'liquor-tree';
+import { INode } from './INode';
+
+// Functions to translate INode to LiqourTree models and vice versa for anti-corruption
+
+export function convertExistingToNode(liquorTreeNode: ILiquorTreeExistingNode): INode {
+    if (!liquorTreeNode) { throw new Error('liquorTreeNode is undefined'); }
+    return {
+        id: liquorTreeNode.id,
+        text: liquorTreeNode.data.text,
+        // selected: liquorTreeNode.states && liquorTreeNode.states.checked,
+        children: (!liquorTreeNode.children || liquorTreeNode.children.length === 0)
+         ? [] : liquorTreeNode.children.map((childNode) => convertExistingToNode(childNode)),
+        documentationUrls: liquorTreeNode.data.documentationUrls,
+    };
+}
+
+export function toNewLiquorTreeNode(node: INode): ILiquorTreeNewNode {
+    if (!node) { throw new Error('node is undefined'); }
+    return {
+        id: node.id,
+        text: node.text,
+        state: {
+            checked: false,
+        },
+        children: (!node.children || node.children.length === 0) ? [] :
+         node.children.map((childNode) => toNewLiquorTreeNode(childNode)),
+        data: {
+            documentationUrls: node.documentationUrls,
+        },
+    };
+}
diff --git a/src/presentation/Scripts/ScriptsTree/SelectableTree/SelectableTree.vue b/src/presentation/Scripts/ScriptsTree/SelectableTree/SelectableTree.vue
index c41a3b91..f3354184 100644
--- a/src/presentation/Scripts/ScriptsTree/SelectableTree/SelectableTree.vue
+++ b/src/presentation/Scripts/ScriptsTree/SelectableTree/SelectableTree.vue
@@ -1,8 +1,8 @@
 <template>
     <span>
-        <span v-if="initialNodes != null && initialNodes.length > 0">
+        <span v-if="initialLiquourTreeNodes != null && initialLiquourTreeNodes.length > 0">
             <tree :options="liquorTreeOptions"
-                  :data="this.initialNodes"
+                  :data="initialLiquourTreeNodes"
                   v-on:node:checked="nodeSelected($event)"
                   v-on:node:unchecked="nodeSelected($event)"
                   ref="treeElement"
@@ -18,9 +18,10 @@
 
 <script lang="ts">
     import { Component, Prop, Vue, Emit, Watch } from 'vue-property-decorator';
-    import LiquorTree, { ILiquorTreeNewNode, ILiquorTreeExistingNode, ILiquorTree } from 'liquor-tree';
+    import LiquorTree, { ILiquorTreeNewNode, ILiquorTreeExistingNode, ILiquorTree, ILiquorTreeOptions } from 'liquor-tree';
     import Node from './Node.vue';
     import { INode } from './INode';
+    import { convertExistingToNode, toNewLiquorTreeNode } from './NodeTranslator';
     export type FilterPredicate = (node: INode) => boolean;
 
     /** Wrapper for Liquor Tree, reveals only abstracted INode for communication */
@@ -33,28 +34,31 @@
     export default class SelectableTree extends Vue {
         @Prop() public filterPredicate?: FilterPredicate;
         @Prop() public filterText?: string;
-        @Prop() public nodes?: INode[];
+        @Prop() public selectedNodeIds?: ReadonlyArray<string>;
+        @Prop() public initialNodes?: ReadonlyArray<INode>;
 
-        public initialNodes?: ILiquorTreeNewNode[] = null;
-        public liquorTreeOptions = this.getLiquorTreeOptions();
+        public initialLiquourTreeNodes?: ILiquorTreeNewNode[] = null;
+        public liquorTreeOptions = DefaultOptions;
+        public convertExistingToNode = convertExistingToNode;
 
         public mounted() {
-            // console.log('Mounted', 'initial nodes', this.nodes);
-            // console.log('Mounted', 'initial model', this.getLiquorTreeApi().model);
-
-            if (this.nodes) {
-                this.initialNodes = this.nodes.map((node) => this.toLiquorTreeNode(node));
+            if (this.initialNodes) {
+                const initialNodes = this.initialNodes.map((node) => toNewLiquorTreeNode(node));
+                if (this.selectedNodeIds) {
+                    recurseDown(initialNodes,
+                        (node) => node.state.checked = this.selectedNodeIds.includes(node.id));
+                }
+                this.initialLiquourTreeNodes = initialNodes;
             } else {
                 throw new Error('Initial nodes are null or empty');
             }
-
             if (this.filterText) {
                this.updateFilterText(this.filterText);
             }
         }
 
         public nodeSelected(node: ILiquorTreeExistingNode) {
-            this.$emit('nodeSelected', this.convertExistingToNode(node));
+            this.$emit('nodeSelected', convertExistingToNode(node));
             return;
         }
 
@@ -64,104 +68,28 @@
             if (!filterText) {
                 api.clearFilter();
             } else {
-                api.filter('filtered'); // text does not matter, it'll trigger the predicate
+                api.filter('filtered'); // text does not matter, it'll trigger the filterPredicate
             }
         }
 
-        @Watch('nodes', {deep: true})
-        public setSelectedStatus(nodes: |ReadonlyArray<INode>) {
-            if (!nodes || nodes.length === 0) {
-                throw new Error('Updated nodes are null or empty');
+        @Watch('selectedNodeIds')
+        public setSelectedStatus(selectedNodeIds: ReadonlyArray<string>) {
+            if (!selectedNodeIds) {
+                throw new Error('Selected nodes are undefined');
             }
-            // Update old node properties, re-setting it changes expanded status etc.
-            // It'll not be needed when this is merged: https://github.com/amsik/liquor-tree/pull/141
-            const updateCheckedState = (
-                oldNodes: ReadonlyArray<ILiquorTreeExistingNode>,
-                updatedNodes: ReadonlyArray<INode>): ILiquorTreeNewNode[] => {
-                    const newNodes = new Array<ILiquorTreeNewNode>();
-                    for (const oldNode of oldNodes) {
-                                for (const updatedNode of updatedNodes) {
-                                    if (oldNode.id === updatedNode.id) {
-                                        const newState = oldNode.states;
-                                        newState.checked = updatedNode.selected;
-                                        newNodes.push({
-                                            id: oldNode.id,
-                                            text: updatedNode.text,
-                                            children: oldNode.children == null ? [] :
-                                                updateCheckedState(
-                                                    oldNode.children,
-                                                    updatedNode.children),
-                                            state: newState,
-                                            data: {
-                                                documentationUrls: oldNode.data.documentationUrls,
-                                            },
-                                        });
-                                    }
-                                }
-                            }
-                    return newNodes;
-            };
-            const newModel = updateCheckedState(
-                this.getLiquorTreeApi().model, nodes);
-            this.getLiquorTreeApi().setModel(newModel);
-        }
-
-        private convertItem(liquorTreeNode: ILiquorTreeNewNode): INode {
-            if (!liquorTreeNode) { throw new Error('liquorTreeNode is undefined'); }
-            return {
-                id: liquorTreeNode.id,
-                text: liquorTreeNode.text,
-                selected: liquorTreeNode.state && liquorTreeNode.state.checked,
-                children: (!liquorTreeNode.children || liquorTreeNode.children.length === 0)
-                 ? [] : liquorTreeNode.children.map((childNode) => this.convertItem(childNode)),
-                documentationUrls: liquorTreeNode.data.documentationUrls,
-            };
-        }
-
-        private convertExistingToNode(liquorTreeNode: ILiquorTreeExistingNode): INode {
-            if (!liquorTreeNode) { throw new Error('liquorTreeNode is undefined'); }
-            return {
-                id: liquorTreeNode.id,
-                text: liquorTreeNode.data.text,
-                selected: liquorTreeNode.states && liquorTreeNode.states.checked,
-                children: (!liquorTreeNode.children || liquorTreeNode.children.length === 0)
-                 ? [] : liquorTreeNode.children.map((childNode) => this.convertExistingToNode(childNode)),
-                documentationUrls: liquorTreeNode.data.documentationUrls,
-            };
-        }
-
-
-        private toLiquorTreeNode(node: INode): ILiquorTreeNewNode {
-            if (!node) { throw new Error('node is undefined'); }
-            return {
-                id: node.id,
-                text: node.text,
-                state: {
-                    checked: node.selected,
-                },
-                children: (!node.children || node.children.length === 0) ? [] :
-                 node.children.map((childNode) => this.toLiquorTreeNode(childNode)),
-                data: {
-                    documentationUrls: node.documentationUrls,
-                },
-            };
-        }
-
-        private getLiquorTreeOptions(): any {
-            return {
-                checkbox: true,
-                checkOnSelect: true,
-                deletion: (node) => !node.children || node.children.length === 0,
-                filter: {
-                    matcher: (query: string, node: ILiquorTreeExistingNode) => {
-                        if (!this.filterPredicate) {
-                            throw new Error('Cannot filter as predicate is null');
-                        }
-                        return this.filterPredicate(this.convertExistingToNode(node));
-                    },
-                    emptyText: '🕵️Hmm.. Can not see one 🧐',
-                },
-            };
+            const newNodes = updateCheckedState(this.getLiquorTreeApi().model, selectedNodeIds);
+            this.getLiquorTreeApi().setModel(newNodes);
+            /*  Alternative:
+                    this.getLiquorTreeApi().recurseDown((node) => {
+                                node.states.checked = selectedNodeIds.includes(node.id);
+                            });
+                Problem: Does not check their parent if all children are checked, because it does not
+                        trigger update on parent as we work with scripts not categories. */
+            /*  Alternative:
+                    this.getLiquorTreeApi().recurseDown((node) => {
+                            if(selectedNodeIds.includes(node.id)) { node.select(); } else { node.unselect(); }
+                    });
+                Problem: Emits nodeSelected() event again which will cause an infinite loop. */
         }
 
         private getLiquorTreeApi(): ILiquorTree {
@@ -172,6 +100,57 @@
         }
     }
 
+    function recurseDown(
+        nodes: ReadonlyArray<ILiquorTreeNewNode>,
+        handler: (node: ILiquorTreeNewNode) => void) {
+        for (const node of nodes) {
+            handler(node);
+            if (node.children) {
+                recurseDown(node.children, handler);
+            }
+        }
+    }
+
+    function updateCheckedState(
+        oldNodes: ReadonlyArray<ILiquorTreeExistingNode>,
+        selectedNodeIds: ReadonlyArray<string>): ReadonlyArray<ILiquorTreeNewNode> {
+        const result = new Array<ILiquorTreeNewNode>();
+        for (const oldNode of oldNodes) {
+            const newState = oldNode.states;
+            newState.checked = selectedNodeIds.some((id) => id === oldNode.id);
+            const newNode: ILiquorTreeNewNode = {
+                id: oldNode.id,
+                text: oldNode.data.text,
+                data: {
+                    documentationUrls: oldNode.data.documentationUrls,
+                },
+                children: oldNode.children == null ? [] :
+                        updateCheckedState(oldNode.children, selectedNodeIds),
+                state: newState,
+            };
+            result.push(newNode);
+        }
+        return result;
+    }
+
+    const DefaultOptions: ILiquorTreeOptions = {
+        multiple: true,
+        checkbox: true,
+        checkOnSelect: true,
+        autoCheckChildren: true,
+        parentSelect: false,
+        keyboardNavigation: true,
+        deletion: (node) => !node.children || node.children.length === 0,
+        filter: {
+            matcher: (query: string, node: ILiquorTreeExistingNode) => {
+                if (!this.filterPredicate) {
+                    throw new Error('Cannot filter as predicate is null');
+                }
+                return this.filterPredicate(convertExistingToNode(node));
+            },
+            emptyText: '🕵️Hmm.. Can not see one 🧐',
+        },
+    };
 </script>
 
 
diff --git a/src/presentation/Scripts/TheScripts.vue b/src/presentation/Scripts/TheScripts.vue
index 13e7b770..bfeb3051 100644
--- a/src/presentation/Scripts/TheScripts.vue
+++ b/src/presentation/Scripts/TheScripts.vue
@@ -5,8 +5,18 @@
             <TheGrouper class="right"
                 v-on:groupingChanged="onGroupingChanged($event)" />
         </div>
-        <CardList v-if="showCards" />
-        <ScriptsTree v-if="showList" />
+        <div class="scripts">
+            <div v-if="!isSearching || searchHasMatches">
+                    <CardList v-if="showCards" />
+                    <div v-else-if="showList" class="tree">
+                        <ScriptsTree />
+                    </div>
+                    </div>
+                    <div v-else class="search-no-matches">
+                        Search has no matches 😞
+                        Feel free to extend the scripts <a :href="repositoryUrl" target="_blank" class="child github" >here</a>.
+            </div>
+        </div>
     </div>
 </template>
 
@@ -14,11 +24,13 @@
     import { Component, Prop, Vue, Emit } from 'vue-property-decorator';
     import { Category } from '@/domain/Category';
     import { StatefulVue } from '@/presentation/StatefulVue';
+    import { Grouping } from './Grouping/Grouping';
+    import { IFilterResult } from '@/application/State/Filter/IFilterResult';
     import TheGrouper from '@/presentation/Scripts/Grouping/TheGrouper.vue';
     import TheSelector from '@/presentation/Scripts/Selector/TheSelector.vue';
     import ScriptsTree from '@/presentation/Scripts/ScriptsTree/ScriptsTree.vue';
     import CardList from '@/presentation/Scripts/Cards/CardList.vue';
-    import { Grouping } from './Grouping/Grouping';
+
 
     /** Shows content of single category or many categories */
     @Component({
@@ -30,33 +42,71 @@
     },
     })
     export default class TheScripts extends StatefulVue {
-        public showCards = true;
+        public showCards = false;
         public showList = false;
+        public repositoryUrl = '';
+        private isSearching = false;
+        private searchHasMatches = false;
 
-        @Prop() public data!: Category | Category[];
+        private currentGrouping: Grouping;
+
+        public async mounted() {
+            const state = await this.getCurrentStateAsync();
+            this.repositoryUrl = state.app.repositoryUrl;
+            state.filter.filterRemoved.on(() => {
+                this.isSearching = false;
+                this.updateGroups();
+            });
+            state.filter.filtered.on((result: IFilterResult) => {
+                this.isSearching = true;
+                this.searchHasMatches = result.hasAnyMatches();
+                this.updateGroups();
+            });
+        }
 
         public onGroupingChanged(group: Grouping) {
-            switch (group) {
-                case Grouping.Cards:
-                    this.showCards = true;
-                    this.showList = false;
-                    break;
-                case Grouping.None:
-                    this.showCards = false;
-                    this.showList = true;
-                    break;
-                default:
-                    throw new Error('Unknown grouping');
-            }
+            this.currentGrouping = group;
+            this.updateGroups();
+        }
+
+        private updateGroups(): void {
+            this.showCards = !this.isSearching && this.currentGrouping === Grouping.Cards;
+            this.showList = this.isSearching || this.currentGrouping === Grouping.None;
         }
     }
 </script>
 
 <style scoped lang="scss">
+@import "@/presentation/styles/colors.scss";
+@import "@/presentation/styles/fonts.scss";
+.scripts {
+    margin-top:10px;
+    .search-no-matches {
+        word-break:break-word;
+        color: $white;
+        text-transform: uppercase;
+        color: $light-gray;
+        font-size: 1.5em;
+        background-color: $slate;
+        padding:5%;
+        text-align:center;
+        > a {
+            color: $gray;
+        }
+    }
+    .tree {
+        padding-left: 3%;
+        margin-top: 15px; // Card margin
+        margin-bottom: 15px; // Card margin
+    }
+}
 .help-container {
   display: flex;
   justify-content: space-between;
-
+  align-items: center;
+  .center {
+      justify-content: center;
+  }
   .left {
       justify-content: flex-start;
   }
@@ -64,4 +114,5 @@
       justify-content: flex-end;
   }
 }
+
 </style>
diff --git a/src/presentation/TheHeader.vue b/src/presentation/TheHeader.vue
index e1d339b3..11d6b5f2 100644
--- a/src/presentation/TheHeader.vue
+++ b/src/presentation/TheHeader.vue
@@ -2,7 +2,7 @@
     <div id="container">
       <h1 class="child title" >{{ title }}</h1>
       <h2 class="child subtitle">{{ subtitle }}</h2>
-      <a :href="githubUrl" target="_blank" class="child github" >
+      <a :href="repositoryUrl" target="_blank" class="child github" >
           <font-awesome-icon :icon="['fab', 'github']" size="3x"  />
       </a>
     </div>
@@ -14,14 +14,15 @@ import { StatefulVue } from './StatefulVue';
 
 @Component
 export default class TheHeader extends StatefulVue {
-  private title: string = '';
-  private subtitle: string = '';
-  @Prop() private githubUrl!: string;
+  public title = '';
+  public subtitle = '';
+  public repositoryUrl = '';
 
   public async mounted() {
     const state = await this.getCurrentStateAsync();
     this.title = state.app.name;
     this.subtitle = 'Enforce privacy & security on Windows';
+    this.repositoryUrl = state.app.repositoryUrl;
   }
 }
 </script>
diff --git a/src/presentation/TheSearchBar.vue b/src/presentation/TheSearchBar.vue
index 62daee56..ec78c7b0 100644
--- a/src/presentation/TheSearchBar.vue
+++ b/src/presentation/TheSearchBar.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="container">
         <div class="search">
-            <input type="text" class="searchTerm" placeholder="Search for configurations"
+            <input type="text" class="searchTerm" placeholder="Search"
               @input="updateFilterAsync($event.target.value)" >
             <div class="iconWrapper">
                 <font-awesome-icon :icon="['fas', 'search']" />
@@ -16,8 +16,6 @@ import { StatefulVue } from './StatefulVue';
 
 @Component
 export default class TheSearchBar extends StatefulVue {
-
-
   public async updateFilterAsync(filter: |string) {
     const state = await this.getCurrentStateAsync();
     if (!filter) {
@@ -35,9 +33,6 @@ export default class TheSearchBar extends StatefulVue {
 @import "@/presentation/styles/fonts.scss";
 
 .container {
-    padding-top: 30px;
-    padding-right: 30%;
-    padding-left: 30%;
     font: $normal-font;
 }
 
@@ -49,6 +44,7 @@ export default class TheSearchBar extends StatefulVue {
 
 .searchTerm {
   width: 100%;
+  min-width: 60px;
   border: 1.5px solid $gray;
   border-right: none;
   height: 36px;
diff --git a/tests/unit/domain/Application.spec.ts b/tests/unit/domain/Application.spec.ts
index ba4d9dac..261abcf4 100644
--- a/tests/unit/domain/Application.spec.ts
+++ b/tests/unit/domain/Application.spec.ts
@@ -11,7 +11,7 @@ describe('Application', () => {
             new ScriptStub('S3').withIsRecommended(true),
             new ScriptStub('S4').withIsRecommended(true),
         ];
-        const sut = new Application('name', 2, [
+        const sut = new Application('name', 'repo', 2, [
             new CategoryStub(3).withScripts(expected[0], new ScriptStub('S1').withIsRecommended(false)),
             new CategoryStub(2).withScripts(expected[1], new ScriptStub('S2').withIsRecommended(false)),
         ]);
@@ -28,7 +28,7 @@ describe('Application', () => {
         const categories = [];
 
         // act
-        function construct() { return new Application('name', 2, categories); }
+        function construct() { return new Application('name', 'repo', 2, categories); }
 
         // assert
         expect(construct).to.throw('Application must consist of at least one category');
@@ -41,7 +41,7 @@ describe('Application', () => {
         ];
 
         // act
-        function construct() { return new Application('name', 2, categories); }
+        function construct() { return new Application('name', 'repo',  2, categories); }
 
         // assert
         expect(construct).to.throw('Application must consist of at least one script');
@@ -54,7 +54,7 @@ describe('Application', () => {
         ];
 
         // act
-        function construct() { return new Application('name', 2, categories); }
+        function construct() { return new Application('name', 'repo', 2, categories); }
 
         // assert
         expect(construct).to.throw('Application must consist of at least one recommended script');
diff --git a/tests/unit/stubs/ApplicationStub.ts b/tests/unit/stubs/ApplicationStub.ts
index c45b3b88..750e28b7 100644
--- a/tests/unit/stubs/ApplicationStub.ts
+++ b/tests/unit/stubs/ApplicationStub.ts
@@ -4,6 +4,7 @@ export class ApplicationStub implements IApplication {
     public readonly totalScripts = 0;
     public readonly totalCategories = 0;
     public readonly name = 'StubApplication';
+    public readonly repositoryUrl = 'https://privacy.sexy';
     public readonly version = 1;
     public readonly categories = new Array<ICategory>();
 
@@ -23,4 +24,7 @@ export class ApplicationStub implements IApplication {
     public getAllScripts(): ReadonlyArray<IScript> {
         throw new Error('Method not implemented.');
     }
+    public getAllCategories(): ReadonlyArray<ICategory> {
+        throw new Error('Method not implemented.');
+    }
 }