diff --git a/backend/windmill-api/src/resources.rs b/backend/windmill-api/src/resources.rs
index ec1eafe08a..4aafcb0207 100644
--- a/backend/windmill-api/src/resources.rs
+++ b/backend/windmill-api/src/resources.rs
@@ -738,6 +738,31 @@ async fn create_resource(
     let res_value = resource.value.unwrap_or_default();
     let raw_json = sqlx::types::Json(res_value.as_ref());
 
+    if resource.path.starts_with("f/app_themes/") {
+        sqlx::query!(
+            "INSERT INTO folder (workspace_id, name, display_name, owners, extra_perms, created_by, edited_at) VALUES ($1, 'app_themes', 'App Themes', ARRAY[]::TEXT[], '{\"g/all\": false}', $2, now()) ON CONFLICT DO NOTHING",
+            w_id,
+            authed.username,
+        )
+        .execute(&db)
+        .await?;
+    } else if resource.path.starts_with("f/app_custom/") {
+        sqlx::query!(
+            "INSERT INTO folder (workspace_id, name, display_name, owners, extra_perms, created_by, edited_at) VALUES ($1, 'app_custom', 'App Custom Components', ARRAY[]::TEXT[], '{\"g/all\": false}', $2, now()) ON CONFLICT DO NOTHING",
+            w_id,
+            authed.username,
+        )
+        .execute(&db)
+        .await?;
+    } else if resource.path.starts_with("f/app_groups/") {
+        sqlx::query!(
+            "INSERT INTO folder (workspace_id, name, display_name, owners, extra_perms, created_by, edited_at) VALUES ($1, 'app_groups', 'App Groups', ARRAY[]::TEXT[], '{\"g/all\": false}', $2, now()) ON CONFLICT DO NOTHING",
+            w_id,
+            authed.username,
+        )
+        .execute(&db)
+        .await?;
+    }
     sqlx::query!(
         "INSERT INTO resource
             (workspace_id, path, value, description, resource_type, created_by, edited_at)
diff --git a/backend/windmill-api/src/workspaces.rs b/backend/windmill-api/src/workspaces.rs
index c7053209da..cea6c2ba5c 100644
--- a/backend/windmill-api/src/workspaces.rs
+++ b/backend/windmill-api/src/workspaces.rs
@@ -2455,38 +2455,6 @@ async fn create_workspace(
     .execute(&mut *tx)
     .await?;
 
-    sqlx::query!(
-        "INSERT INTO folder (workspace_id, name, display_name, owners, extra_perms, created_by, edited_at) VALUES ($1, 'app_themes', 'App Themes', ARRAY[]::TEXT[], '{\"g/all\": false}', $2, now()) ON CONFLICT DO NOTHING",
-        nw.id,
-        username,
-    )
-    .execute(&mut *tx)
-    .await?;
-
-    sqlx::query!(
-        "INSERT INTO folder (workspace_id, name, display_name, owners, extra_perms, created_by, edited_at) VALUES ($1, 'app_custom', 'App Custom Components', ARRAY[]::TEXT[], '{\"g/all\": false}', $2, now()) ON CONFLICT DO NOTHING",
-        nw.id,
-        username,
-    )
-    .execute(&mut *tx)
-    .await?;
-
-    sqlx::query!(
-        "INSERT INTO folder (workspace_id, name, display_name, owners, extra_perms, created_by, edited_at) VALUES ($1, 'app_groups', 'App Groups', ARRAY[]::TEXT[], '{\"g/all\": false}', $2, now()) ON CONFLICT DO NOTHING",
-        nw.id,
-        username,
-    )
-    .execute(&mut *tx)
-    .await?;
-
-    sqlx::query!(
-        "INSERT INTO resource (workspace_id, path, value, description, resource_type, created_by, edited_at) VALUES ($1, 'f/app_themes/theme_0', '{\"name\": \"Default Theme\", \"value\": \"\"}', 'The default app theme', 'app_theme', $2, now()) ON CONFLICT DO NOTHING",
-        nw.id,
-        username,
-    )
-    .execute(&mut *tx)
-    .await?;
-
     audit_log(
         &mut *tx,
         &authed,
diff --git a/cli/install_dev.sh b/cli/install_dev.sh
new file mode 100755
index 0000000000..e172ac1288
--- /dev/null
+++ b/cli/install_dev.sh
@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+
+set -e
+
+if [ -z "$1" ]; then
+    name="wmill"
+else
+    name="$1"
+fi
+
+./gen_wm_client.sh 
+./windmill-utils-internal/gen_wm_client.sh
+
+echo "Installing dev cli as $name (pass arg to override)"
+deno install -f -A -g src/main.ts --name $name --unstable
\ No newline at end of file