diff --git a/ChangeLog.md b/ChangeLog.md
index 123dcd2..35436bb 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -3,11 +3,17 @@
 Changed docker install to install via code-server the recommended way
 changed docker install for ZSH to be installed the recommended way
 changed extension install to use code-server so they are registered
-removed boot time removal of code-server extensions
 changed code-server launch to use its config instead of command line args
 changed boot scripts for readability
 changed boot dependency order for stability
 changed default files path
+
+# Removed
+
+removed boot time removal of code-server extensions
+
+# Added
+
 added a common paths file for all boot scripts to eliminate path issues
 added extra code-server config options to disable some unwanted things
 added code to convert the os log setting to code-server so logging is increased for debugging
@@ -19,4 +25,9 @@ added a tasks file for common tasks be in vs code.
 added a script in custom boot to allow tasks to be code-backed for extra convenience.
 
 # TODO
-get code to auto-launch terminal to motd
\ No newline at end of file
+
+get code to auto-launch terminal to motd
+can settings.json inherit?
+fix settings reset
+check install pkgs for needed
+
diff --git a/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-code-server/run b/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-code-server/run
index 68db402..f5e040e 100644
--- a/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-code-server/run
+++ b/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-code-server/run
@@ -201,13 +201,13 @@ setup_user_settings() {
     fi
 
     # Sets up default user settings on first start.
-    if ! bashio::fs.file_exists "$user_path"/settings.json; then
-        cp "$DEFAULT_FILES_PATH/vscode/settings.json" "$user_path/settings.json"
+    if ! bashio::fs.file_exists "$CODE_SERVER_VSCODE_DIR"/settings.json; then
+        cp "$DEFAULT_FILES_PATH/vscode/settings.json" "$CODE_SERVER_VSCODE_DIR/settings.json"
     else
         # Upgrade if settings.json is still default from previous version.
-        current=$(sha512sum "$user_path"/settings.json | cut -d " " -f 1)
+        current=$(sha512sum "$CODE_SERVER_VSCODE_DIR"/settings.json | cut -d " " -f 1)
         if [[ " ${PREVIOUS_DEFAULT_CONFIG_HASHES[*]} " == *" ${current} "* ]]; then
-            cp "$DEFAULT_FILES_PATH/vscode/settings.json" "$user_path/settings.json"
+            cp "$DEFAULT_FILES_PATH/vscode/settings.json" "$CODE_SERVER_VSCODE_DIR/settings.json"
         fi
     fi
 
diff --git a/vscode/rootfs/var/lib/code-server/defaults/vscode/SERVER.code-workspace b/vscode/rootfs/var/lib/code-server/defaults/vscode/SERVER.code-workspace
index 20b9b1b..0174801 100644
--- a/vscode/rootfs/var/lib/code-server/defaults/vscode/SERVER.code-workspace
+++ b/vscode/rootfs/var/lib/code-server/defaults/vscode/SERVER.code-workspace
@@ -1,4 +1,5 @@
 {
+	"extends": ".vscode/settings.json",
 	"folders": [
 		{
 			"path": "."
@@ -16,107 +17,5 @@
 			"ibm.output-colorizer", // colorize output
 			"pinage404.bash-extension-pack" // helps with bash scipts
 		]
-	},
-	"files.associations": {
-		"*.dash": "yaml",
-		"**/esphome/*.yaml": "esphome",
-		"**/esphome/**/*.yaml": "esphome",
-		"*.yaml": "home-assistant"
-	},
-	"files.watcherExclude": {
-		".nfs**": true,
-		".Trash-0/**": true,
-		"**/__pycache__/**": true,
-		"**/._*": true,
-		"**/.cloud": true,
-		"**/.git/objects/**": true,
-		"**/.git/subtree-cache/**": true,
-		"**/.HA_VERSION": true,
-		"**/.storage": true,
-		"**/*.db-shm": true,
-		"**/*.db-wal": true,
-		"**/*.db": true,
-		"**/*.log": true,
-		"**/deps/**": true,
-		"**/node_modules": true,
-		"**/OZW_Log.txt": true,
-		"**/pyozw.sqlite": true
-	},
-	"search.exclude": {
-		".Trash-0/**": true,
-		"**/__pycache__/**": true,
-		"**/._*": true,
-		"**/.cloud": true,
-		"**/.git/objects/**": true,
-		"**/.git/subtree-cache/**": true,
-		"**/.git": true,
-		"**/.HA_VERSION": true,
-		"**/.storage": true,
-		"**/*.db-shm": true,
-		"**/*.db-wal": true,
-		"**/*.db": true,
-		"**/*.log": true,
-		"**/deps/**": true,
-		"**/node_modules": true,
-		"**/OZW_Log.txt": true,
-		"**/pyozw.sqlite": true
-	},
-	"files.exclude": {
-		".Trash-0/**": true,
-		"**/__pycache__": true,
-		"**/.cloud": true,
-		"**/.DS_Store": true,
-		"**/.git": true,
-		"**/.HA_VERSION": true,
-		"**/.storage": true,
-		"**/*.db-shm": true,
-		"**/*.db-wal": true,
-		"**/*.db": true,
-		"**/deps/**": true,
-		"**/node_modules": true
-	},
-	"yaml.customTags": [
-		"!env_var scalar",
-		"!include_dir_list scalar",
-		"!include_dir_merge_list scalar",
-		"!include_dir_merge_named scalar",
-		"!include_dir_named scalar",
-		"!include scalar",
-		"!secret scalar"
-	],
-	"[yaml]": {
-		"editor.autoIndent": "full",
-		"editor.insertSpaces": true,
-		"editor.tabSize": 2,
-		"editor.quickSuggestions": {
-			"other": true,
-			"comments": false,
-			"strings": true
-		}
-	},
-	"[home-assistant]": {
-		"editor.autoIndent": "full",
-		"editor.insertSpaces": true,
-		"editor.tabSize": 2,
-		"editor.defaultFormatter": "esbenp.prettier-vscode",
-		"editor.formatOnSave": true,
-		"editor.formatOnPaste": true
-	},
-	"editor.renderWhitespace": "boundary",
-	"esphome.validator": "local",
-	"telemetry.enableTelemetry": false,
-	"terminal.integrated.copyOnSelection": true,
-	"terminal.integrated.shell.linux": "/usr/bin/zsh",
-	"update.mode": "none",
-	"vsicons.dontShowNewVersionMessage": true,
-	"vsicons.projectDetection.disableDetect": true,
-	"workbench.iconTheme": "vs-seti",
-	"yaml.format.enable": true,
-	"editor.defaultFormatter": "esbenp.prettier-vscode",
-	"editor.rulers": [
-		80,
-		88,
-		100,
-		120
-	]
+	}
 }