diff --git a/basis/ui/gadgets/buttons/buttons.factor b/basis/ui/gadgets/buttons/buttons.factor
index cb4f020231..bc9a77add1 100644
--- a/basis/ui/gadgets/buttons/buttons.factor
+++ b/basis/ui/gadgets/buttons/buttons.factor
@@ -3,7 +3,7 @@
 USING: accessors assocs classes colors.constants combinators
 combinators.short-circuit combinators.smart fry kernel locals
 math.vectors models namespaces sequences ui.commands ui.gadgets
-ui.gadgets.borders ui.gadgets.labels ui.gadgets.packs
+ui.gadgets.borders ui.gadgets.colors ui.gadgets.labels ui.gadgets.packs
 ui.gadgets.theme ui.gadgets.tracks ui.gadgets.worlds ui.gestures
 ui.pens ui.pens.image ui.pens.solid ui.pens.tile ;
 FROM: models => change-model ;
@@ -104,8 +104,8 @@ M: button-pen pen-foreground
     { 0 1/2 } >>align ; inline
 
 : roll-button-theme ( button -- button )
-    f COLOR: black <solid> dup f f <button-pen> >>boundary
-    f f COLOR: dark-gray <solid> f f <button-pen> >>interior
+    f roll-button-rollover-border <solid> dup f f <button-pen> >>boundary
+    f f roll-button-selected-background <solid> f f <button-pen> >>interior
     align-left ; inline
 
 PRIVATE>
diff --git a/basis/ui/gadgets/colors/colors.factor b/basis/ui/gadgets/colors/colors.factor
index 8c1f00b0c8..7e35516de4 100644
--- a/basis/ui/gadgets/colors/colors.factor
+++ b/basis/ui/gadgets/colors/colors.factor
@@ -15,6 +15,9 @@ CONSTANT: line-color COLOR: grey75
 
 CONSTANT: column-title-background COLOR: grey95
 
+CONSTANT: roll-button-rollover-border COLOR: gray50
+CONSTANT: roll-button-selected-background COLOR: dark-gray
+
 CONSTANT: source-files-color COLOR: NavajoWhite
 CONSTANT: errors-color COLOR: chocolate1
 CONSTANT: details-color COLOR: SlateGray2