diff --git a/css/all.css b/css/all.css
index 93801372..47842906 100644
--- a/css/all.css
+++ b/css/all.css
@@ -654,7 +654,7 @@ a._3_bfp {
 }
 
 .setting-highlight {
-    color: lightyellow !important;
+    background-color: lightyellow !important;
 }
 
 .course-dashboard section.sgy-card img.injected-course-icon {
diff --git a/css/modern.css b/css/modern.css
index 6e7e9172..f00e90b5 100644
--- a/css/modern.css
+++ b/css/modern.css
@@ -89,6 +89,16 @@ p {
     color: var(--text) !important;
 }
 
+pre {
+    background-color: var(--input);
+    color: var(--contrast-text);
+}
+
+#youtube-disclaimer {
+    color: var(--contrast-text);
+    background-color: var(--secondary);
+}
+
 textarea,
 select,
 input[type=text] {
@@ -156,6 +166,18 @@ body button.link-btn {
     display: none !important;
 }
 
+.s-polls-results-overlay {
+    background-color: var(--input) !important;
+}
+
+.s-notifications-mini .edge-sentence {
+    color: var(--text);
+}
+
+#main .s-notifications-mini .edge-time, #main .s-notifications-mini .created {
+    color: var(--muted-text) !important;
+}
+
 .splus-modal-title,
 .submit-span-wrapper,
 .submit-span-wrapper input[type="button"],
@@ -210,8 +232,13 @@ footer button,
     border: none !important;
 }
 
+.popups-close:hover a {
+    background-color: var(--input) !important;
+}
+
 .popups-close a {
     background-position-y: calc(-80px - (20px * var(--theme-is-dark))) !important;
+    border-radius: 2px;
 }
 
 .likers li:not(.last) {
@@ -231,13 +258,15 @@ footer button,
 .splus-courses-navbar-button article,
 .splus-courses-navbar-button article a,
 .splus-groups-navbar-button article,
-.splus-groups-navbar-button article a {
+.splus-groups-navbar-button article a,
+.JoinCard-card-1qWtS {
     border: var(--border-size) solid transparent !important;
     outline: none !important;
 }
 
 .splus-courses-navbar-button article a:hover,
-.splus-groups-navbar-button article a:hover {
+.splus-groups-navbar-button article a:hover,
+.JoinCard-card-1qWtS:hover {
     border: var(--border-size) solid var(--contrast-border) !important;
     border-radius: var(--border-radius) !important;
 }
@@ -280,6 +309,25 @@ header div.Je0RK button._1SIMq {
     border: var(--border-size) solid var(--contrast-border) !important;
 }
 
+.JoinCard-card-1qWtS ._1Z0RM {
+    background-color: var(--primary) !important;
+}
+
+/* Calendar Page */
+.fcalendar-filter-menu-wrapper {
+    background-color: var(--secondary) !important;
+    border-radius: var(--border-radius);
+}
+
+.color-codes-box {
+    /* Does not fix the left-pointing arrow, as that's a PNG */
+    background-color: var(--accent) !important;
+}
+
+.fcalendar-filter-menu-wrapper .checkbox.filter-selected {
+    background-position-y: -19px !important;
+}
+
 /* Navbar menus */
 div.les2- {
     background-color: var(--secondary) !important;
@@ -412,6 +460,18 @@ img.splus-logo-inline {
     border-bottom: 5px solid var(--contrast-border) !important;
 }
 
+.s-edge-type-update-post .update-body, .s-edge-type-update-poll .update-body {
+    color: var(--text) !important;
+}
+
+.user span.name-wrapper {
+    background: var(--secondary) !important;
+}
+
+.selected-realm .name-text {
+    color: var(--text) !important;
+}
+
 /* Grades Page */
 .gradebook-course.hierarchical-grading-report .period-row .grade-column,
 .gradebook-course.hierarchical-grading-report .category-row .grade-column,
@@ -730,7 +790,8 @@ body.library-view #library-left {
     border-radius: var(--border-radius) !important;
 }
 
-#sidebar-left #left-nav #menu-s-main ul li a.active {
+#sidebar-left #left-nav #menu-s-main ul li a.active,
+#sidebar-left #menu-s-main .active-trail .active-trail a.course-materials-left-menu {
     background-color: var(--accent) !important;
     border: var(--border-size) solid var(--contrast-border) !important;
     border-right: none !important;
@@ -752,6 +813,25 @@ th.profile-header {
     color: var(--text) !important;
 }
 
+#wrapper {
+    background-color: var(--primary) !important;
+}
+
+.navigator-buttons a.navbtn.link-btn {
+    background-color: var(--primary) !important;
+    border-radius: var(--border-radius) !important;
+}
+
+.has-folder-player #center-top .content-top-upper,
+.has-materials-player #center-top .content-top-upper {
+    background-color: var(--secondary) !important;
+    border: none !important;
+}
+
+#course-profile-materials {
+    background-color: var(--accent) !important;
+}
+
 .materials-filter-wrapper .action-links-wrapper .action-links-unfold,
 .action-links-wrapper-gearless .action-links-unfold.active,
 .action-links-wrapper-gearless .action-links-unfold:active {
@@ -775,8 +855,8 @@ body .action-links a:hover {
     border-bottom: var(--border-size) solid var(--contrast-border) !important;
 }
 
-.s-edge-feed li {
-    border-top: var(--border-size) solid var(--contrast-border) !important;
+.s-edge-feed li, .s-edge-feed span[style] {
+    color: var(--text) !important;
 }
 
 .s-like-sentence:not(:last-child) {
@@ -821,6 +901,191 @@ span#updates-count {
     background-color: var(--active) !important;
 }
 
+/* Messages */
+.privatemsg-list td {
+    background-color: var(--accent) !important;
+}
+
+.privatemsg-list .privatemsg-unread td {
+    background-color: var(--active) !important;
+}
+
+table.privatemsg-list {
+    border-top: var(--border-size) solid var(--contrast-border) !important;
+}
+
+table.privatemsg-list td.no-messages {
+    color: var(--muted-text) !important;
+}
+
+#attachment-selector {
+    background: var(--secondary) !important;
+    border: none !important;
+    border-bottom-left-radius: 5px !important;
+    border-bottom-right-radius: 5px !important;
+}
+
+#attachment-selector li {
+    border-right: none !important;
+}
+
+#ids {
+    background: none !important;
+    border: none !important;
+}
+
+#ids .userlist_input {
+    border: none !important;
+}
+
+#ids .name-wrapper {
+    background: var(--secondary) !important;
+    color: var(--text) !important;
+}
+
+.ac_results {
+    background: var(--secondary) !important;
+    color: var(--text) !important;
+}
+
+.ac_results ul li {
+    background: var(--secondary) !important;
+    border-color: var(--contrast-border) !important;
+}
+
+.ac-name, .ac-top {
+    color: var(--text) !important;
+}
+
+.ac-row .ac-bot, .ac-row .ac-school {
+    color: var(--muted-text) !important;
+}
+
+.ac_results .ac_over {
+    border-color: var(--contrast-border) !important;
+    background: var(--active) !important;
+}
+
+#sUserAutocomplete-recipient-helper {
+    background-color: var(--secondary) !important;
+    color: var(--muted-text) !important;
+    border: var(--border-size) solid var(--contrast-border) !important;
+    border-radius: var(--border-radius) !important;
+}
+
+.message-participants {
+    color: var(--muted-text) !important;
+}
+
+.message-title, .message-view-row {
+    border-bottom: var(--border-size) solid var(--contrast-border) !important;
+}
+
+/* Discussion Board */
+
+.discussion-view .sticky-wrapper h2.page-title {
+    background: var(--primary) !important;
+}
+
+.discussion-view #content-wrapper {
+    border: none !important;
+    border-radius: var(--border-radius) !important;
+}
+
+.discussion-view #center-top h2.page-title {
+    border: none !important;
+}
+
+.grade-title {
+    color: var(--text) !important;
+}
+
+.received-grade {
+    color: var(--grades) !important;
+}
+
+.grading-grade .max-points {
+    color: var(--muted-text) !important;
+}
+
+.assignment-details, .extra-details {
+    border-bottom: var(--border-size) solid var(--contrast-border) !important;
+}
+
+.discussion-view .sticky-wrapper .s-comments-post-form, .discussion-view .sticky-wrapper .s-comments-post-form-new {
+    background: var(--primary) !important;
+    border-bottom-left-radius: var(--border-radius) !important;
+    border-bottom-right-radius: var(--border-radius) !important;
+}
+
+.discussion-action-bar {
+    background: var(--secondary) !important;
+    border: none !important;
+    border-bottom-left-radius: var(--border-radius) !important;
+    border-bottom-right-radius: var(--border-radius) !important;
+}
+
+.discussion-view .discussion-content #s_comments .discussion-card {
+    background: var(--primary) !important;
+    box-shadow: none !important;
+    border-radius: var(--border-radius) !important;
+}
+
+.discussion-view #content-wrapper .discussion-content div#s_comments .s_comments_level .s_comments_level, .discussion-view #content-wrapper .s-comments-post-form-new div#s_comments .s_comments_level .s_comments_level {
+    background: var(--accent) !important;
+    border: none !important;
+    border-bottom-left-radius: var(--border-radius) !important;
+    border-bottom-right-radius: var(--border-radius) !important;
+}
+
+.discussion-view .expander-bar {
+    background: var(--accent) !important;
+    border: none !important;
+    border-top-left-radius: var(--border-radius) !important;
+}
+
+.discussion-view .comment-body-wrapper span[style] {
+    color: var(--text) !important;
+}
+
+.post-count {
+    color: var(--muted-text) !important;
+}
+
+.discussion-view .discussion-content {
+    border-top: var(--border-size) solid var(--contrast-border) !important;
+}
+
+.bar-right-wrapper, .comment-counts {
+    border-color: var(--contrast-border) !important;
+}
+
+.discussion-view #comment-placeholder {
+    background: var(--accent) !important;
+    border-radius: var(--border-radius) !important;
+    border: none !important;
+    color: var(--muted-text) !important;
+}
+
+.content-top-wrapper .info-container.not-admin .link-btn {
+    background: var(--secondary) !important;
+    border: none !important;
+    border-radius: var(--border-radius) !important;
+}
+
+#comment-navigator td {
+    background: var(--primary) !important;
+    border: none !important;
+}
+
+#comment-navigator td.slide-toggler-cell {
+    background: var(--secondary) !important;
+}
+
+.num-comments-wrapper {
+    color: var(--muted-text) !important;
+}
+
 /* User Page */
 .info-tab th,
 .info-tab td,
diff --git a/js/all.js b/js/all.js
index 7f166c64..3e742c36 100644
--- a/js/all.js
+++ b/js/all.js
@@ -414,7 +414,7 @@ let source = createElement("source", [], {
 let sourceSet = false;
 
 document.body.onkeydown = (data) => {
-    if (data.altKey && data.key === "c") {
+    if (data.altKey && data.code === "KeyC") {
         if (!sourceSet) {
             video.appendChild(source);
             sourceSet = true;
@@ -423,7 +423,7 @@ document.body.onkeydown = (data) => {
         video.currentTime = 0;
         video.play();
         trackEvent("Easter Egg", "play", "Easter Egg");
-    } else if (data.altKey && data.key === "b") {
+    } else if (data.altKey && data.code === "KeyB") {
         openModal("beta-modal");
     }
     else if (data.key === "Escape") {
diff --git a/js/grades.js b/js/grades.js
index 56979c59..31007ee4 100644
--- a/js/grades.js
+++ b/js/grades.js
@@ -108,7 +108,7 @@ var fetchQueue = [];
 
             // if there's no PERIOD \d string in the course name, match will return null; in that case, use the array [null, i++]
             // OR is lazy, so the ++ won't trigger unnecessarily; upperPeriodSortBound is our array key, and we use it to give a unique index (after all course) to periodless courses
-            coursesByPeriod[Number.parseInt((title.textContent.match(/PERIOD (\d+)/) || [null, upperPeriodSortBound++])[1])] = course;
+            coursesByPeriod[Number.parseInt((title.textContent.match(/[Pp][Ee][Rr][Ii]?[Oo]?[Dd]?\s*(\d+)/) || [null, upperPeriodSortBound++])[1])] = course;
 
             // Fix width of assignment columns
             table.appendChild(createElement("colgroup", [], {}, [
@@ -1563,4 +1563,4 @@ function processNonenteredAssignments(sleep, attempts = 0) {
             });
         }, sleep ? 3000 : 0);
     }
-}
\ No newline at end of file
+}
diff --git a/js/preload.js b/js/preload.js
index 43522893..49f0c5e0 100644
--- a/js/preload.js
+++ b/js/preload.js
@@ -543,10 +543,10 @@ function updateSettings(callback) {
                     undefined,
                     element => element.value
                 ).control,
-                isLAUSD() ? new Setting(
+                new Setting(
                     "orderClasses",
                     "Order Classes",
-                    "[Refresh required] Changes the order of your classes on the grades and mastery pages",
+                    "[Refresh required] Changes the order of your classes on the grades and mastery pages (only works if your course names contain PER N or PERIOD N)",
                     "period",
                     "select",
                     {
@@ -564,7 +564,7 @@ function updateSettings(callback) {
                     value => value,
                     undefined,
                     element => element.value
-                ).control : noControl,
+                ).control,
                 new Setting(
                     "courseIcons",
                     "Override Course Icons",
@@ -1060,4 +1060,4 @@ new Setting(
     value => value,
     undefined,
     element => element.value
-);
\ No newline at end of file
+);
diff --git a/js/theme.js b/js/theme.js
index bc21fdfe..9b5df719 100644
--- a/js/theme.js
+++ b/js/theme.js
@@ -151,7 +151,7 @@ class Theme {
                         hue = theme.color.rainbow.hue.value;
                     }
                     if (theme.color.rainbow.saturation.animate) {
-                        saturation = getComponentValue(theme.color.rainbow.saturaiton.animate, time);
+                        saturation = getComponentValue(theme.color.rainbow.saturation.animate, time);
                     } else {
                         saturation = theme.color.rainbow.saturation.value;
                     }
diff --git a/manifest.json b/manifest.json
index 18b7eea6..b91b01bf 100644
--- a/manifest.json
+++ b/manifest.json
@@ -8,7 +8,7 @@
             "id": "schoology.plus@aopell.me"
         }
     },
-    "version": "6.4",
+    "version": "6.4.1",
     "icons": {
         "128": "imgs/icon@128.png",
         "64": "imgs/icon@64.png",