7 files changed, 27 insertions, 768 deletions
diff --git a/ext/bg/css/settings2.css b/ext/bg/css/settings2.css
index 89359309..303b71c4 100644
--- a/ext/bg/css/settings2.css
+++ b/ext/bg/css/settings2.css
@@ -23,17 +23,11 @@
     --main-content-padding: 10px;
     --sidebar-size: 200px;
     --preview-sidebar-expanded-width: 400px;
-    --shadow-color: rgba(0, 0, 0, 0.185);
-    --shadow-color-off: rgba(0, 0, 0, 0);
-    --shadow-color-light: rgba(0, 0, 0, 0.085);
     --shadow-vertical: 0 1px 4px 0 var(--shadow-color), 0 2px 2px 0 var(--shadow-color);
     --shadow-vertical-strong: 0 1px 3px 1px var(--shadow-color), 0 2px 4px 3px var(--shadow-color);
     --shadow-vertical-top: 0 -1px 4px 0 var(--shadow-color), 0 -2px 2px 0 var(--shadow-color);
     --shadow-left: -1px 0 4px 0 var(--shadow-color), -2px 0 2px 0 var(--shadow-color);
     --shadow-right: 1px 0 4px 0 var(--shadow-color), 2px 0 2px 0 var(--shadow-color);
-    --animation-duration: 0s;
-    --animation-duration2: calc(var(--animation-duration) * 2);
-    --animation-duration-half: calc(var(--animation-duration) / 2);
     --settings-group-horizontal-margin: 0;
     --settings-group-inner-vertical-margin: 0.75em;
     --settings-group-inner-vertical-padding: 0.85em;
@@ -46,28 +40,17 @@
     --settings-group-wrap: nowrap;
     --show-preview-label-height: 40px;
 
-    --font-size-default-no-units: 14;
-    --font-size-default: calc(1px * var(--font-size-default-no-units));
+    --font-size-no-units: 14;
+    --font-size: calc(1px * var(--font-size-no-units));
     --font-size-small: 12px;
-    --line-height-default: calc(20 / var(--font-size-default-no-units));
+    --line-height-default: calc(20 / var(--font-size-no-units));
     --outline-item-height: 40px;
     --outline-item-icon-size: 32px;
-    --input-width: 100px;
-    --input-width-large: 200px;
     --input-short: 80px;
-    --input-height: 32px;
     --input-height-short: 24px;
     --input-half-width: calc(var(--input-width-large) / 2 - var(--padding) / 2);
-    --thin-border-size: 1px;
-    --icon-button-size: 36px;
     --fab-button-size: 56px;
     --fab-button-padding: 16px;
-    --checkbox-size: 16px;
-    --toggle-size: 16px;
-    --radio-size: 20px;
-    --button-shadow-params: 0 1px 2px 0;
-    --material-arrow-dimension1: 5px;
-    --material-arrow-dimension2: 10px;
     --modal-width: 600px;
     --modal-height: 400px;
     --modal-width-small: 400px;
@@ -78,13 +61,6 @@
     --menu-item-hover-color: #bbbbbb;
     --menu-item-active-color: #aaaaaa;
 
-    --text-color-default: #222222;
-    --background-color: #f8f9fa;
-    --background-color-light: #ffffff;
-    --input-background-color: #f2f2f2;
-    --input-background-color-dark: #dddddd;
-    --input-background-color-darker: #cccccc;
-    --input-outline-color: var(--text-color-default);
     --link-color: var(--accent-color);
     --link-color-hover: var(--accent-color-dark);
     --text-color-light: #666666;
@@ -93,52 +69,24 @@
     --separator-color2: #eeeeee;
     --outline-item-background-color: rgba(13, 13, 13, 0.0);
     --outline-item-background-color-hover: rgba(13, 13, 13, 0.15);
-    --button-text-color: #ffffff;
-    --button-border-color: var(--separator-color1);
-    --accent-color: #1a73e8;
-    --accent-color-light: #4a91ed;
-    --accent-color-lighter: #8db9f4;
-    --accent-color-lightest: #a7c9f6;
-    --accent-color-dark: #1060c0;
-    --accent-color-transparent0: rgba(28, 116, 233, 0);
-    --accent-color-transparent5: rgba(28, 116, 233, 0.05);
-    --accent-color-transparent25: rgba(28, 116, 233, 0.25);
-    --danger-color: #c83c28;
-    --danger-color-light: #dd6755;
-    --danger-color-lighter: #e68d7f;
-    --danger-color-lightest: #eeb3aa;
-    --danger-color-transparent0: rgba(200, 60, 40, 0);
-    --danger-color-transparent5: rgba(200, 60, 40, 0.05);
-    --danger-color-transparent25: rgba(200, 60, 40, 0.25);
     --warning-color: #96751c;
     --warning-color-light: hsl(44, 80%, 65%);
-    --disabled-color: #aaaaaa;
-    --disabled-color-light: #dddddd;
-    --disabled-color-lighter: #eeeeee;
     --dim-background-color: rgba(0, 0, 0, 0.5);
-    --checkbox-checked: var(--accent-color);
-    --checkbox-unchecked: #666666;
-    --checkbox-check-color: var(--background-color-light);
-    --checkbox-disabled: #aaaaaa;
-    --toggle-track-color: #cccccc;
-    --toggle-knob-color: var(--background-color-light);
-    --selectable-indicator-color: rgba(160, 160, 160, 0.25);
     --content-dimmer-color: rgba(0, 0, 0, 0.1);
-    --button-icon-color: #333333;
-    --button-icon-color-light: #666666;
 
     --modal-padding-horizontal: 1em;
     --modal-padding-vertical: 0.625em;
     --modal-padding-vertical-half: calc(var(--modal-padding-vertical) * 0.5);
     --modal-button-spacing: 0.625em;
-
-    --text-input-border-radius: 0.25em;
-    --textarea-line-height: 1.25em;
-    --textarea-padding: 0.5em;
 }
-:root[data-loaded=true] {
-    --animation-duration: 0.125s;
+:root:not([data-loaded=true]) {
+    --animation-duration: 0s;
 }
+:root[data-theme=dark] {
+    --separator-color1: #333333;
+    --separator-color2: #222222;
+}
+
 
 @media (max-width: 700px) {
     :root {
@@ -167,9 +115,9 @@ body {
     margin: 0;
     padding: 0;
     border: none;
-    font-size: var(--font-size-default);
+    font-size: var(--font-size);
     font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-    color: var(--text-color-default);
+    color: var(--text-color);
     line-height: var(--line-height-default);
     height: 100%;
     overflow: hidden;
@@ -278,48 +226,6 @@ h3 {
 }
 
 
-/* Icons */
-.icon {
-    --icon-image: none;
-    --icon-size: contain;
-    -webkit-mask-repeat: no-repeat;
-    -webkit-mask-position: center center;
-    -webkit-mask-mode: alpha;
-    -webkit-mask-size: var(--icon-size);
-    -webkit-mask-image: var(--icon-image);
-    mask-repeat: no-repeat;
-    mask-position: center center;
-    mask-mode: alpha;
-    mask-size: var(--icon-size);
-    mask-image: var(--icon-image);
-}
-.icon[data-icon=profile]                 { --icon-image: url(/mixed/img/profile.svg); }
-.icon[data-icon=cog]                     { --icon-image: url(/mixed/img/cog.svg); }
-.icon[data-icon=palette]                 { --icon-image: url(/mixed/img/palette.svg); }
-.icon[data-icon=popup]                   { --icon-image: url(/mixed/img/popup.svg); }
-.icon[data-icon=speaker]                 { --icon-image: url(/mixed/img/speaker.svg); }
-.icon[data-icon=scanning]                { --icon-image: url(/mixed/img/scanning.svg); }
-.icon[data-icon=text-parsing]            { --icon-image: url(/mixed/img/text-parsing.svg); }
-.icon[data-icon=translation]             { --icon-image: url(/mixed/img/translation.svg); }
-.icon[data-icon=book]                    { --icon-image: url(/mixed/img/book.svg); }
-.icon[data-icon=note-card]               { --icon-image: url(/mixed/img/note-card.svg); }
-.icon[data-icon=keyboard]                { --icon-image: url(/mixed/img/keyboard.svg); }
-.icon[data-icon=backup]                  { --icon-image: url(/mixed/img/backup.svg); }
-.icon[data-icon=lock]                    { --icon-image: url(/mixed/img/lock.svg); }
-.icon[data-icon=question-mark]           { --icon-image: url(/mixed/img/question-mark.svg); }
-.icon[data-icon=popup-size]              { --icon-image: url(/mixed/img/popup-size.svg); }
-.icon[data-icon=hamburger-menu]          { --icon-image: url(/mixed/img/hamburger-menu.svg); }
-.icon[data-icon=kebab-menu]              { --icon-image: url(/mixed/img/kebab-menu.svg); }
-.icon[data-icon=mouse]                   { --icon-image: url(/mixed/img/mouse.svg); }
-.icon[data-icon=material-down-arrow]     { --icon-image: url(/mixed/img/material-down-arrow.svg); }
-.icon[data-icon=material-right-arrow]    { --icon-image: url(/mixed/img/material-right-arrow.svg); }
-.icon[data-icon=exclamation-point-short] { --icon-image: url(/mixed/img/exclamation-point-short.svg); }
-.icon[data-icon=magnifying-glass]        { --icon-image: url(/mixed/img/magnifying-glass.svg); }
-.icon[data-icon=collapse]                { --icon-image: url(/mixed/img/collapse.svg); }
-.icon[data-icon=expand]                  { --icon-image: url(/mixed/img/expand.svg); }
-.icon[data-icon=window]                  { --icon-image: url(/mixed/img/window.svg); }
-
-
 /* Content layout */
 .content-outer {
     display: flex;
@@ -456,7 +362,7 @@ h3 {
     visibility: hidden;
 }
 .sidebar-top-link:not(:hover) {
-    color: var(--text-color-default);
+    color: var(--text-color);
 }
 .sidebar-top-icon {
     display: inline-block;
@@ -487,7 +393,7 @@ h3 {
 .outline-item,
 .outline-item:hover {
     text-decoration: none;
-    color: var(--text-color-default);
+    color: var(--text-color);
 }
 .outline-item:hover {
     background-color: var(--outline-item-background-color-hover);
@@ -699,7 +605,7 @@ h3 {
 .settings-item.settings-item-button,
 a.settings-item.settings-item-button {
     cursor: pointer;
-    color: var(--text-color-default);
+    color: var(--text-color);
     text-decoration: none;
     background-color: transparent;
     transition: background-color var(--animation-duration) ease-in-out;
@@ -779,659 +685,6 @@ select.short-height {
 }
 
 
-/* Material design checkbox */
-label.checkbox {
-    cursor: default;
-}
-.checkbox {
-    font-size: var(--checkbox-size);
-    display: inline-block;
-}
-.checkbox>input[type=checkbox] {
-    opacity: 0;
-    width: 0;
-    height: 0;
-    display: block;
-    margin: 0;
-    padding: 0;
-    border: none;
-    appearance: none;
-    -moz-appearance: none;
-    -webkit-appearance: none;
-}
-.checkbox-body {
-    display: block;
-    cursor: pointer;
-    width: 1em;
-    height: 1em;
-    position: relative;
-    cursor: pointer;
-}
-.checkbox>input[type=checkbox]:disabled+.checkbox-body {
-    cursor: default;
-}
-.checkbox-fill,
-.checkbox-border,
-.checkbox-check {
-    display: block;
-    position: absolute;
-    left: 0;
-    top: 0;
-    right: 0;
-    bottom: 0;
-    mask-repeat: no-repeat;
-    mask-position: center center;
-    mask-mode: alpha;
-    mask-size: contain;
-    -webkit-mask-repeat: no-repeat;
-    -webkit-mask-position: center center;
-    -webkit-mask-mode: alpha;
-    -webkit-mask-size: contain;
-    transition: opacity var(--animation-duration) linear, background-color var(--animation-duration) linear;
-}
-.checkbox-fill {
-    mask-image: url(/mixed/img/checkbox-fill.svg);
-    -webkit-mask-image: url(/mixed/img/checkbox-fill.svg);
-    background-color: var(--checkbox-unchecked);
-    opacity: 0;
-}
-.checkbox-border {
-    mask-image: url(/mixed/img/checkbox-border.svg);
-    -webkit-mask-image: url(/mixed/img/checkbox-border.svg);
-    background-color: var(--checkbox-unchecked);
-    opacity: 1;
-}
-.checkbox-check {
-    mask-image: url(/mixed/img/checkbox-check.svg);
-    -webkit-mask-image: url(/mixed/img/checkbox-check.svg);
-    background-color: var(--checkbox-check-color);
-    opacity: 0;
-}
-.checkbox>input[type=checkbox]:checked+.checkbox-body>.checkbox-fill {
-    background-color: var(--checkbox-checked);
-    opacity: 1;
-}
-.checkbox>input[type=checkbox]:checked+.checkbox-body>.checkbox-border {
-    background-color: var(--checkbox-checked);
-    opacity: 1;
-}
-.checkbox>input[type=checkbox]:checked+.checkbox-body>.checkbox-check {
-    background-color: var(--checkbox-check-color);
-    opacity: 1;
-}
-.checkbox>input[type=checkbox]:disabled+.checkbox-body>.checkbox-fill {
-    opacity: 0;
-}
-.checkbox>input[type=checkbox]:disabled+.checkbox-body>.checkbox-border {
-    background-color: var(--checkbox-disabled);
-    opacity: 1;
-}
-.checkbox>input[type=checkbox]:disabled+.checkbox-body>.checkbox-check {
-    background-color: var(--checkbox-disabled);
-}
-
-
-/* Material design toggle switch */
-label.toggle {
-    cursor: default;
-}
-.toggle {
-    font-size: var(--toggle-size);
-    display: inline-block;
-}
-.toggle>input[type=checkbox] {
-    opacity: 0;
-    width: 0;
-    height: 0;
-    display: block;
-    margin: 0;
-    padding: 0;
-    border: none;
-    appearance: none;
-    -moz-appearance: none;
-    -webkit-appearance: none;
-}
-.toggle-body {
-    display: block;
-    cursor: pointer;
-    width: 2em;
-    height: 1em;
-    position: relative;
-}
-.toggle-track {
-    display: block;
-    position: absolute;
-    left: 0.125em;
-    right: 0.125em;
-    top: 0.125em;
-    bottom: 0.125em;
-    background-color: var(--toggle-track-color);
-    border-radius: 0.4375em;
-    transition: background-color var(--animation-duration) ease-in-out;
-}
-.toggle-knob {
-    display: block;
-    position: absolute;
-    left: 0;
-    top: 0;
-    width: 1em;
-    height: 1em;
-    background-color: var(--toggle-knob-color);
-    border-radius: 0.5em;
-    box-shadow: var(--shadow-vertical);
-    transition: transform var(--animation-duration) ease-in-out,
-                background-color var(--animation-duration) ease-in-out;
-}
-.toggle-body>.toggle-knob::after {
-    position: absolute;
-    display: block;
-    content: "";
-    left: -0.75em;
-    top: -0.75em;
-    right: -0.75em;
-    bottom: -0.75em;
-    border-radius: 2.5em;
-    background-color: var(--selectable-indicator-color);
-    pointer-events: none;
-    transform: scale(0);
-    opacity: 0;
-    visibility: hidden;
-    transition: transform 0s ease-in-out var(--animation-duration2),
-                background-color var(--animation-duration2) ease-in-out,
-                opacity var(--animation-duration2) ease-in-out,
-                visibility 0s ease-in-out var(--animation-duration2);
-}
-.toggle>input[type=checkbox]:focus:not(:disabled)+.toggle-body>.toggle-knob::after,
-.toggle:active>input[type=checkbox]:not(:disabled)+.toggle-body>.toggle-knob::after {
-    transform: scale(1);
-    opacity: 1;
-    visibility: visible;
-    transition: transform var(--animation-duration2) ease-in-out,
-                background-color var(--animation-duration2) ease-in-out,
-                opacity var(--animation-duration2) ease-in-out,
-                visibility var(--animation-duration2) ease-in-out;
-}
-.toggle>input[type=checkbox]:focus+.toggle-body>.toggle-knob::after {
-    opacity: 0.5;
-}
-.toggle:active>input[type=checkbox]:focus+.toggle-body>.toggle-knob::after {
-    opacity: 1;
-}
-.toggle>input[type=checkbox]:checked+.toggle-body>.toggle-knob {
-    transform: translateX(1em);
-}
-.toggle>input[type=checkbox]:checked:not(:disabled)+.toggle-body>.toggle-track {
-    background-color: var(--accent-color-lighter);
-}
-.toggle>input[type=checkbox]:checked:not(:disabled)+.toggle-body>.toggle-knob {
-    background-color: var(--accent-color);
-}
-.toggle>input[type=checkbox]:focus:checked:not(:disabled)+.toggle-body>.toggle-knob::after,
-.toggle:active>input[type=checkbox]:checked:not(:disabled)+.toggle-body>.toggle-knob::after {
-    background-color: var(--accent-color-transparent25);
-}
-.toggle>input[type=checkbox]:disabled+.toggle-body {
-    cursor: default;
-}
-.toggle>input[type=checkbox]:disabled+.toggle-body>.toggle-track {
-    background-color: var(--disabled-color-light);
-}
-.toggle>input[type=checkbox]:disabled+.toggle-body>.toggle-knob {
-    background-color: var(--disabled-color-lighter);
-}
-
-
-/* Radio button */
-label.radio {
-    cursor: default;
-}
-.radio {
-    display: inline-block;
-    vertical-align: middle;
-}
-.radio>input[type=radio] {
-    opacity: 0;
-    width: 0;
-    height: 0;
-    display: block;
-    margin: 0;
-    padding: 0;
-    border: none;
-    cursor: default;
-    appearance: none;
-    -moz-appearance: none;
-    -webkit-appearance: none;
-}
-.radio>input[type=radio]:not(:disabled)+.radio-body {
-    cursor: pointer;
-}
-.radio-body {
-    display: block;
-    position: relative;
-    width: var(--radio-size);
-    height: var(--radio-size);
-}
-.radio-border,
-.radio-dot {
-    display: block;
-    position: absolute;
-    left: 0;
-    top: 0;
-    right: 0;
-    bottom: 0;
-    background-color: var(--accent-color);
-    mask-repeat: no-repeat;
-    mask-position: center center;
-    mask-mode: alpha;
-    mask-size: var(--radio-size) var(--radio-size);
-    -webkit-mask-repeat: no-repeat;
-    -webkit-mask-position: center center;
-    -webkit-mask-mode: alpha;
-    -webkit-mask-size: var(--radio-size) var(--radio-size);
-}
-.radio-border {
-    mask-image: url(/mixed/img/radio-button.svg);
-    -webkit-mask-image: url(/mixed/img/radio-button.svg);
-}
-.radio-dot {
-    mask-image: url(/mixed/img/radio-button-dot.svg);
-    -webkit-mask-image: url(/mixed/img/radio-button-dot.svg);
-    opacity: 1;
-    transform: none;
-    transition: transform var(--animation-duration2) ease-in-out,
-                opacity var(--animation-duration2) ease-in-out,
-                visibility var(--animation-duration2) ease-in-out;
-}
-.radio>input[type=radio]:disabled+.radio-body>.radio-border,
-.radio>input[type=radio]:disabled+.radio-body>.radio-dot {
-    background-color: var(--disabled-color);
-}
-.radio>input[type=radio]:not(:checked)+.radio-body>.radio-dot {
-    opacity: 0;
-    transform: scale(0);
-    transition: transform 0s ease-in-out var(--animation-duration2),
-                opacity var(--animation-duration2) ease-in-out,
-                visibility 0s ease-in-out var(--animation-duration2);
-}
-.radio-body::after {
-    position: absolute;
-    display: block;
-    content: "";
-    left: -0.75em;
-    top: -0.75em;
-    right: -0.75em;
-    bottom: -0.75em;
-    border-radius: 2.5em;
-    background-color: var(--selectable-indicator-color);
-    pointer-events: none;
-    transform: scale(0);
-    opacity: 0;
-    visibility: hidden;
-    transition: transform 0s ease-in-out var(--animation-duration2),
-                background-color var(--animation-duration2) ease-in-out,
-                opacity var(--animation-duration2) ease-in-out,
-                visibility 0s ease-in-out var(--animation-duration2);
-}
-.radio>input[type=radio]:focus:not(:disabled)+.radio-body::after,
-.radio:active>input[type=radio]:not(:disabled)+.radio-body::after {
-    transform: scale(1);
-    opacity: 1;
-    visibility: visible;
-    transition: transform var(--animation-duration2) ease-in-out,
-                background-color var(--animation-duration2) ease-in-out,
-                opacity var(--animation-duration2) ease-in-out,
-                visibility var(--animation-duration2) ease-in-out;
-}
-.radio>input[type=radio]:focus+.radio-body::after {
-    opacity: 0.5;
-}
-.radio:active>input[type=radio]:focus+.radio-body::after {
-    opacity: 1;
-}
-.radio-label {
-    cursor: pointer;
-    white-space: nowrap;
-}
-.radio-label>.radio {
-    vertical-align: middle;
-}
-.radio-label>.radio-label-text {
-    display: inline-block;
-    margin-left: 0.5em;
-    vertical-align: middle;
-    white-space: normal;
-}
-
-
-/* Material design select */
-select {
-    width: var(--input-width-large);
-    height: var(--input-height);
-    line-height: var(--input-height);
-    border: 0;
-    border-radius: 0.25em;
-    box-sizing: border-box;
-    padding: 0 0.5em;
-    appearance: none;
-    -moz-appearance: none;
-    -webkit-appearance: none;
-    background-image: url(/mixed/img/material-down-arrow.svg);
-    background-repeat: no-repeat;
-    background-position: right var(--padding) center;
-    background-color: var(--input-background-color);
-    background-size: var(--material-arrow-dimension2) var(--material-arrow-dimension1);
-    cursor: pointer;
-}
-select::-ms-expand {
-    display: none;
-}
-
-
-/* Material design inputs */
-input[type=text],
-input[type=number] {
-    width: var(--input-width);
-    height: var(--input-height);
-    line-height: var(--input-height);
-    background-color: var(--input-background-color);
-    border: none;
-    border-radius: var(--text-input-border-radius);
-    box-sizing: border-box;
-    padding: 0 0.5em;
-    appearance: textfield;
-    -moz-appearance: textfield;
-    -webkit-appearance: textfield;
-}
-input[type=number]::-webkit-inner-spin-button,
-input[type=number]::-webkit-outer-spin-button {
-    appearance: none;
-    -moz-appearance: none;
-    -webkit-appearance: none;
-    margin: 0;
-}
-input[type=text] {
-    width: var(--input-width-large);
-}
-textarea {
-    box-sizing: border-box;
-    padding: var(--textarea-padding);
-    font-family: 'Courier New', Courier, monospace;
-    background-color: var(--input-background-color);
-    border-radius: var(--text-input-border-radius);
-    line-height: var(--textarea-line-height);
-    border: 1px solid var(--input-background-color);
-}
-select:invalid,
-textarea:invalid,
-input[type=text]:invalid,
-input[type=number]:invalid,
-select[data-invalid=true],
-textarea[data-invalid=true],
-input[type=text][data-invalid=true],
-input[type=number][data-invalid=true] {
-    border: var(--thin-border-size) solid var(--danger-color);
-}
-select,
-textarea,
-input[type=text],
-input[type=number] {
-    box-shadow: none;
-    transition: box-shadow var(--animation-duration-half) linear;
-}
-select:focus,
-textarea:focus,
-input[type=text]:focus,
-input[type=number]:focus {
-    box-shadow: 0 0 0 2px var(--input-outline-color);
-    outline: none;
-}
-select:invalid:focus,
-textarea:invalid:focus,
-input[type=text]:invalid:focus,
-input[type=number]:invalid:focus,
-select[data-invalid=true]:focus,
-textarea[data-invalid=true]:focus,
-input[type=text][data-invalid=true]:focus,
-input[type=number][data-invalid=true]:focus {
-    box-shadow: 0 0 0 2px var(--danger-color);
-    outline: none;
-}
-input[type=text].input-with-suffix-button,
-input[type=number].input-with-suffix-button {
-    flex: 1 1 auto;
-    border-top-right-radius: 0;
-    border-bottom-right-radius: 0;
-    border-right-style: none;
-    z-index: 1;
-}
-
-
-/* Material design button */
-button {
-    border: var(--thin-border-size) solid transparent;
-    border-radius: 0.3em;
-    padding: 0.5em 1em;
-    font-weight: bold;
-    font-size: inherit;
-    font-family: inherit;
-    cursor: pointer;
-    background-color: transparent;
-    box-shadow: var(--button-shadow-params) var(--shadow-color-off);
-    transition: background-color var(--animation-duration) ease-in, box-shadow var(--animation-duration) ease-in, border-color var(--animation-duration) ease-in;
-    -webkit-tap-highlight-color: transparent;
-}
-button:focus {
-    outline: none;
-}
-button:hover {
-    transition: background-color var(--animation-duration) ease-out, box-shadow var(--animation-duration) ease-out, border-color var(--animation-duration) ease-out;
-}
-button:hover:not(:disabled) {
-    box-shadow: var(--button-shadow-params) var(--shadow-color-light);
-}
-button:active:not(:disabled) {
-    box-shadow: var(--button-shadow-params) var(--shadow-color);
-}
-
-/* Standard button */
-button:not(:disabled) {
-    color: var(--button-text-color);
-    border-color: var(--accent-color);
-    background-color: var(--accent-color);
-}
-button:hover:not(:disabled) {
-    background-color: var(--accent-color-light);
-    border-color: var(--accent-color-light);
-}
-button:focus:not(:disabled) {
-    background-color: var(--accent-color-light);
-}
-button:active:not(:disabled) {
-    border-color: var(--accent-color-lighter);
-    background-color: var(--accent-color-lighter);
-}
-
-/* Standard danger button */
-button.danger:not(:disabled) {
-    color: var(--button-text-color);
-    border-color: var(--danger-color);
-    background-color: var(--danger-color);
-}
-button.danger:hover:not(:disabled) {
-    background-color: var(--danger-color-light);
-    border-color: var(--danger-color-light);
-}
-button.danger:focus:not(:disabled) {
-    background-color: var(--danger-color-light);
-}
-button.danger:active:not(:disabled) {
-    border-color: var(--danger-color-lighter);
-    background-color: var(--danger-color-lighter);
-}
-
-/* Low emphasis button */
-button.low-emphasis:not(:disabled) {
-    color: var(--accent-color);
-    border-color: var(--button-border-color);
-    background-color: var(--accent-color-transparent0);
-}
-button.low-emphasis:hover:not(:disabled) {
-    background-color: var(--accent-color-transparent5);
-    border-color: var(--accent-color-light);
-}
-button.low-emphasis:focus:not(:disabled) {
-    border-color: var(--accent-color);
-}
-button.low-emphasis:active:not(:disabled) {
-    border-color: var(--accent-color);
-    background-color: var(--accent-color-transparent25);
-}
-
-/* Low emphasis danger button */
-button.low-emphasis.danger:not(:disabled) {
-    color: var(--danger-color);
-    border-color: var(--button-border-color);
-    background-color: var(--danger-color-transparent0);
-}
-button.low-emphasis.danger:hover:not(:disabled) {
-    border-color: var(--danger-color-light);
-    background-color: var(--danger-color-transparent5);
-}
-button.low-emphasis.danger:focus:not(:disabled) {
-    border-color: var(--danger-color);
-}
-button.low-emphasis.danger:active:not(:disabled) {
-    border-color: var(--danger-color);
-    background-color: var(--danger-color-transparent25);
-}
-
-/* Disabled buttons */
-button:disabled {
-    color: var(--button-text-color);
-    border-color: var(--disabled-color);
-    background-color: var(--disabled-color);
-    cursor: default;
-}
-button.low-emphasis:disabled {
-    color: var(--disabled-color);
-    border-color: var(--disabled-color);
-    background-color: transparent;
-}
-
-/* Input suffix button */
-button.input-suffix-button {
-    border-top-left-radius: 0;
-    border-bottom-left-radius: 0;
-    border: none;
-    height: var(--input-height);
-    line-height: var(--input-height);
-    background-color: var(--input-background-color);
-    box-sizing: border-box;
-    padding: 0 0.5em;
-    border-color: transparent;
-}
-button.input-suffix-button.input-suffix-icon-button {
-    width: 2.125em;
-    position: relative;
-}
-button.input-suffix-button.input-suffix-icon-button:hover,
-button.input-suffix-button.input-suffix-icon-button:focus {
-    background-color: var(--input-background-color-dark);
-}
-button.input-suffix-button.input-suffix-icon-button:active {
-    background-color: var(--input-background-color-darker);
-}
-input[type=text]:invalid+button.input-suffix-button,
-input[type=number]:invalid+button.input-suffix-button,
-input[type=text][data-invalid=true]+button.input-suffix-button,
-input[type=number][data-invalid=true]+button.input-suffix-button {
-    border: var(--thin-border-size) solid var(--danger-color);
-    border-left-style: none;
-}
-
-
-/* Material design icon button */
-button.icon-button {
-    display: inline-block;
-    vertical-align: middle;
-    border: none;
-    margin: 0;
-    padding: 0;
-    box-sizing: content-box;
-    font-size: inherit;
-    cursor: pointer;
-    background-color: transparent;
-}
-button.icon-button>.icon-button-inner {
-    display: block;
-    width: var(--icon-button-size);
-    height: var(--icon-button-size);
-    position: relative;
-}
-button.icon-button:focus {
-    outline: none;
-}
-button.icon-button,
-button.icon-button:hover,
-button.icon-button:focus,
-button.icon-button:active {
-    background-color: transparent;
-    box-shadow: none;
-}
-.icon-button>.icon-button-inner::after {
-    position: absolute;
-    display: block;
-    content: "";
-    left: 0;
-    top: 0;
-    right: 0;
-    bottom: 0;
-    border-radius: 50%;
-    background-color: var(--selectable-indicator-color);
-    pointer-events: none;
-    transform: scale(0);
-    opacity: 0;
-    visibility: hidden;
-    transition: transform 0s ease-in-out var(--animation-duration2),
-                background-color var(--animation-duration2) ease-in-out,
-                opacity var(--animation-duration2) ease-in-out,
-                visibility 0s ease-in-out var(--animation-duration2);
-}
-.icon-button:focus>.icon-button-inner::after {
-    transform: scale(1);
-    opacity: 1;
-    visibility: visible;
-    transition: transform var(--animation-duration2) ease-in-out,
-                background-color var(--animation-duration2) ease-in-out,
-                opacity var(--animation-duration2) ease-in-out,
-                visibility var(--animation-duration2) ease-in-out;
-}
-.icon-button>.icon-button-inner>.icon {
-    display: block;
-    position: absolute;
-    left: 0;
-    top: 0;
-    right: 0;
-    bottom: 0;
-    background-color: var(--button-icon-color);
-    --icon-size: 16px 16px;
-}
-.icon-button>.icon-button-inner>.icon.icon-button-icon-light {
-    background-color: var(--button-icon-color-light);
-}
-.icon-button>.icon-button-inner>.icon[data-icon=material-right-arrow] { --icon-size: var(--material-arrow-dimension1) var(--material-arrow-dimension2); }
-.icon-button>.icon-button-inner>.icon[data-icon=material-down-arrow] { --icon-size: var(--material-arrow-dimension2) var(--material-arrow-dimension1); }
-
-.input-height-icon-button-container {
-    height: var(--input-height);
-    box-sizing: border-box;
-}
-.input-height-icon-button-container>.icon-button {
-    position: relative;
-    top: calc((var(--input-height) - var(--icon-button-size)) * 0.5);
-}
-
-
 /* Modal */
 .modal-container {
     position: fixed;
@@ -1696,7 +949,7 @@ button.popup-menu-item {
     padding: 0.625em 1.5em;
     border-radius: 0;
     background-color: transparent;
-    color: var(--text-color-default);
+    color: var(--text-color);
     border: none;
     width: 100%;
     text-align: left;
@@ -2220,7 +1473,7 @@ select.profile-condition-operator {
 .anki-card-field-name-container[data-invalid=true],
 .anki-card-field-name-container[data-order-matches=false][data-index='0'] {
     background-color: var(--danger-color-lightest);
-    border-radius: var(--text-input-border-radius);
+    border-radius: var(--input-border-radius);
 }
 .anki-card-field-name {
     flex: 1 1 auto;
@@ -2336,7 +1589,7 @@ code.anki-field-marker {
     font-family: 'Courier New', Courier, monospace;
     background-color: var(--input-background-color);
     border: none;
-    border-radius: var(--text-input-border-radius);
+    border-radius: var(--input-border-radius);
     line-height: var(--textarea-line-height);
     overflow: auto;
     white-space: pre;
diff --git a/ext/bg/info.html b/ext/bg/info.html
index cc69ed1c..07edcbcf 100644
--- a/ext/bg/info.html
+++ b/ext/bg/info.html
@@ -11,6 +11,7 @@
     <link rel="icon" type="image/png" href="/mixed/img/icon48.png" sizes="48x48">
     <link rel="icon" type="image/png" href="/mixed/img/icon64.png" sizes="64x64">
     <link rel="icon" type="image/png" href="/mixed/img/icon128.png" sizes="128x128">
+    <link rel="stylesheet" type="text/css" href="/mixed/css/material.css">
     <link rel="stylesheet" type="text/css" href="/bg/css/settings2.css">
 </head>
 <body>
diff --git a/ext/bg/legal.html b/ext/bg/legal.html
index 7aca19bc..9e63c0f0 100644
--- a/ext/bg/legal.html
+++ b/ext/bg/legal.html
@@ -11,6 +11,7 @@
     <link rel="icon" type="image/png" href="/mixed/img/icon48.png" sizes="48x48">
     <link rel="icon" type="image/png" href="/mixed/img/icon64.png" sizes="64x64">
     <link rel="icon" type="image/png" href="/mixed/img/icon128.png" sizes="128x128">
+    <link rel="stylesheet" type="text/css" href="/mixed/css/material.css">
     <link rel="stylesheet" type="text/css" href="/bg/css/settings2.css">
     <style>
 pre {
diff --git a/ext/bg/permissions.html b/ext/bg/permissions.html
index 596f038a..52bc084e 100644
--- a/ext/bg/permissions.html
+++ b/ext/bg/permissions.html
@@ -11,6 +11,7 @@
     <link rel="icon" type="image/png" href="/mixed/img/icon48.png" sizes="48x48">
     <link rel="icon" type="image/png" href="/mixed/img/icon64.png" sizes="64x64">
     <link rel="icon" type="image/png" href="/mixed/img/icon128.png" sizes="128x128">
+    <link rel="stylesheet" type="text/css" href="/mixed/css/material.css">
     <link rel="stylesheet" type="text/css" href="/bg/css/settings2.css">
 </head>
 <body>
diff --git a/ext/bg/search.html b/ext/bg/search.html
index f0333ab2..43f9f7eb 100644
--- a/ext/bg/search.html
+++ b/ext/bg/search.html
@@ -11,6 +11,7 @@
     <link rel="icon" type="image/png" href="/mixed/img/icon48.png" sizes="48x48">
     <link rel="icon" type="image/png" href="/mixed/img/icon64.png" sizes="64x64">
     <link rel="icon" type="image/png" href="/mixed/img/icon128.png" sizes="128x128">
+    <link rel="stylesheet" type="text/css" href="/mixed/css/material.css">
     <link rel="stylesheet" type="text/css" href="/mixed/css/display.css">
     <link rel="stylesheet" type="text/css" href="/mixed/css/search.css">
 </head>
diff --git a/ext/bg/settings2.html b/ext/bg/settings2.html
index 0a8a98c2..0097fac1 100644
--- a/ext/bg/settings2.html
+++ b/ext/bg/settings2.html
@@ -11,6 +11,7 @@
     <link rel="icon" type="image/png" href="/mixed/img/icon48.png" sizes="48x48">
     <link rel="icon" type="image/png" href="/mixed/img/icon64.png" sizes="64x64">
     <link rel="icon" type="image/png" href="/mixed/img/icon128.png" sizes="128x128">
+    <link rel="stylesheet" type="text/css" href="/mixed/css/material.css">
     <link rel="stylesheet" type="text/css" href="/bg/css/settings2.css">
 </head>
 <body>
diff --git a/ext/bg/welcome.html b/ext/bg/welcome.html
index 98a3167a..86c8ee83 100644
--- a/ext/bg/welcome.html
+++ b/ext/bg/welcome.html
@@ -11,13 +11,14 @@
     <link rel="icon" type="image/png" href="/mixed/img/icon48.png" sizes="48x48">
     <link rel="icon" type="image/png" href="/mixed/img/icon64.png" sizes="64x64">
     <link rel="icon" type="image/png" href="/mixed/img/icon128.png" sizes="128x128">
+    <link rel="stylesheet" type="text/css" href="/mixed/css/material.css">
     <link rel="stylesheet" type="text/css" href="/bg/css/settings2.css">
     <style>
 .inline-icon {
     position: relative;
-    width: calc(1em * (16 / var(--font-size-default-no-units)));
-    height: calc(1em * (16 / var(--font-size-default-no-units)));
-    top: calc(1em * (3 / var(--font-size-default-no-units)));
+    width: calc(1em * (16 / var(--font-size-no-units)));
+    height: calc(1em * (16 / var(--font-size-no-units)));
+    top: calc(1em * (3 / var(--font-size-no-units)));
 }
     </style>
 </head>