diff --git a/manifests/maverick-modules/maverick_web/files/codeserver-settings.json b/manifests/maverick-modules/maverick_web/files/codeserver-settings.json
new file mode 100644
index 00000000..a06842a3
--- /dev/null
+++ b/manifests/maverick-modules/maverick_web/files/codeserver-settings.json
@@ -0,0 +1,4 @@
+{
+    "workbench.iconTheme": "vscode-icons",
+    "workbench.colorTheme": "Night Owl"
+}
diff --git a/manifests/maverick-modules/maverick_web/files/codeserver-workspace-settings.json b/manifests/maverick-modules/maverick_web/files/codeserver-workspace-settings.json
new file mode 100644
index 00000000..77e60373
--- /dev/null
+++ b/manifests/maverick-modules/maverick_web/files/codeserver-workspace-settings.json
@@ -0,0 +1,7 @@
+{
+    "vsicons.presets.hideFolders": true,
+    "files.exclude": {
+        "**.*": true
+    },
+    "python.analysis.logLevel": "Information"
+}
diff --git a/manifests/maverick-modules/maverick_web/manifests/codeserver.pp b/manifests/maverick-modules/maverick_web/manifests/codeserver.pp
index 737cd7c9..b361858d 100644
--- a/manifests/maverick-modules/maverick_web/manifests/codeserver.pp
+++ b/manifests/maverick-modules/maverick_web/manifests/codeserver.pp
@@ -6,11 +6,23 @@
     $filewatchers = "8192"
 ) {
 
-    file { "/srv/maverick/data/web/codeserver":
+    file { [ "/srv/maverick/data/web/codeserver", "/srv/maverick/data/web/codeserver/User", "/srv/maverick/.vscode" ]:
         ensure      => directory,
         owner       => "mav",
         group       => "mav",
         mode        => "755",
+    } ->
+    file { "/srv/maverick/data/web/codeserver/User/settings.json":
+        owner   => "mav",
+        group   => "mav",
+        source  => "puppet:///modules/maverick_web/codeserver-settings.json",
+        replace => false,
+    } ->
+    file { "/srv/maverick/.vscode/settings.json":
+        owner   => "mav",
+        group   => "mav",
+        source  => "puppet:///modules/maverick_web/codeserver-workspace-settings.json",
+        replace => false,
     }
 
     if ! ("install_flag_codeserver" in $installflags) {
@@ -117,8 +129,7 @@
         before      => Service_wrapper["maverick-codeserver"],
         notify      => Service_wrapper["maverick-codeserver"],
     }
-    
-    
+  
     if defined(Class["::maverick_security"]) {
         maverick_security::firewall::firerule { "codeserver":
             ports       => $webport,