diff --git a/assets/components/container/container.vue b/assets/components/container/container.vue
index 0068e046..d770bbc5 100644
--- a/assets/components/container/container.vue
+++ b/assets/components/container/container.vue
@@ -124,8 +124,6 @@ export default {
 </script>
 
 <style lang="scss">
-@import 'theme';
-
 .container {
     position: relative;
     height: 100%;
diff --git a/assets/components/form/toggle.vue b/assets/components/form/toggle.vue
index 89ecddd6..2cde29e0 100644
--- a/assets/components/form/toggle.vue
+++ b/assets/components/form/toggle.vue
@@ -1,5 +1,8 @@
 <template>
-	<label class="toggle-container noselect">
+	<label
+		class="toggle-container noselect"
+		:class="{ light: $store.state.ui.theme === 'dark' }"
+	>
 		<input
 			:id="`toggle-${id}`"
 			:checked="checked"
diff --git a/assets/components/releases/release.vue b/assets/components/releases/release.vue
index 3ab5dba1..6b06cfd8 100644
--- a/assets/components/releases/release.vue
+++ b/assets/components/releases/release.vue
@@ -409,7 +409,7 @@ export default {
 	width: 1.5rem;
 	height: 1.5rem;
 	padding: 0 1rem;
-	fill: var(--darken);
+	fill: var(--shadow);
 
 	&.stashed {
 		fill: var(--primary);
diff --git a/assets/components/users/scene-preview.vue b/assets/components/users/scene-preview.vue
index 0ea6adf8..559b7d64 100644
--- a/assets/components/users/scene-preview.vue
+++ b/assets/components/users/scene-preview.vue
@@ -63,7 +63,7 @@ export default {
 	align-items: center;
 	position: absolute;
 	left: 0;
-	background: var(--shadow-weak);
+	background: var(--darken-weak);
 	color: var(--text-light);
 	font-size: .7rem;
 	font-weight: bold;