diff --git a/Makefile b/Makefile
index 7dbda54a24..e18ac8fe15 100644
--- a/Makefile
+++ b/Makefile
@@ -54,7 +54,7 @@ dev.clone: ## Clone service repos to the parent directory
 	./repo.sh clone
 
 dev.provision.run: ## Provision all services with local mounted directories
-	DOCKER_COMPOSE_FILES="-f docker-compose.yml -f docker-compose-host.yml" $(WINPTY) bash ./provision.sh
+	DOCKER_COMPOSE_FILES="-f docker-compose.yml -f docker-compose-host.yml -f docker-compose-themes.yml" $(WINPTY) bash ./provision.sh
 
 dev.provision: | check-memory dev.clone dev.provision.run stop ## Provision dev environment with all services stopped
 
@@ -72,12 +72,12 @@ dev.repo.reset: ## Attempts to reset the local repo checkouts to the master work
 	$(WINPTY) bash ./repo.sh reset
 
 dev.up: | check-memory ## Bring up all services with host volumes
-	bash -c '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
 	$(WINPTY) bash ./programs/provision.sh cache $(DEVNULL)
 
 dev.up.%: | check-memory ## Bring up a specific service and its dependencies with host volumes
-	bash -c '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
 	$(WINPTY) bash ./programs/provision.sh cache $(DEVNULL)
 
@@ -85,7 +85,7 @@ dev.up.watchers: | check-memory ## Bring up asset watcher containers
 	bash -c 'docker-compose -f docker-compose-watchers.yml up -d'
 
 dev.up.xqueue: | check-memory ## Bring up xqueue, assumes you already have lms running
-	bash -c 'docker-compose -f docker-compose.yml -f docker-compose-xqueue.yml -f docker-compose-host.yml up -d'
+	bash -c 'docker-compose -f docker-compose.yml -f docker-compose-xqueue.yml -f docker-compose-host.yml -f docker-compose-themes.yml up -d'
 
 dev.up.all: | dev.up dev.up.watchers ## Bring up all services with host volumes, including watchers
 
@@ -260,13 +260,13 @@ mongo-shell: ## Run a shell on the mongo container
 dev.provision.analytics_pipeline: | check-memory dev.provision.analytics_pipeline.run stop.analytics_pipeline stop ## Provision analyticstack dev environment with all services stopped
 
 dev.provision.analytics_pipeline.run:
-	DOCKER_COMPOSE_FILES="-f docker-compose.yml -f docker-compose-host.yml -f docker-compose-analytics-pipeline.yml" ./provision-analytics-pipeline.sh
+	DOCKER_COMPOSE_FILES="-f docker-compose.yml -f docker-compose-host.yml -f docker-compose-themes.yml -f docker-compose-analytics-pipeline.yml" ./provision-analytics-pipeline.sh
 
 analytics-pipeline-shell: ## Run a shell on the analytics pipeline container
 	docker exec -it edx.devstack.analytics_pipeline env TERM=$(TERM) /edx/app/analytics_pipeline/devstack.sh open
 
 dev.up.analytics_pipeline: | check-memory ## Bring up analytics pipeline services
-	bash -c 'docker-compose -f docker-compose.yml -f docker-compose-analytics-pipeline.yml -f docker-compose-host.yml up -d analyticspipeline'
+	bash -c 'docker-compose -f docker-compose.yml -f docker-compose-analytics-pipeline.yml -f docker-compose-host.yml -f docker-compose-themes.yml up -d analyticspipeline'
 
 pull.analytics_pipeline: ## Update analytics pipeline docker images
 	docker-compose -f docker-compose.yml -f docker-compose-analytics-pipeline.yml pull
diff --git a/Makefile.edx b/Makefile.edx
index fd9f8ac83d..81343ba2de 100644
--- a/Makefile.edx
+++ b/Makefile.edx
@@ -14,7 +14,7 @@ dev.clone_whitelabel: ## Clone edx-themes repo to the parent directory
 	./repo.sh whitelabel
 
 dev.up.e2e_wl_tests: | check-memory dev.clone_whitelabel ## Bring up all services with edx-themes repo mounted for whitelabel tests.
-	docker-compose -f docker-compose.yml -f docker-compose-host.yml -f docker-compose-themes.yml -f ${DEVSTACK_WORKSPACE}/edx-themes/edx-platform/devstack_hostnames.yml up -d
+	docker-compose -f docker-compose.yml -f docker-compose-host.yml -f docker-compose-themes.yml -f docker-compose-themes.yml -f ${DEVSTACK_WORKSPACE}/edx-themes/edx-platform/devstack_hostnames.yml up -d
 
 dev.provision.whitelabel:
 	${DEVSTACK_WORKSPACE}/edx-themes/edx-platform/devstack_provision_wl.sh
diff --git a/destroy.sh b/destroy.sh
index a63dd00e76..f00ea0f6cc 100755
--- a/destroy.sh
+++ b/destroy.sh
@@ -5,5 +5,5 @@ set -e
 read -p "This will delete all data in your devstack. Would you like to proceed? [y/n] " -r
 if [[ $REPLY =~ ^[Yy]$ ]]
 then
-    docker-compose -f docker-compose.yml -f docker-compose-watchers.yml -f docker-compose-host.yml -f docker-compose-analytics-pipeline.yml down -v
+    docker-compose -f docker-compose.yml -f docker-compose-watchers.yml -f docker-compose-host.yml -f docker-compose-themes.yml -f docker-compose-analytics-pipeline.yml down -v
 fi
diff --git a/docker-compose-watchers.yml b/docker-compose-watchers.yml
index 140ef41e6d..7c7828f701 100644
--- a/docker-compose-watchers.yml
+++ b/docker-compose-watchers.yml
@@ -13,6 +13,7 @@ services:
       - 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'
@@ -26,6 +27,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-themes:/edx/app/edx-themes:cached
 
 volumes:
   edxapp_lms_assets:
diff --git a/docs/pycharm_integration.rst b/docs/pycharm_integration.rst
index 83eba0ed84..043777af2e 100644
--- a/docs/pycharm_integration.rst
+++ b/docs/pycharm_integration.rst
@@ -52,6 +52,7 @@ use the following options:
 
     - ``/LOCAL/PATH/TO/devstack/docker-compose.yml`` (e.g.~/edx/devstack/docker-compose.yml)
     - ``/LOCAL/PATH/TO/devstack/docker-compose-host.yml``
+    - ``/LOCAL/PATH/TO/devstack/docker-compose-themes.yml``
 
 - Service: lms (or whatever IDA you wish to test)
 
diff --git a/marketing.mk b/marketing.mk
index ece83eae5f..04ac367baf 100644
--- a/marketing.mk
+++ b/marketing.mk
@@ -6,16 +6,16 @@ marketing-shell: ## Run a shell on the marketing site container
 	docker exec -it edx.devstack.marketing env TERM=$(TERM) bash -c 'cd /edx/app/edx-mktg/edx-mktg; exec /bin/bash -sh'
 
 stop-marketing:   ## Stop all services (including the marketing site) with host volumes
-	docker-compose -f docker-compose.yml -f docker-compose-host.yml -f docker-compose-marketing-site.yml -f docker-compose-marketing-site-host.yml stop
+	docker-compose -f docker-compose.yml -f docker-compose-host.yml -f docker-compose-themes.yml -f docker-compose-marketing-site.yml -f docker-compose-marketing-site-host.yml stop
 
 down-marketing:   ## Bring down all services (including the marketing site) with host volumes
-	docker-compose -f docker-compose.yml -f docker-compose-host.yml -f docker-compose-marketing-site.yml -f docker-compose-marketing-site-host.yml down
+	docker-compose -f docker-compose.yml -f docker-compose-host.yml -f docker-compose-themes.yml -f docker-compose-marketing-site.yml -f docker-compose-marketing-site-host.yml down
 
 up-marketing:   ## Bring up all services (including the marketing site) with host volumes
-	docker-compose -f docker-compose.yml -f docker-compose-host.yml -f docker-compose-marketing-site.yml -f docker-compose-marketing-site-host.yml up
+	docker-compose -f docker-compose.yml -f docker-compose-host.yml -f docker-compose-themes.yml -f docker-compose-marketing-site.yml -f docker-compose-marketing-site-host.yml up
 
 up-marketing-detached:   ## Bring up all services (including the marketing site) with host volumes (in detached mode)
-	docker-compose -f docker-compose.yml -f docker-compose-host.yml -f docker-compose-marketing-site.yml -f docker-compose-marketing-site-host.yml up -d
+	docker-compose -f docker-compose.yml -f docker-compose-host.yml -f docker-compose-themes.yml -f docker-compose-marketing-site.yml -f docker-compose-marketing-site-host.yml up -d
 
 up-marketing-sync:  ## Bring up all services (including the marketing site) with docker-sync
 	docker-sync-stack start -c docker-sync-marketing-site.yml