From f925c56036a4cb16243dee61c50653996c454f4c Mon Sep 17 00:00:00 2001
From: deR0R0 <rorozee1@gmail.com>
Date: Wed, 22 Oct 2025 21:12:33 -0400
Subject: [PATCH 1/5] feat(ui): add theme choser + twilight theme

---
 celerybeat-schedule-shm                       | Bin 0 -> 32768 bytes
 celerybeat-schedule-wal                       | Bin 0 -> 156592 bytes
 intranet/apps/context_processors.py           |   7 ++
 intranet/apps/preferences/forms.py            |  16 ++++
 intranet/apps/preferences/views.py            |  19 ++++-
 .../migrations/0043_userthemeproperties.py    |  23 ++++++
 intranet/apps/users/models.py                 |  13 +++
 intranet/settings/__init__.py                 |  17 ++++
 intranet/static/css/twilight/_colors.scss     |   7 ++
 intranet/static/css/twilight/about.scss       |   5 ++
 intranet/static/css/twilight/base.scss        |  78 ++++++++++++++++++
 intranet/static/css/twilight/cke.scss         |  14 ++++
 intranet/static/css/twilight/dashboard.scss   |  33 ++++++++
 .../static/css/twilight/eighth.signup.scss    |  38 +++++++++
 intranet/static/css/twilight/enrichment.scss  |   5 ++
 intranet/static/css/twilight/events.scss      |   6 ++
 intranet/static/css/twilight/files.scss       |  14 ++++
 intranet/static/css/twilight/login.scss       |  25 ++++++
 intranet/static/css/twilight/lostfound.scss   |   7 ++
 intranet/static/css/twilight/nav.scss         |  12 +++
 intranet/static/css/twilight/polls.scss       |  18 ++++
 intranet/static/css/twilight/printing.scss    |  16 ++++
 intranet/static/css/twilight/select.scss      |   7 ++
 intranet/static/css/twilight/welcome.scss     |   6 ++
 .../templates/announcements/add_modify.html   |   6 +-
 intranet/templates/announcements/approve.html |   7 +-
 .../templates/announcements/club-request.html |   7 +-
 intranet/templates/announcements/delete.html  |   6 +-
 intranet/templates/announcements/request.html |   7 +-
 .../announcements/request_status.html         |   6 +-
 intranet/templates/announcements/success.html |   6 +-
 intranet/templates/announcements/view.html    |   7 +-
 intranet/templates/auth/about.html            |   7 +-
 intranet/templates/auth/login.html            |   7 +-
 intranet/templates/auth/reauth.html           |   6 +-
 intranet/templates/auth/reset_password.html   |   6 +-
 intranet/templates/bus/home.html              |   6 +-
 intranet/templates/bus/morning.html           |   6 +-
 intranet/templates/dashboard/dashboard.html   |   7 +-
 intranet/templates/docs/api-oauth-aup.html    |   7 +-
 intranet/templates/eighth/absences.html       |   6 +-
 intranet/templates/eighth/activity.html       |   6 +-
 .../templates/eighth/activity_settings.html   |   6 +-
 .../eighth/admin/distribute_group.html        |   2 +-
 .../eighth/admin/eighth_admin_page_base.html  |   6 +-
 .../admin/list_sponsor_by_activity.html       |   2 +-
 .../templates/eighth/admin/list_sponsors.html |   2 +-
 .../eighth/admin/list_sponsors_hybrid.html    |   2 +-
 .../eighth/admin/no_signups_roster.html       |   6 +-
 .../eighth/admin/schedule_activity.html       |   2 +-
 intranet/templates/eighth/edit_profile.html   |   6 +-
 intranet/templates/eighth/email_students.html |   6 +-
 intranet/templates/eighth/location.html       |   6 +-
 intranet/templates/eighth/multi_signup.html   |   8 +-
 intranet/templates/eighth/profile.html        |   6 +-
 .../templates/eighth/profile_history.html     |   6 +-
 intranet/templates/eighth/profile_often.html  |   6 +-
 intranet/templates/eighth/profile_signup.html |   9 +-
 intranet/templates/eighth/roster.html         |   6 +-
 intranet/templates/eighth/signup.html         |   7 +-
 intranet/templates/eighth/statistics.html     |   7 +-
 .../templates/eighth/take_attendance.html     |   8 +-
 .../templates/emailfwd/senior_forward.html    |   6 +-
 intranet/templates/enrichment/add_modify.html |   8 +-
 intranet/templates/enrichment/delete.html     |   9 +-
 intranet/templates/enrichment/home.html       |   9 +-
 intranet/templates/enrichment/roster.html     |   9 +-
 intranet/templates/events/add_modify.html     |   8 +-
 intranet/templates/events/delete.html         |   8 +-
 intranet/templates/events/home.html           |   8 +-
 intranet/templates/events/join_event.html     |   8 +-
 intranet/templates/events/roster.html         |   8 +-
 intranet/templates/feedback/form.html         |   7 +-
 intranet/templates/files/auth.html            |   6 +-
 intranet/templates/files/delete.html          |   6 +-
 intranet/templates/files/directory.html       |   7 +-
 intranet/templates/files/home.html            |   7 +-
 intranet/templates/files/upload.html          |   7 +-
 intranet/templates/groups/addmodify.html      |   7 +-
 intranet/templates/groups/groups.html         |   6 +-
 intranet/templates/itemreg/home.html          |   6 +-
 intranet/templates/itemreg/item_view.html     |   7 +-
 .../templates/itemreg/register_delete.html    |   6 +-
 intranet/templates/itemreg/register_form.html |   6 +-
 intranet/templates/itemreg/search.html        |   7 +-
 intranet/templates/logs/home.html             |   6 +-
 intranet/templates/logs/query.html            |   6 +-
 intranet/templates/logs/request.html          |   6 +-
 .../templates/lostfound/founditem_delete.html |   6 +-
 .../templates/lostfound/founditem_form.html   |   7 +-
 intranet/templates/lostfound/home.html        |   7 +-
 intranet/templates/lostfound/item_view.html   |   7 +-
 .../templates/lostfound/lostitem_delete.html  |   6 +-
 .../templates/lostfound/lostitem_form.html    |   7 +-
 .../templates/notifications/gcm_list.html     |   6 +-
 .../templates/notifications/gcm_post.html     |   6 +-
 .../oauth2_provider/authorized-tokens.html    |   2 +-
 intranet/templates/oauth2_provider/base.html  |   7 +-
 intranet/templates/parking/car.html           |   6 +-
 intranet/templates/parking/form.html          |   6 +-
 intranet/templates/parking/intro.html         |   6 +-
 intranet/templates/parking/joint.html         |   6 +-
 intranet/templates/polls/add_modify.html      |   8 +-
 intranet/templates/polls/delete.html          |   7 +-
 intranet/templates/polls/home.html            |   7 +-
 intranet/templates/polls/results.html         |   7 +-
 intranet/templates/polls/vote.html            |   7 +-
 intranet/templates/polls/winners.html         |   7 +-
 .../templates/preferences/preferences.html    |  13 ++-
 .../preferences/privacy_options.html          |   7 +-
 intranet/templates/printing/print.html        |   7 +-
 intranet/templates/schedule/admin_add.html    |   7 +-
 .../templates/schedule/admin_comment.html     |   8 +-
 .../templates/schedule/admin_daytype.html     |   8 +-
 intranet/templates/schedule/admin_home.html   |   8 +-
 intranet/templates/schedule/calendar.html     |   8 +-
 intranet/templates/schedule/fill.html         |   8 +-
 intranet/templates/search/search_results.html |   7 +-
 intranet/templates/seniors/add.html           |   7 +-
 intranet/templates/seniors/home.html          |   6 +-
 intranet/templates/sessionmgmt/index.html     |   6 +-
 intranet/templates/signage/pages/eighth.html  |   7 +-
 .../special/senior_dests_banner.html          |   2 +-
 intranet/templates/special/tjstar_ribbon.html |   6 +-
 intranet/templates/users/all_classes.html     |   6 +-
 intranet/templates/users/all_courses.html     |   6 +-
 intranet/templates/users/class.html           |   6 +-
 intranet/templates/users/class_room.html      |   6 +-
 intranet/templates/users/profile.html         |   6 +-
 intranet/templates/welcome/base.html          |   5 +-
 130 files changed, 955 insertions(+), 118 deletions(-)
 create mode 100644 celerybeat-schedule-shm
 create mode 100644 celerybeat-schedule-wal
 create mode 100644 intranet/apps/users/migrations/0043_userthemeproperties.py
 create mode 100644 intranet/static/css/twilight/_colors.scss
 create mode 100644 intranet/static/css/twilight/about.scss
 create mode 100644 intranet/static/css/twilight/base.scss
 create mode 100644 intranet/static/css/twilight/cke.scss
 create mode 100644 intranet/static/css/twilight/dashboard.scss
 create mode 100644 intranet/static/css/twilight/eighth.signup.scss
 create mode 100644 intranet/static/css/twilight/enrichment.scss
 create mode 100644 intranet/static/css/twilight/events.scss
 create mode 100644 intranet/static/css/twilight/files.scss
 create mode 100644 intranet/static/css/twilight/login.scss
 create mode 100644 intranet/static/css/twilight/lostfound.scss
 create mode 100644 intranet/static/css/twilight/nav.scss
 create mode 100644 intranet/static/css/twilight/polls.scss
 create mode 100644 intranet/static/css/twilight/printing.scss
 create mode 100644 intranet/static/css/twilight/select.scss
 create mode 100644 intranet/static/css/twilight/welcome.scss

diff --git a/celerybeat-schedule-shm b/celerybeat-schedule-shm
new file mode 100644
index 0000000000000000000000000000000000000000..9720b2cccc315b654de4812460aad6293e4ab3d9
GIT binary patch
literal 32768
zcmeI)xlKbs5C-7?nZw*XbNO+aJEI;D6+i$T&;St$A;plA(E>Rw0Q(TKNRce$;2UW*
zqt$9=^%XG9+gaLJEvHKA(~>93xxVT@Ki<_JH>vKM?&a;v`NhNg>r=1!<NMO;JKDaV
zzvAb5m^!6u=Z;$*eo#Sx009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+
z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+0D%z-RAuAJRJxhXd=|5u
zUfBY(o_;p7o!ty_kfWT8aGq8K#z&x&$xLS^b6Lnz>a1if8)>qYo$O^lhdEBWwMY;k
zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF
N5FkK+0D=D(_yUf_CV>C|

literal 0
HcmV?d00001

diff --git a/celerybeat-schedule-wal b/celerybeat-schedule-wal
new file mode 100644
index 0000000000000000000000000000000000000000..7a206d8ea8f5efab11303990469f8691105e97b6
GIT binary patch
literal 156592
zcmeI*ZEzIj0l@LQypWe8xs!=$0x2CcC_#It2sGBI&Ip5VCs?r-36^#5?n&;N%kItX
z9++q>Efr9=Rm!R})e2a(wodDe<4oz;skM%S*xHWTRun`*K-3TQL#L%3hxXaK+mJ{g
zcY%bw{4<kqx!b$l{q1r)ll$+pt>2mQJx_3dgU1u_IA2{J?>!9_ZQ82CrEBk+v;Q)A
zS4sc-7w@|McXR*s_}UtIXPK|Z<A2V-#n<EC?M%ZL0tg_000IagfB*sroNj@Q=d8P_
zZ2J9|2+d3<gt4~l0bf~e9=&#pRi74yFoS75V+tdvwwofY>AGfHzNkowbayBsRMWO<
zZj8o7ERz(A<*Rhtn@{%4SqV9fstGfsrcy>Ik}*Q2YIGW*?5vdBtZb_?rkcV`bcy~q
zH`|M<D?X~O_n+mj+EF7PiDVK<Gocx_RnZ|#)il#`=2m5ou8D-!uFIQk^5!+pO?iKn
zlF?F$XlGK`>+NN>6}X~Hq!Ur~!lh!3vO-UH+F`Hrfb$)mVg>T+XyjMUnM*XSYo;1;
zRx#`edo1tycDyOxWXfms+L1ZE@~3m#sv7{;rKh!o)?vrXT2AnYRTxXW>KMSj?RLCA
zyQmfM87*ONc&f7`gDlI8Ov=FwwntM&P{>v85L&c57**wZWf$qB6IgQxZm{eN<TqLF
zg_Z1GO7`^>XIt9tVg{NUd>1XxFXoa*yzxe>($$oN@d~TT*~BrCG*$U~*t4Y88}@9F
zfOju-ejf8|N{cRiwFv6TSTLy@X1kuzV!`}Q>#Rh4k#+IF1?`)xZ~t;$L6NVZ^gZM*
zX}}klS<_qLf_fxqyeaI>eIK`R8`||`QeP9yq=IV1keEWUs)?kLU6AXoc>@<jBs$_|
zJiipVrz)A0l7Fhy%RM!>X>&{B8)QjJ2idgs?teoy+9|Y{5={zK%cQc)u`<5W-44$G
zm*2=eHMhGsYiD^cvMulY?9Myzb*&0<TPh)UUwg^#pE8_v&xEF}ySlWwE@MU&p{bFi
zh^;N#7@D>2s?xx<W{-T!sLQ`A4e~!K)V%JSrOopdWwl5f30+eZIenEoeffgWg3vrW
zB!4e;zTLkUs9)Rt-s`^lJFDfLW&WKW|4#pY|2zJF<e$es2q1s}0tg_000IagfB*sr
zATSmM0;SC*{r(2v{d+}epv3I)?wDFSy(Ir<9Pi(psrvnu!TX9_l>xoL*3WKgeC76w
zy?wnvwifU|Hx^f!WkLV}1Q0*~0R#|0VEhZv3(yPD3(yPn<t|0^0?S9N7g)Gw+xjEV
zta_eaVEi9pSOWwQKmY**5I_I{1Q0*~fk`BAqF&&w;(CEqUv1g-;D4Vy<n{v2*aFTN
z1CvOSRYd>+1Q0*~0R#|0U=#)D1?UCn1?UBa=ml;bY<z){>jlDd)BE1|VEt5jfl)jZ
zFe?NQKmY**5I_I{1Q0*~0R&D}V0gX2E;-u);|nZ&`<|~qc4_J_xn5w4Cszyj=mk!7
z`|x}O5I_I{1Q0*~0R)CGu;Gq%E6S$dryaX!!69e(aQVeW3r6vx1@S5U2bkx21Ou)|
zuyCwgk6`H-xgJ4Vyv^NR>gpQH4$eH4>k*7{FHrJkYE$Gt&+eob$i2<-69EJeKmY**
z5I_I{1Q0*~fpH;FP%rTI=dVX_Trcpet9KkZa`a`ZUoWu5w}tBwjEjAMg+u@W1Q0*~
z0R#}3r~>o?V`2~jdV!#xj0KarVYcfTEk-X;pRZLSYP3^mF(sN5s+LLF@v;_K3ygFx
z&^BV%BdGiHA2;2!{ktF23ry5Q3hRXc0tg_000IagfB*srATS{XPSgv$)Bkz|L-zum
z7tFq2dG+Ya$9e&$7T|gW6LOznr4T>>0R#|0009KXivYa<y?`)7YAR)fM3+c+giO`w
zG(wqFOf`j)y-SIz(YR2Y2W<De_CRxk@1o`T^V*j@;*B?2m4=)umPrbGvmLLns?0=}
zh>4`B%HPADCAHqLXM?@WzI&<jb55@uCf}4dtfsW+(pL+5fxhboWLZY77g#yi^$13;
z7kG4QySnG0s#bb|@p6b@IT1hr0R#|0009ILKmY**5Rd}H>jiepXAZa?!G#CUGp~H+
zhtu3%AXf|co$2^O009ILKmY**5I_KdGb2DRKrcWq&=)T>wCl;Fz9yJS1=WZlw5SM*
zE;W%fvgh?r$m<cDN-uCrY4dzVSuN5=Le~^!ZP^1=`L{8vd_ibIXr3LCzdIK=Dedxj
z?`f!L({6v^tzZ6n!|Ye+1<uSHK66C?0R#|0009ILKmY**5I|s90-x^%_EeMxO3WVb
z$;THst`}Haa_CFje_Q_xw-<267Vz)(Z5h@w@gxKgKmY**5I_I{1Q0kK0<stQR@wCX
zG@+U4gfQeMeutco_vBZv-D1_Jg(1vfTF;om2&(O-NNc*T*_O{8EnTRlZPnbEKeK$X
ze3fo_I{8VSIV&NjQ8o87>PW`OpV6M3m6Ds4ZB;s_w>xL3_rJN>UQ}K2QFXolEPvIG
z8u>^hlSrBg&9JSC4q>XMnU*uRDtmNIB(!#2-fWXMuW@e5`>T|UmP$lB<r(nnoip15
zSI86U6Z8V^wkT$Nfx5cJ^1w8Ae1V@ZzJL+Rr3OkSrQ}lsIXXiwHK@w&wgF#YW=*dz
zZx;5%XSBqd!e04Z8gFvO6zH`h$A(=P7vl>IqZbHYnYpg*(`}XX0=c(Yej<PX0tg_0
z00IagfB*srATTZj3hD*kb*9RgQAKEKBq?Iv<9dM`udQwFYW(Mq=mo~bR%am*KmY**
z5I_I{1SW@o>;+cQ3y3w!3O(IvhrLcn;CzRtSb=;K;SRI!R0+|vu9<4YNg~3Yu*dSA
zZ^xSk`LwrgKxomWr?rIE;hdvxo#2rv?m+)e3$bsz`=N4${7^aU4NrAuGRSOZ<SrW!
zY>%c4c_O^LoPazfzB`z`en56^C!N5WJFwlL7qA##U~SpP(5!U@UXNfHy}(~*d7=;R
zI@&-lFgXq|tR(^nAb<b@2q1s}0tg_0zyuK}s2A8fWH0d64F~^y>t*-a^a2xPzhE^G
zKmY**5I_I{1SW!j>;)8h0eXQ{$_N$J3pBKrpL4(+U*J*37hrsW!mdZ~<>j;I|9sZ|
zOX&qB!r_B;KmY**5I_I{1Q0*~0R#}3Gy(<n0`Cpk3%vI61#j$nbapqrz@*u8SWyHJ
zKmY**5I_Kdu`eKdfm`VX=mm=I1-{r=9$e}60$b<>=miSv1&(Y?Jm39c^#$|-WB=g5
z5+Z;A0tg_000IagfB*srAkZgJP%rTQki9_l&V|WO<|iJe7wD7a1_B5mfB*srAb<b@
zXIen^0xG=#y+F~uz&WkuOUm3{U@N@<y+C2Tz}b6a@9w|%&L`*v&h%S9^G5&y1Q0*~
z0R#|0009ILK%fYLf_i~{L-qpOR#cTdwdvI~y+9H6Oo{*k2q1s}0tg_0z{m>7ULZm*
zKrc{qFK}LC`8UpWdx35A0`vlf^#Z=LQ!m}{<LS523yka=JFkua0tg_000IagfB*sr
zAb`MW6)30|*gs@1@T6~H?abE~Df9xTb?fkA2q1s}0tg_000Ib{ih%3|qVxjv0!8-%
z=eL&M`n1~%JVq}-FHl%7u)D4Fp*<ge`y+aRQ+eCwxd<SD00IagfB*srAb<b@2#m5o
zLA}5SL-qm({<O98GqG|Hy}&4MKW2vj0tg_000IagfWV0bWG@h-7oZm?x)->xvD~=V
z?FD{HFF-F)STB%R@JYjh2d^rj7dY{oGLImD00IagfB*srAb<b@2p}-#1PbZ}4h-1~
z99}jp(=v0;MtXrUw}n|C1Q0*~0R#|00D;LXAbSBpFF-F)bT2TkwcM<Adx6L41?U9|
z>jeS_THAiG?B-f}fysN&Va*Xh009ILKmY**5I_I{1jeC2LA}7iA$x%rlb^m{JNI(N
z7Z``T0E>(O0tg_000IagFkuB`FVIdeKrc{qFK|g?dG}to7kGkRfL@@mUf`DS;uU*$
z+;u6vz=S=fuwn=xfB*srAb<b@2q1s}0uxc7pkCn6kiEbk-n{G6m#%wZ5#tL?#GQn7
zLI42-5I_I{1P~af0<stApckMQD7F_k+tXTpN6_sBo}?F`7bvV3_}^EyZ`yU%xv$X+
zjMF0qi;VyR2q1s}0tg_000IagFgXPZ>IFU=vKM$Na{1vK-njf}dV$Hg8?n|1Ab<b@
z2q1s}0%KA@_5yKw0eXR=dx7%C^6x+E_5wen7oZm?tQUCk3-QF!K<@+e0%P)cz(OH_
d00IagfB*srAb<b@2p}-HKta90;p2LN{{sy^ac2Mk

literal 0
HcmV?d00001

diff --git a/intranet/apps/context_processors.py b/intranet/apps/context_processors.py
index 04c514a77c6..a0bd6a6c676 100644
--- a/intranet/apps/context_processors.py
+++ b/intranet/apps/context_processors.py
@@ -184,6 +184,13 @@ def enable_dark_mode(request):
     """
     return {"dark_mode_enabled": dark_mode_enabled(request)}
 
+def user_theme_choice(request):
+    if request.user.is_authenticated:
+        choice = request.user.theme_properties.theme_choice
+    else:
+        choice = request.COOKIES.get("theme_choice", "light")
+    return {"theme_choice": choice}
+
 
 def oauth_toolkit(request):
     """
diff --git a/intranet/apps/preferences/forms.py b/intranet/apps/preferences/forms.py
index 10e027f7822..4e106597f10 100644
--- a/intranet/apps/preferences/forms.py
+++ b/intranet/apps/preferences/forms.py
@@ -101,6 +101,22 @@ def __init__(self, user, *args, **kwargs):
             initial=user.dark_mode_properties.dark_mode_enabled, label="Enable dark mode?", required=False
         )
 
+class ThemeForm(forms.Form):
+    THEME_CHOICES = [
+        ("light", "Light Theme"),
+        ("dark", "Dark Theme"),
+        ("twilight", "Twilight Theme"),
+    ]
+
+    def __init__(self, user, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.fields["theme_choice"] = forms.ChoiceField(
+            choices=self.THEME_CHOICES,
+            initial=user.theme_properties.theme_choice,
+            label="Select your preferred theme:",
+            required=True
+        )
+
 
 class PhoneForm(forms.ModelForm):
     """Represents a phone number (number + purpose)"""
diff --git a/intranet/apps/preferences/views.py b/intranet/apps/preferences/views.py
index 6bcbf78337c..a8b63e1f8a2 100644
--- a/intranet/apps/preferences/views.py
+++ b/intranet/apps/preferences/views.py
@@ -10,7 +10,7 @@
 from ..auth.decorators import eighth_admin_required
 from ..bus.models import Route
 from ..users.models import Email
-from .forms import BusRouteForm, DarkModeForm, EmailFormset, NotificationOptionsForm, PreferredPictureForm, PrivacyOptionsForm
+from .forms import BusRouteForm, DarkModeForm, ThemeForm, EmailFormset, NotificationOptionsForm, PreferredPictureForm, PrivacyOptionsForm
 
 # from .forms import (BusRouteForm, DarkModeForm, EmailFormset, NotificationOptionsForm, PhoneFormset, PreferredPictureForm, PrivacyOptionsForm,
 #                    WebsiteFormset)
@@ -289,6 +289,17 @@ def save_dark_mode_settings(request, user):
 
     return dark_mode_form
 
+def save_theme_settings(request, user):
+    theme_form = ThemeForm(user, data=request.POST, initial={"theme_choice": user.theme_properties.theme_choice})
+    if theme_form.is_valid():
+        if theme_form.has_changed():
+            user.theme_properties.theme_choice = theme_form.cleaned_data["theme_choice"]
+            user.theme_properties.save()
+            invalidate_obj(request.user.theme_properties)
+            messages.success(request, f"Theme set to {user.theme_properties.theme_choice}")
+
+    return theme_form
+
 
 @login_required
 def preferences_view(request):
@@ -314,7 +325,7 @@ def preferences_view(request):
             privacy_options_form = None
         notification_options_form = save_notification_options(request, user)
 
-        dark_mode_form = save_dark_mode_settings(request, user)
+        theme_form = save_theme_settings(request, user)
 
         for error in errors:
             messages.error(request, error)
@@ -355,7 +366,7 @@ def preferences_view(request):
         notification_options = get_notification_options(user)
         notification_options_form = NotificationOptionsForm(user, initial=notification_options)
 
-        dark_mode_form = DarkModeForm(user, initial={"dark_mode_enabled": user.dark_mode_properties.dark_mode_enabled})
+        theme_form = ThemeForm(user, initial={"theme_choice": user.theme_properties.theme_choice})
 
     context = {
         # "phone_formset": phone_formset,
@@ -365,7 +376,7 @@ def preferences_view(request):
         "privacy_options_form": privacy_options_form,
         "notification_options_form": notification_options_form,
         "bus_route_form": bus_route_form if settings.ENABLE_BUS_APP else None,
-        "dark_mode_form": dark_mode_form,
+        "theme_form": theme_form,
     }
     return render(request, "preferences/preferences.html", context)
 
diff --git a/intranet/apps/users/migrations/0043_userthemeproperties.py b/intranet/apps/users/migrations/0043_userthemeproperties.py
new file mode 100644
index 00000000000..aa15c460e0d
--- /dev/null
+++ b/intranet/apps/users/migrations/0043_userthemeproperties.py
@@ -0,0 +1,23 @@
+# Generated by Django 5.2.4 on 2025-10-18 16:00
+
+import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('users', '0042_user_seen_april_fools'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='UserThemeProperties',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('theme_choice', models.CharField(default='light_theme', max_length=100)),
+                ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='theme_properties', to=settings.AUTH_USER_MODEL)),
+            ],
+        ),
+    ]
diff --git a/intranet/apps/users/models.py b/intranet/apps/users/models.py
index a4a5212abf7..33d96b6a236 100644
--- a/intranet/apps/users/models.py
+++ b/intranet/apps/users/models.py
@@ -1095,6 +1095,8 @@ def __getattr__(self, name):
             return UserProperties.objects.get_or_create(user=self)[0]
         elif name == "dark_mode_properties":
             return UserDarkModeProperties.objects.get_or_create(user=self)[0]
+        elif name == "theme_properties":
+            return UserThemeProperties.objects.get_or_create(user=self)[0]
         raise AttributeError(f"{type(self).__name__!r} object has no attribute {name!r}")
 
     def __str__(self):
@@ -1287,6 +1289,17 @@ class UserDarkModeProperties(models.Model):
 
     def __str__(self):
         return str(self.user)
+    
+class UserThemeProperties(models.Model):
+    """
+    Contains user properties relating to themes
+    """
+
+    user = models.OneToOneField(settings.AUTH_USER_MODEL, related_name="theme_properties", on_delete=models.CASCADE)
+    theme_choice = models.CharField(max_length=100, default="light_theme")
+
+    def __str__(self):
+        return str(self.user)
 
 
 class Email(models.Model):
diff --git a/intranet/settings/__init__.py b/intranet/settings/__init__.py
index 43841e51d63..260412b29b5 100644
--- a/intranet/settings/__init__.py
+++ b/intranet/settings/__init__.py
@@ -402,6 +402,22 @@
     "dark/oauth",
     "dark/sessionmgmt",
     "dark/logs",
+    "twilight/base",
+    "twilight/nav",
+    "twilight/cke",
+    "twilight/dashboard",
+    "twilight/preferences",
+    "twilight/eighth.signup",
+    "twilight/about",
+    "twilight/login",
+    "twilight/events",
+    "twilight/select",
+    "twilight/enrichment",
+    "twilight/files",
+    "twilight/lostfound",
+    "twilight/polls",
+    "twilight/printing",
+    "twilight/welcome"
 ]
 
 for name in LIST_OF_INDEPENDENT_CSS:
@@ -453,6 +469,7 @@
                 "intranet.apps.context_processors.global_custom_theme",  # Sitewide custom themes (special events, etc)
                 "intranet.apps.context_processors.show_bus_button",
                 "intranet.apps.context_processors.enable_dark_mode",
+                "intranet.apps.context_processors.user_theme_choice",
                 "intranet.apps.context_processors.oauth_toolkit",  # Django OAuth Toolkit-related middleware
                 "intranet.apps.context_processors.settings_export",  # "Exports" django.conf.settings as DJANGO_SETTINGS
                 "intranet.apps.features.context_processors.feature_announcements",  # Feature announcements that need to be shown on the current page
diff --git a/intranet/static/css/twilight/_colors.scss b/intranet/static/css/twilight/_colors.scss
new file mode 100644
index 00000000000..82da6b94441
--- /dev/null
+++ b/intranet/static/css/twilight/_colors.scss
@@ -0,0 +1,7 @@
+$page_background: #171717;
+$widget_background: #202020;
+$announcement_background: #181818;
+$dark_border: #404040;
+$text_primary: #B7B7B7;
+$text_high_contrast: #FFFFFF;
+$accent_color: #2b7fff;
\ No newline at end of file
diff --git a/intranet/static/css/twilight/about.scss b/intranet/static/css/twilight/about.scss
new file mode 100644
index 00000000000..ad27eea87d7
--- /dev/null
+++ b/intranet/static/css/twilight/about.scss
@@ -0,0 +1,5 @@
+@use 'colors' as *;
+
+.center {
+    background-color: $page_background;
+}
\ No newline at end of file
diff --git a/intranet/static/css/twilight/base.scss b/intranet/static/css/twilight/base.scss
new file mode 100644
index 00000000000..28ed49d21ac
--- /dev/null
+++ b/intranet/static/css/twilight/base.scss
@@ -0,0 +1,78 @@
+@use "colors" as *;
+
+body {
+    color: #B7B7B7;
+    background-color: $page_background;
+}
+
+button, a.button, input[type="button"], input[type="submit"], input[type="reset"] {
+    color: #B7B7B7;
+    background-color: #151515;
+    background-image: linear-gradient(to bottom, #0E0E0E 0%, #121212 100%);
+    text-shadow: none;
+    border-color: $dark_border;
+}
+
+button:hover, a.button:hover, input[type="button"]:hover, input[type="submit"]:hover, input[type="reset"]:hover {
+    color: #CDCDCD;
+    background-color: #1C1C1C;
+    background-image: linear-gradient(to bottom, #1C1C1C 0%, #202020 100%);
+}
+
+.widget, .widget-content {
+    background-color: $widget_background;
+    border-color: $dark_border;
+    border-width: 1px;
+}
+
+.widget-title {
+    background: #151515;
+    border-color: $dark_border;
+}
+
+.header .search input[type="text"] {
+    background-color: $widget_background;
+    color: white;
+    font-weight: bold;
+}
+
+.main ul.nav > li {
+    border-color: $dark_border;
+}
+
+input[type="text"] {
+    background-color: $widget_background;
+    border-color: $dark_border;
+    color: white;
+}
+
+textarea {
+    background-color: $widget_background;
+    border-color: $dark_border;
+    color: white;
+}
+
+.selectize-input {
+    background-color: $widget_background !important;
+    border-color: $dark_border !important;
+    color: $text_primary !important;
+}
+/* who's big brain idea was it to make the stuff important??? */
+.selectize-input input[type="text"] {
+    background-color: $widget_background !important;
+    border-color: $dark_border !important;
+    color: $text_primary !important;
+}
+
+.selectize-dropdown {
+    background: $widget_background;
+    border: 1px solid $dark_border;
+    outline: $dark_border;
+}
+
+.selectize-dropdown-content {
+    background: $widget_background;
+    border-color: $dark_border;
+    color: $text_primary;
+    scrollbar-color: $dark_border $widget_background;
+}
\ No newline at end of file
diff --git a/intranet/static/css/twilight/cke.scss b/intranet/static/css/twilight/cke.scss
new file mode 100644
index 00000000000..ef0b63aaa09
--- /dev/null
+++ b/intranet/static/css/twilight/cke.scss
@@ -0,0 +1,14 @@
+@use "colors" as *;
+
+.cke {
+    background: $page_background !important;
+    border-color: $dark_border !important;
+}
+
+.cke_top {
+    background: $page_background !important;
+}
+
+.cke_contents iframe {
+    background-color: $widget_background !important;
+}
\ No newline at end of file
diff --git a/intranet/static/css/twilight/dashboard.scss b/intranet/static/css/twilight/dashboard.scss
new file mode 100644
index 00000000000..42d624a9fd1
--- /dev/null
+++ b/intranet/static/css/twilight/dashboard.scss
@@ -0,0 +1,33 @@
+@use 'colors' as *;
+
+.announcement, .club-announcements, .announcement-meta, .event {
+    background: $announcement_background;
+    border-color: $dark_border;
+    border-radius: 5px;
+
+    h3 > a.announcement-link {
+        color: #D8D8D8 !important;
+    }
+
+    &-metadata {
+        color: darkgray;
+    }
+
+    &.partially-hidden .announcement-toggle-content::after {
+        background-image: linear-gradient(
+                        to bottom,
+                        rgba(255, 255, 255, 0),
+                        black 80%
+        );
+    }
+
+    &.club-announcements {
+        background-color: rgb(24, 24, 24);
+    }
+}
+
+.club-announcement-filters > .club-announcement-filter {
+    background-color: $widget_background;
+    border-color: $dark_border;
+    outline-color: $dark_border;
+}
\ No newline at end of file
diff --git a/intranet/static/css/twilight/eighth.signup.scss b/intranet/static/css/twilight/eighth.signup.scss
new file mode 100644
index 00000000000..182aabc7cc9
--- /dev/null
+++ b/intranet/static/css/twilight/eighth.signup.scss
@@ -0,0 +1,38 @@
+@use "./colors" as *;
+
+.day-picker {
+    border-color: $dark_border;
+
+    &-buttons button {
+        border-color: $dark_border;
+    }
+
+    &-buttons button:hover {
+        border-color: $dark_border;
+    }
+
+    .day {
+        outline-color: $dark_border;
+        scrollbar-color: $dark_border $widget_background;
+    }
+}
+
+.search-wrapper {
+    background-color: $widget_background;
+    border-color: $dark_border;
+}
+
+#activity-picker {
+    border-color: $dark_border;
+    scrollbar-color: $dark_border $widget_background;
+
+    * { /* for each child element */
+        border-color: $dark_border;
+        outline-color: $dark_border;
+    }
+}
+
+#activity-detail {
+    background-color: $widget_background;
+    border-color: $dark_border;
+}
\ No newline at end of file
diff --git a/intranet/static/css/twilight/enrichment.scss b/intranet/static/css/twilight/enrichment.scss
new file mode 100644
index 00000000000..32e5e8eb14b
--- /dev/null
+++ b/intranet/static/css/twilight/enrichment.scss
@@ -0,0 +1,5 @@
+@use 'colors' as *;
+
+.schedule tr td {
+    border: 1px solid $dark_border;
+}
\ No newline at end of file
diff --git a/intranet/static/css/twilight/events.scss b/intranet/static/css/twilight/events.scss
new file mode 100644
index 00000000000..17fdd682163
--- /dev/null
+++ b/intranet/static/css/twilight/events.scss
@@ -0,0 +1,6 @@
+@use 'colors' as *;
+
+.event {
+    background-color: $widget_background;
+    border-color: $dark_border;
+}
\ No newline at end of file
diff --git a/intranet/static/css/twilight/files.scss b/intranet/static/css/twilight/files.scss
new file mode 100644
index 00000000000..3d8456a0b92
--- /dev/null
+++ b/intranet/static/css/twilight/files.scss
@@ -0,0 +1,14 @@
+@use 'colors' as *;
+
+.filesystem {
+    background-color: $widget_background;
+    border-color: $dark_border;
+}
+
+.filesystem a {
+    color: white;
+}
+
+table.directory-list a, table.directory-list a:link, table.directory-list a:visited, table.directory-list a:hover, table.directory-list a:active {
+    color: $text_primary;
+}
\ No newline at end of file
diff --git a/intranet/static/css/twilight/login.scss b/intranet/static/css/twilight/login.scss
new file mode 100644
index 00000000000..4eae07ac12b
--- /dev/null
+++ b/intranet/static/css/twilight/login.scss
@@ -0,0 +1,25 @@
+@use 'colors' as *;
+
+body.login-page input {
+    background-color: $widget_background;
+    border-color: $dark_border;
+    color: $text_primary;
+}
+
+body.login-page .login input[type="submit"] {
+    background-color: $widget_background;
+    border-color: $dark_border;
+    color: $text_primary;
+}
+
+body.login-page input:hover {
+    border-color: $accent_color;
+}
+
+body.login-page .login input[type="submit"]:hover {
+    border-color: $accent_color;
+}
+
+.footer {
+    background: $page_background;
+}
\ No newline at end of file
diff --git a/intranet/static/css/twilight/lostfound.scss b/intranet/static/css/twilight/lostfound.scss
new file mode 100644
index 00000000000..59fa5bd2cf0
--- /dev/null
+++ b/intranet/static/css/twilight/lostfound.scss
@@ -0,0 +1,7 @@
+@use "colors" as *;
+
+.item {
+    background-color: $widget_background;
+    border-color: $dark_border;
+}
+
diff --git a/intranet/static/css/twilight/nav.scss b/intranet/static/css/twilight/nav.scss
new file mode 100644
index 00000000000..9a70aadb60e
--- /dev/null
+++ b/intranet/static/css/twilight/nav.scss
@@ -0,0 +1,12 @@
+@use 'colors' as *;
+
+ul.nav {
+    background-color: $widget_background;
+    border-color: $dark_border;
+    border-width: 1px;
+}
+
+ul.nav li {
+    border-color: $dark_border;
+    border-width: 1px;
+}
\ No newline at end of file
diff --git a/intranet/static/css/twilight/polls.scss b/intranet/static/css/twilight/polls.scss
new file mode 100644
index 00000000000..9481dd4f098
--- /dev/null
+++ b/intranet/static/css/twilight/polls.scss
@@ -0,0 +1,18 @@
+@use 'colors' as *;
+
+#questions .question [contenteditable="true"] {
+    background-color: $widget_background;
+    border-color: $dark_border;
+}
+
+input {
+    background-color: $widget_background !important;
+    border-color: $dark_border !important;
+    color: white;
+}
+
+.poll {
+    background-color: $page_background;
+    font-weight: bold;
+    border-color: $dark_border;
+}
\ No newline at end of file
diff --git a/intranet/static/css/twilight/printing.scss b/intranet/static/css/twilight/printing.scss
new file mode 100644
index 00000000000..37e1ffcad47
--- /dev/null
+++ b/intranet/static/css/twilight/printing.scss
@@ -0,0 +1,16 @@
+@use 'colors' as *;
+
+.working {
+    background-color: #00c951;
+    color: $text_primary;
+}
+
+.broken {
+    background-color: #efb100;
+    color: $text_primary;
+}
+
+.error {
+    background-color: #fb2c36;
+    color: $text_primary;
+}
diff --git a/intranet/static/css/twilight/select.scss b/intranet/static/css/twilight/select.scss
new file mode 100644
index 00000000000..e04c4a89bf0
--- /dev/null
+++ b/intranet/static/css/twilight/select.scss
@@ -0,0 +1,7 @@
+@use 'colors' as *;
+
+select {
+    background-color: $widget_background;
+    border-color: $dark_border;
+    color: $text_primary;
+}
\ No newline at end of file
diff --git a/intranet/static/css/twilight/welcome.scss b/intranet/static/css/twilight/welcome.scss
new file mode 100644
index 00000000000..ad0a58308f8
--- /dev/null
+++ b/intranet/static/css/twilight/welcome.scss
@@ -0,0 +1,6 @@
+@use 'colors' as *;
+
+
+#welcome {
+    background-color: $page_background;
+}
\ No newline at end of file
diff --git a/intranet/templates/announcements/add_modify.html b/intranet/templates/announcements/add_modify.html
index dbbdb8c0a6b..76c630a526e 100644
--- a/intranet/templates/announcements/add_modify.html
+++ b/intranet/templates/announcements/add_modify.html
@@ -34,11 +34,15 @@
 {% endblock %}
 
 {% block head %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/nav' %}
         {% stylesheet 'dark/cke' %}
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/nav' %}
+    {% endif %}
 {% endblock %}
 
 {% block main %}
diff --git a/intranet/templates/announcements/approve.html b/intranet/templates/announcements/approve.html
index 39cd0c26246..eefb54b2298 100644
--- a/intranet/templates/announcements/approve.html
+++ b/intranet/templates/announcements/approve.html
@@ -39,11 +39,16 @@
 {% endblock %}
 
 {% block head %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/nav' %}
         {% stylesheet 'dark/cke' %}
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/nav' %}
+        {% stylesheet 'twilight/cke' %}
+    {% endif %}
 {% endblock %}
 
 {% block main %}
diff --git a/intranet/templates/announcements/club-request.html b/intranet/templates/announcements/club-request.html
index c70c82c6285..61ff524e1d0 100644
--- a/intranet/templates/announcements/club-request.html
+++ b/intranet/templates/announcements/club-request.html
@@ -33,11 +33,16 @@
 {% endblock %}
 
 {% block head %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/nav' %}
         {% stylesheet 'dark/cke' %}
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/nav' %}
+        {% stylesheet 'twilight/cke' %}
+    {% endif %}
 {% endblock %}
 
 {% block main %}
diff --git a/intranet/templates/announcements/delete.html b/intranet/templates/announcements/delete.html
index 94203622e85..6a59b7e3479 100644
--- a/intranet/templates/announcements/delete.html
+++ b/intranet/templates/announcements/delete.html
@@ -26,10 +26,14 @@
 {% endblock %}
 
 {% block head %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/nav' %}
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/nav' %}
+    {% endif %}
 {% endblock %}
 
 {% block main %}
diff --git a/intranet/templates/announcements/request.html b/intranet/templates/announcements/request.html
index d3c8634b397..d521fdf4197 100644
--- a/intranet/templates/announcements/request.html
+++ b/intranet/templates/announcements/request.html
@@ -34,11 +34,16 @@
 {% endblock %}
 
 {% block head %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/nav' %}
         {% stylesheet 'dark/cke' %}
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/nav' %}
+        {% stylesheet 'twilight/cke' %}
+    {% endif %}
 {% endblock %}
 
 {% block main %}
diff --git a/intranet/templates/announcements/request_status.html b/intranet/templates/announcements/request_status.html
index de82f098d63..6ab32df2870 100644
--- a/intranet/templates/announcements/request_status.html
+++ b/intranet/templates/announcements/request_status.html
@@ -17,10 +17,14 @@
 {% endblock %}
 
 {% block head %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/nav' %}
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/nav' %}
+    {% endif %}
 {% endblock %}
 
 {% block main %}
diff --git a/intranet/templates/announcements/success.html b/intranet/templates/announcements/success.html
index f97627bc8d7..022c894bdd3 100644
--- a/intranet/templates/announcements/success.html
+++ b/intranet/templates/announcements/success.html
@@ -17,10 +17,14 @@
 {% endblock %}
 
 {% block head %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/nav' %}
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/nav' %}
+    {% endif %}
 {% endblock %}
 
 {% block main %}
diff --git a/intranet/templates/announcements/view.html b/intranet/templates/announcements/view.html
index 80c27c7d225..4b901a203f3 100644
--- a/intranet/templates/announcements/view.html
+++ b/intranet/templates/announcements/view.html
@@ -20,11 +20,16 @@
 {% endblock %}
 
 {% block head %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/nav' %}
         {% stylesheet 'dark/dashboard' %}
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/nav' %}
+        {% stylesheet 'twilight/dashboard' %}
+    {% endif %}
 {% endblock %}
 
 {% block main %}
diff --git a/intranet/templates/auth/about.html b/intranet/templates/auth/about.html
index 147348fae81..0b8de5d9e6d 100644
--- a/intranet/templates/auth/about.html
+++ b/intranet/templates/auth/about.html
@@ -19,11 +19,16 @@
 {% endblock %}
 
 {% block head %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/login' %}
         {% stylesheet 'dark/about' %}
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/nav' %}
+        {% stylesheet 'twilight/about' %}
+    {% endif %}
 {% endblock %}
 
 {% block body %}
diff --git a/intranet/templates/auth/login.html b/intranet/templates/auth/login.html
index 67dbc68e6ee..413e0afa70a 100644
--- a/intranet/templates/auth/login.html
+++ b/intranet/templates/auth/login.html
@@ -39,13 +39,18 @@
 {% endblock %}
 
 {% block head %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/login' %}
         {% stylesheet 'dark/schedule' %}
         {% stylesheet 'dark/events' %}
         <script>spinnerOptions.color = "#FFF";</script>
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/login' %}
+        {% stylesheet 'twilight/events' %}
+    {% endif %}
 {% endblock %}
 
 {% block bodyclass %} login-page{% if login_warning %} has-login-warning{% endif %}{% endblock %}
diff --git a/intranet/templates/auth/reauth.html b/intranet/templates/auth/reauth.html
index e977ff058c6..1127c7c010b 100644
--- a/intranet/templates/auth/reauth.html
+++ b/intranet/templates/auth/reauth.html
@@ -30,11 +30,15 @@
 {% endblock %}
 
 {% block head %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/login' %}
         <script>spinnerOptions.color = "#FFF";</script>
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/login' %}
+    {% endif %}
 {% endblock %}
 
 {% block bodyclass %} login-page{% if login_warning %} has-login-warning{% endif %}{% endblock %}
diff --git a/intranet/templates/auth/reset_password.html b/intranet/templates/auth/reset_password.html
index e17ecc76379..246bbd3e52a 100644
--- a/intranet/templates/auth/reset_password.html
+++ b/intranet/templates/auth/reset_password.html
@@ -26,11 +26,15 @@
 {% endblock %}
 
 {% block head %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/login' %}
         <script>spinnerOptions.color = "#FFF";</script>
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/login' %}
+    {% endif %}
 {% endblock %}
 
 {% block bodyclass %} login-page{% if login_warning %} has-login-warning{% endif %}{% endblock %}
diff --git a/intranet/templates/bus/home.html b/intranet/templates/bus/home.html
index a5b7a59d9fb..10d38a1f473 100644
--- a/intranet/templates/bus/home.html
+++ b/intranet/templates/bus/home.html
@@ -21,11 +21,15 @@
 {% endblock %}
 
 {% block head %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/nav' %}
         {% stylesheet 'dark/bus' %}
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/nav' %}
+    {% endif %}
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0" />
 {% endblock %}
 
diff --git a/intranet/templates/bus/morning.html b/intranet/templates/bus/morning.html
index b1e3e5691f8..12940a5dd49 100644
--- a/intranet/templates/bus/morning.html
+++ b/intranet/templates/bus/morning.html
@@ -21,11 +21,15 @@
 {% endblock %}
 
 {% block head %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/nav' %}
         {% stylesheet 'dark/bus' %}
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/nav' %}
+    {% endif %}
 {% endblock %}
 
 {% block main %}
diff --git a/intranet/templates/dashboard/dashboard.html b/intranet/templates/dashboard/dashboard.html
index 98cb44e29c5..f2b0b691636 100644
--- a/intranet/templates/dashboard/dashboard.html
+++ b/intranet/templates/dashboard/dashboard.html
@@ -44,7 +44,7 @@
 {% endblock %}
 
 {% block head %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/nav' %}
         {% stylesheet 'dark/dashboard' %}
@@ -53,6 +53,11 @@
         {% stylesheet 'dark/schedule.widget' %}
         {% stylesheet 'dark/events' %}
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/nav' %}
+        {% stylesheet 'twilight/dashboard' %}
+    {% endif %}
 {% endblock %}
 
 {% block main %}
diff --git a/intranet/templates/docs/api-oauth-aup.html b/intranet/templates/docs/api-oauth-aup.html
index a1528fef3ac..84c89d18cf9 100644
--- a/intranet/templates/docs/api-oauth-aup.html
+++ b/intranet/templates/docs/api-oauth-aup.html
@@ -15,11 +15,16 @@
 {% endblock %}
 
 {% block head %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/login' %}
         {% stylesheet 'dark/about' %}
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/login' %}
+        {% stylesheet 'twilight/about' %}
+    {% endif %}
 {% endblock %}
 
 {% block body %}
diff --git a/intranet/templates/eighth/absences.html b/intranet/templates/eighth/absences.html
index 8f8a981eca5..a6ebd318572 100644
--- a/intranet/templates/eighth/absences.html
+++ b/intranet/templates/eighth/absences.html
@@ -13,10 +13,14 @@
 {% endblock %}
 
 {% block head %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/nav' %}
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/nav' %}
+    {% endif %}
 {% endblock %}
 
 {% block main %}
diff --git a/intranet/templates/eighth/activity.html b/intranet/templates/eighth/activity.html
index 223665f5ddc..9f26a51bbaf 100644
--- a/intranet/templates/eighth/activity.html
+++ b/intranet/templates/eighth/activity.html
@@ -32,10 +32,14 @@
 {% endblock %}
 
 {% block head %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/nav' %}
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/nav' %}
+    {% endif %}
 {% endblock %}
 
 {% block main %}
diff --git a/intranet/templates/eighth/activity_settings.html b/intranet/templates/eighth/activity_settings.html
index fb1cbd31266..74ac8c10ce2 100644
--- a/intranet/templates/eighth/activity_settings.html
+++ b/intranet/templates/eighth/activity_settings.html
@@ -30,10 +30,14 @@
 {% endblock %}
 
 {% block head %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/nav' %}
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/nav' %}
+    {% endif %}
 {% endblock %}
 
 {% block main %}
diff --git a/intranet/templates/eighth/admin/distribute_group.html b/intranet/templates/eighth/admin/distribute_group.html
index 07d885044a5..2e190a77f9f 100644
--- a/intranet/templates/eighth/admin/distribute_group.html
+++ b/intranet/templates/eighth/admin/distribute_group.html
@@ -11,7 +11,7 @@
 
 {% block head %}
     {{ block.super }}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/eighth.schedule' %}
     {% endif %}
 {% endblock %}
diff --git a/intranet/templates/eighth/admin/eighth_admin_page_base.html b/intranet/templates/eighth/admin/eighth_admin_page_base.html
index e15a3c103b4..403867dcbf0 100644
--- a/intranet/templates/eighth/admin/eighth_admin_page_base.html
+++ b/intranet/templates/eighth/admin/eighth_admin_page_base.html
@@ -13,10 +13,14 @@
 {% endblock %}
 
 {% block head %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/nav' %}
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/nav' %}
+    {% endif %}
 {% endblock %}
 
 {% block js %}
diff --git a/intranet/templates/eighth/admin/list_sponsor_by_activity.html b/intranet/templates/eighth/admin/list_sponsor_by_activity.html
index f291eff90dc..a19a9022548 100644
--- a/intranet/templates/eighth/admin/list_sponsor_by_activity.html
+++ b/intranet/templates/eighth/admin/list_sponsor_by_activity.html
@@ -35,7 +35,7 @@
 
 {% block head %}
     {{ block.super }}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         <style>
             #sponsor-list tr.cont {
                 background-color: black;
diff --git a/intranet/templates/eighth/admin/list_sponsors.html b/intranet/templates/eighth/admin/list_sponsors.html
index 5fb9a38a4f7..4635643f8a6 100644
--- a/intranet/templates/eighth/admin/list_sponsors.html
+++ b/intranet/templates/eighth/admin/list_sponsors.html
@@ -38,7 +38,7 @@
 
 {% block head %}
     {{ block.super }}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         <style>
             #sponsor-list tr.cont {
                 background-color: black;
diff --git a/intranet/templates/eighth/admin/list_sponsors_hybrid.html b/intranet/templates/eighth/admin/list_sponsors_hybrid.html
index ca31c561035..def7f09ff6a 100644
--- a/intranet/templates/eighth/admin/list_sponsors_hybrid.html
+++ b/intranet/templates/eighth/admin/list_sponsors_hybrid.html
@@ -38,7 +38,7 @@
 
 {% block head %}
     {{ block.super }}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         <style>
             #sponsor-list tr.cont {
                 background-color: black;
diff --git a/intranet/templates/eighth/admin/no_signups_roster.html b/intranet/templates/eighth/admin/no_signups_roster.html
index f516bcbd7cc..c4b5bdb78a5 100644
--- a/intranet/templates/eighth/admin/no_signups_roster.html
+++ b/intranet/templates/eighth/admin/no_signups_roster.html
@@ -23,10 +23,14 @@
 {% endblock %}
 
 {% block head %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/nav' %}
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/nav' %}
+    {% endif %}
 {% endblock %}
 
 {% block js %}
diff --git a/intranet/templates/eighth/admin/schedule_activity.html b/intranet/templates/eighth/admin/schedule_activity.html
index ee1499ec559..23793963c86 100644
--- a/intranet/templates/eighth/admin/schedule_activity.html
+++ b/intranet/templates/eighth/admin/schedule_activity.html
@@ -88,7 +88,7 @@
 
 {% block head %}
     {{ block.super }}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/eighth.schedule' %}
     {% endif %}
 {% endblock %}
diff --git a/intranet/templates/eighth/edit_profile.html b/intranet/templates/eighth/edit_profile.html
index 43b7f3db2ee..5b6be59639d 100644
--- a/intranet/templates/eighth/edit_profile.html
+++ b/intranet/templates/eighth/edit_profile.html
@@ -29,12 +29,16 @@
 {% endblock %}
 
 {% block head %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/nav' %}
         {% stylesheet 'dark/select' %}
         {% stylesheet 'dark/cke' %}
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/nav' %}
+    {% endif %}
 {% endblock %}
 
 {% block main %}
diff --git a/intranet/templates/eighth/email_students.html b/intranet/templates/eighth/email_students.html
index 21ac4aef6b6..7fa7456ef51 100644
--- a/intranet/templates/eighth/email_students.html
+++ b/intranet/templates/eighth/email_students.html
@@ -15,10 +15,14 @@
 {% endblock %}
 
 {% block head %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/nav' %}
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/nav' %}
+    {% endif %}
 {% endblock %}
 
 {% block main %}
diff --git a/intranet/templates/eighth/location.html b/intranet/templates/eighth/location.html
index dc2e85a77bc..096e11cfe7c 100644
--- a/intranet/templates/eighth/location.html
+++ b/intranet/templates/eighth/location.html
@@ -16,10 +16,14 @@
 {% endblock %}
 
 {% block head %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/nav' %}
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/nav' %}
+    {% endif %}
 {% endblock %}
 
 {% block main %}
diff --git a/intranet/templates/eighth/multi_signup.html b/intranet/templates/eighth/multi_signup.html
index d780804abbc..5a220f43eb6 100644
--- a/intranet/templates/eighth/multi_signup.html
+++ b/intranet/templates/eighth/multi_signup.html
@@ -81,14 +81,18 @@
 {% endblock %}
 
 {% block head %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/nav' %}
         {% stylesheet 'dark/eighth.signup' %}
         <script>spinnerOptions.color = "#FFF";</script>
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/nav' %}
+        {% stylesheet 'twilight/eighth.signup' %}
+    {% endif %}
 {% endblock %}
-
 {% block main %}
     <script type="text/template" id="activity-list-row-template">
         {% verbatim %}
diff --git a/intranet/templates/eighth/profile.html b/intranet/templates/eighth/profile.html
index 69a423cfb06..677fc277975 100644
--- a/intranet/templates/eighth/profile.html
+++ b/intranet/templates/eighth/profile.html
@@ -19,10 +19,14 @@
 {% endblock %}
 
 {% block head %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/nav' %}
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/nav' %}
+    {% endif %}
 {% endblock %}
 
 {% block main %}
diff --git a/intranet/templates/eighth/profile_history.html b/intranet/templates/eighth/profile_history.html
index bbd2ae25f76..39b634b9b37 100644
--- a/intranet/templates/eighth/profile_history.html
+++ b/intranet/templates/eighth/profile_history.html
@@ -25,10 +25,14 @@
 {% endblock %}
 
 {% block head %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/nav' %}
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/nav' %}
+    {% endif %}
 {% endblock %}
 
 {% block main %}
diff --git a/intranet/templates/eighth/profile_often.html b/intranet/templates/eighth/profile_often.html
index 65d7d3b9027..3fa9f5450cf 100644
--- a/intranet/templates/eighth/profile_often.html
+++ b/intranet/templates/eighth/profile_often.html
@@ -73,10 +73,14 @@
 {% endblock %}
 
 {% block head %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/nav' %}
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/nav' %}
+    {% endif %}
 {% endblock %}
 
 {% block main %}
diff --git a/intranet/templates/eighth/profile_signup.html b/intranet/templates/eighth/profile_signup.html
index 48ec00146b9..173a6563c39 100644
--- a/intranet/templates/eighth/profile_signup.html
+++ b/intranet/templates/eighth/profile_signup.html
@@ -81,12 +81,17 @@
 {% endblock %}
 
 {% block head %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/nav' %}
         {% stylesheet 'dark/eighth.signup' %}
         <script>spinnerOptions.color = "#FFF";</script>
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/nav' %}
+        {% stylesheet 'twilight/eighth.signup' %}
+    {% endif %}
 {% endblock %}
 
 {% block main %}
@@ -417,7 +422,7 @@ <h3>
             </thead>
             {% for sch in eighth_schedule %}
             {% if sch.block.date == active_block.date %}
-                <tr class="form-row"{% if sch.block == active_block %} style="background-color: yellow;{% if dark_mode_enabled %} color: black;{% endif %}"{% endif %}>
+                <tr class="form-row"{% if sch.block == active_block %} style="background-color: yellow;{% if theme_choice == 'dark' or theme_choice == 'twilight' %} color: black;{% endif %}"{% endif %}>
                     <td class="center checkbox">
                         <input type="checkbox" name="block" value="{{ sch.block.id }}">
                     </td>
diff --git a/intranet/templates/eighth/roster.html b/intranet/templates/eighth/roster.html
index ccba747c4a4..551bdf71916 100644
--- a/intranet/templates/eighth/roster.html
+++ b/intranet/templates/eighth/roster.html
@@ -36,10 +36,14 @@
 {% endblock %}
 
 {% block head %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/nav' %}
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/nav' %}
+    {% endif %}
 {% endblock %}
 
 {% block main %}
diff --git a/intranet/templates/eighth/signup.html b/intranet/templates/eighth/signup.html
index d07dbdd6eed..3f3207f8f81 100644
--- a/intranet/templates/eighth/signup.html
+++ b/intranet/templates/eighth/signup.html
@@ -98,12 +98,17 @@
 {% endblock %}
 
 {% block head %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/nav' %}
         {% stylesheet 'dark/eighth.signup' %}
         <script>spinnerOptions.color = "#FFF";</script>
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/nav' %}
+        {% stylesheet 'twilight/eighth.signup' %}
+    {% endif %}
 {% endblock %}
 
 {% block main %}
diff --git a/intranet/templates/eighth/statistics.html b/intranet/templates/eighth/statistics.html
index dc52142a5bb..a5e8ab6b185 100644
--- a/intranet/templates/eighth/statistics.html
+++ b/intranet/templates/eighth/statistics.html
@@ -70,11 +70,16 @@
 {% endblock %}
 
 {% block head %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/nav' %}
         {% stylesheet 'dark/select' %}
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/nav' %}
+        {% stylesheet 'twilight/select' %}
+    {% endif %}
 {% endblock %}
 
 {% block main %}
diff --git a/intranet/templates/eighth/take_attendance.html b/intranet/templates/eighth/take_attendance.html
index 68317822075..ce2720d1847 100644
--- a/intranet/templates/eighth/take_attendance.html
+++ b/intranet/templates/eighth/take_attendance.html
@@ -69,10 +69,14 @@
 {% endblock %}
 
 {% block head %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/nav' %}
-        {% stylesheet 'dark/eighth.attendance' %}
+    {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/nav' %}
+
     {% endif %}
 {% endblock %}
 
diff --git a/intranet/templates/emailfwd/senior_forward.html b/intranet/templates/emailfwd/senior_forward.html
index 5771afe65e8..b15ba78447f 100644
--- a/intranet/templates/emailfwd/senior_forward.html
+++ b/intranet/templates/emailfwd/senior_forward.html
@@ -18,10 +18,14 @@
 {% endblock %}
 
 {% block head %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/nav' %}
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/nav' %}
+    {% endif %}
 {% endblock %}
 
 {% block main %}
diff --git a/intranet/templates/enrichment/add_modify.html b/intranet/templates/enrichment/add_modify.html
index 5b33b623f13..20d9ed7ae45 100644
--- a/intranet/templates/enrichment/add_modify.html
+++ b/intranet/templates/enrichment/add_modify.html
@@ -58,12 +58,18 @@
 {% endblock %}
 
 {% block head %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/nav' %}
         {% stylesheet 'dark/events' %}
         {% stylesheet 'dark/cke' %}
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/nav' %}
+        {% stylesheet 'twilight/events' %}
+        {% stylesheet 'twilight/cke' %}
+    {% endif %}
 {% endblock %}
 
 {% block main %}
diff --git a/intranet/templates/enrichment/delete.html b/intranet/templates/enrichment/delete.html
index 6fe71b8b768..d0b19726291 100644
--- a/intranet/templates/enrichment/delete.html
+++ b/intranet/templates/enrichment/delete.html
@@ -18,13 +18,20 @@
 {% endblock %}
 
 {% block head %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/dashboard' %}
         {% stylesheet 'dark/nav' %}
         {% stylesheet 'dark/events' %}
         {% stylesheet 'dark/enrichment' %}
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/dashboard' %}
+        {% stylesheet 'twilight/nav' %}
+        {% stylesheet 'twilight/events' %}
+        {% stylesheet 'twilight/enrichment' %}
+    {% endif %}
 {% endblock %}
 
 {% block main %}
diff --git a/intranet/templates/enrichment/home.html b/intranet/templates/enrichment/home.html
index 293cc0621e0..ff071f9e542 100644
--- a/intranet/templates/enrichment/home.html
+++ b/intranet/templates/enrichment/home.html
@@ -52,13 +52,20 @@
 {% endblock %}
 
 {% block head %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/dashboard' %}
         {% stylesheet 'dark/nav' %}
         {% stylesheet 'dark/events' %}
         {% stylesheet 'dark/enrichment' %}
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/dashboard' %}
+        {% stylesheet 'twilight/nav' %}
+        {% stylesheet 'twilight/events' %}
+        {% stylesheet 'twilight/enrichment' %}
+    {% endif %}
 {% endblock %}
 
 {% block main %}
diff --git a/intranet/templates/enrichment/roster.html b/intranet/templates/enrichment/roster.html
index 2dbc0e5cb9a..ae17b66dad4 100644
--- a/intranet/templates/enrichment/roster.html
+++ b/intranet/templates/enrichment/roster.html
@@ -22,7 +22,7 @@
 {% endblock %}
 
 {% block head %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/dashboard' %}
         {% stylesheet 'dark/nav' %}
@@ -30,6 +30,13 @@
         {% stylesheet 'dark/enrichment' %}
         {% stylesheet 'dark/eighth.attendance' %}
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/dashboard' %}
+        {% stylesheet 'twilight/nav' %}
+        {% stylesheet 'twilight/events' %}
+        {% stylesheet 'twilight/enrichment' %}
+    {% endif %}
 {% endblock %}
 
 {% block main %}
diff --git a/intranet/templates/events/add_modify.html b/intranet/templates/events/add_modify.html
index 41dcbe3a1e6..a0143002ee2 100644
--- a/intranet/templates/events/add_modify.html
+++ b/intranet/templates/events/add_modify.html
@@ -56,12 +56,18 @@
 {% endblock %}
 
 {% block head %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/nav' %}
         {% stylesheet 'dark/events' %}
         {% stylesheet 'dark/cke' %}
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/nav' %}
+        {% stylesheet 'twilight/events' %}
+        {% stylesheet 'twilight/cke' %}
+    {% endif %}
 {% endblock %}
 
 {% block main %}
diff --git a/intranet/templates/events/delete.html b/intranet/templates/events/delete.html
index d93b319c6b7..d5fbe598883 100644
--- a/intranet/templates/events/delete.html
+++ b/intranet/templates/events/delete.html
@@ -17,12 +17,18 @@
 {% endblock %}
 
 {% block head %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/dashboard' %}
         {% stylesheet 'dark/nav' %}
         {% stylesheet 'dark/events' %}
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/dashboard' %}
+        {% stylesheet 'twilight/nav' %}
+        {% stylesheet 'twilight/events' %}
+    {% endif %}
 {% endblock %}
 
 {% block main %}
diff --git a/intranet/templates/events/home.html b/intranet/templates/events/home.html
index c7315a79693..d4608aa0481 100644
--- a/intranet/templates/events/home.html
+++ b/intranet/templates/events/home.html
@@ -50,12 +50,18 @@
 {% endblock %}
 
 {% block head %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/dashboard' %}
         {% stylesheet 'dark/nav' %}
         {% stylesheet 'dark/events' %}
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/dashboard' %}
+        {% stylesheet 'twilight/nav' %}
+        {% stylesheet 'twilight/events' %}
+    {% endif %}
 {% endblock %}
 
 {% block main %}
diff --git a/intranet/templates/events/join_event.html b/intranet/templates/events/join_event.html
index 906e4804266..ada26284864 100644
--- a/intranet/templates/events/join_event.html
+++ b/intranet/templates/events/join_event.html
@@ -24,12 +24,18 @@
 {% endblock %}
 
 {% block head %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/dashboard' %}
         {% stylesheet 'dark/nav' %}
         {% stylesheet 'dark/events' %}
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/dashboard' %}
+        {% stylesheet 'twilight/nav' %}
+        {% stylesheet 'twilight/events' %}
+    {% endif %}
 {% endblock %}
 
 {% block main %}
diff --git a/intranet/templates/events/roster.html b/intranet/templates/events/roster.html
index e5123d17928..6a58d6b3286 100644
--- a/intranet/templates/events/roster.html
+++ b/intranet/templates/events/roster.html
@@ -18,12 +18,18 @@
 {% endblock %}
 
 {% block head %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/dashboard' %}
         {% stylesheet 'dark/nav' %}
         {% stylesheet 'dark/events' %}
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/dashboard' %}
+        {% stylesheet 'twilight/nav' %}
+        {% stylesheet 'twilight/events' %}
+    {% endif %}
 {% endblock %}
 
 {% block main %}
diff --git a/intranet/templates/feedback/form.html b/intranet/templates/feedback/form.html
index df16cc23c23..1cf840ba18a 100644
--- a/intranet/templates/feedback/form.html
+++ b/intranet/templates/feedback/form.html
@@ -45,11 +45,16 @@
 {% endblock %}
 
 {% block head %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/nav' %}
         {% stylesheet 'dark/cke' %}
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/nav' %}
+        {% stylesheet 'twilight/cke' %}
+    {% endif %}
 {% endblock %}
 
 {% block main %}
diff --git a/intranet/templates/files/auth.html b/intranet/templates/files/auth.html
index e324e953759..41e03f4cdb8 100644
--- a/intranet/templates/files/auth.html
+++ b/intranet/templates/files/auth.html
@@ -21,10 +21,14 @@
 {% endblock %}
 
 {% block head %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/nav' %}
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/nav' %}
+    {% endif %}
 {% endblock %}
 
 {% block main %}
diff --git a/intranet/templates/files/delete.html b/intranet/templates/files/delete.html
index 60b28951b58..4e8c30e3f87 100644
--- a/intranet/templates/files/delete.html
+++ b/intranet/templates/files/delete.html
@@ -15,10 +15,14 @@
 {% endblock %}
 
 {% block head %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/nav' %}
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/nav' %}
+    {% endif %}
 {% endblock %}
 
 {% block main %}
diff --git a/intranet/templates/files/directory.html b/intranet/templates/files/directory.html
index c4fe72c8c33..a0bdd3b7b8c 100644
--- a/intranet/templates/files/directory.html
+++ b/intranet/templates/files/directory.html
@@ -20,11 +20,16 @@
 {% endblock %}
 
 {% block head %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/nav' %}
         {% stylesheet 'dark/files' %}
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/nav' %}
+        {% stylesheet 'twilight/files' %}
+    {% endif %}
 {% endblock %}
 
 {% block main %}
diff --git a/intranet/templates/files/home.html b/intranet/templates/files/home.html
index 413c03cd6b4..f991ea60371 100644
--- a/intranet/templates/files/home.html
+++ b/intranet/templates/files/home.html
@@ -16,11 +16,16 @@
 {% endblock %}
 
 {% block head %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/nav' %}
         {% stylesheet 'dark/files' %}
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/nav' %}
+        {% stylesheet 'twilight/files' %}
+    {% endif %}
 {% endblock %}
 
 {% block main %}
diff --git a/intranet/templates/files/upload.html b/intranet/templates/files/upload.html
index be5cd390215..fa688bf6e22 100644
--- a/intranet/templates/files/upload.html
+++ b/intranet/templates/files/upload.html
@@ -20,11 +20,16 @@
 {% endblock %}
 
 {% block head %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/nav' %}
         {% stylesheet 'dark/files' %}
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/nav' %}
+        {% stylesheet 'twilight/files' %}
+    {% endif %}
 {% endblock %}
 
 {% block main %}
diff --git a/intranet/templates/groups/addmodify.html b/intranet/templates/groups/addmodify.html
index 7e678a84d15..1d805949b9a 100644
--- a/intranet/templates/groups/addmodify.html
+++ b/intranet/templates/groups/addmodify.html
@@ -29,11 +29,16 @@
 {% endblock %}
 
 {% block head %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/nav' %}
         {% stylesheet 'dark/select' %}
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/nav' %}
+        {% stylesheet 'twilight/select' %}
+    {% endif %}
 {% endblock %}
 
 {% block main %}
diff --git a/intranet/templates/groups/groups.html b/intranet/templates/groups/groups.html
index a2ef39509f5..8ae149d489e 100644
--- a/intranet/templates/groups/groups.html
+++ b/intranet/templates/groups/groups.html
@@ -12,10 +12,14 @@
 {% endblock %}
 
 {% block head %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/nav' %}
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/nav' %}
+    {% endif %}
 {% endblock %}
 
 {% block main %}
diff --git a/intranet/templates/itemreg/home.html b/intranet/templates/itemreg/home.html
index ee480ee53f3..7f9937324ad 100644
--- a/intranet/templates/itemreg/home.html
+++ b/intranet/templates/itemreg/home.html
@@ -43,10 +43,14 @@
 {% endblock %}
 
 {% block head %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/nav' %}
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/nav' %}
+    {% endif %}
 {% endblock %}
 
 {% block main %}
diff --git a/intranet/templates/itemreg/item_view.html b/intranet/templates/itemreg/item_view.html
index 7fd11bf361d..b70b8c2bea5 100644
--- a/intranet/templates/itemreg/item_view.html
+++ b/intranet/templates/itemreg/item_view.html
@@ -17,11 +17,16 @@
 {% endblock %}
 
 {% block head %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/nav' %}
         {% stylesheet 'dark/lostfound' %}
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/nav' %}
+        {% stylesheet 'twilight/lostfound' %}
+    {% endif %}
 {% endblock %}
 
 {% block main %}
diff --git a/intranet/templates/itemreg/register_delete.html b/intranet/templates/itemreg/register_delete.html
index 3aed0fe8b3b..b0875082c7a 100644
--- a/intranet/templates/itemreg/register_delete.html
+++ b/intranet/templates/itemreg/register_delete.html
@@ -16,10 +16,14 @@
 {% endblock %}
 
 {% block head %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/nav' %}
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/nav' %}
+    {% endif %}
 {% endblock %}
 
 {% block main %}
diff --git a/intranet/templates/itemreg/register_form.html b/intranet/templates/itemreg/register_form.html
index 45d2d27734e..73c083928f9 100644
--- a/intranet/templates/itemreg/register_form.html
+++ b/intranet/templates/itemreg/register_form.html
@@ -57,7 +57,7 @@
 {% endblock %}
 
 {% block head %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/nav' %}
         {% if type == "calculator" %}
@@ -72,6 +72,10 @@
             </style>
         {% endif %}
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/nav' %}
+    {% endif %}
 {% endblock %}
 
 {% block main %}
diff --git a/intranet/templates/itemreg/search.html b/intranet/templates/itemreg/search.html
index ad04833f49b..b1a8069e527 100644
--- a/intranet/templates/itemreg/search.html
+++ b/intranet/templates/itemreg/search.html
@@ -57,11 +57,16 @@
 {% endblock %}
 
 {% block head %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/nav' %}
         {% stylesheet 'dark/select' %}
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/nav' %}
+        {% stylesheet 'twilight/select' %}
+    {% endif %}
 {% endblock %}
 
 {% block main %}
diff --git a/intranet/templates/logs/home.html b/intranet/templates/logs/home.html
index 87b2e4361aa..1d3bc9cd18a 100644
--- a/intranet/templates/logs/home.html
+++ b/intranet/templates/logs/home.html
@@ -17,11 +17,15 @@
 {% endblock %}
 
 {% block head %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/nav' %}
         {% stylesheet 'dark/logs' %}
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/nav' %}
+    {% endif %}
 {% endblock %}
 
 {% block js %}
diff --git a/intranet/templates/logs/query.html b/intranet/templates/logs/query.html
index 5b4c8ac781a..96d5c61b293 100644
--- a/intranet/templates/logs/query.html
+++ b/intranet/templates/logs/query.html
@@ -12,10 +12,14 @@
 {% endblock %}
 
 {% block head %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/nav' %}
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/nav' %}
+    {% endif %}
 {% endblock %}
 
 {% block js %}
diff --git a/intranet/templates/logs/request.html b/intranet/templates/logs/request.html
index 1ca87acd81a..bb21df9ff22 100644
--- a/intranet/templates/logs/request.html
+++ b/intranet/templates/logs/request.html
@@ -8,10 +8,14 @@
 {% endblock %}
 
 {% block head %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/nav' %}
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/nav' %}
+    {% endif %}
 {% endblock %}
 
 {% block js %}
diff --git a/intranet/templates/lostfound/founditem_delete.html b/intranet/templates/lostfound/founditem_delete.html
index 06f9735691e..3ae303c9567 100644
--- a/intranet/templates/lostfound/founditem_delete.html
+++ b/intranet/templates/lostfound/founditem_delete.html
@@ -16,10 +16,14 @@
 {% endblock %}
 
 {% block head %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/nav' %}
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/nav' %}
+    {% endif %}
 {% endblock %}
 
 {% block main %}
diff --git a/intranet/templates/lostfound/founditem_form.html b/intranet/templates/lostfound/founditem_form.html
index cd053f03627..a13b67acc6e 100644
--- a/intranet/templates/lostfound/founditem_form.html
+++ b/intranet/templates/lostfound/founditem_form.html
@@ -52,11 +52,16 @@
 {% endblock %}
 
 {% block head %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/nav' %}
         {% stylesheet 'dark/lostfound' %}
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/nav' %}
+        {% stylesheet 'twilight/lostfound' %}
+    {% endif %}
 {% endblock %}
 
 {% block main %}
diff --git a/intranet/templates/lostfound/home.html b/intranet/templates/lostfound/home.html
index b51c356c24e..5e10edc562a 100644
--- a/intranet/templates/lostfound/home.html
+++ b/intranet/templates/lostfound/home.html
@@ -17,11 +17,16 @@
 {% endblock %}
 
 {% block head %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/nav' %}
         {% stylesheet 'dark/lostfound' %}
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/nav' %}
+        {% stylesheet 'twilight/lostfound' %}
+    {% endif %}
 {% endblock %}
 
 {% block main %}
diff --git a/intranet/templates/lostfound/item_view.html b/intranet/templates/lostfound/item_view.html
index 7fd11bf361d..b70b8c2bea5 100644
--- a/intranet/templates/lostfound/item_view.html
+++ b/intranet/templates/lostfound/item_view.html
@@ -17,11 +17,16 @@
 {% endblock %}
 
 {% block head %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/nav' %}
         {% stylesheet 'dark/lostfound' %}
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/nav' %}
+        {% stylesheet 'twilight/lostfound' %}
+    {% endif %}
 {% endblock %}
 
 {% block main %}
diff --git a/intranet/templates/lostfound/lostitem_delete.html b/intranet/templates/lostfound/lostitem_delete.html
index cfaf90981bc..b59178534db 100644
--- a/intranet/templates/lostfound/lostitem_delete.html
+++ b/intranet/templates/lostfound/lostitem_delete.html
@@ -16,10 +16,14 @@
 {% endblock %}
 
 {% block head %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/nav' %}
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/nav' %}
+    {% endif %}
 {% endblock %}
 
 {% block main %}
diff --git a/intranet/templates/lostfound/lostitem_form.html b/intranet/templates/lostfound/lostitem_form.html
index c4f326d6fcd..fe54b0b579e 100644
--- a/intranet/templates/lostfound/lostitem_form.html
+++ b/intranet/templates/lostfound/lostitem_form.html
@@ -52,11 +52,16 @@
 {% endblock %}
 
 {% block head %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/nav' %}
         {% stylesheet 'dark/lostfound' %}
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/nav' %}
+        {% stylesheet 'twilight/lostfound' %}
+    {% endif %}
 {% endblock %}
 
 {% block main %}
diff --git a/intranet/templates/notifications/gcm_list.html b/intranet/templates/notifications/gcm_list.html
index 411d8c64c7a..9abf679e946 100644
--- a/intranet/templates/notifications/gcm_list.html
+++ b/intranet/templates/notifications/gcm_list.html
@@ -15,10 +15,14 @@
 {% endblock %}
 
 {% block head %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/nav' %}
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/nav' %}
+    {% endif %}
 {% endblock %}
 
 {% block main %}
diff --git a/intranet/templates/notifications/gcm_post.html b/intranet/templates/notifications/gcm_post.html
index 8f4745f59f9..f6357e79c8d 100644
--- a/intranet/templates/notifications/gcm_post.html
+++ b/intranet/templates/notifications/gcm_post.html
@@ -27,10 +27,14 @@
 {% endblock %}
 
 {% block head %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/nav' %}
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/nav' %}
+    {% endif %}
 {% endblock %}
 
 {% block main %}
diff --git a/intranet/templates/oauth2_provider/authorized-tokens.html b/intranet/templates/oauth2_provider/authorized-tokens.html
index 95886cc4265..c3a354a6ec7 100644
--- a/intranet/templates/oauth2_provider/authorized-tokens.html
+++ b/intranet/templates/oauth2_provider/authorized-tokens.html
@@ -74,7 +74,7 @@
             font-family: monospace;
             padding: 0px 2px;
             color: black;
-            {% if dark_mode_enabled %}
+            {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
             color: white;
             {% endif %}
         }
diff --git a/intranet/templates/oauth2_provider/base.html b/intranet/templates/oauth2_provider/base.html
index 0764724acc7..9a453f82ab0 100644
--- a/intranet/templates/oauth2_provider/base.html
+++ b/intranet/templates/oauth2_provider/base.html
@@ -24,12 +24,17 @@
             crossorigin="anonymous">
         </script>
     {% endblock %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/login' %}
         {% stylesheet 'dark/about' %}
         {% stylesheet 'dark/oauth' %}
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/login' %}
+        {% stylesheet 'twilight/about' %}
+    {% endif %}
 </head>
 <body class="notransition">
     {% block back %}{% endblock %}
diff --git a/intranet/templates/parking/car.html b/intranet/templates/parking/car.html
index 1570e031b99..30042eaafb0 100644
--- a/intranet/templates/parking/car.html
+++ b/intranet/templates/parking/car.html
@@ -27,10 +27,14 @@
 {% endblock %}
 
 {% block head %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/nav' %}
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/nav' %}
+    {% endif %}
 {% endblock %}
 
 {% block main %}
diff --git a/intranet/templates/parking/form.html b/intranet/templates/parking/form.html
index a3cd7695257..cecb6a0beac 100644
--- a/intranet/templates/parking/form.html
+++ b/intranet/templates/parking/form.html
@@ -22,10 +22,14 @@
 {% endblock %}
 
 {% block head %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/nav' %}
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/nav' %}
+    {% endif %}
 {% endblock %}
 
 {% block main %}
diff --git a/intranet/templates/parking/intro.html b/intranet/templates/parking/intro.html
index a35f6f19b63..f0c14c96a1e 100644
--- a/intranet/templates/parking/intro.html
+++ b/intranet/templates/parking/intro.html
@@ -20,10 +20,14 @@
 {% endblock %}
 
 {% block head %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/nav' %}
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/nav' %}
+    {% endif %}
 {% endblock %}
 
 {% block main %}
diff --git a/intranet/templates/parking/joint.html b/intranet/templates/parking/joint.html
index fe5f5965a19..b7121dc52cd 100644
--- a/intranet/templates/parking/joint.html
+++ b/intranet/templates/parking/joint.html
@@ -28,10 +28,14 @@
 {% endblock %}
 
 {% block head %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/nav' %}
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/nav' %}
+    {% endif %}
 {% endblock %}
 
 {% block main %}
diff --git a/intranet/templates/polls/add_modify.html b/intranet/templates/polls/add_modify.html
index bd4643efdab..0aa50f79861 100644
--- a/intranet/templates/polls/add_modify.html
+++ b/intranet/templates/polls/add_modify.html
@@ -31,12 +31,18 @@
 {% endblock %}
 
 {% block head %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/nav' %}
         {% stylesheet 'dark/cke' %}
         {% stylesheet 'dark/polls' %}
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/nav' %}
+        {% stylesheet 'twilight/cke' %}
+        {% stylesheet 'twilight/polls' %}
+    {% endif %}
 {% endblock %}
 
 {% block main %}
diff --git a/intranet/templates/polls/delete.html b/intranet/templates/polls/delete.html
index e4be949d75d..4b8085283fb 100644
--- a/intranet/templates/polls/delete.html
+++ b/intranet/templates/polls/delete.html
@@ -13,11 +13,16 @@
 {% endblock %}
 
 {% block head %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/nav' %}
         {% stylesheet 'dark/polls' %}
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/nav' %}
+        {% stylesheet 'twilight/polls' %}
+    {% endif %}
 {% endblock %}
 
 {% block main %}
diff --git a/intranet/templates/polls/home.html b/intranet/templates/polls/home.html
index eba848fcc62..bdd99abe564 100644
--- a/intranet/templates/polls/home.html
+++ b/intranet/templates/polls/home.html
@@ -13,11 +13,16 @@
 {% endblock %}
 
 {% block head %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/nav' %}
         {% stylesheet 'dark/polls' %}
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/nav' %}
+        {% stylesheet 'twilight/polls' %}
+    {% endif %}
 {% endblock %}
 
 {% block js %}
diff --git a/intranet/templates/polls/results.html b/intranet/templates/polls/results.html
index c1b6e1ceea2..b7d429b83c7 100644
--- a/intranet/templates/polls/results.html
+++ b/intranet/templates/polls/results.html
@@ -58,11 +58,16 @@
 {% endblock %}
 
 {% block head %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/nav' %}
         {% stylesheet 'dark/polls' %}
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/nav' %}
+        {% stylesheet 'twilight/polls' %}
+    {% endif %}
 {% endblock %}
 
 {% block main %}
diff --git a/intranet/templates/polls/vote.html b/intranet/templates/polls/vote.html
index 17e5cf735db..84ca78fe941 100644
--- a/intranet/templates/polls/vote.html
+++ b/intranet/templates/polls/vote.html
@@ -104,11 +104,16 @@
 {% endblock %}
 
 {% block head %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/nav' %}
         {% stylesheet 'dark/polls' %}
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/nav' %}
+        {% stylesheet 'twilight/polls' %}
+    {% endif %}
 {% endblock %}
 
 {% block main %}
diff --git a/intranet/templates/polls/winners.html b/intranet/templates/polls/winners.html
index c5f2ee49cad..aa21921de42 100644
--- a/intranet/templates/polls/winners.html
+++ b/intranet/templates/polls/winners.html
@@ -30,11 +30,16 @@
 {% endblock %}
 
 {% block head %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/nav' %}
         {% stylesheet 'dark/polls' %}
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/nav' %}
+        {% stylesheet 'twilight/polls' %}
+    {% endif %}
 {% endblock %}
 
 {% block main %}
diff --git a/intranet/templates/preferences/preferences.html b/intranet/templates/preferences/preferences.html
index 24ff9f7e21a..c725c1ecdff 100644
--- a/intranet/templates/preferences/preferences.html
+++ b/intranet/templates/preferences/preferences.html
@@ -64,11 +64,16 @@
 {% endblock %}
 
 {% block head %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/nav' %}
         {% stylesheet 'dark/preferences' %}
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/nav' %}
+        {% stylesheet 'twilight/preferences' %}
+    {% endif %}
 {% endblock %}
 
 {% block main %}
@@ -233,9 +238,9 @@ <h3>Privacy Options</h3>
             {% endif %}
           {% endcomment %}
 
-            {% if dark_mode_form %}
-                <h3>Dark Mode</h3>
-                {% for field in dark_mode_form %}
+            {% if theme_form %}
+                <h3>Theme</h3>
+                {% for field in theme_form %}
                     {{ field.label }}
                     {{ field }}
                 {% endfor %}
diff --git a/intranet/templates/preferences/privacy_options.html b/intranet/templates/preferences/privacy_options.html
index 7569a2450c9..d2a8817b8a9 100644
--- a/intranet/templates/preferences/privacy_options.html
+++ b/intranet/templates/preferences/privacy_options.html
@@ -50,11 +50,16 @@
 {% endblock %}
 
 {% block head %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/nav' %}
         {% stylesheet 'dark/preferences' %}
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/nav' %}
+        {% stylesheet 'twilight/preferences' %}
+    {% endif %}
 {% endblock %}
 
 {% block main %}
diff --git a/intranet/templates/printing/print.html b/intranet/templates/printing/print.html
index c04a1dcc90b..9bfd647b0fb 100644
--- a/intranet/templates/printing/print.html
+++ b/intranet/templates/printing/print.html
@@ -23,11 +23,16 @@
 {% endblock %}
 
 {% block head %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/nav' %}
         {% stylesheet 'dark/printing' %}
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/nav' %}
+        {% stylesheet 'twilight/printing' %}
+    {% endif %}
 {% endblock %}
 
 {% block main %}
diff --git a/intranet/templates/schedule/admin_add.html b/intranet/templates/schedule/admin_add.html
index 818a595312c..767a7055a8e 100644
--- a/intranet/templates/schedule/admin_add.html
+++ b/intranet/templates/schedule/admin_add.html
@@ -38,11 +38,16 @@
 {% endblock %}
 
 {% block head %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/nav' %}
         {% stylesheet 'dark/schedule' %}
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/nav' %}
+        {% stylesheet 'twilight/schedule' %}
+    {% endif %}
 {% endblock %}
 
 {% block main %}
diff --git a/intranet/templates/schedule/admin_comment.html b/intranet/templates/schedule/admin_comment.html
index cd33783fa2f..78939d22299 100644
--- a/intranet/templates/schedule/admin_comment.html
+++ b/intranet/templates/schedule/admin_comment.html
@@ -25,13 +25,19 @@
 {% endblock %}
 
 {% block head %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/nav' %}
         {% stylesheet 'dark/schedule' %}
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/nav' %}
+        {% stylesheet 'twilight/schedule' %}
+    {% endif %}
 {% endblock %}
 
+
 {% block main %}
     <div class="primary-content">
         <a href="{% url 'schedule_admin' %}" class="button">
diff --git a/intranet/templates/schedule/admin_daytype.html b/intranet/templates/schedule/admin_daytype.html
index 77ccc5a6020..77db8535107 100644
--- a/intranet/templates/schedule/admin_daytype.html
+++ b/intranet/templates/schedule/admin_daytype.html
@@ -127,13 +127,19 @@
 {% endblock %}
 
 {% block head %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/nav' %}
         {% stylesheet 'dark/schedule' %}
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/nav' %}
+        {% stylesheet 'twilight/schedule' %}
+    {% endif %}
 {% endblock %}
 
+
 {% block main %}
     <div class="primary-content">
         <a href="{% url 'schedule_admin' %}" class="button">
diff --git a/intranet/templates/schedule/admin_home.html b/intranet/templates/schedule/admin_home.html
index 3c1fd808e8e..7a3d87ecb07 100644
--- a/intranet/templates/schedule/admin_home.html
+++ b/intranet/templates/schedule/admin_home.html
@@ -191,13 +191,19 @@
 {% endblock %}
 
 {% block head %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/nav' %}
         {% stylesheet 'dark/schedule' %}
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/nav' %}
+        {% stylesheet 'twilight/schedule' %}
+    {% endif %}
 {% endblock %}
 
+
 {% block main %}
     <div class="primary-content">
         <div class="change-daytype-form">
diff --git a/intranet/templates/schedule/calendar.html b/intranet/templates/schedule/calendar.html
index 02c591a9e7b..7bff650aac5 100644
--- a/intranet/templates/schedule/calendar.html
+++ b/intranet/templates/schedule/calendar.html
@@ -59,13 +59,19 @@
 {% endblock %}
 
 {% block head %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/nav' %}
         {% stylesheet 'dark/schedule' %}
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/nav' %}
+        {% stylesheet 'twilight/schedule' %}
+    {% endif %}
 {% endblock %}
 
+
 {% block main %}
     <div class="primary-content">
         <h2>Schedule</h2>
diff --git a/intranet/templates/schedule/fill.html b/intranet/templates/schedule/fill.html
index 130a94b8386..ea63282e1f4 100644
--- a/intranet/templates/schedule/fill.html
+++ b/intranet/templates/schedule/fill.html
@@ -15,13 +15,19 @@
 {% endblock %}
 
 {% block head %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/nav' %}
         {% stylesheet 'dark/schedule' %}
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/nav' %}
+        {% stylesheet 'twilight/schedule' %}
+    {% endif %}
 {% endblock %}
 
+
 {% block main %}
     <div class="primary-content">
         <a href="{% url 'schedule_admin' %}" class="button">
diff --git a/intranet/templates/search/search_results.html b/intranet/templates/search/search_results.html
index e76ae7f7a06..9ccc68dbaba 100644
--- a/intranet/templates/search/search_results.html
+++ b/intranet/templates/search/search_results.html
@@ -15,12 +15,17 @@
 {% endblock %}
 
 {% block head %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/nav' %}
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/nav' %}
+    {% endif %}
 {% endblock %}
 
+
 {% block main %}
 <div class="primary-content">
 
diff --git a/intranet/templates/seniors/add.html b/intranet/templates/seniors/add.html
index 217e8a7c947..bfed9d22ca5 100644
--- a/intranet/templates/seniors/add.html
+++ b/intranet/templates/seniors/add.html
@@ -36,12 +36,17 @@
 {% endblock %}
 
 {% block head %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/nav' %}
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/nav' %}
+    {% endif %}
 {% endblock %}
 
+
 {% block main %}
     <div class="primary-content polls">
         <h2>Add Destination Info</h2>
diff --git a/intranet/templates/seniors/home.html b/intranet/templates/seniors/home.html
index 7c79ca1339d..a5beb6dbdca 100644
--- a/intranet/templates/seniors/home.html
+++ b/intranet/templates/seniors/home.html
@@ -26,10 +26,14 @@
 {% endblock %}
 
 {% block head %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/nav' %}
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/nav' %}
+    {% endif %}
 {% endblock %}
 
 {% block main %}
diff --git a/intranet/templates/sessionmgmt/index.html b/intranet/templates/sessionmgmt/index.html
index cbfb566d7a7..71aa287ae93 100644
--- a/intranet/templates/sessionmgmt/index.html
+++ b/intranet/templates/sessionmgmt/index.html
@@ -9,11 +9,15 @@
 {% block head %}
     {% stylesheet 'sessionmgmt' %}
 
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/nav' %}
         {% stylesheet 'dark/sessionmgmt' %}
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/nav' %}
+    {% endif %}
 {% endblock %}
 
 {% block main %}
diff --git a/intranet/templates/signage/pages/eighth.html b/intranet/templates/signage/pages/eighth.html
index 9be751c7c73..f94ea898d5f 100644
--- a/intranet/templates/signage/pages/eighth.html
+++ b/intranet/templates/signage/pages/eighth.html
@@ -315,12 +315,17 @@
 {% endblock %}
 
 {% block head %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/nav' %}
         {% stylesheet 'dark/eighth.signup' %}
         <script>spinnerOptions.color = "#FFF";</script>
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/nav' %}
+        {% stylesheet 'twilight/eighth.signup' %}
+    {% endif %}
 {% endblock %}
 
 {% block body %}
diff --git a/intranet/templates/special/senior_dests_banner.html b/intranet/templates/special/senior_dests_banner.html
index b4fd6540f7a..9cc2b0423cd 100644
--- a/intranet/templates/special/senior_dests_banner.html
+++ b/intranet/templates/special/senior_dests_banner.html
@@ -1,6 +1,6 @@
 {% load static %}
 
-{% if dark_mode_enabled %}
+{% if theme_choice == 'dark' or theme_choice == 'twilight' %}
     <link rel="stylesheet" href="{% static 'css/dark/senior_dests_banner.css' %}">
 {% else %}
     <link rel="stylesheet" href="{% static 'css/senior_dests_banner.css' %}">
diff --git a/intranet/templates/special/tjstar_ribbon.html b/intranet/templates/special/tjstar_ribbon.html
index d49d8bdd8c3..a8bd84b8501 100644
--- a/intranet/templates/special/tjstar_ribbon.html
+++ b/intranet/templates/special/tjstar_ribbon.html
@@ -10,7 +10,7 @@
 <script src="{% static 'js/tjstar_ribbon.js' %}"></script>
 
 
-{% if dark_mode_enabled %}
+{% if theme_choice == 'dark' or theme_choice == 'twilight' %}
 <style>
     .tjstar-ribbon-content {
         color: #fff;
@@ -35,7 +35,7 @@
         <i class="fas fa-chevron-down"></i>
     </span>
     <img
-        class="tjstar-img {% if dark_mode_enabled %}invert-100{% endif %}"
+        class="tjstar-img {% if theme_choice == 'dark' or theme_choice == 'twilight' %}invert-100{% endif %}"
         src="{% static 'img/special/tjstar.svg' %}"
         alt="tjSTAR" height="30"
     >
@@ -47,7 +47,7 @@
     </span>
     <center>
         <img
-            class="tjstar-img tjstar-img-link {% if dark_mode_enabled %}invert-100{% endif %}"
+            class="tjstar-img tjstar-img-link {% if theme_choice == 'dark' or theme_choice == 'twilight' %}invert-100{% endif %}"
             src="{% static 'img/special/tjstar.svg' %}"
             alt="tjSTAR" height="100"
             onclick="window.open('https://tjhsst.fcps.edu/academics/research-program', '_blank');"
diff --git a/intranet/templates/users/all_classes.html b/intranet/templates/users/all_classes.html
index e14aac6fc55..2cb90fe430e 100644
--- a/intranet/templates/users/all_classes.html
+++ b/intranet/templates/users/all_classes.html
@@ -22,10 +22,14 @@
 {% endblock %}
 
 {% block head %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/nav' %}
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/nav' %}
+    {% endif %}
 {% endblock %}
 
 {% block main %}
diff --git a/intranet/templates/users/all_courses.html b/intranet/templates/users/all_courses.html
index a6b6d5ffd80..9baa4e5f956 100644
--- a/intranet/templates/users/all_courses.html
+++ b/intranet/templates/users/all_courses.html
@@ -22,10 +22,14 @@
 {% endblock %}
 
 {% block head %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/nav' %}
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/nav' %}
+    {% endif %}
 {% endblock %}
 
 {% block main %}
diff --git a/intranet/templates/users/class.html b/intranet/templates/users/class.html
index a51f01f131b..de88f6a8418 100644
--- a/intranet/templates/users/class.html
+++ b/intranet/templates/users/class.html
@@ -21,10 +21,14 @@
 {% endblock %}
 
 {% block head %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/nav' %}
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/nav' %}
+    {% endif %}
 {% endblock %}
 
 {% block main %}
diff --git a/intranet/templates/users/class_room.html b/intranet/templates/users/class_room.html
index bdbc9d4ac23..0cdc80faed3 100644
--- a/intranet/templates/users/class_room.html
+++ b/intranet/templates/users/class_room.html
@@ -22,10 +22,14 @@
 {% endblock %}
 
 {% block head %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/nav' %}
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/nav' %}
+    {% endif %}
 {% endblock %}
 
 {% block main %}
diff --git a/intranet/templates/users/profile.html b/intranet/templates/users/profile.html
index c0884a83d50..5076af84d97 100644
--- a/intranet/templates/users/profile.html
+++ b/intranet/templates/users/profile.html
@@ -67,10 +67,14 @@
 {% endblock %}
 
 {% block head %}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/nav' %}
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/base' %}
+        {% stylesheet 'twilight/nav' %}
+    {% endif %}
 {% endblock %}
 
 {% block main %}
diff --git a/intranet/templates/welcome/base.html b/intranet/templates/welcome/base.html
index 7439ad9066b..0bbd8607f99 100644
--- a/intranet/templates/welcome/base.html
+++ b/intranet/templates/welcome/base.html
@@ -19,9 +19,12 @@
 
 {% block head %}
     {{ block.super }}
-    {% if dark_mode_enabled %}
+    {% if theme_choice == 'dark' or theme_choice == 'twilight' %}
         {% stylesheet 'dark/welcome' %}
     {% endif %}
+    {% if theme_choice == 'twilight' %}
+        {% stylesheet 'twilight/welcome' %}
+    {% endif %}
 {% endblock %}
 
 {% block body %}

From a01f575e647399677a5761f8274a229fdefff57c Mon Sep 17 00:00:00 2001
From: deR0R0 <rorozee1@gmail.com>
Date: Wed, 22 Oct 2025 23:08:50 -0400
Subject: [PATCH 2/5] fix(lint): fix linting issues for theme chooser

---
 intranet/apps/context_processors.py | 1 +
 intranet/apps/preferences/forms.py  | 6 ++----
 intranet/apps/preferences/views.py  | 3 ++-
 intranet/apps/users/models.py       | 3 ++-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/intranet/apps/context_processors.py b/intranet/apps/context_processors.py
index a0bd6a6c676..42eb2e28e67 100644
--- a/intranet/apps/context_processors.py
+++ b/intranet/apps/context_processors.py
@@ -184,6 +184,7 @@ def enable_dark_mode(request):
     """
     return {"dark_mode_enabled": dark_mode_enabled(request)}
 
+
 def user_theme_choice(request):
     if request.user.is_authenticated:
         choice = request.user.theme_properties.theme_choice
diff --git a/intranet/apps/preferences/forms.py b/intranet/apps/preferences/forms.py
index 4e106597f10..c23190111ec 100644
--- a/intranet/apps/preferences/forms.py
+++ b/intranet/apps/preferences/forms.py
@@ -101,6 +101,7 @@ def __init__(self, user, *args, **kwargs):
             initial=user.dark_mode_properties.dark_mode_enabled, label="Enable dark mode?", required=False
         )
 
+
 class ThemeForm(forms.Form):
     THEME_CHOICES = [
         ("light", "Light Theme"),
@@ -111,10 +112,7 @@ class ThemeForm(forms.Form):
     def __init__(self, user, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.fields["theme_choice"] = forms.ChoiceField(
-            choices=self.THEME_CHOICES,
-            initial=user.theme_properties.theme_choice,
-            label="Select your preferred theme:",
-            required=True
+            choices=self.THEME_CHOICES, initial=user.theme_properties.theme_choice, label="Select your preferred theme:", required=True
         )
 
 
diff --git a/intranet/apps/preferences/views.py b/intranet/apps/preferences/views.py
index a8b63e1f8a2..74399dcf8ee 100644
--- a/intranet/apps/preferences/views.py
+++ b/intranet/apps/preferences/views.py
@@ -10,7 +10,7 @@
 from ..auth.decorators import eighth_admin_required
 from ..bus.models import Route
 from ..users.models import Email
-from .forms import BusRouteForm, DarkModeForm, ThemeForm, EmailFormset, NotificationOptionsForm, PreferredPictureForm, PrivacyOptionsForm
+from .forms import BusRouteForm, DarkModeForm, EmailFormset, NotificationOptionsForm, PreferredPictureForm, PrivacyOptionsForm, ThemeForm
 
 # from .forms import (BusRouteForm, DarkModeForm, EmailFormset, NotificationOptionsForm, PhoneFormset, PreferredPictureForm, PrivacyOptionsForm,
 #                    WebsiteFormset)
@@ -289,6 +289,7 @@ def save_dark_mode_settings(request, user):
 
     return dark_mode_form
 
+
 def save_theme_settings(request, user):
     theme_form = ThemeForm(user, data=request.POST, initial={"theme_choice": user.theme_properties.theme_choice})
     if theme_form.is_valid():
diff --git a/intranet/apps/users/models.py b/intranet/apps/users/models.py
index 33d96b6a236..e86dc76e889 100644
--- a/intranet/apps/users/models.py
+++ b/intranet/apps/users/models.py
@@ -1289,7 +1289,8 @@ class UserDarkModeProperties(models.Model):
 
     def __str__(self):
         return str(self.user)
-    
+
+
 class UserThemeProperties(models.Model):
     """
     Contains user properties relating to themes

From 7c1f1082d2817469680e5b7dc52e48a520b29f39 Mon Sep 17 00:00:00 2001
From: deR0R0 <rorozee1@gmail.com>
Date: Thu, 23 Oct 2025 08:02:46 -0400
Subject: [PATCH 3/5] fix(pr): fixed scss at-use issues

---
 intranet/static/css/twilight/about.scss         | 2 +-
 intranet/static/css/twilight/base.scss          | 2 +-
 intranet/static/css/twilight/cke.scss           | 2 +-
 intranet/static/css/twilight/dashboard.scss     | 2 +-
 intranet/static/css/twilight/eighth.signup.scss | 2 +-
 intranet/static/css/twilight/enrichment.scss    | 2 +-
 intranet/static/css/twilight/events.scss        | 2 +-
 intranet/static/css/twilight/files.scss         | 2 +-
 intranet/static/css/twilight/login.scss         | 2 +-
 intranet/static/css/twilight/lostfound.scss     | 2 +-
 intranet/static/css/twilight/nav.scss           | 2 +-
 intranet/static/css/twilight/polls.scss         | 2 +-
 intranet/static/css/twilight/printing.scss      | 2 +-
 intranet/static/css/twilight/select.scss        | 2 +-
 intranet/static/css/twilight/welcome.scss       | 2 +-
 15 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/intranet/static/css/twilight/about.scss b/intranet/static/css/twilight/about.scss
index ad27eea87d7..cf15b0d02f9 100644
--- a/intranet/static/css/twilight/about.scss
+++ b/intranet/static/css/twilight/about.scss
@@ -1,4 +1,4 @@
-@use 'colors' as *;
+@import './colors';
 
 .center {
     background-color: $page_background;
diff --git a/intranet/static/css/twilight/base.scss b/intranet/static/css/twilight/base.scss
index 28ed49d21ac..81111fd1c9e 100644
--- a/intranet/static/css/twilight/base.scss
+++ b/intranet/static/css/twilight/base.scss
@@ -1,4 +1,4 @@
-@use "colors" as *;
+@import './colors';
 
 body {
     color: #B7B7B7;
diff --git a/intranet/static/css/twilight/cke.scss b/intranet/static/css/twilight/cke.scss
index ef0b63aaa09..06efda37808 100644
--- a/intranet/static/css/twilight/cke.scss
+++ b/intranet/static/css/twilight/cke.scss
@@ -1,4 +1,4 @@
-@use "colors" as *;
+@import './colors';
 
 .cke {
     background: $page_background !important;
diff --git a/intranet/static/css/twilight/dashboard.scss b/intranet/static/css/twilight/dashboard.scss
index 42d624a9fd1..e710cbf67b9 100644
--- a/intranet/static/css/twilight/dashboard.scss
+++ b/intranet/static/css/twilight/dashboard.scss
@@ -1,4 +1,4 @@
-@use 'colors' as *;
+@import './colors';
 
 .announcement, .club-announcements, .announcement-meta, .event {
     background: $announcement_background;
diff --git a/intranet/static/css/twilight/eighth.signup.scss b/intranet/static/css/twilight/eighth.signup.scss
index 182aabc7cc9..f99741dee7e 100644
--- a/intranet/static/css/twilight/eighth.signup.scss
+++ b/intranet/static/css/twilight/eighth.signup.scss
@@ -1,4 +1,4 @@
-@use "./colors" as *;
+@import './colors';
 
 .day-picker {
     border-color: $dark_border;
diff --git a/intranet/static/css/twilight/enrichment.scss b/intranet/static/css/twilight/enrichment.scss
index 32e5e8eb14b..f144d8bbb91 100644
--- a/intranet/static/css/twilight/enrichment.scss
+++ b/intranet/static/css/twilight/enrichment.scss
@@ -1,4 +1,4 @@
-@use 'colors' as *;
+@import './colors';
 
 .schedule tr td {
     border: 1px solid $dark_border;
diff --git a/intranet/static/css/twilight/events.scss b/intranet/static/css/twilight/events.scss
index 17fdd682163..a449aeae522 100644
--- a/intranet/static/css/twilight/events.scss
+++ b/intranet/static/css/twilight/events.scss
@@ -1,4 +1,4 @@
-@use 'colors' as *;
+@import './colors';
 
 .event {
     background-color: $widget_background;
diff --git a/intranet/static/css/twilight/files.scss b/intranet/static/css/twilight/files.scss
index 3d8456a0b92..ea764b17cf2 100644
--- a/intranet/static/css/twilight/files.scss
+++ b/intranet/static/css/twilight/files.scss
@@ -1,4 +1,4 @@
-@use 'colors' as *;
+@import './colors';
 
 .filesystem {
     background-color: $widget_background;
diff --git a/intranet/static/css/twilight/login.scss b/intranet/static/css/twilight/login.scss
index 4eae07ac12b..cd4137a093d 100644
--- a/intranet/static/css/twilight/login.scss
+++ b/intranet/static/css/twilight/login.scss
@@ -1,4 +1,4 @@
-@use 'colors' as *;
+@import './colors';
 
 body.login-page input {
     background-color: $widget_background;
diff --git a/intranet/static/css/twilight/lostfound.scss b/intranet/static/css/twilight/lostfound.scss
index 59fa5bd2cf0..d6d9879bf21 100644
--- a/intranet/static/css/twilight/lostfound.scss
+++ b/intranet/static/css/twilight/lostfound.scss
@@ -1,4 +1,4 @@
-@use "colors" as *;
+@import './colors';
 
 .item {
     background-color: $widget_background;
diff --git a/intranet/static/css/twilight/nav.scss b/intranet/static/css/twilight/nav.scss
index 9a70aadb60e..ec0cc45122c 100644
--- a/intranet/static/css/twilight/nav.scss
+++ b/intranet/static/css/twilight/nav.scss
@@ -1,4 +1,4 @@
-@use 'colors' as *;
+@import './colors';
 
 ul.nav {
     background-color: $widget_background;
diff --git a/intranet/static/css/twilight/polls.scss b/intranet/static/css/twilight/polls.scss
index 9481dd4f098..08dd3d1bd31 100644
--- a/intranet/static/css/twilight/polls.scss
+++ b/intranet/static/css/twilight/polls.scss
@@ -1,4 +1,4 @@
-@use 'colors' as *;
+@import './colors';
 
 #questions .question [contenteditable="true"] {
     background-color: $widget_background;
diff --git a/intranet/static/css/twilight/printing.scss b/intranet/static/css/twilight/printing.scss
index 37e1ffcad47..00c996011a1 100644
--- a/intranet/static/css/twilight/printing.scss
+++ b/intranet/static/css/twilight/printing.scss
@@ -1,4 +1,4 @@
-@use 'colors' as *;
+@import './colors';
 
 .working {
     background-color: #00c951;
diff --git a/intranet/static/css/twilight/select.scss b/intranet/static/css/twilight/select.scss
index e04c4a89bf0..1458578bec9 100644
--- a/intranet/static/css/twilight/select.scss
+++ b/intranet/static/css/twilight/select.scss
@@ -1,4 +1,4 @@
-@use 'colors' as *;
+@import './colors';
 
 select {
     background-color: $widget_background;
diff --git a/intranet/static/css/twilight/welcome.scss b/intranet/static/css/twilight/welcome.scss
index ad0a58308f8..080b98426c2 100644
--- a/intranet/static/css/twilight/welcome.scss
+++ b/intranet/static/css/twilight/welcome.scss
@@ -1,4 +1,4 @@
-@use 'colors' as *;
+@import './colors';
 
 
 #welcome {

From b56d096953acfd0e2f19aa369475177078db0446 Mon Sep 17 00:00:00 2001
From: deR0R0 <rorozee1@gmail.com>
Date: Thu, 23 Oct 2025 08:40:04 -0400
Subject: [PATCH 4/5] fix(css): fixed codacy issues

---
 intranet/static/css/twilight/_colors.scss |  2 +-
 intranet/static/css/twilight/base.scss    | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/intranet/static/css/twilight/_colors.scss b/intranet/static/css/twilight/_colors.scss
index 82da6b94441..6d15a507895 100644
--- a/intranet/static/css/twilight/_colors.scss
+++ b/intranet/static/css/twilight/_colors.scss
@@ -3,5 +3,5 @@ $widget_background: #202020;
 $announcement_background: #181818;
 $dark_border: #404040;
 $text_primary: #B7B7B7;
-$text_high_contrast: #FFFFFF;
+$text_high_contrast: #FFF;
 $accent_color: #2b7fff;
\ No newline at end of file
diff --git a/intranet/static/css/twilight/base.scss b/intranet/static/css/twilight/base.scss
index 81111fd1c9e..ba194380324 100644
--- a/intranet/static/css/twilight/base.scss
+++ b/intranet/static/css/twilight/base.scss
@@ -30,6 +30,12 @@ button:hover, a.button:hover, input[type="button"]:hover, input[type="submit"]:h
     border-color: $dark_border;
 }
 
+input[type="text"] {
+    background-color: $widget_background;
+    border-color: $dark_border;
+    color: white;
+}
+
 .header .search input[type="text"] {
     background-color: $widget_background;
     color: white;
@@ -40,12 +46,6 @@ button:hover, a.button:hover, input[type="button"]:hover, input[type="submit"]:h
     border-color: $dark_border;
 }
 
-input[type="text"] {
-    background-color: $widget_background;
-    border-color: $dark_border;
-    color: white;
-}
-
 textarea {
     background-color: $widget_background;
     border-color: $dark_border;
@@ -57,8 +57,8 @@ textarea {
     border-color: $dark_border !important;
     color: $text_primary !important;
 }
-/* who's big brain idea was it to make the stuff important??? */
-.selectize-input input[type="text"] {
+
+input[type="text"] .selectize-input {
     background-color: $widget_background !important;
     border-color: $dark_border !important;
     color: $text_primary !important;

From 292026d2d441ff83019bc9a184a50e6f9a0201cc Mon Sep 17 00:00:00 2001
From: deR0R0 <rorozee1@gmail.com>
Date: Thu, 23 Oct 2025 11:54:38 -0400
Subject: [PATCH 5/5] refactor(dark): remove dark mode form and view

---
 celerybeat-schedule-shm             | Bin 32768 -> 0 bytes
 celerybeat-schedule-wal             | Bin 156592 -> 0 bytes
 intranet/apps/context_processors.py |   9 +--------
 intranet/apps/preferences/forms.py  |   8 --------
 intranet/apps/preferences/views.py  |  16 ++--------------
 intranet/settings/__init__.py       |   1 -
 6 files changed, 3 insertions(+), 31 deletions(-)
 delete mode 100644 celerybeat-schedule-shm
 delete mode 100644 celerybeat-schedule-wal

diff --git a/celerybeat-schedule-shm b/celerybeat-schedule-shm
deleted file mode 100644
index 9720b2cccc315b654de4812460aad6293e4ab3d9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 32768
zcmeI)xlKbs5C-7?nZw*XbNO+aJEI;D6+i$T&;St$A;plA(E>Rw0Q(TKNRce$;2UW*
zqt$9=^%XG9+gaLJEvHKA(~>93xxVT@Ki<_JH>vKM?&a;v`NhNg>r=1!<NMO;JKDaV
zzvAb5m^!6u=Z;$*eo#Sx009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+
z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+0D%z-RAuAJRJxhXd=|5u
zUfBY(o_;p7o!ty_kfWT8aGq8K#z&x&$xLS^b6Lnz>a1if8)>qYo$O^lhdEBWwMY;k
zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF
N5FkK+0D=D(_yUf_CV>C|

diff --git a/celerybeat-schedule-wal b/celerybeat-schedule-wal
deleted file mode 100644
index 7a206d8ea8f5efab11303990469f8691105e97b6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 156592
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

diff --git a/intranet/apps/context_processors.py b/intranet/apps/context_processors.py
index 42eb2e28e67..b8b34d7274a 100644
--- a/intranet/apps/context_processors.py
+++ b/intranet/apps/context_processors.py
@@ -12,7 +12,7 @@
 from intranet.apps.notifications.models import NotificationConfig
 from intranet.apps.oauth.models import CSLApplication
 
-from ..utils.helpers import dark_mode_enabled, get_theme, get_theme_name, get_warning_html
+from ..utils.helpers import get_theme, get_theme_name, get_warning_html
 from .announcements.models import WarningAnnouncement
 from .schedule.models import Day
 
@@ -178,13 +178,6 @@ def show_bus_button(request):
         return {"show_bus_nav": is_bus_admin and settings.ENABLE_BUS_APP}
 
 
-def enable_dark_mode(request):
-    """
-    Export whether dark mode is enabled.
-    """
-    return {"dark_mode_enabled": dark_mode_enabled(request)}
-
-
 def user_theme_choice(request):
     if request.user.is_authenticated:
         choice = request.user.theme_properties.theme_choice
diff --git a/intranet/apps/preferences/forms.py b/intranet/apps/preferences/forms.py
index c23190111ec..892cd826146 100644
--- a/intranet/apps/preferences/forms.py
+++ b/intranet/apps/preferences/forms.py
@@ -94,14 +94,6 @@ def flag(label, default):
         )
 
 
-class DarkModeForm(forms.Form):
-    def __init__(self, user, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.fields["dark_mode_enabled"] = forms.BooleanField(
-            initial=user.dark_mode_properties.dark_mode_enabled, label="Enable dark mode?", required=False
-        )
-
-
 class ThemeForm(forms.Form):
     THEME_CHOICES = [
         ("light", "Light Theme"),
diff --git a/intranet/apps/preferences/views.py b/intranet/apps/preferences/views.py
index 74399dcf8ee..23b042e4c47 100644
--- a/intranet/apps/preferences/views.py
+++ b/intranet/apps/preferences/views.py
@@ -10,9 +10,9 @@
 from ..auth.decorators import eighth_admin_required
 from ..bus.models import Route
 from ..users.models import Email
-from .forms import BusRouteForm, DarkModeForm, EmailFormset, NotificationOptionsForm, PreferredPictureForm, PrivacyOptionsForm, ThemeForm
+from .forms import BusRouteForm, EmailFormset, NotificationOptionsForm, PreferredPictureForm, PrivacyOptionsForm, ThemeForm
 
-# from .forms import (BusRouteForm, DarkModeForm, EmailFormset, NotificationOptionsForm, PhoneFormset, PreferredPictureForm, PrivacyOptionsForm,
+# from .forms import (BusRouteForm, EmailFormset, NotificationOptionsForm, PhoneFormset, PreferredPictureForm, PrivacyOptionsForm,
 #                    WebsiteFormset)
 
 
@@ -278,18 +278,6 @@ def save_gcm_options(request, user):
                 messages.success(request, "Disabled push notifications")
 
 
-def save_dark_mode_settings(request, user):
-    dark_mode_form = DarkModeForm(user, data=request.POST, initial={"dark_mode_enabled": user.dark_mode_properties.dark_mode_enabled})
-    if dark_mode_form.is_valid():
-        if dark_mode_form.has_changed():
-            user.dark_mode_properties.dark_mode_enabled = dark_mode_form.cleaned_data["dark_mode_enabled"]
-            user.dark_mode_properties.save()
-            invalidate_obj(request.user.dark_mode_properties)
-            messages.success(request, ("Dark mode enabled" if user.dark_mode_properties.dark_mode_enabled else "Dark mode disabled"))
-
-    return dark_mode_form
-
-
 def save_theme_settings(request, user):
     theme_form = ThemeForm(user, data=request.POST, initial={"theme_choice": user.theme_properties.theme_choice})
     if theme_form.is_valid():
diff --git a/intranet/settings/__init__.py b/intranet/settings/__init__.py
index 260412b29b5..d96f1e13e92 100644
--- a/intranet/settings/__init__.py
+++ b/intranet/settings/__init__.py
@@ -468,7 +468,6 @@
                 "intranet.apps.context_processors.show_homecoming",  # Sitewide custom themes (special events, etc)
                 "intranet.apps.context_processors.global_custom_theme",  # Sitewide custom themes (special events, etc)
                 "intranet.apps.context_processors.show_bus_button",
-                "intranet.apps.context_processors.enable_dark_mode",
                 "intranet.apps.context_processors.user_theme_choice",
                 "intranet.apps.context_processors.oauth_toolkit",  # Django OAuth Toolkit-related middleware
                 "intranet.apps.context_processors.settings_export",  # "Exports" django.conf.settings as DJANGO_SETTINGS