diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8e1b135..533da67 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,7 +5,7 @@ find_package(KDE4 REQUIRED)
 include(KDE4Defaults)
  
 install(DIRECTORY .
-        DESTINATION ${DATA_INSTALL_DIR}/plasma/plasmoids/org.kde.heiku-clock)
+	DESTINATION ${DATA_INSTALL_DIR}/plasma/plasmoids/org.kde.heiku-clock PATTERN .git EXCLUDE)
  
 install(FILES metadata.desktop
-        DESTINATION ${SERVICES_INSTALL_DIR} RENAME plasma-applet-heiku-clock.desktop)
\ No newline at end of file
+        DESTINATION ${SERVICES_INSTALL_DIR} RENAME plasma-applet-heiku-clock.desktop)
diff --git a/contents/qml/main.qml b/contents/qml/main.qml
index e9eca7d..2aad63e 100644
--- a/contents/qml/main.qml
+++ b/contents/qml/main.qml
@@ -17,10 +17,10 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-import QtQuick 1.0
-import Qt 4.7
+import QtQuick 1.1
 import org.kde.plasma.graphicswidgets 0.1 as PlasmaWidgets
 import org.kde.plasma.core 0.1 as PlasmaCore
+import org.kde.plasma.components 0.1 as PlasmaComponents
 
 Item {
   
@@ -39,10 +39,6 @@ Item {
     interval: 500
   }
   
-  PlasmaCore.Theme {
-    id: theme
-  }
-  
   Column {
     id: column
     anchors {
@@ -50,12 +46,11 @@ Item {
       right: mainWindow.right
     }
     
-    Text {
+    PlasmaComponents.Label {
       id: time
       font.bold: true
       font.family: theme.defaultFont.family
       font.pixelSize: (mainWindow.height / 3) - 5
-      color: theme.textColor
       text : Qt.formatTime( dataSource.data["Local"]["Time"],"hh:mm" )
       anchors {
         right: parent.right;
@@ -63,8 +58,9 @@ Item {
     }
     
     Rectangle {
-      height: 3
+      height: 2
       width: column.width
+      color: theme.backgroundColor
       anchors {
         left: column.left
         right: column.right
@@ -73,7 +69,8 @@ Item {
     
     Row {
       id: row
-      Text {
+      spacing: 8
+      PlasmaComponents.Label {
         id: day
         font.bold: true
         font.family: theme.defaultFont.family
@@ -83,26 +80,24 @@ Item {
         anchors.verticalCenter: row.verticalCenter
       }
       
-      Text {
+      PlasmaComponents.Label {
         id: monthyear
         font.bold: true
         font.family: theme.defaultFont.family
         font.pixelSize: (mainWindow.height / 10)
         font.capitalization: Font.AllUppercase
-        color: theme.textColor
         text : Qt.formatDate( dataSource.data["Local"]["Date"],"MMMM yyyy" )
         anchors.leftMargin: 15
         anchors.verticalCenter: row.verticalCenter
       }
     }
     
-    Text {
+    PlasmaComponents.Label {
       id: weekday
       font.bold: true
       font.family: theme.defaultFont.family
       font.pixelSize: (mainWindow.height / 6)
       font.capitalization: Font.AllUppercase
-      color: theme.textColor
       text : Qt.formatDate( dataSource.data["Local"]["Date"],"dddd" )
       anchors {
         left: parent.left;