diff --git a/EmojiDrawer.qml b/EmojiDrawer.qml
index 1b72df8..9c1336a 100644
--- a/EmojiDrawer.qml
+++ b/EmojiDrawer.qml
@@ -8,7 +8,7 @@ import QtQml.Models 2.13
 
 import "fonts/MutantStandard.js" as Mutant
 import "controls"
-import "../theme"
+import "theme"
 
 Item {
     id: root
@@ -24,7 +24,7 @@ Item {
     visible: height != 0
 
     Rectangle {
-        color: theme.backgroundPaneColor
+        color: Theme.backgroundPaneColor
         anchors.fill: parent
     }
 
diff --git a/controls/FlagButton.qml b/controls/FlagButton.qml
index 760ed21..6b62d16 100644
--- a/controls/FlagButton.qml
+++ b/controls/FlagButton.qml
@@ -5,12 +5,13 @@ import QtQuick.Controls.Material 2.0
 import QtQuick.Layouts 1.3
 import QtQuick.Window 2.11
 import QtQuick.Controls 1.4
+import "../theme"
 
 Rectangle {
     width: img.width + 10
     height: img.height + 5
     property string emoji
-    color: selected ? windowItem.cwtch_color : windowItem.cwtch_background_color
+    color: selected ? Theme.defaultButtonActiveColor : Theme.backgroundPaneColor
     property bool selected
     property string locale