6 files changed, 43 insertions, 11 deletions
diff --git a/src/components/button.style.js b/src/components/button.style.js
index 51f781e1..49147c8d 100644
--- a/src/components/button.style.js
+++ b/src/components/button.style.js
@@ -15,5 +15,20 @@ export default {
   validInnerComponents: [
     'Text',
     'Icon'
+  ],
+  defaultRules: [
+    {
+      component: 'Button',
+      directives: {
+        background: '--fg'
+      }
+    },
+    {
+      component: 'Button',
+      state: ['hover'],
+      directives: {
+        background: '#FFFFFF'
+      }
+    }
   ]
 }
diff --git a/src/components/link.style.js b/src/components/link.style.js
index 0128fd91..d13cef33 100644
--- a/src/components/link.style.js
+++ b/src/components/link.style.js
@@ -16,7 +16,6 @@ export default {
       component: 'Link',
       state: ['faint'],
       directives: {
-        textColor: '--link',
         textOpacity: 0.5,
         textOpacityMode: 'fake'
       }
diff --git a/src/components/panel.style.js b/src/components/panel.style.js
index 870f5099..a9de7e56 100644
--- a/src/components/panel.style.js
+++ b/src/components/panel.style.js
@@ -7,5 +7,13 @@ export default {
     'Icon',
     'Button',
     'PanelHeader'
+  ],
+  defaultRules: [
+    {
+      component: 'Panel',
+      directives: {
+        background: '--fg'
+      }
+    }
   ]
 }
diff --git a/src/components/panel_header.style.js b/src/components/panel_header.style.js
index e83e1f15..01f8a67f 100644
--- a/src/components/panel_header.style.js
+++ b/src/components/panel_header.style.js
@@ -6,5 +6,14 @@ export default {
     'Link',
     'Icon',
     'Button'
+  ],
+  defaultRules: [
+    {
+      component: 'PanelHeader',
+      directives: {
+        background: '--fg'
+        // opacity: 0.9
+      }
+    }
   ]
 }
diff --git a/src/components/text.style.js b/src/components/text.style.js
index e52b6f68..18472032 100644
--- a/src/components/text.style.js
+++ b/src/components/text.style.js
@@ -19,7 +19,6 @@ export default {
       component: 'Text',
       state: ['faint'],
       directives: {
-        textColor: '--text',
         textOpacity: 0.5
       }
     },
@@ -29,15 +28,6 @@ export default {
       directives: {
         textColor: '--cGreen'
       }
-    },
-    {
-      component: 'Text',
-      variant: 'greentext',
-      state: ['faint'],
-      directives: {
-        textColor: '--cGreen',
-        textOpacity: 0.5
-      }
     }
   ]
 }
diff --git a/src/components/underlay.style.js b/src/components/underlay.style.js
index c35fbada..380ea26e 100644
--- a/src/components/underlay.style.js
+++ b/src/components/underlay.style.js
@@ -4,5 +4,16 @@ export default {
   outOfTreeSelector: '.underlay',
   validInnerComponents: [
     'Panel'
+  ],
+  defaultRules: [
+    {
+      component: 'Underlay',
+      // variant: 'normal',
+      // state: 'normal'
+      directives: {
+        background: '#000000',
+        opacity: 0.2
+      }
+    }
   ]
 }