1 files changed, 10 insertions, 11 deletions

diff --git a/src/IconbarTheme.hh b/src/IconbarTheme.hh
index 419ab1a..9e2307b 100644
--- a/src/IconbarTheme.hh
+++ b/src/IconbarTheme.hh
@@ -26,10 +26,9 @@
 #define ICONBARTHEME_HH
 
 #include "FbTk/Theme.hh"
+#include "FbTk/BorderTheme.hh"
 #include "FbTk/Texture.hh"
-
-#include "TextTheme.hh"
-#include "BorderTheme.hh"
+#include "FbTk/TextTheme.hh"
 
 class IconbarTheme:public FbTk::Theme {
 public:
@@ -39,21 +38,21 @@ public:
     void reconfigTheme();
     bool fallback(FbTk::ThemeItem_base &item);
 
-    TextTheme &focusedText()  { return m_focused_text; }
-    TextTheme &unfocusedText() { return m_unfocused_text; }
+    FbTk::TextTheme &focusedText()  { return m_focused_text; }
+    FbTk::TextTheme &unfocusedText() { return m_unfocused_text; }
+
+    const FbTk::BorderTheme &focusedBorder() const { return m_focused_border; }
+    const FbTk::BorderTheme &unfocusedBorder() const { return m_unfocused_border; }
+    const FbTk::BorderTheme &border() const { return m_border; }
 
-    const BorderTheme &focusedBorder() const { return m_focused_border; }
-    const BorderTheme &unfocusedBorder() const { return m_unfocused_border; }
-    const BorderTheme &border() const { return m_border; }
-    
     const FbTk::Texture &focusedTexture() const { return *m_focused_texture; }
     const FbTk::Texture &unfocusedTexture() const { return *m_unfocused_texture; }
     const FbTk::Texture &emptyTexture() const { return *m_empty_texture; }
 
 private:
     FbTk::ThemeItem<FbTk::Texture> m_focused_texture, m_unfocused_texture, m_empty_texture;
-    BorderTheme m_focused_border, m_unfocused_border, m_border;
-    TextTheme m_focused_text, m_unfocused_text;
+    FbTk::BorderTheme m_focused_border, m_unfocused_border, m_border;
+    FbTk::TextTheme m_focused_text, m_unfocused_text;
     std::string m_name, m_altname;
 };