diff --git a/app/main.cpp b/app/main.cpp
index 477ca7309..3c8dcb02e 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -72,7 +72,7 @@ int main(int argc, char **argv)
                            "%{if-critical}\n%{backtrace depth=" DEPTH " separator=\"\n\"}%{endif}" CNORMAL));
                            
     //  qputenv("QT_QUICK_CONTROLS_1_STYLE", "Desktop");
-    NowDockCorona corona;
+    Latte::NowDockCorona corona;
     
     return app.exec();
 }
diff --git a/app/nowdockconfigview.cpp b/app/nowdockconfigview.cpp
index e31414990..59537630b 100644
--- a/app/nowdockconfigview.cpp
+++ b/app/nowdockconfigview.cpp
@@ -31,6 +31,8 @@
 
 #include <plasma/package.h>
 
+namespace Latte {
+
 NowDockConfigView::NowDockConfigView(Plasma::Containment *containment, NowDockView *dockView, QWindow *parent)
     : PlasmaQuick::ConfigView(containment, parent), m_containment(containment), m_dockView(dockView)
 {
@@ -214,4 +216,5 @@ void NowDockConfigView::immutabilityChanged(Plasma::Types::ImmutabilityType type
     }
 }
 
+}
 // kate: indent-mode cstyle; indent-width 4; replace-tabs on;
diff --git a/app/nowdockconfigview.h b/app/nowdockconfigview.h
index ff4635ac6..56c75188e 100644
--- a/app/nowdockconfigview.h
+++ b/app/nowdockconfigview.h
@@ -34,6 +34,8 @@ class Containment;
 class Types;
 }
 
+namespace Latte {
+
 class NowDockView;
 
 class NowDockConfigView : public PlasmaQuick::ConfigView {
@@ -64,5 +66,7 @@ private:
     QTimer m_screenSyncTimer;
     
 };
+
+}
 #endif //DOCKCONFIGVIEW_H
 // kate: indent-mode cstyle; indent-width 4; replace-tabs on;
diff --git a/app/nowdockcorona.cpp b/app/nowdockcorona.cpp
index b6c414d5a..ae0004598 100644
--- a/app/nowdockcorona.cpp
+++ b/app/nowdockcorona.cpp
@@ -38,6 +38,8 @@
 #include <KPackage/Package>
 #include <KPackage/PackageLoader>
 
+namespace Latte {
+
 NowDockCorona::NowDockCorona(QObject *parent)
     : Plasma::Corona(parent)
 {
@@ -249,3 +251,5 @@ inline void NowDockCorona::qmlRegisterTypes() const
 //    qmlRegisterUncreatableType<NowDockView>(uri, vMajor, vMinor, "DockView", "class DockView uncreatable");
     qmlRegisterType<QScreen>();
 }
+
+}
diff --git a/app/nowdockcorona.h b/app/nowdockcorona.h
index cb3c4d8ea..1b5ec20a6 100644
--- a/app/nowdockcorona.h
+++ b/app/nowdockcorona.h
@@ -33,6 +33,8 @@ class Containment;
 class Types;
 }
 
+namespace Latte {
+
 class NowDockCorona : public Plasma::Corona {
     Q_OBJECT
     
@@ -60,5 +62,6 @@ private:
     std::vector<NowDockView *> m_containments;
 };
 
+}
 
 #endif
diff --git a/app/nowdockview.cpp b/app/nowdockview.cpp
index da60ad9cd..f39fefe85 100644
--- a/app/nowdockview.cpp
+++ b/app/nowdockview.cpp
@@ -39,6 +39,7 @@
 
 #include "nowdockcorona.h"
 
+namespace Latte {
 
 NowDockView::NowDockView(Plasma::Corona *corona, QScreen *targetScreen)
     : PlasmaQuick::ContainmentView(corona),
@@ -81,7 +82,6 @@ NowDockView::NowDockView(Plasma::Corona *corona, QScreen *targetScreen)
             m_visibility = new VisibilityManager(this);
         }
         
-        m_visibility->setContainment(containment());
     }, Qt::DirectConnection);
 }
 
@@ -417,7 +417,6 @@ void NowDockView::setMaskArea(QRect area)
     }
     
     m_maskArea = area;
-    m_visibility->setMaskArea(area);
     
     setMask(m_maskArea);
     
@@ -566,6 +565,8 @@ void NowDockView::restoreConfig()
     //  setAlignment(static_cast<Dock::Alignment>(readEntry("alignment", Dock::Center).toInt()));
 }
 
+}
+
 //!END SLOTS
 
 
diff --git a/app/nowdockview.h b/app/nowdockview.h
index 6df93990f..d4ee55ac1 100644
--- a/app/nowdockview.h
+++ b/app/nowdockview.h
@@ -47,12 +47,12 @@ class DockConfigView;
 class VisibilityManager;
 }*/
 
+namespace Latte {
+
 class NowDockView : public PlasmaQuick::ContainmentView {
     Q_OBJECT
     
-    
     Q_PROPERTY(bool compositing READ compositing NOTIFY compositingChanged)
-    
     Q_PROPERTY(int height READ height NOTIFY heightChanged)
     Q_PROPERTY(int length READ length WRITE setLength NOTIFY lengthChanged)
     Q_PROPERTY(int maxLength READ maxLength WRITE setMaxLength NOTIFY maxLengthChanged)
@@ -61,9 +61,7 @@ class NowDockView : public PlasmaQuick::ContainmentView {
     Q_PROPERTY(int width READ width NOTIFY widthChanged)
     
     Q_PROPERTY(QRect maskArea READ maskArea WRITE setMaskArea NOTIFY maskAreaChanged)
-    
     Q_PROPERTY(VisibilityManager *visibility READ visibility NOTIFY visibilityChanged)
-    
     Q_PROPERTY(QQmlListProperty<QScreen> screens READ screens)
     
 public:
@@ -161,4 +159,6 @@ private:
     void initWindow();
 };
 
+}
+
 #endif