diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 4883c49..d3be2fc 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -14,6 +14,7 @@ find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core REQUIRED)
 find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Gui REQUIRED)
 find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Widgets REQUIRED)
 find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core5Compat REQUIRED)
+find_package(Qt${QT_VERSION_MAJOR} COMPONENTS StateMachine REQUIRED)
 
 # Add executable called "examples" that is built from the source files
 # "*.cpp". The extensions are automatically found.
@@ -25,66 +26,66 @@ set(PROJECT_SOURCES
     mainwindow.cpp    
     avatarsettingseditor.cpp 
     badgesettingseditor.cpp
-#    checkboxsettingseditor.cpp
-#    fabsettingseditor.cpp
-#    raisedbuttonsettingseditor.cpp
-#    flatbuttonsettingseditor.cpp
-#    iconbuttonsettingseditor.cpp
-#    progresssettingseditor.cpp
-#    circularprogresssettingseditor.cpp
-#    slidersettingseditor.cpp
-#    radiobuttonsettingseditor.cpp
-#    togglesettingseditor.cpp
-#    textfieldsettingseditor.cpp
-#    tabssettingseditor.cpp
-#    snackbarsettingseditor.cpp
-#    dialogsettingseditor.cpp
-#    drawersettingseditor.cpp
-#    scrollbarsettingseditor.cpp
+    checkboxsettingseditor.cpp
+    fabsettingseditor.cpp
+    raisedbuttonsettingseditor.cpp
+    flatbuttonsettingseditor.cpp
+    iconbuttonsettingseditor.cpp
+    progresssettingseditor.cpp
+    circularprogresssettingseditor.cpp
+    slidersettingseditor.cpp
+    radiobuttonsettingseditor.cpp
+    togglesettingseditor.cpp
+    textfieldsettingseditor.cpp
+    tabssettingseditor.cpp
+    snackbarsettingseditor.cpp
+    dialogsettingseditor.cpp
+    drawersettingseditor.cpp
+    scrollbarsettingseditor.cpp
     appbarsettingseditor.cpp
-#    autocompletesettingseditor.cpp
-#    menusettingseditor.cpp
+    autocompletesettingseditor.cpp
+    menusettingseditor.cpp
     # Headers
     mainwindow.h 
     avatarsettingseditor.h 
     badgesettingseditor.h
-#    checkboxsettingseditor.h
-#    fabsettingseditor.h
-#    raisedbuttonsettingseditor.h
-#    flatbuttonsettingseditor.h
-#    iconbuttonsettingseditor.h
-#    progresssettingseditor.h
-#    circularprogresssettingseditor.h
-#    slidersettingseditor.h
-#    radiobuttonsettingseditor.h
-#    togglesettingseditor.h
-#    textfieldsettingseditor.h
-#    tabssettingseditor.h
-#    snackbarsettingseditor.h
-#    dialogsettingseditor.h
-#    drawersettingseditor.h
-#    scrollbarsettingseditor.h
+    checkboxsettingseditor.h
+    fabsettingseditor.h
+    raisedbuttonsettingseditor.h
+    flatbuttonsettingseditor.h
+    iconbuttonsettingseditor.h
+    progresssettingseditor.h
+    circularprogresssettingseditor.h
+    slidersettingseditor.h
+    radiobuttonsettingseditor.h
+    togglesettingseditor.h
+    textfieldsettingseditor.h
+    tabssettingseditor.h
+    snackbarsettingseditor.h
+    dialogsettingseditor.h
+    drawersettingseditor.h
+    scrollbarsettingseditor.h
     appbarsettingseditor.h
-#    autocompletesettingseditor.h
-#    menusettingseditor.h
+    autocompletesettingseditor.h
+    menusettingseditor.h
     # Forms
     avatarsettingsform.ui 
     badgesettingsform.ui
-#    checkboxsettingsform.ui
-#    fabsettingsform.ui
-#    flatbuttonsettingsform.ui
-#    iconbuttonsettingsform.ui
-#    progresssettingsform.ui
-#    circularprogresssettingsform.ui
-#    slidersettingsform.ui
-#    snackbarsettingsform.ui
-#    radiobuttonsettingsform.ui
-#    togglesettingsform.ui
-#    textfieldsettingsform.ui
-#    tabssettingsform.ui
-#    dialogsettingsform.ui
-#    drawersettingsform.ui
-#    scrollbarsettingsform.ui
+    checkboxsettingsform.ui
+    fabsettingsform.ui
+    flatbuttonsettingsform.ui
+    iconbuttonsettingsform.ui
+    progresssettingsform.ui
+    circularprogresssettingsform.ui
+    slidersettingsform.ui
+    snackbarsettingsform.ui
+    radiobuttonsettingsform.ui
+    togglesettingsform.ui
+    textfieldsettingsform.ui
+    tabssettingsform.ui
+    dialogsettingsform.ui
+    drawersettingsform.ui
+    scrollbarsettingsform.ui
     appbarsettingsform.ui
 )
 
@@ -115,6 +116,7 @@ target_link_libraries(examples PRIVATE Qt${QT_VERSION_MAJOR}::Core)
 target_link_libraries(examples PRIVATE Qt${QT_VERSION_MAJOR}::Gui)
 target_link_libraries(examples PRIVATE Qt${QT_VERSION_MAJOR}::Widgets)
 target_link_libraries(examples PRIVATE Qt${QT_VERSION_MAJOR}::Core5Compat)
+target_link_libraries(examples PRIVATE Qt${QT_VERSION_MAJOR}::StateMachine)
 
 
 # Link the executable to the 'components' library. Since the 'components' library has
diff --git a/examples/autocompletesettingseditor.cpp b/examples/autocompletesettingseditor.cpp
index 0c8dede..d101670 100644
--- a/examples/autocompletesettingseditor.cpp
+++ b/examples/autocompletesettingseditor.cpp
@@ -1,12 +1,9 @@
 #include "autocompletesettingseditor.h"
-#include <QVBoxLayout>
-#include <QDebug>
-#include <qtmaterialautocomplete.h>
 
 AutoCompleteSettingsEditor::AutoCompleteSettingsEditor(QWidget *parent)
     : QWidget(parent),
       //ui(new Ui::AutoCompleteSettingsForm),
-      m_autocomplete(new QtMaterialAutoComplete)
+      m_autocomplete(new AutoComplete)
 {
     QVBoxLayout *layout = new QVBoxLayout;
     setLayout(layout);
diff --git a/examples/autocompletesettingseditor.h b/examples/autocompletesettingseditor.h
index b6c5743..cbc7c3a 100644
--- a/examples/autocompletesettingseditor.h
+++ b/examples/autocompletesettingseditor.h
@@ -4,9 +4,14 @@
 #include <QWidget>
 //#include "ui_autocompletesettingsform.h"
 
+#include <QWidget>
+#include <QVBoxLayout>
+#include <QDebug>
+
+#include <qtmaterialautocomplete.h>
 #include "lib/qtmaterialoverlaywidget.h"
 
-class QtMaterialAutoComplete;
+using namespace md;
 
 class AutoCompleteSettingsEditor : public QWidget
 {
@@ -23,7 +28,7 @@ protected slots:
 
 private:
     //Ui::AutoCompleteSettingsForm *const ui;
-    QtMaterialAutoComplete       *const m_autocomplete;
+    AutoComplete       *const m_autocomplete;
 };
 
 #endif // AUTOCOMPLETESETTINGSEDITOR_H
diff --git a/examples/checkboxsettingseditor.cpp b/examples/checkboxsettingseditor.cpp
index 2e4037d..6ade78c 100644
--- a/examples/checkboxsettingseditor.cpp
+++ b/examples/checkboxsettingseditor.cpp
@@ -1,12 +1,9 @@
 #include "checkboxsettingseditor.h"
-#include <QVBoxLayout>
-#include <QColorDialog>
-#include <qtmaterialcheckbox.h>
 
 CheckBoxSettingsEditor::CheckBoxSettingsEditor(QWidget *parent)
     : QWidget(parent),
       ui(new Ui::CheckBoxSettingsForm),
-      m_checkBox(new QtMaterialCheckBox)
+      m_checkBox(new CheckBox)
 {
     QVBoxLayout *layout = new QVBoxLayout;
     setLayout(layout);
@@ -52,10 +49,10 @@ void CheckBoxSettingsEditor::setupForm()
 {
     switch (m_checkBox->labelPosition())
     {
-    case QtMaterialCheckable::LabelPositionLeft:
+    case Checkable::LabelPositionLeft:
         ui->labelPositionComboBox->setCurrentIndex(0);
         break;
-    case QtMaterialCheckable::LabelPositionRight:
+    case Checkable::LabelPositionRight:
         ui->labelPositionComboBox->setCurrentIndex(1);
         break;
     default:
@@ -73,10 +70,10 @@ void CheckBoxSettingsEditor::updateWidget()
     switch (ui->labelPositionComboBox->currentIndex())
     {
     case 0:
-        m_checkBox->setLabelPosition(QtMaterialCheckable::LabelPositionLeft);
+        m_checkBox->setLabelPosition(Checkable::LabelPositionLeft);
         break;
     case 1:
-        m_checkBox->setLabelPosition(QtMaterialCheckable::LabelPositionRight);
+        m_checkBox->setLabelPosition(Checkable::LabelPositionRight);
         break;
     default:
         break;
diff --git a/examples/checkboxsettingseditor.h b/examples/checkboxsettingseditor.h
index 4456367..ac0f19a 100644
--- a/examples/checkboxsettingseditor.h
+++ b/examples/checkboxsettingseditor.h
@@ -2,9 +2,14 @@
 #define CHECKBOXSETTINGSEDITOR_H
 
 #include <QWidget>
+#include <QVBoxLayout>
+#include <QColorDialog>
+
+#include <qtmaterialcheckbox.h>
+
 #include "ui_checkboxsettingsform.h"
 
-class QtMaterialCheckable;
+using namespace md;
 
 class CheckBoxSettingsEditor : public QWidget
 {
@@ -21,7 +26,7 @@ protected slots:
 
 private:
     Ui::CheckBoxSettingsForm *const ui;
-    QtMaterialCheckable      *const m_checkBox;
+    Checkable      *const m_checkBox;
 };
 
 #endif // CHECKBOXSETTINGSEDITOR_H
diff --git a/examples/circularprogresssettingseditor.cpp b/examples/circularprogresssettingseditor.cpp
index 8c049fc..976f962 100644
--- a/examples/circularprogresssettingseditor.cpp
+++ b/examples/circularprogresssettingseditor.cpp
@@ -1,12 +1,9 @@
 #include "circularprogresssettingseditor.h"
-#include <QVBoxLayout>
-#include <QColorDialog>
-#include <qtmaterialcircularprogress.h>
 
 CircularProgressSettingsEditor::CircularProgressSettingsEditor(QWidget *parent)
     : QWidget(parent),
       ui(new Ui::CircularProgressSettingsForm),
-      m_progress(new QtMaterialCircularProgress)
+      m_progress(new CircularProgress)
 {
     QVBoxLayout *layout = new QVBoxLayout;
     setLayout(layout);
diff --git a/examples/circularprogresssettingseditor.h b/examples/circularprogresssettingseditor.h
index 5077989..e008fff 100644
--- a/examples/circularprogresssettingseditor.h
+++ b/examples/circularprogresssettingseditor.h
@@ -2,9 +2,14 @@
 #define CIRCULARPROGRESSSETTINGSEDITOR_H
 
 #include <QWidget>
+#include <QVBoxLayout>
+#include <QColorDialog>
+
+#include <qtmaterialcircularprogress.h>
+
 #include "ui_circularprogresssettingsform.h"
 
-class QtMaterialCircularProgress;
+using namespace md;
 
 class CircularProgressSettingsEditor : public QWidget
 {
@@ -21,7 +26,7 @@ protected slots:
 
 private:
     Ui::CircularProgressSettingsForm *const ui;
-    QtMaterialCircularProgress       *const m_progress;
+    CircularProgress       *const m_progress;
 };
 
 #endif // CIRCULARPROGRESSSETTINGSEDITOR_H
diff --git a/examples/dialogsettingseditor.cpp b/examples/dialogsettingseditor.cpp
index f4e4916..8b350dd 100644
--- a/examples/dialogsettingseditor.cpp
+++ b/examples/dialogsettingseditor.cpp
@@ -1,13 +1,9 @@
 #include "dialogsettingseditor.h"
-#include <QVBoxLayout>
-#include <QColorDialog>
-#include <qtmaterialdialog.h>
-#include <qtmaterialflatbutton.h>
 
 DialogSettingsEditor::DialogSettingsEditor(QWidget *parent)
     : QWidget(parent),
       ui(new Ui::DialogSettingsForm),
-      m_dialog(new QtMaterialDialog)
+      m_dialog(new Dialog)
 {
     QVBoxLayout *layout = new QVBoxLayout;
     setLayout(layout);
@@ -32,7 +28,7 @@ DialogSettingsEditor::DialogSettingsEditor(QWidget *parent)
     QVBoxLayout *dialogWidgetLayout = new QVBoxLayout;
     dialogWidget->setLayout(dialogWidgetLayout);
 
-    QtMaterialFlatButton *closeButton = new QtMaterialFlatButton("Close");
+    FlatButton *closeButton = new FlatButton("Close");
     dialogWidgetLayout->addWidget(closeButton);
     dialogWidgetLayout->setAlignment(closeButton, Qt::AlignBottom | Qt::AlignCenter);
 
diff --git a/examples/dialogsettingseditor.h b/examples/dialogsettingseditor.h
index f922046..1de0de4 100644
--- a/examples/dialogsettingseditor.h
+++ b/examples/dialogsettingseditor.h
@@ -2,9 +2,15 @@
 #define DIALOGSETTINGSEDITOR_H
 
 #include <QWidget>
+#include <QVBoxLayout>
+#include <QColorDialog>
+#include <qtmaterialdialog.h>
+
+#include <qtmaterialflatbutton.h>
+
 #include "ui_dialogsettingsform.h"
 
-class QtMaterialDialog;
+using namespace md;
 
 class DialogSettingsEditor : public QWidget
 {
@@ -20,7 +26,7 @@ protected slots:
 
 private:
     Ui::DialogSettingsForm *const ui;
-    QtMaterialDialog       *const m_dialog;
+    Dialog       *const m_dialog;
 };
 
 #endif // DIALOGSETTINGSEDITOR_H
diff --git a/examples/drawersettingseditor.cpp b/examples/drawersettingseditor.cpp
index dc515b7..f9b2d71 100644
--- a/examples/drawersettingseditor.cpp
+++ b/examples/drawersettingseditor.cpp
@@ -1,12 +1,9 @@
 #include "drawersettingseditor.h"
-#include <QVBoxLayout>
-#include <QColorDialog>
-#include <qtmaterialdrawer.h>
 
 DrawerSettingsEditor::DrawerSettingsEditor(QWidget *parent)
     : QWidget(parent),
       ui(new Ui::DrawerSettingsForm),
-      m_drawer(new QtMaterialDrawer)
+      m_drawer(new Drawer)
 {
     QVBoxLayout *layout = new QVBoxLayout;
     setLayout(layout);
diff --git a/examples/drawersettingseditor.h b/examples/drawersettingseditor.h
index 45f21af..0c57864 100644
--- a/examples/drawersettingseditor.h
+++ b/examples/drawersettingseditor.h
@@ -2,9 +2,14 @@
 #define DRAWERSETTINGSEDITOR_H
 
 #include <QWidget>
+#include <QVBoxLayout>
+#include <QColorDialog>
+
+#include <qtmaterialdrawer.h>
+
 #include "ui_drawersettingsform.h"
 
-class QtMaterialDrawer;
+using namespace md;
 
 class DrawerSettingsEditor : public QWidget
 {
@@ -20,7 +25,7 @@ protected slots:
 
 private:
     Ui::DrawerSettingsForm *const ui;
-    QtMaterialDrawer       *const m_drawer;
+    Drawer       *const m_drawer;
 };
 
 #endif // DRAWERSETTINGSEDITOR_H
diff --git a/examples/fabsettingseditor.cpp b/examples/fabsettingseditor.cpp
index efbceed..cc5c540 100644
--- a/examples/fabsettingseditor.cpp
+++ b/examples/fabsettingseditor.cpp
@@ -1,13 +1,9 @@
 #include "fabsettingseditor.h"
-#include <QVBoxLayout>
-#include <QDebug>
-#include <QColorDialog>
-#include <qtmaterialfab.h>
 
 FloatingActionButtonSettingsEditor::FloatingActionButtonSettingsEditor(QWidget *parent)
     : QWidget(parent),
       ui(new Ui::FloatingActionButtonSettingsForm),
-      m_fab(new QtMaterialFloatingActionButton(QtMaterialTheme::icon("toggle", "star")))
+      m_fab(new FloatingActionButton(Theme::icon("toggle", "star")))
 {
     QVBoxLayout *layout = new QVBoxLayout;
     setLayout(layout);
diff --git a/examples/fabsettingseditor.h b/examples/fabsettingseditor.h
index 2d815f4..8973039 100644
--- a/examples/fabsettingseditor.h
+++ b/examples/fabsettingseditor.h
@@ -2,9 +2,15 @@
 #define FABSETTINGSEDITOR_H
 
 #include <QWidget>
+#include <QVBoxLayout>
+#include <QDebug>
+#include <QColorDialog>
+
+#include <qtmaterialfab.h>
+
 #include "ui_fabsettingsform.h"
 
-class QtMaterialFloatingActionButton;
+using namespace md;
 
 class FloatingActionButtonSettingsEditor : public QWidget
 {
@@ -21,7 +27,7 @@ protected slots:
 
 private:
     Ui::FloatingActionButtonSettingsForm *const ui;
-    QtMaterialFloatingActionButton       *const m_fab;
+    FloatingActionButton       *const m_fab;
 };
 
 #endif // FABSETTINGSEDITOR_H
diff --git a/examples/flatbuttonsettingseditor.cpp b/examples/flatbuttonsettingseditor.cpp
index 6b620cc..eaf1723 100644
--- a/examples/flatbuttonsettingseditor.cpp
+++ b/examples/flatbuttonsettingseditor.cpp
@@ -1,12 +1,9 @@
 #include "flatbuttonsettingseditor.h"
-#include <QColorDialog>
-#include <QDebug>
-#include <qtmaterialflatbutton.h>
 
 FlatButtonSettingsEditor::FlatButtonSettingsEditor(QWidget *parent)
     : QWidget(parent),
       ui(new Ui::FlatButtonSettingsForm),
-      m_button(new QtMaterialFlatButton("I'm flat"))
+      m_button(new FlatButton("I'm flat"))
 {
     init();
 }
@@ -16,7 +13,7 @@ FlatButtonSettingsEditor::~FlatButtonSettingsEditor()
     delete ui;
 }
 
-FlatButtonSettingsEditor::FlatButtonSettingsEditor(QtMaterialFlatButton *button, QWidget *parent)
+FlatButtonSettingsEditor::FlatButtonSettingsEditor(FlatButton *button, QWidget *parent)
     : QWidget(parent),
       ui(new Ui::FlatButtonSettingsForm),
       m_button(button)
@@ -180,7 +177,7 @@ void FlatButtonSettingsEditor::updateWidget()
     m_button->setCheckable(ui->checkableCheckBox->isChecked());
     m_button->setChecked(ui->checkedCheckBox->isChecked());
     m_button->setHaloVisible(ui->showHaloCheckBox->isChecked());
-    m_button->setIcon(ui->iconCheckBox->isChecked() ? QtMaterialTheme::icon("toggle", "star")
+    m_button->setIcon(ui->iconCheckBox->isChecked() ? Theme::icon("toggle", "star")
                                                     : QIcon());
     m_button->setUseThemeColors(ui->useThemeColorsCheckBox->isChecked());
     m_button->setBackgroundMode(ui->transparentCheckBox->isChecked()
diff --git a/examples/flatbuttonsettingseditor.h b/examples/flatbuttonsettingseditor.h
index 0ec4fd2..044ac99 100644
--- a/examples/flatbuttonsettingseditor.h
+++ b/examples/flatbuttonsettingseditor.h
@@ -2,9 +2,14 @@
 #define FLATBUTTONSETTINGSMANAGER_H
 
 #include <QWidget>
+#include <QColorDialog>
+#include <QDebug>
+
+#include <qtmaterialflatbutton.h>
+
 #include "ui_flatbuttonsettingsform.h"
 
-class QtMaterialFlatButton;
+using namespace md;
 
 class FlatButtonSettingsEditor : public QWidget
 {
@@ -15,7 +20,7 @@ public:
     ~FlatButtonSettingsEditor();
 
 protected:
-    explicit FlatButtonSettingsEditor(QtMaterialFlatButton *button, QWidget *parent = 0);
+    explicit FlatButtonSettingsEditor(FlatButton *button, QWidget *parent = 0);
 
     Ui::FlatButtonSettingsForm *const ui;
 
@@ -29,7 +34,7 @@ protected slots:
 private:
     void init();
 
-    QtMaterialFlatButton *const m_button;
+    FlatButton *const m_button;
 };
 
 #endif // FLATBUTTONSETTINGSMANAGER_H
diff --git a/examples/iconbuttonsettingseditor.cpp b/examples/iconbuttonsettingseditor.cpp
index aba4bc1..4a67ca4 100644
--- a/examples/iconbuttonsettingseditor.cpp
+++ b/examples/iconbuttonsettingseditor.cpp
@@ -1,12 +1,9 @@
 #include "iconbuttonsettingseditor.h"
-#include <QColorDialog>
-#include <qtmaterialiconbutton.h>
-#include <lib/qtmaterialtheme.h>
 
 IconButtonSettingsEditor::IconButtonSettingsEditor(QWidget *parent)
     : QWidget(parent),
       ui(new Ui::IconButtonSettingsForm),
-      m_button(new QtMaterialIconButton(Theme::icon("toggle", "star")))
+      m_button(new IconButton(Theme::icon("toggle", "star")))
 {
     init();
 }
diff --git a/examples/iconbuttonsettingseditor.h b/examples/iconbuttonsettingseditor.h
index d8758f8..275f2e2 100644
--- a/examples/iconbuttonsettingseditor.h
+++ b/examples/iconbuttonsettingseditor.h
@@ -2,9 +2,14 @@
 #define ICONBUTTONSETTINGSMANAGER_H
 
 #include <QWidget>
+#include <QColorDialog>
+
+#include <qtmaterialiconbutton.h>
+#include <lib/qtmaterialtheme.h>
+
 #include "ui_iconbuttonsettingsform.h"
 
-class QtMaterialIconButton;
+using namespace md;
 
 class IconButtonSettingsEditor : public QWidget
 {
@@ -15,7 +20,7 @@ public:
     ~IconButtonSettingsEditor();
 
 protected:
-    explicit IconButtonSettingsEditor(QtMaterialIconButton *button, QWidget *parent = 0);
+    explicit IconButtonSettingsEditor(IconButton *button, QWidget *parent = 0);
 
     Ui::IconButtonSettingsForm *const ui;
 
@@ -27,7 +32,7 @@ protected slots:
 private:
     void init();
 
-    QtMaterialIconButton *const m_button;
+    IconButton *const m_button;
 };
 
 #endif // ICONBUTTONSETTINGSMANAGER_H
diff --git a/examples/mainwindow.cpp b/examples/mainwindow.cpp
index cc45106..3567e1b 100644
--- a/examples/mainwindow.cpp
+++ b/examples/mainwindow.cpp
@@ -21,70 +21,70 @@ MainWindow::MainWindow(QWidget *parent)
 
     AvatarSettingsEditor *avatar = new AvatarSettingsEditor;
     BadgeSettingsEditor *badge = new BadgeSettingsEditor;
-//    CheckBoxSettingsEditor *checkbox = new CheckBoxSettingsEditor;
-//    FloatingActionButtonSettingsEditor *fab = new FloatingActionButtonSettingsEditor;
-//    RaisedButtonSettingsEditor *raisedButton = new RaisedButtonSettingsEditor;
-//    FlatButtonSettingsEditor *flatButton = new FlatButtonSettingsEditor;
-//    IconButtonSettingsEditor *iconButton = new IconButtonSettingsEditor;
-//    ProgressSettingsEditor *progress = new ProgressSettingsEditor;
-//    CircularProgressSettingsEditor *circularProgress = new CircularProgressSettingsEditor;
-//    SliderSettingsEditor *slider = new SliderSettingsEditor;
-//    RadioButtonSettingsEditor *radioButton = new RadioButtonSettingsEditor;
-//    ToggleSettingsEditor *toggle = new ToggleSettingsEditor;
-//    TextFieldSettingsEditor *textField = new TextFieldSettingsEditor;
-//    TabsSettingsEditor *tabs = new TabsSettingsEditor;
-//    SnackbarSettingsEditor *snackbar = new SnackbarSettingsEditor;
-//    DialogSettingsEditor *dialog = new DialogSettingsEditor;
-//    DrawerSettingsEditor *drawer = new DrawerSettingsEditor;
-//    ScrollBarSettingsEditor *scrollBar = new ScrollBarSettingsEditor;
+    CheckBoxSettingsEditor *checkbox = new CheckBoxSettingsEditor;
+    FloatingActionButtonSettingsEditor *fab = new FloatingActionButtonSettingsEditor;
+    RaisedButtonSettingsEditor *raisedButton = new RaisedButtonSettingsEditor;
+    FlatButtonSettingsEditor *flatButton = new FlatButtonSettingsEditor;
+    IconButtonSettingsEditor *iconButton = new IconButtonSettingsEditor;
+    ProgressSettingsEditor *progress = new ProgressSettingsEditor;
+    CircularProgressSettingsEditor *circularProgress = new CircularProgressSettingsEditor;
+    SliderSettingsEditor *slider = new SliderSettingsEditor;
+    RadioButtonSettingsEditor *radioButton = new RadioButtonSettingsEditor;
+    ToggleSettingsEditor *toggle = new ToggleSettingsEditor;
+    TextFieldSettingsEditor *textField = new TextFieldSettingsEditor;
+    TabsSettingsEditor *tabs = new TabsSettingsEditor;
+    SnackbarSettingsEditor *snackbar = new SnackbarSettingsEditor;
+    DialogSettingsEditor *dialog = new DialogSettingsEditor;
+    DrawerSettingsEditor *drawer = new DrawerSettingsEditor;
+    ScrollBarSettingsEditor *scrollBar = new ScrollBarSettingsEditor;
     AppBarSettingsEditor *appBar = new AppBarSettingsEditor;
-//    AutoCompleteSettingsEditor *autocomplete = new AutoCompleteSettingsEditor;
-//    MenuSettingsEditor *menu = new MenuSettingsEditor;
+    AutoCompleteSettingsEditor *autocomplete = new AutoCompleteSettingsEditor;
+    MenuSettingsEditor *menu = new MenuSettingsEditor;
 
     stack->addWidget(avatar);
     stack->addWidget(appBar);
-//    stack->addWidget(autocomplete);
+    stack->addWidget(autocomplete);
     stack->addWidget(badge);
-//    stack->addWidget(checkbox);
-//    stack->addWidget(circularProgress);
-//    stack->addWidget(dialog);
-//    stack->addWidget(drawer);
-//    stack->addWidget(fab);
-//    stack->addWidget(flatButton);
-//    stack->addWidget(iconButton);
-//    stack->addWidget(menu);
-//    stack->addWidget(progress);
-//    stack->addWidget(radioButton);
-//    stack->addWidget(raisedButton);
-//    stack->addWidget(scrollBar);
-//    stack->addWidget(slider);
-//    stack->addWidget(snackbar);
-//    stack->addWidget(tabs);
-//    stack->addWidget(textField);
-//    stack->addWidget(toggle);
+    stack->addWidget(checkbox);
+    stack->addWidget(circularProgress);
+    stack->addWidget(dialog);
+    stack->addWidget(drawer);
+    stack->addWidget(fab);
+    stack->addWidget(flatButton);
+    stack->addWidget(iconButton);
+    stack->addWidget(menu);
+    stack->addWidget(progress);
+    stack->addWidget(radioButton);
+    stack->addWidget(raisedButton);
+    stack->addWidget(scrollBar);
+    stack->addWidget(slider);
+    stack->addWidget(snackbar);
+    stack->addWidget(tabs);
+    stack->addWidget(textField);
+    stack->addWidget(toggle);
 
 
     list->addItem("Avatar");
     list->addItem("App Bar");
-//    list->addItem("Auto Complete");
+    list->addItem("Auto Complete");
     list->addItem("Badge");
-//    list->addItem("Checkbox");
-//    list->addItem("Circular Progress");
-//    list->addItem("Dialog");
-//    list->addItem("Drawer");
-//    list->addItem("Floating Action Button");
-//    list->addItem("Flat Button");
-//    list->addItem("Icon Button");
-//    list->addItem("Menu");
-//    list->addItem("Progress");
-//    list->addItem("Radio Button");
-//    list->addItem("Raised Button");
-//    list->addItem("ScrollBar");
-//    list->addItem("Slider");
-//    list->addItem("Snackbar");
-//    list->addItem("Tabs");
-//    list->addItem("Text Field");
-//    list->addItem("Toggle");
+    list->addItem("Checkbox");
+    list->addItem("Circular Progress");
+    list->addItem("Dialog");
+    list->addItem("Drawer");
+    list->addItem("Floating Action Button");
+    list->addItem("Flat Button");
+    list->addItem("Icon Button");
+    list->addItem("Menu");
+    list->addItem("Progress");
+    list->addItem("Radio Button");
+    list->addItem("Raised Button");
+    list->addItem("ScrollBar");
+    list->addItem("Slider");
+    list->addItem("Snackbar");
+    list->addItem("Tabs");
+    list->addItem("Text Field");
+    list->addItem("Toggle");
 
     list->setCurrentRow(0);
 
diff --git a/examples/mainwindow.h b/examples/mainwindow.h
index 9550356..eaf1c9b 100644
--- a/examples/mainwindow.h
+++ b/examples/mainwindow.h
@@ -8,25 +8,25 @@
 
 #include "avatarsettingseditor.h"
 #include "badgesettingseditor.h"
-//#include "checkboxsettingseditor.h"
-//#include "fabsettingseditor.h"
-//#include "raisedbuttonsettingseditor.h"
-//#include "flatbuttonsettingseditor.h"
-//#include "iconbuttonsettingseditor.h"
-//#include "progresssettingseditor.h"
-//#include "circularprogresssettingseditor.h"
-//#include "slidersettingseditor.h"
-//#include "radiobuttonsettingseditor.h"
-//#include "togglesettingseditor.h"
-//#include "textfieldsettingseditor.h"
-//#include "tabssettingseditor.h"
-//#include "snackbarsettingseditor.h"
-//#include "dialogsettingseditor.h"
-//#include "drawersettingseditor.h"
-//#include "scrollbarsettingseditor.h"
+#include "checkboxsettingseditor.h"
+#include "fabsettingseditor.h"
+#include "raisedbuttonsettingseditor.h"
+#include "flatbuttonsettingseditor.h"
+#include "iconbuttonsettingseditor.h"
+#include "progresssettingseditor.h"
+#include "circularprogresssettingseditor.h"
+#include "slidersettingseditor.h"
+#include "radiobuttonsettingseditor.h"
+#include "togglesettingseditor.h"
+#include "textfieldsettingseditor.h"
+#include "tabssettingseditor.h"
+#include "snackbarsettingseditor.h"
+#include "dialogsettingseditor.h"
+#include "drawersettingseditor.h"
+#include "scrollbarsettingseditor.h"
 #include "appbarsettingseditor.h"
-//#include "autocompletesettingseditor.h"
-//#include "menusettingseditor.h"
+#include "autocompletesettingseditor.h"
+#include "menusettingseditor.h"
 
 class MainWindow : public QMainWindow
 {
diff --git a/examples/menusettingseditor.cpp b/examples/menusettingseditor.cpp
index fcf5c65..e406feb 100644
--- a/examples/menusettingseditor.cpp
+++ b/examples/menusettingseditor.cpp
@@ -1,12 +1,9 @@
 #include "menusettingseditor.h"
-#include <QVBoxLayout>
-#include <QDebug>
-#include <qtmaterialmenu.h>
 
 MenuSettingsEditor::MenuSettingsEditor(QWidget *parent)
     : QWidget(parent),
       //ui(new Ui::MenuSettingsForm),
-      m_menu(new QtMaterialMenu)
+      m_menu(new Menu)
 {
     QVBoxLayout *layout = new QVBoxLayout;
     setLayout(layout);
diff --git a/examples/menusettingseditor.h b/examples/menusettingseditor.h
index bed5c41..d6ecc43 100644
--- a/examples/menusettingseditor.h
+++ b/examples/menusettingseditor.h
@@ -2,11 +2,15 @@
 #define MENUSETTINGSEDITOR_H
 
 #include <QWidget>
-//#include "ui_menusettingsform.h"
+#include <QVBoxLayout>
+#include <QDebug>
 
+#include <qtmaterialmenu.h>
 #include "lib/qtmaterialoverlaywidget.h"
 
-class QtMaterialMenu;
+//#include "ui_menusettingsform.h"
+
+using namespace md;
 
 class MenuSettingsEditor : public QWidget
 {
@@ -23,7 +27,7 @@ protected slots:
 
 private:
     //Ui::MenuSettingsForm *const ui;
-    QtMaterialMenu       *const m_menu;
+    Menu       *const m_menu;
 };
 
 #endif // MENUSETTINGSEDITOR_H
diff --git a/examples/progresssettingseditor.cpp b/examples/progresssettingseditor.cpp
index 401eb57..57e5cde 100644
--- a/examples/progresssettingseditor.cpp
+++ b/examples/progresssettingseditor.cpp
@@ -1,12 +1,9 @@
 #include "progresssettingseditor.h"
-#include <QColorDialog>
-#include <qtmaterialprogress.h>
-#include <lib/qtmaterialtheme.h>
 
 ProgressSettingsEditor::ProgressSettingsEditor(QWidget *parent)
     : QWidget(parent),
       ui(new Ui::ProgressSettingsForm),
-      m_progress(new QtMaterialProgress)
+      m_progress(new ProgressBar)
 {
     QVBoxLayout *layout = new QVBoxLayout;
     setLayout(layout);
diff --git a/examples/progresssettingseditor.h b/examples/progresssettingseditor.h
index bc5bbaa..fcd6317 100644
--- a/examples/progresssettingseditor.h
+++ b/examples/progresssettingseditor.h
@@ -2,9 +2,14 @@
 #define PROGRESSSETTINGSEDITOR_H
 
 #include <QWidget>
+#include <QColorDialog>
+
+#include <qtmaterialprogress.h>
+#include <lib/qtmaterialtheme.h>
+
 #include "ui_progresssettingsform.h"
 
-class QtMaterialProgress;
+using namespace md;
 
 class ProgressSettingsEditor : public QWidget
 {
@@ -21,7 +26,7 @@ protected slots:
 
 private:
     Ui::ProgressSettingsForm *const ui;
-    QtMaterialProgress       *const m_progress;
+    ProgressBar       *const m_progress;
 };
 
 #endif // PROGRESSSETTINGSEDITOR_H
diff --git a/examples/radiobuttonsettingseditor.cpp b/examples/radiobuttonsettingseditor.cpp
index 2a039ce..51b1129 100644
--- a/examples/radiobuttonsettingseditor.cpp
+++ b/examples/radiobuttonsettingseditor.cpp
@@ -1,15 +1,11 @@
 #include "radiobuttonsettingseditor.h"
-#include <QVBoxLayout>
-#include <QRadioButton>
-#include <QColorDialog>
-#include <qtmaterialradiobutton.h>
 
 RadioButtonSettingsEditor::RadioButtonSettingsEditor(QWidget *parent)
     : QWidget(parent),
       ui(new Ui::RadioButtonSettingsForm),
-      m_radioButton1(new QtMaterialRadioButton),
-      m_radioButton2(new QtMaterialRadioButton),
-      m_radioButton3(new QtMaterialRadioButton)
+      m_radioButton1(new RadioButton),
+      m_radioButton2(new RadioButton),
+      m_radioButton3(new RadioButton)
 {
     QVBoxLayout *layout = new QVBoxLayout;
     setLayout(layout);
@@ -47,7 +43,7 @@ RadioButtonSettingsEditor::RadioButtonSettingsEditor(QWidget *parent)
 
     layout->setAlignment(Qt::AlignCenter);
 
-    layout->setMargin(0);
+//    layout->setMargin(0); // FIXME: ???
     layout->setSpacing(0);
 
     setupForm();
@@ -72,10 +68,10 @@ void RadioButtonSettingsEditor::setupForm()
 {
     switch (m_radioButton1->labelPosition())
     {
-    case QtMaterialCheckable::LabelPositionLeft:
+    case Checkable::LabelPositionLeft:
         ui->labelPositionComboBox_2->setCurrentIndex(0);
         break;
-    case QtMaterialCheckable::LabelPositionRight:
+    case Checkable::LabelPositionRight:
         ui->labelPositionComboBox_2->setCurrentIndex(1);
         break;
     default:
@@ -92,14 +88,14 @@ void RadioButtonSettingsEditor::updateWidget()
     switch (ui->labelPositionComboBox_2->currentIndex())
     {
     case 0:
-        m_radioButton1->setLabelPosition(QtMaterialCheckable::LabelPositionLeft);
-        m_radioButton2->setLabelPosition(QtMaterialCheckable::LabelPositionLeft);
-        m_radioButton3->setLabelPosition(QtMaterialCheckable::LabelPositionLeft);
+        m_radioButton1->setLabelPosition(Checkable::LabelPositionLeft);
+        m_radioButton2->setLabelPosition(Checkable::LabelPositionLeft);
+        m_radioButton3->setLabelPosition(Checkable::LabelPositionLeft);
         break;
     case 1:
-        m_radioButton1->setLabelPosition(QtMaterialCheckable::LabelPositionRight);
-        m_radioButton2->setLabelPosition(QtMaterialCheckable::LabelPositionRight);
-        m_radioButton3->setLabelPosition(QtMaterialCheckable::LabelPositionRight);
+        m_radioButton1->setLabelPosition(Checkable::LabelPositionRight);
+        m_radioButton2->setLabelPosition(Checkable::LabelPositionRight);
+        m_radioButton3->setLabelPosition(Checkable::LabelPositionRight);
         break;
     default:
         break;
diff --git a/examples/radiobuttonsettingseditor.h b/examples/radiobuttonsettingseditor.h
index 76ad852..3625a17 100644
--- a/examples/radiobuttonsettingseditor.h
+++ b/examples/radiobuttonsettingseditor.h
@@ -2,10 +2,15 @@
 #define RADIOBUTTONSETTINGSEDITOR_H
 
 #include <QWidget>
+#include <QVBoxLayout>
+#include <QRadioButton>
+#include <QColorDialog>
+
+#include <qtmaterialradiobutton.h>
+
 #include "ui_radiobuttonsettingsform.h"
 
-class QtMaterialRadioButton;
-class RadioButton;
+using namespace md;
 
 class RadioButtonSettingsEditor : public QWidget
 {
@@ -22,9 +27,9 @@ protected slots:
 
 private:
     Ui::RadioButtonSettingsForm *const ui;
-    QtMaterialRadioButton       *const m_radioButton1;
-    QtMaterialRadioButton       *const m_radioButton2;
-    QtMaterialRadioButton       *const m_radioButton3;
+    RadioButton       *const m_radioButton1;
+    RadioButton       *const m_radioButton2;
+    RadioButton       *const m_radioButton3;
 };
 
 #endif // RADIOBUTTONSETTINGSEDITOR_H
diff --git a/examples/raisedbuttonsettingseditor.cpp b/examples/raisedbuttonsettingseditor.cpp
index 3dc41e0..fc79b2e 100644
--- a/examples/raisedbuttonsettingseditor.cpp
+++ b/examples/raisedbuttonsettingseditor.cpp
@@ -1,8 +1,7 @@
 #include "raisedbuttonsettingseditor.h"
-#include <qtmaterialraisedbutton.h>
 
 RaisedButtonSettingsEditor::RaisedButtonSettingsEditor(QWidget *parent)
-    : FlatButtonSettingsEditor(new QtMaterialRaisedButton("Rise up"), parent)
+    : FlatButtonSettingsEditor(new RaisedButton("Rise up"), parent)
 {
     ui->transparentCheckBox->setDisabled(true);
     ui->defaultPresetPushButton->setDisabled(true);
diff --git a/examples/raisedbuttonsettingseditor.h b/examples/raisedbuttonsettingseditor.h
index 250acd0..225292e 100644
--- a/examples/raisedbuttonsettingseditor.h
+++ b/examples/raisedbuttonsettingseditor.h
@@ -1,8 +1,11 @@
 #ifndef RAISEDBUTTONSETTINGSEDITOR_H
 #define RAISEDBUTTONSETTINGSEDITOR_H
 
+#include <qtmaterialraisedbutton.h>
 #include "flatbuttonsettingseditor.h"
 
+using namespace md;
+
 class RaisedButtonSettingsEditor : public FlatButtonSettingsEditor
 {
     Q_OBJECT
diff --git a/examples/scrollbarsettingseditor.cpp b/examples/scrollbarsettingseditor.cpp
index b02944c..fdd5d81 100644
--- a/examples/scrollbarsettingseditor.cpp
+++ b/examples/scrollbarsettingseditor.cpp
@@ -1,14 +1,10 @@
 #include "scrollbarsettingseditor.h"
-#include <QVBoxLayout>
-#include <QColorDialog>
-#include <QtWidgets/QTextEdit>
-#include <qtmaterialscrollbar.h>
 
 ScrollBarSettingsEditor::ScrollBarSettingsEditor(QWidget *parent)
     : QWidget(parent),
       ui(new Ui::ScrollBarSettingsForm),
-      m_verticalScrollbar(new QtMaterialScrollBar),
-      m_horizontalScrollbar(new QtMaterialScrollBar)
+      m_verticalScrollbar(new ScrollBar),
+      m_horizontalScrollbar(new ScrollBar)
 {
     QVBoxLayout *layout = new QVBoxLayout;
     setLayout(layout);
diff --git a/examples/scrollbarsettingseditor.h b/examples/scrollbarsettingseditor.h
index fd74539..971d12e 100644
--- a/examples/scrollbarsettingseditor.h
+++ b/examples/scrollbarsettingseditor.h
@@ -2,9 +2,15 @@
 #define SCROLLBARSETTINGSEDITOR_H
 
 #include <QWidget>
+#include <QVBoxLayout>
+#include <QColorDialog>
+#include <QtWidgets/QTextEdit>
+
+#include <qtmaterialscrollbar.h>
+
 #include "ui_scrollbarsettingsform.h"
 
-class QtMaterialScrollBar;
+using namespace md;
 
 class ScrollBarSettingsEditor : public QWidget
 {
@@ -20,8 +26,8 @@ protected slots:
 
 private:
     Ui::ScrollBarSettingsForm *const ui;
-    QtMaterialScrollBar       *const m_verticalScrollbar;
-    QtMaterialScrollBar       *const m_horizontalScrollbar;
+    ScrollBar       *const m_verticalScrollbar;
+    ScrollBar       *const m_horizontalScrollbar;
 };
 
 #endif // SCROLLBARSETTINGSEDITOR_H
diff --git a/examples/slidersettingseditor.cpp b/examples/slidersettingseditor.cpp
index 2911fdb..fd3ca73 100644
--- a/examples/slidersettingseditor.cpp
+++ b/examples/slidersettingseditor.cpp
@@ -1,12 +1,9 @@
 #include "slidersettingseditor.h"
-#include <QVBoxLayout>
-#include <QColorDialog>
-#include <qtmaterialslider.h>
 
 SliderSettingsEditor::SliderSettingsEditor(QWidget *parent)
     : QWidget(parent),
       ui(new Ui::SliderSettingsForm),
-      m_slider(new QtMaterialSlider)
+      m_slider(new Slider)
 {
     QVBoxLayout *layout = new QVBoxLayout;
     setLayout(layout);
diff --git a/examples/slidersettingseditor.h b/examples/slidersettingseditor.h
index 11e1a85..fdd3d9f 100644
--- a/examples/slidersettingseditor.h
+++ b/examples/slidersettingseditor.h
@@ -2,9 +2,14 @@
 #define SLIDERSETTINGSEDITOR_H
 
 #include <QWidget>
+#include <QVBoxLayout>
+#include <QColorDialog>
+
+#include <qtmaterialslider.h>
+
 #include "ui_slidersettingsform.h"
 
-class QtMaterialSlider;
+using namespace md;
 
 class SliderSettingsEditor : public QWidget
 {
@@ -20,7 +25,7 @@ protected slots:
 
 private:
     Ui::SliderSettingsForm *const ui;
-    QtMaterialSlider       *const m_slider;
+    Slider       *const m_slider;
 };
 
 #endif // SLIDERSETTINGSEDITOR_H
diff --git a/examples/snackbarsettingseditor.cpp b/examples/snackbarsettingseditor.cpp
index 0a9dcca..bd34864 100644
--- a/examples/snackbarsettingseditor.cpp
+++ b/examples/snackbarsettingseditor.cpp
@@ -1,12 +1,9 @@
 #include "snackbarsettingseditor.h"
-#include <QVBoxLayout>
-#include <QColorDialog>
-#include <qtmaterialsnackbar.h>
 
 SnackbarSettingsEditor::SnackbarSettingsEditor(QWidget *parent)
     : QWidget(parent),
       ui(new Ui::SnackbarSettingsForm),
-      m_snackbar(new QtMaterialSnackbar)
+      m_snackbar(new SnackBar)
 {
     QVBoxLayout *layout = new QVBoxLayout;
     setLayout(layout);
diff --git a/examples/snackbarsettingseditor.h b/examples/snackbarsettingseditor.h
index 2e4eb0d..e51c163 100644
--- a/examples/snackbarsettingseditor.h
+++ b/examples/snackbarsettingseditor.h
@@ -2,9 +2,14 @@
 #define SNACKBARSETTINGSEDITOR_H
 
 #include <QWidget>
+#include <QVBoxLayout>
+#include <QColorDialog>
+
+#include <qtmaterialsnackbar.h>
+
 #include "ui_snackbarsettingsform.h"
 
-class QtMaterialSnackbar;
+using namespace md;
 
 class SnackbarSettingsEditor : public QWidget
 {
@@ -21,7 +26,7 @@ protected slots:
 
 private:
     Ui::SnackbarSettingsForm *const ui;
-    QtMaterialSnackbar       *const m_snackbar;
+    SnackBar       *const m_snackbar;
 };
 
 #endif // SNACKBARSETTINGSEDITOR_H
diff --git a/examples/tabssettingseditor.cpp b/examples/tabssettingseditor.cpp
index 9b53a1d..04f4c29 100644
--- a/examples/tabssettingseditor.cpp
+++ b/examples/tabssettingseditor.cpp
@@ -1,12 +1,9 @@
 #include "tabssettingseditor.h"
-#include <QVBoxLayout>
-#include <QColorDialog>
-#include <qtmaterialtabs.h>
 
 TabsSettingsEditor::TabsSettingsEditor(QWidget *parent)
     : QWidget(parent),
       ui(new Ui::TabsSettingsForm),
-      m_tabs(new QtMaterialTabs)
+      m_tabs(new Tabs)
 {
     QVBoxLayout *layout = new QVBoxLayout;
     setLayout(layout);
diff --git a/examples/tabssettingseditor.h b/examples/tabssettingseditor.h
index 7bf3e97..806a4cd 100644
--- a/examples/tabssettingseditor.h
+++ b/examples/tabssettingseditor.h
@@ -2,9 +2,14 @@
 #define TABSSETTINGSEDITOR_H
 
 #include <QWidget>
+#include <QVBoxLayout>
+#include <QColorDialog>
+
+#include <qtmaterialtabs.h>
+
 #include "ui_tabssettingsform.h"
 
-class QtMaterialTabs;
+using namespace md;
 
 class TabsSettingsEditor : public QWidget
 {
@@ -20,7 +25,7 @@ protected slots:
 
 private:
     Ui::TabsSettingsForm *const ui;
-    QtMaterialTabs       *const m_tabs;
+    Tabs       *const m_tabs;
 };
 
 #endif // TABSSETTINGSEDITOR_H
diff --git a/examples/textfieldsettingseditor.cpp b/examples/textfieldsettingseditor.cpp
index 2b7fa8d..d56a085 100644
--- a/examples/textfieldsettingseditor.cpp
+++ b/examples/textfieldsettingseditor.cpp
@@ -1,12 +1,9 @@
 #include "textfieldsettingseditor.h"
-#include <QVBoxLayout>
-#include <QColorDialog>
-#include <qtmaterialtextfield.h>
 
 TextFieldSettingsEditor::TextFieldSettingsEditor(QWidget *parent)
     : QWidget(parent),
       ui(new Ui::TextFieldSettingsForm),
-      m_textField(new QtMaterialTextField)
+      m_textField(new TextField)
 {
     QVBoxLayout *layout = new QVBoxLayout;
     setLayout(layout);
diff --git a/examples/textfieldsettingseditor.h b/examples/textfieldsettingseditor.h
index 57f0d0f..cc01a1c 100644
--- a/examples/textfieldsettingseditor.h
+++ b/examples/textfieldsettingseditor.h
@@ -2,9 +2,14 @@
 #define TEXTFIELDSETTINGSEDITOR_H
 
 #include <QWidget>
+#include <QVBoxLayout>
+#include <QColorDialog>
+
+#include <qtmaterialtextfield.h>
+
 #include "ui_textfieldsettingsform.h"
 
-class QtMaterialTextField;
+using namespace md;
 
 class TextFieldSettingsEditor : public QWidget
 {
@@ -22,7 +27,7 @@ protected slots:
 
 private:
     Ui::TextFieldSettingsForm *const ui;
-    QtMaterialTextField       *const m_textField;
+    TextField       *const m_textField;
 };
 
 #endif // TEXTFIELDSETTINGSEDITOR_H
diff --git a/examples/togglesettingseditor.cpp b/examples/togglesettingseditor.cpp
index 36fe978..39d51bc 100644
--- a/examples/togglesettingseditor.cpp
+++ b/examples/togglesettingseditor.cpp
@@ -1,11 +1,9 @@
 #include "togglesettingseditor.h"
-#include <QColorDialog>
-#include <qtmaterialtoggle.h>
 
 ToggleSettingsEditor::ToggleSettingsEditor(QWidget *parent)
     : QWidget(parent),
       ui(new Ui::ToggleSettingsForm),
-      m_toggle(new QtMaterialToggle)
+      m_toggle(new Toggle)
 {
     QVBoxLayout *layout = new QVBoxLayout;
     setLayout(layout);
diff --git a/examples/togglesettingseditor.h b/examples/togglesettingseditor.h
index a74553e..435c76c 100644
--- a/examples/togglesettingseditor.h
+++ b/examples/togglesettingseditor.h
@@ -2,9 +2,13 @@
 #define TOGGLESETTINGSEDITOR_H
 
 #include <QWidget>
+#include <QColorDialog>
+
+#include <qtmaterialtoggle.h>
+
 #include "ui_togglesettingsform.h"
 
-class QtMaterialToggle;
+using namespace md;
 
 class ToggleSettingsEditor : public QWidget
 {
@@ -21,7 +25,7 @@ protected slots:
 
 private:
     Ui::ToggleSettingsForm *const ui;
-    QtMaterialToggle       *const m_toggle;
+    Toggle       *const m_toggle;
 };
 
 #endif // TOGGLESETTINGSEDITOR_H