diff --git a/_config.yml b/_config.yml
index 4c494ee..ca4ce3a 100644
--- a/_config.yml
+++ b/_config.yml
@@ -21,6 +21,7 @@ tagline: A Jekyll template for course websites
 description: A modern, highly customizable, responsive Jekyll template for course websites
 # TODO(template): this should be built from the staff list...
 author: Various Bears
+color_scheme: berkeley-dark
 
 # TODO(setup): Set this to the semester, e.g. /sp24, (faXX / spXX / suXX / wiXX )
 baseurl: '/berkeley-class-site' # the subpath of your site, which should just be the semester.
@@ -132,7 +133,6 @@ defaults:
 
 # Theme settings
 theme: just-the-docs
-color_scheme: light
 search_enabled: true
 heading_anchors: true
 permalink: pretty
diff --git a/_includes/css/custom.scss.liquid b/_includes/css/custom.scss.liquid
deleted file mode 100644
index 3449754..0000000
--- a/_includes/css/custom.scss.liquid
+++ /dev/null
@@ -1,16 +0,0 @@
-// This file is loaded relative to _scss/
-// You should not need to edit it.
-// This overrides as default file of just-the-docs!
-// It also allows using liquid variables.
-
-// It loads Berkeley-specific CSS in _sass/theme/berkeley/
-// Berkeley Shared CSS. Try not to edit.
-@import './berkeley/berkeley';
-// Department specific customizations
-// Only one of these will be included.
-@import './berkeley/{{ site.course_department }}';
-
-// Just the Class customizations are all loaded in one file.
-@import './theme/just-the-class';
-
-@import "./custom/custom";
diff --git a/_sass/berkeley/berkeley.scss b/_sass/berkeley/berkeley.scss
deleted file mode 100644
index 101f88b..0000000
--- a/_sass/berkeley/berkeley.scss
+++ /dev/null
@@ -1,6 +0,0 @@
-// This config applies to all berkeley courses.
-// It is loaded before all Just-the-class customizations
-
-// h1 {
-//   font-family: serif;
-// }
diff --git a/_sass/berkeley/dsus.scss b/_sass/berkeley/dsus.scss
deleted file mode 100644
index 56a4c4d..0000000
--- a/_sass/berkeley/dsus.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-// DSUS-Specific styling for class sites.
-// Loaded after Berkeley-specific styles.
-// Currently not really used...
diff --git a/_sass/berkeley/eecs.scss b/_sass/berkeley/eecs.scss
deleted file mode 100644
index 72a8c6d..0000000
--- a/_sass/berkeley/eecs.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-// EECS-Specific styling for class sites.
-// Loaded after Berkeley-specific styles.
-// Currently not really used...
diff --git a/_sass/berkeley/stat.scss b/_sass/berkeley/stat.scss
deleted file mode 100644
index a000715..0000000
--- a/_sass/berkeley/stat.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-// STAT-Specific styling for class sites.
-// Loaded after Berkeley-specific styles.
-// Currently not really used...
diff --git a/_sass/color_schemes/berkeley-dark.scss b/_sass/color_schemes/berkeley-dark.scss
new file mode 100644
index 0000000..b982e06
--- /dev/null
+++ b/_sass/color_schemes/berkeley-dark.scss
@@ -0,0 +1,8 @@
+// Default JTD color scheme
+@import "./color_schemes/dark";
+
+@import './berkeley/variables';
+@import './berkeley/berkeley';
+
+// Just the Class customizations are all loaded in one file.
+@import '../just-the-class/just-the-class';
diff --git a/_sass/color_schemes/berkeley-light.scss b/_sass/color_schemes/berkeley-light.scss
new file mode 100644
index 0000000..508c111
--- /dev/null
+++ b/_sass/color_schemes/berkeley-light.scss
@@ -0,0 +1,5 @@
+@import './berkeley/variables';
+@import './berkeley/berkeley';
+
+// Just the Class customizations are all loaded in one file.
+@import '../just-the-class/just-the-class';
diff --git a/_sass/color_schemes/berkeley/berkeley.scss b/_sass/color_schemes/berkeley/berkeley.scss
new file mode 100644
index 0000000..4d5f222
--- /dev/null
+++ b/_sass/color_schemes/berkeley/berkeley.scss
@@ -0,0 +1,35 @@
+// This config applies to all berkeley courses.
+// It is loaded before all Just-the-class customizations
+
+// h1 {
+//   font-family: serif;
+// }
+
+// Override default JTD CSS for larger/more accessibile fonts.
+html {
+  @include fs-3;
+}
+
+body {
+  font-family: $body-font-family;
+  font-size: inherit;
+  line-height: $body-line-height;
+  color: $body-text-color;
+  background-color: $body-background-color;
+  overflow-wrap: break-word;
+}
+
+// Link Colors
+a,
+.main-content .anchor-heading svg {
+  color: $link-color;
+
+  &:hover,
+  &:focus {
+    color: $hover-focus-link-color;
+  }
+}
+
+a:not([class]):hover {
+  text-decoration-color: lighten($link-color, 20%);
+}
diff --git a/_sass/color_schemes/berkeley/variables.scss b/_sass/color_schemes/berkeley/variables.scss
new file mode 100644
index 0000000..7c72c97
--- /dev/null
+++ b/_sass/color_schemes/berkeley/variables.scss
@@ -0,0 +1,21 @@
+// Common Berkeley Variables.
+// This file is explicitly included before berkeley.scss in _includes/css/custom
+
+$content-width: 1200px;
+
+// Typography
+// $body-font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;
+
+// Colors
+$link-color: $blue-100;
+$hover-focus-link-color: darken($link-color, 0.3);
+
+// Layout
+$gutter-spacing: $sp-6;
+$gutter-spacing-sm: $sp-4;
+$nav-width: 256px;
+
+// Components
+$box-shadow: 0 1px 3px rgba(0, 0, 0, 0.07), 0 4px 14px rgba(0, 0, 0, 0.05);
+$module-date-color: $link-color;
+$staffer-image-size: 100px;
diff --git a/_sass/custom/setup.scss b/_sass/custom/setup.scss
new file mode 100644
index 0000000..207ea92
--- /dev/null
+++ b/_sass/custom/setup.scss
@@ -0,0 +1,3 @@
+// Use this file to customize SASS variables.
+// You will likely want to review the Jst the Docs CSS
+// This file is loaded *early* in the SASS compilation process.
diff --git a/_sass/theme/announcement.scss b/_sass/just-the-class/announcement.scss
similarity index 100%
rename from _sass/theme/announcement.scss
rename to _sass/just-the-class/announcement.scss
diff --git a/_sass/theme/card.scss b/_sass/just-the-class/card.scss
similarity index 100%
rename from _sass/theme/card.scss
rename to _sass/just-the-class/card.scss
diff --git a/_sass/theme/just-the-class.scss b/_sass/just-the-class/just-the-class.scss
similarity index 100%
rename from _sass/theme/just-the-class.scss
rename to _sass/just-the-class/just-the-class.scss
diff --git a/_sass/theme/lab.scss b/_sass/just-the-class/lab.scss
similarity index 100%
rename from _sass/theme/lab.scss
rename to _sass/just-the-class/lab.scss
diff --git a/_sass/theme/module.scss b/_sass/just-the-class/module.scss
similarity index 100%
rename from _sass/theme/module.scss
rename to _sass/just-the-class/module.scss
diff --git a/_sass/theme/schedule.scss b/_sass/just-the-class/schedule.scss
similarity index 100%
rename from _sass/theme/schedule.scss
rename to _sass/just-the-class/schedule.scss
diff --git a/_sass/theme/staffer.scss b/_sass/just-the-class/staffer.scss
similarity index 100%
rename from _sass/theme/staffer.scss
rename to _sass/just-the-class/staffer.scss
diff --git a/assets/css/just-the-docs-berkeley-dark.scss b/assets/css/just-the-docs-berkeley-dark.scss
new file mode 100644
index 0000000..2ef8bbb
--- /dev/null
+++ b/assets/css/just-the-docs-berkeley-dark.scss
@@ -0,0 +1,4 @@
+---
+---
+
+{% include css/just-the-docs.scss.liquid color_scheme="berkeley-dark" %}
diff --git a/assets/css/just-the-docs-berkeley-light.scss b/assets/css/just-the-docs-berkeley-light.scss
new file mode 100644
index 0000000..e0d2a48
--- /dev/null
+++ b/assets/css/just-the-docs-berkeley-light.scss
@@ -0,0 +1,4 @@
+---
+---
+
+{% include css/just-the-docs.scss.liquid color_scheme="berkeley-light" %}