Manage colours through the gtkrc instead.

2 files changed, 18 insertions, 14 deletions

diff --git a/themes/Adwaita/gtk-2.0/gtkrc-dark b/themes/Adwaita/gtk-2.0/gtkrc-dark
index 5160798b..2ff7527f 100755
--- a/themes/Adwaita/gtk-2.0/gtkrc-dark
+++ b/themes/Adwaita/gtk-2.0/gtkrc-dark
@@ -7,6 +7,10 @@ gtk-color-scheme = "text_color:white\nbase_color:#292929"
 gtk-color-scheme = "fg_color:#eeeeec\nbg_color:#393f3f"
 # Selected foreground/background colors
 gtk-color-scheme = "selected_fg_color:#ffffff\nselected_bg_color:#215d9c"
+# Insensitive foreground/background colors
+gtk-color-scheme = "insensitive_fg_color:#949796\ninsensitive_bg_color:#333636"
+# Link colors
+gtk-color-scheme = "link_color:#4a90d9\nvisited_link_color:#2a76c6"
 # Tooltip colors
 gtk-color-scheme = "tooltip_fg_color:#ffffff\ntooltip_bg_color:#343434"
 
diff --git a/themes/Adwaita/gtk-2.0/main.rc b/themes/Adwaita/gtk-2.0/main.rc
index 146624ab..56103782 100644
--- a/themes/Adwaita/gtk-2.0/main.rc
+++ b/themes/Adwaita/gtk-2.0/main.rc
@@ -19,13 +19,13 @@ style "default" {
   GtkWidget::tooltip-alpha     = 235
   GtkWidget::new-tooltip-style = 1 #for compatibility
 
-  GtkWidget::link-color              = shade(0.9, @selected_bg_color)
-  GtkWidget::visited-link-color      = shade(0.8, @selected_bg_color)
-  GnomeHRef::link_color              = shade(0.9, @selected_bg_color)
-  GtkHTML::link-color                = shade(0.9, @selected_bg_color)
-  GtkHTML::vlink-color               = shade(0.8, @selected_bg_color)
-  GtkIMHtml::hyperlink-color         = shade(0.9, @selected_bg_color)
-  GtkIMHtml::hyperlink-visited-color = shade(0.8, @selected_bg_color)
+  GtkWidget::link-color              = @link_color
+  GtkWidget::visited-link-color      = @visited_link_color
+  GnomeHRef::link_color              = @link_color
+  GtkHTML::link-color                = @link_color
+  GtkHTML::vlink-color               = @visited_link_color
+  GtkIMHtml::hyperlink-color         = @link_color
+  GtkIMHtml::hyperlink-visited-color = @visited_link_color
 
   GtkSeparatorMenuItem::horizontal-padding = 0
   GtkSeparatorMenuItem::wide-separators    = 1
@@ -106,25 +106,25 @@ style "default" {
   bg[NORMAL]      = @bg_color
   bg[PRELIGHT]    = @bg_color
   bg[SELECTED]    = @selected_bg_color
-  bg[INSENSITIVE] = mix (0.6, @bg_color, @base_color)
+  bg[INSENSITIVE] = @insensitive_bg_color
   bg[ACTIVE]      = @bg_color
 
   fg[NORMAL]      = @fg_color
   fg[PRELIGHT]    = @fg_color
   fg[SELECTED]    = @selected_fg_color
-  fg[INSENSITIVE] = mix (0.5, @fg_color, @bg_color)
+  fg[INSENSITIVE] = @insensitive_fg_color
   fg[ACTIVE]      = @fg_color
 
   text[NORMAL]      = @text_color
   text[PRELIGHT]    = @text_color
   text[SELECTED]    = @selected_fg_color
-  text[INSENSITIVE] = darker (@bg_color)
+  text[INSENSITIVE] = @insensitive_fg_color
   text[ACTIVE]      = @selected_fg_color
 
   base[NORMAL]      = @base_color
   base[PRELIGHT]    = shade (0.95, @bg_color)
   base[SELECTED]    = @selected_bg_color
-  base[INSENSITIVE] = mix (0.5, @fg_color, @bg_color)
+  base[INSENSITIVE] = @insensitive_bg_color
   base[ACTIVE]      = @selected_bg_color
 
   # For succinctness, all reasonable pixmap options remain here
@@ -1495,7 +1495,7 @@ style "menubar" {
 
   # Needed to fix Firefox's menubar text
   bg[SELECTED] = @selected_fg_color
-  fg[SELECTED] = shade(0.9, @selected_bg_color)
+  fg[SELECTED] = @link_color
 
 }
 
@@ -1504,7 +1504,7 @@ style "menubar_item" {
   xthickness = 3
   ythickness = 4
 
-  fg[PRELIGHT] = shade(0.9, @selected_bg_color)
+  fg[PRELIGHT] = @link_color
 
   engine "pixmap" {
     image {
@@ -2087,7 +2087,7 @@ style "notebook_entry" {
 style "normal_bg" {
   bg[NORMAL]      = @bg_color
   bg[PRELIGHT]    = @bg_color
-  bg[INSENSITIVE] = mix (0.6, @bg_color, @base_color)
+  bg[INSENSITIVE] = @insensitive_bg_color
 }
 
 style "normal_entry" {