diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 8c4a59f..80297bc 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -54,13 +54,13 @@ jobs:
 
             # sf code scanner
             - name: run sf scanner
-              run: sf scanner:run --target force-app -f table -s 2 --normalize-severity
+              run: sf scanner:run --target force-app -f table -s 3 --normalize-severity
 
             # Authorise devhub
             - name: Autenticate DevHub
               run: |
-                  echo "${{ secrets.SERVER_KEY }}" > "server.key"
-                  sf org login jwt -i ${{ secrets.CONSUMER_KEY }} -f server.key -o ${{ secrets.USERNAME }} -d -a hub-org
+                  echo ${{ secrets.DEVHUB_SFDX_URL }} > ./SFDX_URL_STORE.txt
+                  sf org login sfdx-url -f ./SFDX_URL_STORE.txt -a hub-org -d
 
             # Build Scratch Org
             - name: Run org_builder
diff --git a/.gitignore b/.gitignore
index d67c779..18927fb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,3 +47,4 @@ JWT/server.crt
 JWT/server.csr
 JWT/server.key
 JWT/server.pass.key
+authFile.json
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index 0827bd6..d439aff 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -20,11 +20,11 @@
 		"njqdev.vscode-python-typehint",
 		"mechatroner.rainbow-csv",
 		"salesforce.salesforcedx-vscode-core",
-		"hugoom.sfdx-autoheader",
 		"salesforce.salesforce-vscode-slds",
 		"salesforce.salesforcedx-vscode-soql",
 		"salesforce.salesforcedx-vscode-visualforce",
 		"ms-python.black-formatter",
-		"ms-python.flake8"
+        "ms-python.flake8",
+        "peterweinberg.apexdox-vs-code"
 	]
 }
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 5ea49b3..94d09f5 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,16 +1,16 @@
 {
-  "search.exclude": {
-    "**/node_modules": true,
-    "**/bower_components": true,
-    "**/.sfdx": true
-  },
-  "editor.formatOnSave": true,
-  "files.autoSave": "onFocusChange",
-  "prettier.useTabs": true,
-  "prettier.tabWidth": 4,
-"editor.detectIndentation": false,
-"editor.insertSpaces": true,
-"apexPMD.runOnFileOpen": true,
-"apexPMD.priorityErrorThreshold": 2,
-"apexPMD.priorityWarnThreshold": 4
-}
+    "search.exclude": {
+        "**/node_modules": true,
+        "**/bower_components": true,
+        "**/.sfdx": true
+    },
+    "editor.formatOnSave": true,
+    "files.autoSave": "onFocusChange",
+    "prettier.useTabs": true,
+    "prettier.tabWidth": 4,
+    "editor.detectIndentation": false,
+    "editor.insertSpaces": true,
+    "apexPMD.runOnFileOpen": true,
+    "apexPMD.priorityErrorThreshold": 2,
+    "apexPMD.priorityWarnThreshold": 4
+}
\ No newline at end of file
diff --git a/force-app/main/default/appMenus/AppSwitcher.appMenu-meta.xml b/force-app/main/default/appMenus/AppSwitcher.appMenu-meta.xml
deleted file mode 100644
index 8d8f8e3..0000000
--- a/force-app/main/default/appMenus/AppSwitcher.appMenu-meta.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<AppMenu xmlns="http://soap.sforce.com/2006/04/metadata">
-    <appMenuItems>
-        <name>standard__Platform</name>
-        <type>CustomApplication</type>
-    </appMenuItems>
-    <appMenuItems>
-        <name>standard__Sales</name>
-        <type>CustomApplication</type>
-    </appMenuItems>
-    <appMenuItems>
-        <name>standard__Service</name>
-        <type>CustomApplication</type>
-    </appMenuItems>
-    <appMenuItems>
-        <name>standard__Marketing</name>
-        <type>CustomApplication</type>
-    </appMenuItems>
-    <appMenuItems>
-        <name>standard__ServiceConsole</name>
-        <type>CustomApplication</type>
-    </appMenuItems>
-    <appMenuItems>
-        <name>standard__AppLauncher</name>
-        <type>CustomApplication</type>
-    </appMenuItems>
-    <appMenuItems>
-        <name>standard__Community</name>
-        <type>CustomApplication</type>
-    </appMenuItems>
-    <appMenuItems>
-        <name>standard__Sites</name>
-        <type>CustomApplication</type>
-    </appMenuItems>
-    <appMenuItems>
-        <name>standard__Chatter</name>
-        <type>CustomApplication</type>
-    </appMenuItems>
-    <appMenuItems>
-        <name>standard__Content</name>
-        <type>CustomApplication</type>
-    </appMenuItems>
-    <appMenuItems>
-        <name>standard__LightningSales</name>
-        <type>CustomApplication</type>
-    </appMenuItems>
-    <appMenuItems>
-        <name>standard__AllTabSet</name>
-        <type>CustomApplication</type>
-    </appMenuItems>
-    <appMenuItems>
-        <name>CPQIntegrationUserApp</name>
-        <type>ConnectedApp</type>
-    </appMenuItems>
-    <appMenuItems>
-        <name>standard__LightningBolt</name>
-        <type>CustomApplication</type>
-    </appMenuItems>
-    <appMenuItems>
-        <name>standard__SalesforceCMS</name>
-        <type>CustomApplication</type>
-    </appMenuItems>
-    <appMenuItems>
-        <name>ancestry</name>
-        <type>CustomApplication</type>
-    </appMenuItems>
-</AppMenu>