diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index dd11115..4883c49 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -24,7 +24,7 @@ set(PROJECT_SOURCES
     main.cpp
     mainwindow.cpp    
     avatarsettingseditor.cpp 
-#    badgesettingseditor.cpp
+    badgesettingseditor.cpp
 #    checkboxsettingseditor.cpp
 #    fabsettingseditor.cpp
 #    raisedbuttonsettingseditor.cpp
@@ -41,13 +41,13 @@ set(PROJECT_SOURCES
 #    dialogsettingseditor.cpp
 #    drawersettingseditor.cpp
 #    scrollbarsettingseditor.cpp
-#    appbarsettingseditor.cpp
+    appbarsettingseditor.cpp
 #    autocompletesettingseditor.cpp
 #    menusettingseditor.cpp
     # Headers
     mainwindow.h 
     avatarsettingseditor.h 
-#    badgesettingseditor.h
+    badgesettingseditor.h
 #    checkboxsettingseditor.h
 #    fabsettingseditor.h
 #    raisedbuttonsettingseditor.h
@@ -64,12 +64,12 @@ set(PROJECT_SOURCES
 #    dialogsettingseditor.h
 #    drawersettingseditor.h
 #    scrollbarsettingseditor.h
-#    appbarsettingseditor.h
+    appbarsettingseditor.h
 #    autocompletesettingseditor.h
 #    menusettingseditor.h
     # Forms
     avatarsettingsform.ui 
-#    badgesettingsform.ui
+    badgesettingsform.ui
 #    checkboxsettingsform.ui
 #    fabsettingsform.ui
 #    flatbuttonsettingsform.ui
@@ -85,7 +85,7 @@ set(PROJECT_SOURCES
 #    dialogsettingsform.ui
 #    drawersettingsform.ui
 #    scrollbarsettingsform.ui
-#    appbarsettingsform.ui
+    appbarsettingsform.ui
 )
 
 if(${QT_VERSION_MAJOR} GREATER_EQUAL 6)
diff --git a/examples/appbarsettingseditor.cpp b/examples/appbarsettingseditor.cpp
index 5f2ce00..89d7803 100644
--- a/examples/appbarsettingseditor.cpp
+++ b/examples/appbarsettingseditor.cpp
@@ -1,18 +1,13 @@
 #include "appbarsettingseditor.h"
-#include <QtWidgets/QVBoxLayout>
-#include <QColorDialog>
-#include <qtmaterialappbar.h>
-#include <qtmaterialiconbutton.h>
-#include <lib/qtmaterialtheme.h>
 
 AppBarSettingsEditor::AppBarSettingsEditor(QWidget *parent)
     : QWidget(parent),
       ui(new Ui::AppBarSettingsForm),
-      m_appBar(new QtMaterialAppBar)
+      m_appBar(new AppBar)
 {
     QLabel *label = new QLabel("Inbox");
     label->setAttribute(Qt::WA_TranslucentBackground);
-    label->setForegroundRole(QPalette::Foreground);
+//    label->setForegroundRole(QPalette::Foreground); // FIXME: palette ? foreground !
     label->setContentsMargins(6, 0, 0, 0);
 
     QPalette palette = label->palette();
@@ -21,7 +16,7 @@ AppBarSettingsEditor::AppBarSettingsEditor(QWidget *parent)
 
     label->setFont(QFont("Roboto", 18, QFont::Normal));
 
-    QtMaterialIconButton *button = new QtMaterialIconButton(QtMaterialTheme::icon("navigation", "menu"));
+    IconButton *button = new IconButton(Theme::icon("navigation", "menu"));
     button->setIconSize(QSize(24, 24));
     m_appBar->appBarLayout()->addWidget(button);
     m_appBar->appBarLayout()->addWidget(label);
diff --git a/examples/appbarsettingseditor.h b/examples/appbarsettingseditor.h
index b2eb882..be9dce3 100644
--- a/examples/appbarsettingseditor.h
+++ b/examples/appbarsettingseditor.h
@@ -2,9 +2,17 @@
 #define APPBARSETTINGSEDITOR_H
 
 #include <QWidget>
+#include <QtWidgets/QVBoxLayout>
+#include <QColorDialog>
+#include <QPalette>
+
+#include <qtmaterialappbar.h>
+#include <qtmaterialiconbutton.h>
+#include <lib/qtmaterialtheme.h>
+
 #include "ui_appbarsettingsform.h"
 
-class QtMaterialAppBar;
+using namespace md;
 
 class AppBarSettingsEditor : public QWidget
 {
@@ -21,7 +29,7 @@ protected slots:
 
 private:
     Ui::AppBarSettingsForm *const ui;
-    QtMaterialAppBar       *const m_appBar;
+    AppBar       *const m_appBar;
 };
 
 #endif // APPBARSETTINGSEDITOR_H
diff --git a/examples/avatarsettingseditor.h b/examples/avatarsettingseditor.h
index 6485fa0..eda4fe1 100644
--- a/examples/avatarsettingseditor.h
+++ b/examples/avatarsettingseditor.h
@@ -6,10 +6,10 @@
 #include <QColorDialog>
 #include <qtmaterialavatar.h>
 #include <lib/qtmaterialtheme.h>
+
 #include "ui_avatarsettingsform.h"
 
 using namespace md;
-//class Avatar;
 
 class AvatarSettingsEditor : public QWidget
 {
diff --git a/examples/badgesettingseditor.cpp b/examples/badgesettingseditor.cpp
index 9e70d7b..5f2be5e 100644
--- a/examples/badgesettingseditor.cpp
+++ b/examples/badgesettingseditor.cpp
@@ -7,7 +7,7 @@ BadgeSettingsEditor::BadgeSettingsEditor(QWidget *parent)
     : QWidget(parent),
       ui(new Ui::BadgeSettingsForm),
       m_avatar(new Avatar(QImage(":/images/assets/sikh.jpg"))),
-      m_badge(new QtMaterialBadge)
+      m_badge(new Badge)
 {
     QVBoxLayout *layout = new QVBoxLayout;
     setLayout(layout);
@@ -73,7 +73,7 @@ void BadgeSettingsEditor::updateWidget()
         m_badge->setText("3");
         break;
     case 1:
-        m_badge->setIcon(QIcon(QtMaterialTheme::icon("communication", "message")));
+        m_badge->setIcon(QIcon(Theme::icon("communication", "message")));
         break;
     default:
         break;
diff --git a/examples/badgesettingseditor.h b/examples/badgesettingseditor.h
index 531dfb2..3e22ae1 100644
--- a/examples/badgesettingseditor.h
+++ b/examples/badgesettingseditor.h
@@ -2,10 +2,13 @@
 #define BADGESETTINGSEDITOR_H
 
 #include <QWidget>
+
+#include <qtmaterialavatar.h>
+#include <qtmaterialbadge.h>
+
 #include "ui_badgesettingsform.h"
 
-class Avatar;
-class QtMaterialBadge;
+using namespace md;
 
 class BadgeSettingsEditor : public QWidget
 {
@@ -23,7 +26,7 @@ protected slots:
 private:
     Ui::BadgeSettingsForm *const ui;
     Avatar      *const m_avatar;
-    QtMaterialBadge       *const m_badge;
+    Badge       *const m_badge;
 };
 
 #endif // BADGESETTINGSEDITOR_H
diff --git a/examples/mainwindow.cpp b/examples/mainwindow.cpp
index 773a61d..cc45106 100644
--- a/examples/mainwindow.cpp
+++ b/examples/mainwindow.cpp
@@ -3,6 +3,7 @@
 MainWindow::MainWindow(QWidget *parent)
     : QMainWindow(parent)
 {
+    this->showMaximized();
     QWidget *widget = new QWidget;
     QHBoxLayout *layout = new QHBoxLayout;
 
@@ -19,7 +20,7 @@ MainWindow::MainWindow(QWidget *parent)
     setCentralWidget(widget);
 
     AvatarSettingsEditor *avatar = new AvatarSettingsEditor;
-//    BadgeSettingsEditor *badge = new BadgeSettingsEditor;
+    BadgeSettingsEditor *badge = new BadgeSettingsEditor;
 //    CheckBoxSettingsEditor *checkbox = new CheckBoxSettingsEditor;
 //    FloatingActionButtonSettingsEditor *fab = new FloatingActionButtonSettingsEditor;
 //    RaisedButtonSettingsEditor *raisedButton = new RaisedButtonSettingsEditor;
@@ -36,14 +37,14 @@ MainWindow::MainWindow(QWidget *parent)
 //    DialogSettingsEditor *dialog = new DialogSettingsEditor;
 //    DrawerSettingsEditor *drawer = new DrawerSettingsEditor;
 //    ScrollBarSettingsEditor *scrollBar = new ScrollBarSettingsEditor;
-//    AppBarSettingsEditor *appBar = new AppBarSettingsEditor;
+    AppBarSettingsEditor *appBar = new AppBarSettingsEditor;
 //    AutoCompleteSettingsEditor *autocomplete = new AutoCompleteSettingsEditor;
 //    MenuSettingsEditor *menu = new MenuSettingsEditor;
 
     stack->addWidget(avatar);
-//    stack->addWidget(appBar);
+    stack->addWidget(appBar);
 //    stack->addWidget(autocomplete);
-//    stack->addWidget(badge);
+    stack->addWidget(badge);
 //    stack->addWidget(checkbox);
 //    stack->addWidget(circularProgress);
 //    stack->addWidget(dialog);
@@ -64,9 +65,9 @@ MainWindow::MainWindow(QWidget *parent)
 
 
     list->addItem("Avatar");
-//    list->addItem("App Bar");
+    list->addItem("App Bar");
 //    list->addItem("Auto Complete");
-//    list->addItem("Badge");
+    list->addItem("Badge");
 //    list->addItem("Checkbox");
 //    list->addItem("Circular Progress");
 //    list->addItem("Dialog");
diff --git a/examples/mainwindow.h b/examples/mainwindow.h
index 856795a..9550356 100644
--- a/examples/mainwindow.h
+++ b/examples/mainwindow.h
@@ -7,7 +7,7 @@
 #include <QtWidgets/QListWidget>
 
 #include "avatarsettingseditor.h"
-//#include "badgesettingseditor.h"
+#include "badgesettingseditor.h"
 //#include "checkboxsettingseditor.h"
 //#include "fabsettingseditor.h"
 //#include "raisedbuttonsettingseditor.h"
@@ -24,7 +24,7 @@
 //#include "dialogsettingseditor.h"
 //#include "drawersettingseditor.h"
 //#include "scrollbarsettingseditor.h"
-//#include "appbarsettingseditor.h"
+#include "appbarsettingseditor.h"
 //#include "autocompletesettingseditor.h"
 //#include "menusettingseditor.h"