diff --git a/SkyfallDarkTeal/gtk-3.0/gtk-widgets.css b/SkyfallDarkTeal/gtk-3.0/gtk-widgets.css
index 520548a..9f90857 100644
--- a/SkyfallDarkTeal/gtk-3.0/gtk-widgets.css
+++ b/SkyfallDarkTeal/gtk-3.0/gtk-widgets.css
@@ -447,12 +447,128 @@ undershoot.right {
  * Text Entries *
  ****************/
 
-entry {
+/*entry {
     border-style: solid;
     padding: 4px;
     color: @entry_text_color;
     background-color: @theme_base_color;
-}
+}*/
+entry {
+  min-height: 20px;
+  padding: 2px 8px;
+  transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
+  background-color: transparent;
+  color: #E3E6EA;
+  background-image: linear-gradient(to bottom, #2B2B2C, #2B2B2C);
+  box-shadow: inset 0 1px rgba(0, 0, 0, 0.1);
+  border-image: -gtk-scaled(url("borders/entry-normal-border-dark.png"), url("borders/entry-normal-border-dark@2.png")) 2 2 3 2/2px 2px 3px 2px stretch;
+  outline-width: 0px;
+  border-radius: 2px;
+  border-width: 1px 1px 2px 1px;
+  border-style: solid;
+  border-color: transparent;
+  caret-color: currentColor;
+  background-color: #2B2B2C; }
+  entry image {
+    color: #E3E6EA; }
+    entry image:hover {
+      color: white; }
+    entry image:active {
+      color: #3266FB; }
+    entry image.left {
+      padding-left: 0;
+      padding-right: 5px; }
+    entry image.right {
+      padding-right: 0;
+      padding-left: 5px; }
+  entry.flat, entry.flat:focus {
+    color: white;
+    min-height: 0;
+    padding: 2px;
+    background-color: #2B2B2C;
+    background-image: none;
+    border: none;
+    border-radius: 0;
+    box-shadow: none; }
+  entry:focus {
+    color: white;
+    background-color: transparent;
+    background-image: linear-gradient(to bottom, #2B2B2C, #2B2B2C);
+    box-shadow: none;
+    border-image: -gtk-scaled(url("borders/entry-focused-border-dark.png"), url("borders/entry-focused-border-dark@2.png")) 2 2 3 2/2px 2px 3px 2px stretch;
+    border-radius: 2px;
+    border-width: 1px 1px 2px 1px;
+    border-style: solid;
+    border-color: transparent; }
+  entry:disabled {
+    background-color: transparent;
+    color: #dcdee2;
+    background-image: linear-gradient(to bottom, #434446, #434446);
+    box-shadow: none;
+    border-image: -gtk-scaled(url("borders/entry-normal-border-dark.png"), url("borders/entry-normal-border-dark@2.png")) 2 2 3 2/2px 2px 3px 2px stretch;
+    border-radius: 2px;
+    border-width: 1px 1px 2px 1px;
+    border-style: solid;
+    border-color: transparent; }
+  entry.warning {
+    color: #f57900;
+    background-image: linear-gradient(to bottom, #533b23, #533b23); }
+    entry.warning image {
+      color: #f57900; }
+    entry.warning selection, entry.warning selection:focus {
+      background-color: #f57900; }
+  entry.error {
+    color: #cc0000;
+    background-image: linear-gradient(to bottom, #4b2223, #4b2223); }
+    entry.error image {
+      color: #cc0000; }
+    entry.error selection, entry.error selection:focus {
+      background-color: #cc0000; }
+  entry.search-missing {
+    color: #cc0000;
+    background-image: linear-gradient(to bottom, #4b2223, #4b2223); }
+    entry.search-missing image {
+      color: #cc0000; }
+    entry.search-missing selection, entry.search-missing selection:focus {
+      background-color: #cc0000; }
+  .osd entry {
+    background-color: transparent;
+    color: #E3E6EA;
+    background-image: linear-gradient(to bottom, rgba(52, 52, 54, 0.75), rgba(52, 52, 54, 0.75));
+    border-image: -gtk-scaled(url("borders/entry-normal-border-dark.png"), url("borders/entry-normal-border-dark@2.png")) 2 2 3 2/2px 2px 3px 2px stretch;
+    border-radius: 2px;
+    border-width: 1px 1px 2px 1px;
+    border-style: solid;
+    border-color: transparent; }
+    .osd entry:focus {
+      background-color: transparent;
+      color: white;
+      background-image: linear-gradient(to bottom, rgba(52, 52, 54, 0.75), rgba(52, 52, 54, 0.75));
+      border-image: -gtk-scaled(url("borders/entry-focused-border-dark.png"), url("borders/entry-focused-border-dark@2.png")) 2 2 3 2/2px 2px 3px 2px stretch;
+      border-radius: 2px;
+      border-width: 1px 1px 2px 1px;
+      border-style: solid;
+      border-color: transparent; }
+    .osd entry:disabled {
+      background-color: transparent;
+      color: #dcdee2;
+      background-image: linear-gradient(to bottom, rgba(65, 65, 67, 0.7), rgba(65, 65, 67, 0.7));
+      box-shadow: none;
+      border-image: -gtk-scaled(url("borders/entry-normal-border-dark.png"), url("borders/entry-normal-border-dark@2.png")) 2 2 3 2/2px 2px 3px 2px stretch;
+      border-radius: 2px;
+      border-width: 1px 1px 2px 1px;
+      border-style: solid;
+      border-color: transparent; }
+  entry progress {
+    margin: 0 -6px;
+    border-radius: 0;
+    border-width: 0 0 2px;
+    border-color: #3266FB;
+    border-style: solid;
+    background-image: none;
+    background-color: transparent;
+    box-shadow: none;
+    border-image: none; }
 
 entry progressbar {
     background-color: @theme_selected_bg_color;
diff --git a/SkyfallDarkTeal/gtk-3.0/gtk.css b/SkyfallDarkTeal/gtk-3.0/gtk.css
index 125bbb4..458d908 100644
--- a/SkyfallDarkTeal/gtk-3.0/gtk.css
+++ b/SkyfallDarkTeal/gtk-3.0/gtk.css
@@ -7,9 +7,9 @@
  ****************/
 
 @define-color theme_window_border_color #314a4e;
-@define-color theme_base_color #242424;
+@define-color theme_base_color #2D2D2D;
 
-@define-color theme_bg_color #232323;
+@define-color theme_bg_color #303030;
 @define-color theme_fg_color #F1F1F1;
 
 @define-color theme_selected_bg_color #408994;
diff --git a/SkyfallDarkTeal/gtk-3.0/img/checkbox-checked-hover.png b/SkyfallDarkTeal/gtk-3.0/img/checkbox-checked-hover.png
index 219f779..0cb5eab 100644
Binary files a/SkyfallDarkTeal/gtk-3.0/img/checkbox-checked-hover.png and b/SkyfallDarkTeal/gtk-3.0/img/checkbox-checked-hover.png differ
diff --git a/SkyfallDarkTeal/gtk-3.0/img/checkbox-checked-insensitive.png b/SkyfallDarkTeal/gtk-3.0/img/checkbox-checked-insensitive.png
index 3ede8c9..74b5072 100644
Binary files a/SkyfallDarkTeal/gtk-3.0/img/checkbox-checked-insensitive.png and b/SkyfallDarkTeal/gtk-3.0/img/checkbox-checked-insensitive.png differ
diff --git a/SkyfallDarkTeal/gtk-3.0/img/checkbox-checked.png b/SkyfallDarkTeal/gtk-3.0/img/checkbox-checked.png
index 2a7c7c0..b4e6dbe 100644
Binary files a/SkyfallDarkTeal/gtk-3.0/img/checkbox-checked.png and b/SkyfallDarkTeal/gtk-3.0/img/checkbox-checked.png differ
diff --git a/SkyfallDarkTeal/gtk-3.0/img/checkbox-mixed-hover.png b/SkyfallDarkTeal/gtk-3.0/img/checkbox-mixed-hover.png
index e95b05c..21077db 100644
Binary files a/SkyfallDarkTeal/gtk-3.0/img/checkbox-mixed-hover.png and b/SkyfallDarkTeal/gtk-3.0/img/checkbox-mixed-hover.png differ
diff --git a/SkyfallDarkTeal/gtk-3.0/img/checkbox-mixed-insensitive.png b/SkyfallDarkTeal/gtk-3.0/img/checkbox-mixed-insensitive.png
index 7af14e2..b27be5f 100644
Binary files a/SkyfallDarkTeal/gtk-3.0/img/checkbox-mixed-insensitive.png and b/SkyfallDarkTeal/gtk-3.0/img/checkbox-mixed-insensitive.png differ
diff --git a/SkyfallDarkTeal/gtk-3.0/img/checkbox-mixed.png b/SkyfallDarkTeal/gtk-3.0/img/checkbox-mixed.png
index 611facc..ee7280d 100644
Binary files a/SkyfallDarkTeal/gtk-3.0/img/checkbox-mixed.png and b/SkyfallDarkTeal/gtk-3.0/img/checkbox-mixed.png differ
diff --git a/SkyfallDarkTeal/gtk-3.0/img/checkbox-unchecked-insensitive.png b/SkyfallDarkTeal/gtk-3.0/img/checkbox-unchecked-insensitive.png
index 00158b1..002d422 100644
Binary files a/SkyfallDarkTeal/gtk-3.0/img/checkbox-unchecked-insensitive.png and b/SkyfallDarkTeal/gtk-3.0/img/checkbox-unchecked-insensitive.png differ
diff --git a/SkyfallDarkTeal/gtk-3.0/img/checkbox-unchecked.png b/SkyfallDarkTeal/gtk-3.0/img/checkbox-unchecked.png
index b6b59c6..65e4f83 100644
Binary files a/SkyfallDarkTeal/gtk-3.0/img/checkbox-unchecked.png and b/SkyfallDarkTeal/gtk-3.0/img/checkbox-unchecked.png differ
diff --git a/SkyfallDarkTeal/gtk-3.0/img/menuitem-checkbox-checked-hover.png b/SkyfallDarkTeal/gtk-3.0/img/menuitem-checkbox-checked-hover.png
index 392931d..0cb5eab 100644
Binary files a/SkyfallDarkTeal/gtk-3.0/img/menuitem-checkbox-checked-hover.png and b/SkyfallDarkTeal/gtk-3.0/img/menuitem-checkbox-checked-hover.png differ
diff --git a/SkyfallDarkTeal/gtk-3.0/img/menuitem-checkbox-checked-insensitive.png b/SkyfallDarkTeal/gtk-3.0/img/menuitem-checkbox-checked-insensitive.png
index 806284d..74b5072 100644
Binary files a/SkyfallDarkTeal/gtk-3.0/img/menuitem-checkbox-checked-insensitive.png and b/SkyfallDarkTeal/gtk-3.0/img/menuitem-checkbox-checked-insensitive.png differ
diff --git a/SkyfallDarkTeal/gtk-3.0/img/menuitem-checkbox-checked.png b/SkyfallDarkTeal/gtk-3.0/img/menuitem-checkbox-checked.png
index 05494c4..b4e6dbe 100644
Binary files a/SkyfallDarkTeal/gtk-3.0/img/menuitem-checkbox-checked.png and b/SkyfallDarkTeal/gtk-3.0/img/menuitem-checkbox-checked.png differ
diff --git a/SkyfallDarkTeal/gtk-3.0/img/menuitem-checkbox-hover.png b/SkyfallDarkTeal/gtk-3.0/img/menuitem-checkbox-hover.png
index f8ac7e7..5d75df0 100644
Binary files a/SkyfallDarkTeal/gtk-3.0/img/menuitem-checkbox-hover.png and b/SkyfallDarkTeal/gtk-3.0/img/menuitem-checkbox-hover.png differ
diff --git a/SkyfallDarkTeal/gtk-3.0/img/menuitem-checkbox-insensitive.png b/SkyfallDarkTeal/gtk-3.0/img/menuitem-checkbox-insensitive.png
index 3dc632d..002d422 100644
Binary files a/SkyfallDarkTeal/gtk-3.0/img/menuitem-checkbox-insensitive.png and b/SkyfallDarkTeal/gtk-3.0/img/menuitem-checkbox-insensitive.png differ
diff --git a/SkyfallDarkTeal/gtk-3.0/img/menuitem-checkbox-mixed-hover.png b/SkyfallDarkTeal/gtk-3.0/img/menuitem-checkbox-mixed-hover.png
index 7d714c1..21077db 100644
Binary files a/SkyfallDarkTeal/gtk-3.0/img/menuitem-checkbox-mixed-hover.png and b/SkyfallDarkTeal/gtk-3.0/img/menuitem-checkbox-mixed-hover.png differ
diff --git a/SkyfallDarkTeal/gtk-3.0/img/menuitem-checkbox-mixed-insensitive.png b/SkyfallDarkTeal/gtk-3.0/img/menuitem-checkbox-mixed-insensitive.png
index bcd916f..b27be5f 100644
Binary files a/SkyfallDarkTeal/gtk-3.0/img/menuitem-checkbox-mixed-insensitive.png and b/SkyfallDarkTeal/gtk-3.0/img/menuitem-checkbox-mixed-insensitive.png differ
diff --git a/SkyfallDarkTeal/gtk-3.0/img/menuitem-checkbox-mixed.png b/SkyfallDarkTeal/gtk-3.0/img/menuitem-checkbox-mixed.png
index eccddb9..ee7280d 100644
Binary files a/SkyfallDarkTeal/gtk-3.0/img/menuitem-checkbox-mixed.png and b/SkyfallDarkTeal/gtk-3.0/img/menuitem-checkbox-mixed.png differ
diff --git a/SkyfallDarkTeal/gtk-3.0/img/menuitem-checkbox.png b/SkyfallDarkTeal/gtk-3.0/img/menuitem-checkbox.png
index 73b2207..65e4f83 100644
Binary files a/SkyfallDarkTeal/gtk-3.0/img/menuitem-checkbox.png and b/SkyfallDarkTeal/gtk-3.0/img/menuitem-checkbox.png differ
diff --git a/SkyfallDarkTeal/gtk-3.0/img/menuitem-radio-checked-insensitive.png b/SkyfallDarkTeal/gtk-3.0/img/menuitem-radio-checked-insensitive.png
index ee61fc9..2c408ee 100644
Binary files a/SkyfallDarkTeal/gtk-3.0/img/menuitem-radio-checked-insensitive.png and b/SkyfallDarkTeal/gtk-3.0/img/menuitem-radio-checked-insensitive.png differ
diff --git a/SkyfallDarkTeal/gtk-3.0/img/menuitem-radio-checked.png b/SkyfallDarkTeal/gtk-3.0/img/menuitem-radio-checked.png
index 88af5ea..2a7eda4 100644
Binary files a/SkyfallDarkTeal/gtk-3.0/img/menuitem-radio-checked.png and b/SkyfallDarkTeal/gtk-3.0/img/menuitem-radio-checked.png differ
diff --git a/SkyfallDarkTeal/gtk-3.0/img/menuitem-radio-hover.png b/SkyfallDarkTeal/gtk-3.0/img/menuitem-radio-hover.png
index 01284fc..017c62e 100644
Binary files a/SkyfallDarkTeal/gtk-3.0/img/menuitem-radio-hover.png and b/SkyfallDarkTeal/gtk-3.0/img/menuitem-radio-hover.png differ
diff --git a/SkyfallDarkTeal/gtk-3.0/img/menuitem-radio-insensitive.png b/SkyfallDarkTeal/gtk-3.0/img/menuitem-radio-insensitive.png
index 64fc069..605a734 100644
Binary files a/SkyfallDarkTeal/gtk-3.0/img/menuitem-radio-insensitive.png and b/SkyfallDarkTeal/gtk-3.0/img/menuitem-radio-insensitive.png differ
diff --git a/SkyfallDarkTeal/gtk-3.0/img/menuitem-radio-mixed-hover.png b/SkyfallDarkTeal/gtk-3.0/img/menuitem-radio-mixed-hover.png
index 5492088..34fa6b2 100644
Binary files a/SkyfallDarkTeal/gtk-3.0/img/menuitem-radio-mixed-hover.png and b/SkyfallDarkTeal/gtk-3.0/img/menuitem-radio-mixed-hover.png differ
diff --git a/SkyfallDarkTeal/gtk-3.0/img/menuitem-radio-mixed-insensitive.png b/SkyfallDarkTeal/gtk-3.0/img/menuitem-radio-mixed-insensitive.png
index 5c467da..052d66d 100644
Binary files a/SkyfallDarkTeal/gtk-3.0/img/menuitem-radio-mixed-insensitive.png and b/SkyfallDarkTeal/gtk-3.0/img/menuitem-radio-mixed-insensitive.png differ
diff --git a/SkyfallDarkTeal/gtk-3.0/img/menuitem-radio-mixed.png b/SkyfallDarkTeal/gtk-3.0/img/menuitem-radio-mixed.png
index d168e65..7aec78a 100644
Binary files a/SkyfallDarkTeal/gtk-3.0/img/menuitem-radio-mixed.png and b/SkyfallDarkTeal/gtk-3.0/img/menuitem-radio-mixed.png differ
diff --git a/SkyfallDarkTeal/gtk-3.0/img/menuitem-radio.png b/SkyfallDarkTeal/gtk-3.0/img/menuitem-radio.png
index ebd23d0..434cf9b 100644
Binary files a/SkyfallDarkTeal/gtk-3.0/img/menuitem-radio.png and b/SkyfallDarkTeal/gtk-3.0/img/menuitem-radio.png differ
diff --git a/SkyfallDarkTeal/gtk-3.0/img/radio-checked-hover.png b/SkyfallDarkTeal/gtk-3.0/img/radio-checked-hover.png
index cf74fb2..f9fc303 100644
Binary files a/SkyfallDarkTeal/gtk-3.0/img/radio-checked-hover.png and b/SkyfallDarkTeal/gtk-3.0/img/radio-checked-hover.png differ
diff --git a/SkyfallDarkTeal/gtk-3.0/img/radio-checked-insensitive.png b/SkyfallDarkTeal/gtk-3.0/img/radio-checked-insensitive.png
index 819cb96..2c408ee 100644
Binary files a/SkyfallDarkTeal/gtk-3.0/img/radio-checked-insensitive.png and b/SkyfallDarkTeal/gtk-3.0/img/radio-checked-insensitive.png differ
diff --git a/SkyfallDarkTeal/gtk-3.0/img/radio-checked.png b/SkyfallDarkTeal/gtk-3.0/img/radio-checked.png
index acceea3..2a7eda4 100644
Binary files a/SkyfallDarkTeal/gtk-3.0/img/radio-checked.png and b/SkyfallDarkTeal/gtk-3.0/img/radio-checked.png differ
diff --git a/SkyfallDarkTeal/gtk-3.0/img/radio-mixed-hover.png b/SkyfallDarkTeal/gtk-3.0/img/radio-mixed-hover.png
index dad1d2d..34fa6b2 100644
Binary files a/SkyfallDarkTeal/gtk-3.0/img/radio-mixed-hover.png and b/SkyfallDarkTeal/gtk-3.0/img/radio-mixed-hover.png differ
diff --git a/SkyfallDarkTeal/gtk-3.0/img/radio-mixed-insensitive.png b/SkyfallDarkTeal/gtk-3.0/img/radio-mixed-insensitive.png
index 2a59261..052d66d 100644
Binary files a/SkyfallDarkTeal/gtk-3.0/img/radio-mixed-insensitive.png and b/SkyfallDarkTeal/gtk-3.0/img/radio-mixed-insensitive.png differ
diff --git a/SkyfallDarkTeal/gtk-3.0/img/radio-mixed.png b/SkyfallDarkTeal/gtk-3.0/img/radio-mixed.png
index bbe18db..7aec78a 100644
Binary files a/SkyfallDarkTeal/gtk-3.0/img/radio-mixed.png and b/SkyfallDarkTeal/gtk-3.0/img/radio-mixed.png differ
diff --git a/SkyfallDarkTeal/gtk-3.0/img/radio-unchecked-insensitive.png b/SkyfallDarkTeal/gtk-3.0/img/radio-unchecked-insensitive.png
index c59f135..605a734 100644
Binary files a/SkyfallDarkTeal/gtk-3.0/img/radio-unchecked-insensitive.png and b/SkyfallDarkTeal/gtk-3.0/img/radio-unchecked-insensitive.png differ
diff --git a/SkyfallDarkTeal/gtk-3.0/img/radio-unchecked.png b/SkyfallDarkTeal/gtk-3.0/img/radio-unchecked.png
index 99106b0..434cf9b 100644
Binary files a/SkyfallDarkTeal/gtk-3.0/img/radio-unchecked.png and b/SkyfallDarkTeal/gtk-3.0/img/radio-unchecked.png differ
diff --git a/SkyfallTeal/gtk-3.0/img/border-focused-ptb.svg b/SkyfallTeal/gtk-3.0/img/border-focused-ptb.svg
index b360734..51df847 100644
--- a/SkyfallTeal/gtk-3.0/img/border-focused-ptb.svg
+++ b/SkyfallTeal/gtk-3.0/img/border-focused-ptb.svg
@@ -13,8 +13,8 @@
    height="16px"
    id="svg33222"
    version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="border-focused-2.svg">
+   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
+   sodipodi:docname="border-focused-ptb.svg">
   <defs
      id="defs33224">
     <linearGradient
@@ -37,16 +37,16 @@
      inkscape:pageopacity="1"
      inkscape:pageshadow="2"
      inkscape:zoom="44.5625"
-     inkscape:cx="8"
+     inkscape:cx="3.9046283"
      inkscape:cy="8"
      inkscape:current-layer="layer1"
      showgrid="false"
      inkscape:grid-bbox="true"
      inkscape:document-units="px"
-     inkscape:window-width="1280"
-     inkscape:window-height="949"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
+     inkscape:window-width="2559"
+     inkscape:window-height="1393"
+     inkscape:window-x="1"
+     inkscape:window-y="1080"
      inkscape:window-maximized="1"
      inkscape:snap-nodes="false"
      inkscape:snap-bbox="true"
@@ -84,7 +84,7 @@
        height="13.999999"
        width="15"
        id="rect17861"
-       style="color:#000000;fill:none;stroke:#869bb7;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+       style="color:#000000;fill:none;stroke:#86b2b7;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
     <rect
        ry="1.5"
        rx="1.5"