diff --git a/packages/core.gbapp/services/GBDeployer.ts b/packages/core.gbapp/services/GBDeployer.ts
index 6ca48a4b..a6b6f45d 100644
--- a/packages/core.gbapp/services/GBDeployer.ts
+++ b/packages/core.gbapp/services/GBDeployer.ts
@@ -712,8 +712,8 @@ export class GBDeployer implements IGBDeployer {
 
       case '.gbtheme':
         // Updates server listeners to serve theme files in .gbtheme.
-
-        GBServer.globals.server.use('/' + urlJoin('themes', packageName), express.static(packageWorkFolder));
+        const filePath = path.join(GBConfigService.get('STORAGE_LIBRARY'), gbai, packageName);
+        GBServer.globals.server.use('/' + urlJoin('themes', packageName), express.static( filePath));
         GBLogEx.verbose(min, `Theme (.gbtheme) assets accessible at: /themes/${packageName}.`);
 
         break;
diff --git a/packages/core.gbapp/services/GBMinService.ts b/packages/core.gbapp/services/GBMinService.ts
index 2fb52e3d..47b771ba 100644
--- a/packages/core.gbapp/services/GBMinService.ts
+++ b/packages/core.gbapp/services/GBMinService.ts
@@ -313,7 +313,7 @@ export class GBMinService {
       await this.deployer['deployPackage2'](min, user, packagePath);
       await this.watchPackages(min, 'gbtheme');
     } else {
-      await this.deployer['deployPackage2'](min, user, path.join(GBConfigService.get('STORAGE_LIBRARY'), 'default.gbai', 'default.gbtheme'));
+      await this.deployer['deployPackage2'](min, user, path.join('work', 'default.gbai', 'default.gbtheme'));
     }
 
     packagePath = urlJoin(`work`, GBUtil.getGBAIPath(min.botId, `gblib`));