diff --git a/src/common/themes.css b/src/common/themes.css
index e16f198..b7bfc69 100644
--- a/src/common/themes.css
+++ b/src/common/themes.css
@@ -5,8 +5,8 @@
  */
 
 .__NoScript_Theme__ {
-  --focus-color-dark:  #8007;
-  --focus-color-light: #f787;
+  --focus-color-dark: #c35a;
+  --focus-color-light: #f68a;
 
   --img-noscript-options: url(/img/noscript-options.png);
   --img-ui-revoke-temp: url(/img/ui-revoke-temp64.png);
@@ -37,15 +37,15 @@
   --bg-preset-color: var(--form-color2);
   --bg-odd-row: var(--bg-color2);
   --bg-even-row: var(--tab-color1);
-  --bg-focused-row: linear-gradient(to bottom, var(--focus-color) 0, transparent 20%, transparent 80%, var(--focus-color) 100%);
+  --bg-focused-row: linear-gradient(to bottom, var(--focus-color) 0, transparent 10%, transparent 90%, var(--focus-color) 100%);
   --border-row-sep: none;
 }
 
 
 .__NoScript_Theme__.vintage {
 
-  --focus-color-light: #8cf8 !important;
-  --focus-color-dark: #2488 !important;
+  --focus-color-dark: #35Ca !important;
+  --focus-color-light: #8cfa !important;
 
   --img-noscript-options: url(/img/vintage/noscript-options.png);
   --img-ui-revoke-temp: url(/img/vintage/ui-revoke-temp64.png);
diff --git a/src/ui/common.css b/src/ui/common.css
index 970cbd5..c9a65b5 100644
--- a/src/ui/common.css
+++ b/src/ui/common.css
@@ -137,7 +137,7 @@ input:disabled, button:disabled, select:disabled {
   cursor: not-allowed !important;
 }
 
-:focus-visible, :is(.cap, .switch):focus-within {
+:focus-visible, :is(.cap.needed, .switch):focus-within {
   outline: 0;
   filter:
     drop-shadow(1px 1px 1px var(--focus-color))
@@ -146,6 +146,10 @@ input:disabled, button:disabled, select:disabled {
     drop-shadow(-1px -1px 1px var(--focus-color)) !important;
 }
 
+:is(label, .full-address, .full-address *):is(:focus, :focus-visible) {
+  text-shadow: 0 0 .1em var(--focus-color);
+  filter: none !important;
+}
 
 .donate {
   color: var(--text-color1) !important;