diff --git a/Makefile b/Makefile
index e1abb70edb..2153c0d246 100644
--- a/Makefile
+++ b/Makefile
@@ -59,12 +59,12 @@ dev.repo.reset: ## Attempts to reset the local repo checkouts to the master work
 	./repo.sh reset
 
 dev.up: | check-memory ## Bring up all services with host volumes
-	docker-compose -f docker-compose.yml -f docker-compose-host.yml up -d
+	bash -c 'docker-compose -f docker-compose.yml -f docker-compose-host.yml -f docker-compose-themes.yml up -d'
 	@# Comment out this next line if you want to save some time and don't care about catalog programs
 	./programs/provision.sh cache >/dev/null
 
 dev.up.watchers: | check-memory ## Bring up asset watcher containers
-	docker-compose -f docker-compose-watchers.yml up -d
+	docker-compose -f docker-compose-watchers.yml -f docker-compose-themes-watchers.yml up -d
 
 dev.up.xqueue: | check-memory ## Bring up xqueue, assumes you already have lms running
 	docker-compose -f docker-compose.yml -f docker-compose-xqueue.yml -f docker-compose-host.yml up -d
@@ -200,10 +200,10 @@ xqueue_consumer-restart: ## Kill the XQueue development server. The watcher proc
 	docker exec -t edx.devstack.$* bash -c 'source /edx/app/$*/$*_env && cd /edx/app/$*/$*/ && make static'
 
 lms-static: ## Rebuild static assets for the LMS container
-	docker exec -t edx.devstack.lms bash -c 'source /edx/app/edxapp/edxapp_env && cd /edx/app/edxapp/edx-platform/ && paver update_assets'
+	docker exec -t edx.devstack.lms bash -c 'source /edx/app/edxapp/edxapp_env && cd /edx/app/edxapp/edx-platform/ && paver update_assets --theme-dirs=/edx/app/edx-themes/edx-platform/ --themes educateworkforce greermade'
 
-studio-static: ## Rebuild static assets for the Studio container
-	docker exec -t edx.devstack.studio bash -c 'source /edx/app/edxapp/edxapp_env && cd /edx/app/edxapp/edx-platform/ && paver update_assets'
+studio-static: ## Rebuild static assets for the Studio container (educateworkforce,arm,belizeproject,bmw,caregiver,dlsc,greermade,mahcc,meep,nccte,nwgrc,ptc,scelect,scjru,ts)
+	docker exec -t edx.devstack.studio bash -c 'source /edx/app/edxapp/edxapp_env && cd /edx/app/edxapp/edx-platform/ && paver update_assets --theme-dirs=/edx/app/edx-themes/edx-platform/ --themes educateworkforce greermade'
 
 static: | credentials-static discovery-static ecommerce-static lms-static studio-static ## Rebuild static assets for all service containers
 
diff --git a/docker-compose-host.yml b/docker-compose-host.yml
index cf848e98eb..637ac290aa 100644
--- a/docker-compose-host.yml
+++ b/docker-compose-host.yml
@@ -21,6 +21,7 @@ services:
       - ${DEVSTACK_WORKSPACE}/edx-platform:/edx/app/edxapp/edx-platform:cached
       - edxapp_node_modules:/edx/app/edxapp/edx-platform/node_modules
       - ${DEVSTACK_WORKSPACE}/src:/edx/src:cached
+      - ${DEVSTACK_WORKSPACE}/edx-var-edxapp-uploads:/edx/var/edxapp/uploads:cached
   edx_notes_api:
     volumes:
       - ${DEVSTACK_WORKSPACE}/edx-notes-api:/edx/app/edx_notes_api/edx_notes_api:cached
diff --git a/docker-compose-themes-watchers.yml b/docker-compose-themes-watchers.yml
new file mode 100644
index 0000000000..e8fbb66074
--- /dev/null
+++ b/docker-compose-themes-watchers.yml
@@ -0,0 +1,9 @@
+version: "2.1"
+
+services:
+  lms_watcher:
+      volumes:
+      - ${DEVSTACK_WORKSPACE}/edx-themes:/edx/app/edx-themes:cached
+  studio_watcher:
+      volumes:
+      - ${DEVSTACK_WORKSPACE}/edx-themes:/edx/app/edx-themes:cached
diff --git a/docker-compose-watchers.yml b/docker-compose-watchers.yml
index aedd8fd710..0f55930d19 100644
--- a/docker-compose-watchers.yml
+++ b/docker-compose-watchers.yml
@@ -2,7 +2,7 @@ version: "2.1"
 
 services:
   lms_watcher:
-    command: bash -c 'cd /edx/app/edxapp/edx-platform && source ../edxapp_env && while true; do paver watch_assets --w=$$ASSET_WATCHER_TIMEOUT; sleep 2; done'
+    command: bash -c 'cd /edx/app/edxapp/edx-platform && source ../edxapp_env && while true; do paver watch_assets --w=$$ASSET_WATCHER_TIMEOUT --theme-dirs=/edx/app/edx-themes/edx-platform/ --themes=educateworkforce,greermade; sleep 2; done'
     container_name: edx.devstack.lms_watcher
     environment:
       BOK_CHOY_HOSTNAME: edx.devstack.lms_watcher
@@ -11,10 +11,12 @@ services:
     volumes:
       - ${DEVSTACK_WORKSPACE}/edx-platform:/edx/app/edxapp/edx-platform:cached
       - edxapp_lms_assets:/edx/var/edxapp/staticfiles/
+      - edxapp_node_modules:/edx/app/edxapp/edx-platform/node_modules
       - ${DEVSTACK_WORKSPACE}/src:/edx/src:cached
+      - ${DEVSTACK_WORKSPACE}/edx-themes:/edx/app/edx-themes:cached
 
   studio_watcher:
-    command: bash -c 'cd /edx/app/edxapp/edx-platform && source ../edxapp_env && while true; do paver watch_assets --w=$$ASSET_WATCHER_TIMEOUT; sleep 2; done'
+    command: bash -c 'cd /edx/app/edxapp/edx-platform && source ../edxapp_env && while true; do paver watch_assets --w=$$ASSET_WATCHER_TIMEOUT --theme-dirs=/edx/app/edx-themes/edx-platform/ --themes=educateworkforce,greermade; sleep 2; done'
     container_name: edx.devstack.studio_watcher
     environment:
       BOK_CHOY_HOSTNAME: edx.devstack.studio_watcher
@@ -23,8 +25,11 @@ services:
     volumes:
       - edxapp_studio_assets:/edx/var/edxapp/staticfiles/
       - ${DEVSTACK_WORKSPACE}/edx-platform:/edx/app/edxapp/edx-platform:cached
+      - edxapp_node_modules:/edx/app/edxapp/edx-platform/node_modules
       - ${DEVSTACK_WORKSPACE}/src:/edx/src:cached
+      - ${DEVSTACK_WORKSPACE}/edx-themes:/edx/app/edx-themes:cached
 
 volumes:
   edxapp_lms_assets:
   edxapp_studio_assets:
+  edxapp_node_modules:
diff --git a/docker-compose.yml b/docker-compose.yml
index 2c496de921..027bac2e94 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -68,8 +68,8 @@ services:
       MYSQL_ROOT_PASSWORD: ""
       MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
     image: mysql:5.6
-    # ports:
-    #   - "3306:3306"
+    ports:
+      - "33060:3306"
     volumes:
       - mysql_data:/var/lib/mysql