diff --git a/src/static/css/ccdarktheme.css b/src/static/css/ccdarktheme.css
index e8e7366..0282658 100644
--- a/src/static/css/ccdarktheme.css
+++ b/src/static/css/ccdarktheme.css
@@ -1934,6 +1934,10 @@
   color: rgba(255, 255, 255, .26)!important;
 }
 
+.mdc-button {
+  --gm-colortextbutton-disabled-ink-color: rgba(255, 255, 255, .26);
+}
+
 /* Material icons */
 ec-filter-drawer-item material-icon,
     ec-filter-drawer-item ec-icon,
@@ -2006,7 +2010,8 @@
   color: var(--TWPT-link)!important;
 }
 
-material-dialog .footer material-button[raised]:not([disabled]) {
+material-dialog .footer material-button[raised]:not([disabled]),
+    material-dialog .footer .mdc-button.submit:not(:disabled){
   background-color: var(--TWPT-blue-A100)!important;
   color: #1f1f1f!important;
 }
@@ -2120,11 +2125,14 @@
 }
 
 /* Checkbox input (except for forum checkboxes in the drawer) */
-material-checkbox material-icon:not(ec-forum-drawer-item material-icon, ec-thread-list material-icon),
-    material-checkbox .content:not(ec-forum-drawer-item material-icon, ec-thread-list material-icon) {
+material-checkbox material-icon:not(ec-forum-drawer-item material-icon, ec-thread-list material-icon) {
   color: var(--TWPT-secondary-text)!important;
 }
 
+material-checkbox .content:not(ec-forum-drawer-item material-icon, ec-thread-list material-icon) {
+  color: var(--TWPT-primary-text);
+}
+
 /* .gm-icons is added by the SMEI_GOOGLE_MATERIAL_ICONS experiment. */
 material-checkbox material-icon.filled:not(ec-forum-drawer-item material-icon, ec-thread-list material-icon) {
   color: var(--TWPT-blue-A100)!important;
@@ -2157,6 +2165,11 @@
   color: var(--TWPT-blue-A100)!important;
 }
 
+material-radio {
+  --gm-radio-stroke-color--checked: var(--TWPT-blue-A100);
+  --gm-radio-ink-color: var(--TWPT-blue-A100);
+}
+
 /* Material switch */
 .mdc-switch:not(.mdc-switch--checked) .mdc-switch__track {
   background-color: #7d7d7d!important; /* custom value */
@@ -2281,7 +2294,9 @@
 ec-canned-responses ec-canned-response-row .header.closed:hover,
     ec-canned-responses ec-canned-response-row .header.closed:focus,
     ec-canned-responses ec-canned-response-row .header.closed:hover .toolbar,
-    ec-canned-responses ec-canned-response-row .header.closed:focus .toolbar {
+    ec-canned-responses ec-canned-response-row .header.closed:focus .toolbar,
+    ec-canned-responses ec-canned-response-row material-expansionpanel:not(.expanded) .main-header:focus-within,
+    ec-canned-responses ec-canned-response-row material-expansionpanel:not(.expanded) .main-header:hover {
   background-color: var(--TWPT-active-background)!important;
 }
 
@@ -2312,7 +2327,7 @@
   border-bottom-color: var(--TWPT-subtle-border)!important;
 }
 
-ec-settings .forum-language-container material-button {
+ec-settings .forum-language-container :is(material-button, button) {
   color: var(--TWPT-secondary-text)!important;
 }