v0.1.0

06/24/2016

- reworked status bar
- reviewed D-Bus interfaces, now using signals instead of methods for day/night mode
- created new home screen simulator app
- license changed to Apache 2.0
- put D-Bus introspections in one central place
- disabled "only one instance allowed" for development

170 files changed, 1919 insertions, 1721 deletions

diff --git a/HomeScreen.pro b/HomeScreen.pro
index 3a80fab..00d5a7f 100644
--- a/HomeScreen.pro
+++ b/HomeScreen.pro
@@ -1,162 +1,6 @@
-# Copyright (C) 2016 Mentor Graphics Development (Deutschland) GmbH
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+TEMPLATE = subdirs
 
-#TODO: compile switches for ARM/x86 architecture
-
-QT       += core gui dbus
-
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
-
-TARGET = HomeScreen
-TEMPLATE = app
-
-
-SOURCES += \
-    src/main.cpp \
-    src/mainwindow.cpp \
-    src/inputdevicesimulator.cpp \
-    src/systemsettingssimulator.cpp \
-    $$OUT_PWD/daynightmode_adapter.cpp \        #generated dbus adapter
-    $$OUT_PWD/daynightmode_proxy.cpp \             #generated dbus proxy
-    $$OUT_PWD/popup_adapter.cpp \        #generated dbus adapter
-    $$OUT_PWD/popup_proxy.cpp \             #generated dbus proxy
-    $$OUT_PWD/inputevent_adapter.cpp \        #generated dbus adapter
-    $$OUT_PWD/inputevent_proxy.cpp \             #generated dbus proxy
-    $$OUT_PWD/statusbar_adapter.cpp \        #generated dbus adapter
-    $$OUT_PWD/statusbar_proxy.cpp \             #generated dbus proxy
-    src/settingswidget.cpp \
-    src/popupwidget.cpp \
-    src/inputeventdistributor.cpp \
-    src/controlbarwidget.cpp \
-    src/statusbarwidget.cpp
-
-HEADERS  += \
-    include/daynightmode.h \
-    include/inputevent.h \
-    include/popup.h \
-    src/mainwindow.h \
-    src/inputdevicesimulator.h \
-    src/systemsettingssimulator.h \
-    $$OUT_PWD/daynightmode_adapter.h \      #generated dbus adapter
-    $$OUT_PWD/daynightmode_proxy.h \           #generated dbus proxy
-    $$OUT_PWD/popup_adapter.h \      #generated dbus adapter
-    $$OUT_PWD/popup_proxy.h \           #generated dbus proxy
-    $$OUT_PWD/inputevent_adapter.h \      #generated dbus adapter
-    $$OUT_PWD/inputevent_proxy.h \           #generated dbus proxy
-    $$OUT_PWD/statusbar_adapter.h \      #generated dbus adapter
-    $$OUT_PWD/statusbar_proxy.h \           #generated dbus proxy
-    src/settingswidget.h \
-    src/popupwidget.h \
-    src/inputeventdistributor.h \
-    src/controlbarwidget.h \
-    src/statusbarwidget.h
-
-FORMS    += \
-    resources/mainwindow.ui \
-    resources/inputdevicesimulator.ui \
-    resources/systemsettingssimulator.ui \
-    resources/settingswidget.ui \
-    resources/popupwidget.ui \
-    resources/controlbarwidget.ui \
-    resources/statusbarwidget.ui
-
-TRANSLATIONS = \
-    resources/translations/homescreen_en_US.ts \
-    resources/translations/homescreen_de_DE.ts \
-    resources/translations/homescreen_ja_JP.ts
-
-OTHER_FILES += \
-    dbus-introspections/daynightmode.xml \
-    dbus-introspections/inputevent.xml \
-    dbus-introspections/popup.xml \
-    dbus-introspections/statusbar.xml
-
-RESOURCES += \
-    resources/homescreen.qrc
-
-# remove generated files
-QMAKE_CLEAN += -r \
-    $$OUT_PWD/HomeScreen \
-    $$OUT_PWD/Makefile \
-    $$OUT_PWD/daynightmode_adapter.h \
-    $$OUT_PWD/daynightmode_adapter.cpp \
-    $$OUT_PWD/daynightmode_adapter.moc \
-    $$OUT_PWD/daynightmode_proxy.h \
-    $$OUT_PWD/daynightmode_proxy.cpp \
-    $$OUT_PWD/daynightmode_proxy.moc \
-    $$OUT_PWD/popup_adapter.h \
-    $$OUT_PWD/popup_adapter.cpp \
-    $$OUT_PWD/popup_adapter.moc \
-    $$OUT_PWD/popup_proxy.h \
-    $$OUT_PWD/popup_proxy.cpp \
-    $$OUT_PWD/popup_proxy.moc \
-    $$OUT_PWD/inputevent_adapter.h \
-    $$OUT_PWD/inputevent_adapter.cpp \
-    $$OUT_PWD/inputevent_adapter.moc \
-    $$OUT_PWD/inputevent_proxy.h \
-    $$OUT_PWD/inputevent_proxy.cpp \
-    $$OUT_PWD/inputevent_proxy.moc \
-    $$OUT_PWD/statusbar_adapter.h \
-    $$OUT_PWD/statusbar_adapter.cpp \
-    $$OUT_PWD/statusbar_adapter.moc \
-    $$OUT_PWD/statusbar_proxy.h \
-    $$OUT_PWD/statusbar_proxy.cpp \
-    $$OUT_PWD/statusbar_proxy.moc
-
-# Create custom targets for generating dbus proxy and adapter
-# for daynightmode
-daynightmodegenerateadapter.target = $$OUT_PWD/daynightmode_adapter.cpp
-unix:daynightmodegenerateadapter.commands = "qdbusxml2cpp -m -a daynightmode_adapter $$_PRO_FILE_PWD_/dbus-introspections/daynightmode.xml; moc $$OUT_PWD/daynightmode_adapter.h -o $$OUT_PWD/daynightmode_adapter.moc"
-daynightmodegenerateproxy.target = $$OUT_PWD/daynightmode_proxy.cpp
-unix:daynightmodegenerateproxy.commands = "qdbusxml2cpp -m -p daynightmode_proxy $$_PRO_FILE_PWD_/dbus-introspections/daynightmode.xml; moc $$OUT_PWD/daynightmode_proxy.h -o $$OUT_PWD/daynightmode_proxy.moc"
-PRE_TARGETDEPS += \
-    $$OUT_PWD/daynightmode_adapter.cpp \
-    $$OUT_PWD/daynightmode_proxy.cpp
-QMAKE_EXTRA_TARGETS += \
-    daynightmodegenerateadapter \
-    daynightmodegenerateproxy
-# for popup
-popupgenerateadapter.target = $$OUT_PWD/popup_adapter.cpp
-unix:popupgenerateadapter.commands = "qdbusxml2cpp -m -a popup_adapter $$_PRO_FILE_PWD_/dbus-introspections/popup.xml; moc $$OUT_PWD/popup_adapter.h -o $$OUT_PWD/popup_adapter.moc"
-popupgenerateproxy.target = $$OUT_PWD/popup_proxy.cpp
-unix:popupgenerateproxy.commands = "qdbusxml2cpp -m -p popup_proxy $$_PRO_FILE_PWD_/dbus-introspections/popup.xml; moc $$OUT_PWD/popup_proxy.h -o $$OUT_PWD/popup_proxy.moc"
-PRE_TARGETDEPS += \
-    $$OUT_PWD/popup_adapter.cpp \
-    $$OUT_PWD/popup_proxy.cpp
-QMAKE_EXTRA_TARGETS += \
-    popupgenerateadapter \
-    popupgenerateproxy
-# for inputevent
-inputeventgenerateadapter.target = $$OUT_PWD/inputevent_adapter.cpp
-unix:inputeventgenerateadapter.commands = "qdbusxml2cpp -m -a inputevent_adapter $$_PRO_FILE_PWD_/dbus-introspections/inputevent.xml; moc $$OUT_PWD/inputevent_adapter.h -o $$OUT_PWD/inputevent_adapter.moc"
-inputeventgenerateproxy.target = $$OUT_PWD/inputevent_proxy.cpp
-unix:inputeventgenerateproxy.commands = "qdbusxml2cpp -m -p inputevent_proxy $$_PRO_FILE_PWD_/dbus-introspections/inputevent.xml; moc $$OUT_PWD/inputevent_proxy.h -o $$OUT_PWD/inputevent_proxy.moc"
-PRE_TARGETDEPS += \
-    $$OUT_PWD/inputevent_adapter.cpp \
-    $$OUT_PWD/inputevent_proxy.cpp
-QMAKE_EXTRA_TARGETS += \
-    inputeventgenerateadapter \
-    inputeventgenerateproxy
-# for statusbar
-statusbargenerateadapter.target = $$OUT_PWD/statusbar_adapter.cpp
-unix:statusbargenerateadapter.commands = "qdbusxml2cpp -m -a statusbar_adapter $$_PRO_FILE_PWD_/dbus-introspections/statusbar.xml; moc $$OUT_PWD/statusbar_adapter.h -o $$OUT_PWD/statusbar_adapter.moc"
-statusbargenerateproxy.target = $$OUT_PWD/statusbar_proxy.cpp
-unix:statusbargenerateproxy.commands = "qdbusxml2cpp -m -p statusbar_proxy $$_PRO_FILE_PWD_/dbus-introspections/statusbar.xml; moc $$OUT_PWD/statusbar_proxy.h -o $$OUT_PWD/statusbar_proxy.moc"
-PRE_TARGETDEPS += \
-    $$OUT_PWD/statusbar_adapter.cpp \
-    $$OUT_PWD/statusbar_proxy.cpp
-QMAKE_EXTRA_TARGETS += \
-    statusbargenerateadapter \
-    statusbargenerateproxy
+SUBDIRS = HomeScreen \
+	HomeScreenSimulator \
+	SampleAppTimeDate
 
diff --git a/HomeScreen/HomeScreen.pro b/HomeScreen/HomeScreen.pro
new file mode 100644
index 0000000..01e5ace
--- /dev/null
+++ b/HomeScreen/HomeScreen.pro
@@ -0,0 +1,137 @@
+# Copyright (C) 2016 Mentor Graphics Development (Deutschland) GmbH
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#TODO: compile switches for ARM/x86 architecture
+
+QT       += core gui dbus
+
+greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+
+TARGET = HomeScreen
+TEMPLATE = app
+
+
+SOURCES += \
+    src/main.cpp \
+    src/mainwindow.cpp \
+    $$OUT_PWD/daynightmode_adapter.cpp \        #generated dbus adapter
+    $$OUT_PWD/daynightmode_proxy.cpp \             #generated dbus proxy
+    $$OUT_PWD/popup_adapter.cpp \        #generated dbus adapter
+    $$OUT_PWD/popup_proxy.cpp \             #generated dbus proxy
+    $$OUT_PWD/statusbar_adapter.cpp \        #generated dbus adapter
+    $$OUT_PWD/statusbar_proxy.cpp \             #generated dbus proxy
+    src/settingswidget.cpp \
+    src/popupwidget.cpp \
+    src/controlbarwidget.cpp \
+    src/statusbarwidget.cpp
+
+HEADERS  += \
+    ../interfaces/daynightmode.h \
+    ../interfaces/popup.h \
+    src/mainwindow.h \
+    $$OUT_PWD/daynightmode_adapter.h \      #generated dbus adapter
+    $$OUT_PWD/daynightmode_proxy.h \           #generated dbus proxy
+    $$OUT_PWD/popup_adapter.h \      #generated dbus adapter
+    $$OUT_PWD/popup_proxy.h \           #generated dbus proxy
+    $$OUT_PWD/statusbar_adapter.h \      #generated dbus adapter
+    $$OUT_PWD/statusbar_proxy.h \           #generated dbus proxy
+    src/settingswidget.h \
+    src/popupwidget.h \
+    src/controlbarwidget.h \
+    src/statusbarwidget.h
+
+FORMS    += \
+    resources/mainwindow.ui \
+    resources/settingswidget.ui \
+    resources/popupwidget.ui \
+    resources/controlbarwidget.ui \
+    resources/statusbarwidget.ui
+
+TRANSLATIONS = \
+    resources/translations/homescreen_en_US.ts \
+    resources/translations/homescreen_de_DE.ts \
+    resources/translations/homescreen_ja_JP.ts
+
+OTHER_FILES += \
+    ../interfaces/daynightmode.xml \
+    ../interfaces/inputevent.xml \
+    ../interfaces/popup.xml \
+    ../interfaces/statusbar.xml \
+    README.md
+
+RESOURCES += \
+    resources/homescreen.qrc
+
+# remove generated files
+QMAKE_CLEAN += -r \
+    $$OUT_PWD/HomeScreen \
+    $$OUT_PWD/Makefile \
+    $$OUT_PWD/daynightmode_adapter.h \
+    $$OUT_PWD/daynightmode_adapter.cpp \
+    $$OUT_PWD/daynightmode_adapter.moc \
+    $$OUT_PWD/daynightmode_proxy.h \
+    $$OUT_PWD/daynightmode_proxy.cpp \
+    $$OUT_PWD/daynightmode_proxy.moc \
+    $$OUT_PWD/popup_adapter.h \
+    $$OUT_PWD/popup_adapter.cpp \
+    $$OUT_PWD/popup_adapter.moc \
+    $$OUT_PWD/popup_proxy.h \
+    $$OUT_PWD/popup_proxy.cpp \
+    $$OUT_PWD/popup_proxy.moc \
+    $$OUT_PWD/statusbar_adapter.h \
+    $$OUT_PWD/statusbar_adapter.cpp \
+    $$OUT_PWD/statusbar_adapter.moc \
+    $$OUT_PWD/statusbar_proxy.h \
+    $$OUT_PWD/statusbar_proxy.cpp \
+    $$OUT_PWD/statusbar_proxy.moc
+
+# Create custom targets for generating dbus proxy and adapter
+# OE_QMAKE_PATH_EXTERNAL_HOST_BINS is only defined in the yocto environment
+isEmpty(OE_QMAKE_PATH_EXTERNAL_HOST_BINS){
+  OE_QMAKE_PATH_EXTERNAL_HOST_BINS = "/"
+}
+# for daynightmode
+daynightmodegenerateadapter.target = $$OUT_PWD/daynightmode_adapter.cpp
+unix:daynightmodegenerateadapter.commands = "$(OE_QMAKE_PATH_EXTERNAL_HOST_BINS)qdbusxml2cpp -m -a daynightmode_adapter $$_PRO_FILE_PWD_/../interfaces/daynightmode.xml; $(OE_QMAKE_PATH_EXTERNAL_HOST_BINS)moc $$OUT_PWD/daynightmode_adapter.h -o $$OUT_PWD/daynightmode_adapter.moc"
+daynightmodegenerateproxy.target = $$OUT_PWD/daynightmode_proxy.cpp
+unix:daynightmodegenerateproxy.commands = "$(OE_QMAKE_PATH_EXTERNAL_HOST_BINS)qdbusxml2cpp -m -p daynightmode_proxy $$_PRO_FILE_PWD_/../interfaces/daynightmode.xml; $(OE_QMAKE_PATH_EXTERNAL_HOST_BINS)moc $$OUT_PWD/daynightmode_proxy.h -o $$OUT_PWD/daynightmode_proxy.moc"
+PRE_TARGETDEPS += \
+    $$OUT_PWD/daynightmode_adapter.cpp \
+    $$OUT_PWD/daynightmode_proxy.cpp
+QMAKE_EXTRA_TARGETS += \
+    daynightmodegenerateadapter \
+    daynightmodegenerateproxy
+# for popup
+popupgenerateadapter.target = $$OUT_PWD/popup_adapter.cpp
+unix:popupgenerateadapter.commands = "$(OE_QMAKE_PATH_EXTERNAL_HOST_BINS)qdbusxml2cpp -m -a popup_adapter $$_PRO_FILE_PWD_/../interfaces/popup.xml; $(OE_QMAKE_PATH_EXTERNAL_HOST_BINS)moc $$OUT_PWD/popup_adapter.h -o $$OUT_PWD/popup_adapter.moc"
+popupgenerateproxy.target = $$OUT_PWD/popup_proxy.cpp
+unix:popupgenerateproxy.commands = "$(OE_QMAKE_PATH_EXTERNAL_HOST_BINS)qdbusxml2cpp -m -p popup_proxy $$_PRO_FILE_PWD_/../interfaces/popup.xml; $(OE_QMAKE_PATH_EXTERNAL_HOST_BINS)moc $$OUT_PWD/popup_proxy.h -o $$OUT_PWD/popup_proxy.moc"
+PRE_TARGETDEPS += \
+    $$OUT_PWD/popup_adapter.cpp \
+    $$OUT_PWD/popup_proxy.cpp
+QMAKE_EXTRA_TARGETS += \
+    popupgenerateadapter \
+    popupgenerateproxy
+# for statusbar
+statusbargenerateadapter.target = $$OUT_PWD/statusbar_adapter.cpp
+unix:statusbargenerateadapter.commands = "$(OE_QMAKE_PATH_EXTERNAL_HOST_BINS)qdbusxml2cpp -m -a statusbar_adapter $$_PRO_FILE_PWD_/../interfaces/statusbar.xml; $(OE_QMAKE_PATH_EXTERNAL_HOST_BINS)moc $$OUT_PWD/statusbar_adapter.h -o $$OUT_PWD/statusbar_adapter.moc"
+statusbargenerateproxy.target = $$OUT_PWD/statusbar_proxy.cpp
+unix:statusbargenerateproxy.commands = "$(OE_QMAKE_PATH_EXTERNAL_HOST_BINS)qdbusxml2cpp -m -p statusbar_proxy $$_PRO_FILE_PWD_/../interfaces/statusbar.xml; $(OE_QMAKE_PATH_EXTERNAL_HOST_BINS)moc $$OUT_PWD/statusbar_proxy.h -o $$OUT_PWD/statusbar_proxy.moc"
+PRE_TARGETDEPS += \
+    $$OUT_PWD/statusbar_adapter.cpp \
+    $$OUT_PWD/statusbar_proxy.cpp
+QMAKE_EXTRA_TARGETS += \
+    statusbargenerateadapter \
+    statusbargenerateproxy
+
diff --git a/LICENSE b/HomeScreen/LICENSE
index 31c692a..31c692a 100644
--- a/LICENSE
+++ b/HomeScreen/LICENSE
diff --git a/HomeScreen/README.md b/HomeScreen/README.md
new file mode 100644
index 0000000..b896bfa
--- /dev/null
+++ b/HomeScreen/README.md
@@ -0,0 +1,61 @@
+AGL Home Screen reference implementation
+
+
+AGL repo for source code:
+https://gerrit.automotivelinux.org/gerrit/#/admin/projects/staging/HomeScreen
+
+
+v0.1.0
+06/24/2016
+
+#changes
+- reworked status bar
+- reviewed D-Bus interfaces, now using signals instead of methods for day/night mode
+- created new home screen simulator app
+- license changed to Apache 2.0
+- put D-Bus introspections in one central place
+- disabled "only one instance allowed" for development
+
+v0.0.2
+06/13/2016
+
+#changes
+- created layout 1. Changed home screen app size to 1080x1920
+
+v0.0.1
+06/01/2016
+
+#new features
+- initial version
+- first implementation of home screen
+- fix HMI layout (will be configurable in the future)
+- dBus as IPC (may change in the future)
+- no interaction with application manager so far
+- multi-lanuage support
+- day/night mode support
+- initial status bar implementation (interface will be enhanced in the future)
+- initial control bar implementation
+- MPLv2.0 license
+- input device simulator for developer build (not functional right now)
+- system settings simulator for developer build (day/night mode switch functional right now)
+- using QSettings for local app setting storage (may change in the future)
+- first popup implementation (single popup support for now; multiple popup not defined; interface will change)
+- only one instance of the app allowed
+
+#TODOs
+- define and implement control bar D-Bus-interface
+- many settings have to be read from the system somewhere during app startup. This is not available right now
+- interaction with application manager
+- interaction with wayland compositor
+- define and implement input device event handler
+- replace my HMI design with the official AGL design (graphics/icons...)
+- implement example HMI layouts
+- fix font issues on target
+- more documentation ;)
+- add animations
+- much more...
+
+Thanks to Umar Irshad for his free iconset available here:
+https://dribbble.com/shots/1569128-Freebie-48-Bubbles-Iconset
+
+
diff --git a/resources/controlbarwidget.ui b/HomeScreen/resources/controlbarwidget.ui
index bcbe95c..9696a49 100644
--- a/resources/controlbarwidget.ui
+++ b/HomeScreen/resources/controlbarwidget.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>800</width>
+    <width>1080</width>
     <height>60</height>
    </rect>
   </property>
@@ -18,7 +18,7 @@
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>800</width>
+     <width>1080</width>
      <height>60</height>
     </rect>
    </property>
@@ -58,7 +58,7 @@ border-image: url(:/images/transparency.png);</string>
    <widget class="QPushButton" name="pushButton_Settings">
     <property name="geometry">
      <rect>
-      <x>380</x>
+      <x>60</x>
       <y>10</y>
       <width>40</width>
       <height>40</height>
diff --git a/resources/homescreen.qrc b/HomeScreen/resources/homescreen.qrc
index 0a8ee15..0a8ee15 100644
--- a/resources/homescreen.qrc
+++ b/HomeScreen/resources/homescreen.qrc
diff --git a/resources/images/backgrounds/bg_blue_day.png b/HomeScreen/resources/images/backgrounds/bg_blue_day.png
index 1cbe79a..1cbe79a 100755
--- a/resources/images/backgrounds/bg_blue_day.png
+++ b/HomeScreen/resources/images/backgrounds/bg_blue_day.png
diff --git a/resources/images/backgrounds/bg_blue_night.png b/HomeScreen/resources/images/backgrounds/bg_blue_night.png
index bd3f1e9..bd3f1e9 100755
--- a/resources/images/backgrounds/bg_blue_night.png
+++ b/HomeScreen/resources/images/backgrounds/bg_blue_night.png
diff --git a/resources/images/backgrounds/bg_green_day.png b/HomeScreen/resources/images/backgrounds/bg_green_day.png
index 9549399..9549399 100755
--- a/resources/images/backgrounds/bg_green_day.png
+++ b/HomeScreen/resources/images/backgrounds/bg_green_day.png
diff --git a/resources/images/backgrounds/bg_green_night.png b/HomeScreen/resources/images/backgrounds/bg_green_night.png
index 0377283..0377283 100755
--- a/resources/images/backgrounds/bg_green_night.png
+++ b/HomeScreen/resources/images/backgrounds/bg_green_night.png
diff --git a/HomeScreen/resources/images/backgrounds/bg_stripes_day.png b/HomeScreen/resources/images/backgrounds/bg_stripes_day.png
new file mode 100755
index 0000000..e2fdadd
--- /dev/null
+++ b/HomeScreen/resources/images/backgrounds/bg_stripes_day.png
diff --git a/HomeScreen/resources/images/backgrounds/bg_stripes_night.png b/HomeScreen/resources/images/backgrounds/bg_stripes_night.png
new file mode 100755
index 0000000..3c08bd2
--- /dev/null
+++ b/HomeScreen/resources/images/backgrounds/bg_stripes_night.png
diff --git a/resources/images/icons/Black/01.Home.png b/HomeScreen/resources/images/icons/Black/01.Home.png
index 08323c8..08323c8 100644
--- a/resources/images/icons/Black/01.Home.png
+++ b/HomeScreen/resources/images/icons/Black/01.Home.png
diff --git a/resources/images/icons/Black/02.Shop.png b/HomeScreen/resources/images/icons/Black/02.Shop.png
index c50ae45..c50ae45 100644
--- a/resources/images/icons/Black/02.Shop.png
+++ b/HomeScreen/resources/images/icons/Black/02.Shop.png
diff --git a/resources/images/icons/Black/03.Office.png b/HomeScreen/resources/images/icons/Black/03.Office.png
index 6e74c74..6e74c74 100644
--- a/resources/images/icons/Black/03.Office.png
+++ b/HomeScreen/resources/images/icons/Black/03.Office.png
diff --git a/resources/images/icons/Black/04.Bank.png b/HomeScreen/resources/images/icons/Black/04.Bank.png
index 07a724d..07a724d 100644
--- a/resources/images/icons/Black/04.Bank.png
+++ b/HomeScreen/resources/images/icons/Black/04.Bank.png
diff --git a/resources/images/icons/Black/05.Tag.png b/HomeScreen/resources/images/icons/Black/05.Tag.png
index 5d09027..5d09027 100644
--- a/resources/images/icons/Black/05.Tag.png
+++ b/HomeScreen/resources/images/icons/Black/05.Tag.png
diff --git a/resources/images/icons/Black/06.Tags.png b/HomeScreen/resources/images/icons/Black/06.Tags.png
index 6d85dde..6d85dde 100644
--- a/resources/images/icons/Black/06.Tags.png
+++ b/HomeScreen/resources/images/icons/Black/06.Tags.png
diff --git a/resources/images/icons/Black/07.Wallet.png b/HomeScreen/resources/images/icons/Black/07.Wallet.png
index 7c3be7f..7c3be7f 100644
--- a/resources/images/icons/Black/07.Wallet.png
+++ b/HomeScreen/resources/images/icons/Black/07.Wallet.png
diff --git a/resources/images/icons/Black/08.Credit-Card.png b/HomeScreen/resources/images/icons/Black/08.Credit-Card.png
index 690fb65..690fb65 100644
--- a/resources/images/icons/Black/08.Credit-Card.png
+++ b/HomeScreen/resources/images/icons/Black/08.Credit-Card.png
diff --git a/resources/images/icons/Black/09.Handbag.png b/HomeScreen/resources/images/icons/Black/09.Handbag.png
index d12348d..d12348d 100644
--- a/resources/images/icons/Black/09.Handbag.png
+++ b/HomeScreen/resources/images/icons/Black/09.Handbag.png
diff --git a/resources/images/icons/Black/10.Folder.png b/HomeScreen/resources/images/icons/Black/10.Folder.png
index eeb9a05..eeb9a05 100644
--- a/resources/images/icons/Black/10.Folder.png
+++ b/HomeScreen/resources/images/icons/Black/10.Folder.png
diff --git a/resources/images/icons/Black/11.Notebook.png b/HomeScreen/resources/images/icons/Black/11.Notebook.png
index eb8bd67..eb8bd67 100644
--- a/resources/images/icons/Black/11.Notebook.png
+++ b/HomeScreen/resources/images/icons/Black/11.Notebook.png
diff --git a/resources/images/icons/Black/12.File.png b/HomeScreen/resources/images/icons/Black/12.File.png
index 6e2bd02..6e2bd02 100644
--- a/resources/images/icons/Black/12.File.png
+++ b/HomeScreen/resources/images/icons/Black/12.File.png
diff --git a/resources/images/icons/Black/13.Clipboard.png b/HomeScreen/resources/images/icons/Black/13.Clipboard.png
index d1c6816..d1c6816 100644
--- a/resources/images/icons/Black/13.Clipboard.png
+++ b/HomeScreen/resources/images/icons/Black/13.Clipboard.png
diff --git a/resources/images/icons/Black/14.News.png b/HomeScreen/resources/images/icons/Black/14.News.png
index f5689c8..f5689c8 100644
--- a/resources/images/icons/Black/14.News.png
+++ b/HomeScreen/resources/images/icons/Black/14.News.png
diff --git a/resources/images/icons/Black/15.Pencil.png b/HomeScreen/resources/images/icons/Black/15.Pencil.png
index d9cbca9..d9cbca9 100644
--- a/resources/images/icons/Black/15.Pencil.png
+++ b/HomeScreen/resources/images/icons/Black/15.Pencil.png
diff --git a/resources/images/icons/Black/16.Pen.png b/HomeScreen/resources/images/icons/Black/16.Pen.png
index ce6e2e2..ce6e2e2 100644
--- a/resources/images/icons/Black/16.Pen.png
+++ b/HomeScreen/resources/images/icons/Black/16.Pen.png
diff --git a/resources/images/icons/Black/17.Brush.png b/HomeScreen/resources/images/icons/Black/17.Brush.png
index ca9b131..ca9b131 100644
--- a/resources/images/icons/Black/17.Brush.png
+++ b/HomeScreen/resources/images/icons/Black/17.Brush.png
diff --git a/resources/images/icons/Black/18.Pictures-Day.png b/HomeScreen/resources/images/icons/Black/18.Pictures-Day.png
index 75cee68..75cee68 100644
--- a/resources/images/icons/Black/18.Pictures-Day.png
+++ b/HomeScreen/resources/images/icons/Black/18.Pictures-Day.png
diff --git a/resources/images/icons/Black/19.Pictures-Night.png b/HomeScreen/resources/images/icons/Black/19.Pictures-Night.png
index 532e5b3..532e5b3 100644
--- a/resources/images/icons/Black/19.Pictures-Night.png
+++ b/HomeScreen/resources/images/icons/Black/19.Pictures-Night.png
diff --git a/resources/images/icons/Black/20.Photos.png b/HomeScreen/resources/images/icons/Black/20.Photos.png
index c9f5fce..c9f5fce 100644
--- a/resources/images/icons/Black/20.Photos.png
+++ b/HomeScreen/resources/images/icons/Black/20.Photos.png
diff --git a/resources/images/icons/Black/21.Music.png b/HomeScreen/resources/images/icons/Black/21.Music.png
index 4cab482..4cab482 100644
--- a/resources/images/icons/Black/21.Music.png
+++ b/HomeScreen/resources/images/icons/Black/21.Music.png
diff --git a/resources/images/icons/Black/22.Music-Playlist.png b/HomeScreen/resources/images/icons/Black/22.Music-Playlist.png
index 9b7a05d..9b7a05d 100644
--- a/resources/images/icons/Black/22.Music-Playlist.png
+++ b/HomeScreen/resources/images/icons/Black/22.Music-Playlist.png
diff --git a/resources/images/icons/Black/23.Videos.png b/HomeScreen/resources/images/icons/Black/23.Videos.png
index 04b6575..04b6575 100644
--- a/resources/images/icons/Black/23.Videos.png
+++ b/HomeScreen/resources/images/icons/Black/23.Videos.png
diff --git a/resources/images/icons/Black/24.TV.png b/HomeScreen/resources/images/icons/Black/24.TV.png
index 188bf42..188bf42 100644
--- a/resources/images/icons/Black/24.TV.png
+++ b/HomeScreen/resources/images/icons/Black/24.TV.png
diff --git a/resources/images/icons/Black/25.Camera-Front.png b/HomeScreen/resources/images/icons/Black/25.Camera-Front.png
index 0b32a56..0b32a56 100644
--- a/resources/images/icons/Black/25.Camera-Front.png
+++ b/HomeScreen/resources/images/icons/Black/25.Camera-Front.png
diff --git a/resources/images/icons/Black/26.Camera-Back.png b/HomeScreen/resources/images/icons/Black/26.Camera-Back.png
index b6e6935..b6e6935 100644
--- a/resources/images/icons/Black/26.Camera-Back.png
+++ b/HomeScreen/resources/images/icons/Black/26.Camera-Back.png
diff --git a/resources/images/icons/Black/27.Phone.png b/HomeScreen/resources/images/icons/Black/27.Phone.png
index afd67de..afd67de 100644
--- a/resources/images/icons/Black/27.Phone.png
+++ b/HomeScreen/resources/images/icons/Black/27.Phone.png
diff --git a/resources/images/icons/Black/28.Tablet.png b/HomeScreen/resources/images/icons/Black/28.Tablet.png
index 6806fba..6806fba 100644
--- a/resources/images/icons/Black/28.Tablet.png
+++ b/HomeScreen/resources/images/icons/Black/28.Tablet.png
diff --git a/resources/images/icons/Black/29.Mac.png b/HomeScreen/resources/images/icons/Black/29.Mac.png
index 35125f1..35125f1 100644
--- a/resources/images/icons/Black/29.Mac.png
+++ b/HomeScreen/resources/images/icons/Black/29.Mac.png
diff --git a/resources/images/icons/Black/30.User.png b/HomeScreen/resources/images/icons/Black/30.User.png
index ca34e59..ca34e59 100644
--- a/resources/images/icons/Black/30.User.png
+++ b/HomeScreen/resources/images/icons/Black/30.User.png
diff --git a/resources/images/icons/Black/31.ID-Horizontal.png b/HomeScreen/resources/images/icons/Black/31.ID-Horizontal.png
index ac20dc8..ac20dc8 100644
--- a/resources/images/icons/Black/31.ID-Horizontal.png
+++ b/HomeScreen/resources/images/icons/Black/31.ID-Horizontal.png
diff --git a/resources/images/icons/Black/32.ID-Vertical.png b/HomeScreen/resources/images/icons/Black/32.ID-Vertical.png
index 88c9787..88c9787 100644
--- a/resources/images/icons/Black/32.ID-Vertical.png
+++ b/HomeScreen/resources/images/icons/Black/32.ID-Vertical.png
diff --git a/resources/images/icons/Black/33.Thumbs-Up.png b/HomeScreen/resources/images/icons/Black/33.Thumbs-Up.png
index 06e5c0d..06e5c0d 100644
--- a/resources/images/icons/Black/33.Thumbs-Up.png
+++ b/HomeScreen/resources/images/icons/Black/33.Thumbs-Up.png
diff --git a/resources/images/icons/Black/34.Thumbs-Down.png b/HomeScreen/resources/images/icons/Black/34.Thumbs-Down.png
index c37a621..c37a621 100644
--- a/resources/images/icons/Black/34.Thumbs-Down.png
+++ b/HomeScreen/resources/images/icons/Black/34.Thumbs-Down.png
diff --git a/resources/images/icons/Black/35.Alarm-Clock.png b/HomeScreen/resources/images/icons/Black/35.Alarm-Clock.png
index 12de647..12de647 100644
--- a/resources/images/icons/Black/35.Alarm-Clock.png
+++ b/HomeScreen/resources/images/icons/Black/35.Alarm-Clock.png
diff --git a/resources/images/icons/Black/36.Watch.png b/HomeScreen/resources/images/icons/Black/36.Watch.png
index dec17c4..dec17c4 100644
--- a/resources/images/icons/Black/36.Watch.png
+++ b/HomeScreen/resources/images/icons/Black/36.Watch.png
diff --git a/resources/images/icons/Black/37.Stopwatch.png b/HomeScreen/resources/images/icons/Black/37.Stopwatch.png
index 0671df9..0671df9 100644
--- a/resources/images/icons/Black/37.Stopwatch.png
+++ b/HomeScreen/resources/images/icons/Black/37.Stopwatch.png
diff --git a/resources/images/icons/Black/38.Location-Pin.png b/HomeScreen/resources/images/icons/Black/38.Location-Pin.png
index d8ea41f..d8ea41f 100644
--- a/resources/images/icons/Black/38.Location-Pin.png
+++ b/HomeScreen/resources/images/icons/Black/38.Location-Pin.png
diff --git a/resources/images/icons/Black/39.Heart.png b/HomeScreen/resources/images/icons/Black/39.Heart.png
index f25ac7e..f25ac7e 100644
--- a/resources/images/icons/Black/39.Heart.png
+++ b/HomeScreen/resources/images/icons/Black/39.Heart.png
diff --git a/resources/images/icons/Black/40.Cloud.png b/HomeScreen/resources/images/icons/Black/40.Cloud.png
index 5772739..5772739 100644
--- a/resources/images/icons/Black/40.Cloud.png
+++ b/HomeScreen/resources/images/icons/Black/40.Cloud.png
diff --git a/resources/images/icons/Black/41.Trophy.png b/HomeScreen/resources/images/icons/Black/41.Trophy.png
index c78fb34..c78fb34 100644
--- a/resources/images/icons/Black/41.Trophy.png
+++ b/HomeScreen/resources/images/icons/Black/41.Trophy.png
diff --git a/resources/images/icons/Black/42.Badge.png b/HomeScreen/resources/images/icons/Black/42.Badge.png
index dfbc6ed..dfbc6ed 100644
--- a/resources/images/icons/Black/42.Badge.png
+++ b/HomeScreen/resources/images/icons/Black/42.Badge.png
diff --git a/resources/images/icons/Black/43.Bell.png b/HomeScreen/resources/images/icons/Black/43.Bell.png
index 1ddcb40..1ddcb40 100644
--- a/resources/images/icons/Black/43.Bell.png
+++ b/HomeScreen/resources/images/icons/Black/43.Bell.png
diff --git a/resources/images/icons/Black/44.Share.png b/HomeScreen/resources/images/icons/Black/44.Share.png
index 08b710f..08b710f 100644
--- a/resources/images/icons/Black/44.Share.png
+++ b/HomeScreen/resources/images/icons/Black/44.Share.png
diff --git a/resources/images/icons/Black/45.Settings.png b/HomeScreen/resources/images/icons/Black/45.Settings.png
index 2487c4f..2487c4f 100644
--- a/resources/images/icons/Black/45.Settings.png
+++ b/HomeScreen/resources/images/icons/Black/45.Settings.png
diff --git a/resources/images/icons/Black/46.Calender.png b/HomeScreen/resources/images/icons/Black/46.Calender.png
index 255cd76..255cd76 100644
--- a/resources/images/icons/Black/46.Calender.png
+++ b/HomeScreen/resources/images/icons/Black/46.Calender.png
diff --git a/resources/images/icons/Black/47.Explore.png b/HomeScreen/resources/images/icons/Black/47.Explore.png
index 202f710..202f710 100644
--- a/resources/images/icons/Black/47.Explore.png
+++ b/HomeScreen/resources/images/icons/Black/47.Explore.png
diff --git a/resources/images/icons/Black/48.Dashboard.png b/HomeScreen/resources/images/icons/Black/48.Dashboard.png
index 3deb0a0..3deb0a0 100644
--- a/resources/images/icons/Black/48.Dashboard.png
+++ b/HomeScreen/resources/images/icons/Black/48.Dashboard.png
diff --git a/resources/images/icons/White/01.Home.png b/HomeScreen/resources/images/icons/White/01.Home.png
index 0aca105..0aca105 100644
--- a/resources/images/icons/White/01.Home.png
+++ b/HomeScreen/resources/images/icons/White/01.Home.png
diff --git a/resources/images/icons/White/02.Shop.png b/HomeScreen/resources/images/icons/White/02.Shop.png
index 21a33e3..21a33e3 100644
--- a/resources/images/icons/White/02.Shop.png
+++ b/HomeScreen/resources/images/icons/White/02.Shop.png
diff --git a/resources/images/icons/White/03.Office.png b/HomeScreen/resources/images/icons/White/03.Office.png
index 105b516..105b516 100644
--- a/resources/images/icons/White/03.Office.png
+++ b/HomeScreen/resources/images/icons/White/03.Office.png
diff --git a/resources/images/icons/White/04.Bank.png b/HomeScreen/resources/images/icons/White/04.Bank.png
index 22d1bce..22d1bce 100644
--- a/resources/images/icons/White/04.Bank.png
+++ b/HomeScreen/resources/images/icons/White/04.Bank.png
diff --git a/resources/images/icons/White/05.Tag.png b/HomeScreen/resources/images/icons/White/05.Tag.png
index a5d7e10..a5d7e10 100644
--- a/resources/images/icons/White/05.Tag.png
+++ b/HomeScreen/resources/images/icons/White/05.Tag.png
diff --git a/resources/images/icons/White/06.Tags.png b/HomeScreen/resources/images/icons/White/06.Tags.png
index d2dc4ff..d2dc4ff 100644
--- a/resources/images/icons/White/06.Tags.png
+++ b/HomeScreen/resources/images/icons/White/06.Tags.png
diff --git a/resources/images/icons/White/07.Wallet.png b/HomeScreen/resources/images/icons/White/07.Wallet.png
index b713ae0..b713ae0 100644
--- a/resources/images/icons/White/07.Wallet.png
+++ b/HomeScreen/resources/images/icons/White/07.Wallet.png
diff --git a/resources/images/icons/White/08.Credit-Card.png b/HomeScreen/resources/images/icons/White/08.Credit-Card.png
index bb1499f..bb1499f 100644
--- a/resources/images/icons/White/08.Credit-Card.png
+++ b/HomeScreen/resources/images/icons/White/08.Credit-Card.png
diff --git a/resources/images/icons/White/09.Handbag.png b/HomeScreen/resources/images/icons/White/09.Handbag.png
index 4ff1b39..4ff1b39 100644
--- a/resources/images/icons/White/09.Handbag.png
+++ b/HomeScreen/resources/images/icons/White/09.Handbag.png
diff --git a/resources/images/icons/White/10.Folder.png b/HomeScreen/resources/images/icons/White/10.Folder.png
index aa238d5..aa238d5 100644
--- a/resources/images/icons/White/10.Folder.png
+++ b/HomeScreen/resources/images/icons/White/10.Folder.png
diff --git a/resources/images/icons/White/11.Notebook.png b/HomeScreen/resources/images/icons/White/11.Notebook.png
index f306b7f..f306b7f 100644
--- a/resources/images/icons/White/11.Notebook.png
+++ b/HomeScreen/resources/images/icons/White/11.Notebook.png
diff --git a/resources/images/icons/White/12.File.png b/HomeScreen/resources/images/icons/White/12.File.png
index 711af78..711af78 100644
--- a/resources/images/icons/White/12.File.png
+++ b/HomeScreen/resources/images/icons/White/12.File.png
diff --git a/resources/images/icons/White/13.Clipboard.png b/HomeScreen/resources/images/icons/White/13.Clipboard.png
index 83c6af5..83c6af5 100644
--- a/resources/images/icons/White/13.Clipboard.png
+++ b/HomeScreen/resources/images/icons/White/13.Clipboard.png
diff --git a/resources/images/icons/White/14.News.png b/HomeScreen/resources/images/icons/White/14.News.png
index 0e884c2..0e884c2 100644
--- a/resources/images/icons/White/14.News.png
+++ b/HomeScreen/resources/images/icons/White/14.News.png
diff --git a/resources/images/icons/White/15.Pencil.png b/HomeScreen/resources/images/icons/White/15.Pencil.png
index b260f5b..b260f5b 100644
--- a/resources/images/icons/White/15.Pencil.png
+++ b/HomeScreen/resources/images/icons/White/15.Pencil.png
diff --git a/resources/images/icons/White/16.Pen.png b/HomeScreen/resources/images/icons/White/16.Pen.png
index 0447477..0447477 100644
--- a/resources/images/icons/White/16.Pen.png
+++ b/HomeScreen/resources/images/icons/White/16.Pen.png
diff --git a/resources/images/icons/White/17.Brush.png b/HomeScreen/resources/images/icons/White/17.Brush.png
index 222c1c2..222c1c2 100644
--- a/resources/images/icons/White/17.Brush.png
+++ b/HomeScreen/resources/images/icons/White/17.Brush.png
diff --git a/resources/images/icons/White/18.Pictures-Day.png b/HomeScreen/resources/images/icons/White/18.Pictures-Day.png
index fabf402..fabf402 100644
--- a/resources/images/icons/White/18.Pictures-Day.png
+++ b/HomeScreen/resources/images/icons/White/18.Pictures-Day.png
diff --git a/resources/images/icons/White/19.Pictures-Night.png b/HomeScreen/resources/images/icons/White/19.Pictures-Night.png
index 32850a8..32850a8 100644
--- a/resources/images/icons/White/19.Pictures-Night.png
+++ b/HomeScreen/resources/images/icons/White/19.Pictures-Night.png
diff --git a/resources/images/icons/White/20.Photos.png b/HomeScreen/resources/images/icons/White/20.Photos.png
index 7799b55..7799b55 100644
--- a/resources/images/icons/White/20.Photos.png
+++ b/HomeScreen/resources/images/icons/White/20.Photos.png
diff --git a/resources/images/icons/White/21.Music.png b/HomeScreen/resources/images/icons/White/21.Music.png
index 7ddeead..7ddeead 100644
--- a/resources/images/icons/White/21.Music.png
+++ b/HomeScreen/resources/images/icons/White/21.Music.png
diff --git a/resources/images/icons/White/22.Music-Playlist.png b/HomeScreen/resources/images/icons/White/22.Music-Playlist.png
index 3bde110..3bde110 100644
--- a/resources/images/icons/White/22.Music-Playlist.png
+++ b/HomeScreen/resources/images/icons/White/22.Music-Playlist.png
diff --git a/resources/images/icons/White/23.Videos.png b/HomeScreen/resources/images/icons/White/23.Videos.png
index e508572..e508572 100644
--- a/resources/images/icons/White/23.Videos.png
+++ b/HomeScreen/resources/images/icons/White/23.Videos.png
diff --git a/resources/images/icons/White/24.TV.png b/HomeScreen/resources/images/icons/White/24.TV.png
index 6677e66..6677e66 100644
--- a/resources/images/icons/White/24.TV.png
+++ b/HomeScreen/resources/images/icons/White/24.TV.png
diff --git a/resources/images/icons/White/25.Camera-Front.png b/HomeScreen/resources/images/icons/White/25.Camera-Front.png
index 4df0878..4df0878 100644
--- a/resources/images/icons/White/25.Camera-Front.png
+++ b/HomeScreen/resources/images/icons/White/25.Camera-Front.png
diff --git a/resources/images/icons/White/26.Camera-Back.png b/HomeScreen/resources/images/icons/White/26.Camera-Back.png
index dbf46d7..dbf46d7 100644
--- a/resources/images/icons/White/26.Camera-Back.png
+++ b/HomeScreen/resources/images/icons/White/26.Camera-Back.png
diff --git a/resources/images/icons/White/27.Phone.png b/HomeScreen/resources/images/icons/White/27.Phone.png
index 8590412..8590412 100644
--- a/resources/images/icons/White/27.Phone.png
+++ b/HomeScreen/resources/images/icons/White/27.Phone.png
diff --git a/resources/images/icons/White/28.Tablet.png b/HomeScreen/resources/images/icons/White/28.Tablet.png
index f29fb36..f29fb36 100644
--- a/resources/images/icons/White/28.Tablet.png
+++ b/HomeScreen/resources/images/icons/White/28.Tablet.png
diff --git a/resources/images/icons/White/29.Mac.png b/HomeScreen/resources/images/icons/White/29.Mac.png
index 1916a6e..1916a6e 100644
--- a/resources/images/icons/White/29.Mac.png
+++ b/HomeScreen/resources/images/icons/White/29.Mac.png
diff --git a/resources/images/icons/White/30.User.png b/HomeScreen/resources/images/icons/White/30.User.png
index 9e4a17f..9e4a17f 100644
--- a/resources/images/icons/White/30.User.png
+++ b/HomeScreen/resources/images/icons/White/30.User.png
diff --git a/resources/images/icons/White/31.ID-Horizontal.png b/HomeScreen/resources/images/icons/White/31.ID-Horizontal.png
index 36b5593..36b5593 100644
--- a/resources/images/icons/White/31.ID-Horizontal.png
+++ b/HomeScreen/resources/images/icons/White/31.ID-Horizontal.png
diff --git a/resources/images/icons/White/32.ID-Vertical.png b/HomeScreen/resources/images/icons/White/32.ID-Vertical.png
index 7a9dcea..7a9dcea 100644
--- a/resources/images/icons/White/32.ID-Vertical.png
+++ b/HomeScreen/resources/images/icons/White/32.ID-Vertical.png
diff --git a/resources/images/icons/White/33.Thumbs-Up.png b/HomeScreen/resources/images/icons/White/33.Thumbs-Up.png
index 8e7a559..8e7a559 100644
--- a/resources/images/icons/White/33.Thumbs-Up.png
+++ b/HomeScreen/resources/images/icons/White/33.Thumbs-Up.png
diff --git a/resources/images/icons/White/34.Thumbs-Down.png b/HomeScreen/resources/images/icons/White/34.Thumbs-Down.png
index a41d54a..a41d54a 100644
--- a/resources/images/icons/White/34.Thumbs-Down.png
+++ b/HomeScreen/resources/images/icons/White/34.Thumbs-Down.png
diff --git a/resources/images/icons/White/35.Alarm-Clock.png b/HomeScreen/resources/images/icons/White/35.Alarm-Clock.png
index 1459802..1459802 100644
--- a/resources/images/icons/White/35.Alarm-Clock.png
+++ b/HomeScreen/resources/images/icons/White/35.Alarm-Clock.png
diff --git a/resources/images/icons/White/36.Watch.png b/HomeScreen/resources/images/icons/White/36.Watch.png
index bf8bcfa..bf8bcfa 100644
--- a/resources/images/icons/White/36.Watch.png
+++ b/HomeScreen/resources/images/icons/White/36.Watch.png
diff --git a/resources/images/icons/White/37.Stopwatch.png b/HomeScreen/resources/images/icons/White/37.Stopwatch.png
index b94c702..b94c702 100644
--- a/resources/images/icons/White/37.Stopwatch.png
+++ b/HomeScreen/resources/images/icons/White/37.Stopwatch.png
diff --git a/resources/images/icons/White/38.Location-Pin.png b/HomeScreen/resources/images/icons/White/38.Location-Pin.png
index b9817a3..b9817a3 100644
--- a/resources/images/icons/White/38.Location-Pin.png
+++ b/HomeScreen/resources/images/icons/White/38.Location-Pin.png
diff --git a/resources/images/icons/White/39.Heart.png b/HomeScreen/resources/images/icons/White/39.Heart.png
index 512a9d5..512a9d5 100644
--- a/resources/images/icons/White/39.Heart.png
+++ b/HomeScreen/resources/images/icons/White/39.Heart.png
diff --git a/resources/images/icons/White/40.Cloud.png b/HomeScreen/resources/images/icons/White/40.Cloud.png
index bcfecf0..bcfecf0 100644
--- a/resources/images/icons/White/40.Cloud.png
+++ b/HomeScreen/resources/images/icons/White/40.Cloud.png
diff --git a/resources/images/icons/White/41.Trophy.png b/HomeScreen/resources/images/icons/White/41.Trophy.png
index 2f3fb3a..2f3fb3a 100644
--- a/resources/images/icons/White/41.Trophy.png
+++ b/HomeScreen/resources/images/icons/White/41.Trophy.png
diff --git a/resources/images/icons/White/42.Badge.png b/HomeScreen/resources/images/icons/White/42.Badge.png
index 2140235..2140235 100644
--- a/resources/images/icons/White/42.Badge.png
+++ b/HomeScreen/resources/images/icons/White/42.Badge.png
diff --git a/resources/images/icons/White/43.Bell.png b/HomeScreen/resources/images/icons/White/43.Bell.png
index cad88a2..cad88a2 100644
--- a/resources/images/icons/White/43.Bell.png
+++ b/HomeScreen/resources/images/icons/White/43.Bell.png
diff --git a/resources/images/icons/White/44.Share.png b/HomeScreen/resources/images/icons/White/44.Share.png
index 4b7bd14..4b7bd14 100644
--- a/resources/images/icons/White/44.Share.png
+++ b/HomeScreen/resources/images/icons/White/44.Share.png
diff --git a/resources/images/icons/White/45.Settings.png b/HomeScreen/resources/images/icons/White/45.Settings.png
index 7a2b809..7a2b809 100644
--- a/resources/images/icons/White/45.Settings.png
+++ b/HomeScreen/resources/images/icons/White/45.Settings.png
diff --git a/resources/images/icons/White/46.Calender.png b/HomeScreen/resources/images/icons/White/46.Calender.png
index 737bf0d..737bf0d 100644
--- a/resources/images/icons/White/46.Calender.png
+++ b/HomeScreen/resources/images/icons/White/46.Calender.png
diff --git a/resources/images/icons/White/47.Explore.png b/HomeScreen/resources/images/icons/White/47.Explore.png
index 83ac058..83ac058 100644
--- a/resources/images/icons/White/47.Explore.png
+++ b/HomeScreen/resources/images/icons/White/47.Explore.png
diff --git a/resources/images/icons/White/48.Dashboard.png b/HomeScreen/resources/images/icons/White/48.Dashboard.png
index 3f9cef5..3f9cef5 100644
--- a/resources/images/icons/White/48.Dashboard.png
+++ b/HomeScreen/resources/images/icons/White/48.Dashboard.png
diff --git a/resources/images/transparency.png b/HomeScreen/resources/images/transparency.png
index 989d3c5..989d3c5 100644
--- a/resources/images/transparency.png
+++ b/HomeScreen/resources/images/transparency.png
diff --git a/HomeScreen/resources/mainwindow.ui b/HomeScreen/resources/mainwindow.ui
new file mode 100644
index 0000000..7e9b4fa
--- /dev/null
+++ b/HomeScreen/resources/mainwindow.ui
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>MainWindow</class>
+ <widget class="QMainWindow" name="MainWindow">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>1080</width>
+    <height>1920</height>
+   </rect>
+  </property>
+  <property name="focusPolicy">
+   <enum>Qt::NoFocus</enum>
+  </property>
+  <property name="windowTitle">
+   <string/>
+  </property>
+  <property name="styleSheet">
+   <string notr="true"/>
+  </property>
+  <widget class="QWidget" name="centralWidget">
+   <widget class="QWidget" name="widget_Background" native="true">
+    <property name="geometry">
+     <rect>
+      <x>0</x>
+      <y>60</y>
+      <width>1080</width>
+      <height>1800</height>
+     </rect>
+    </property>
+    <property name="focusPolicy">
+     <enum>Qt::NoFocus</enum>
+    </property>
+    <property name="styleSheet">
+     <string notr="true">background-image: url(:/images/backgrounds/bg_blue_day.png)
+</string>
+    </property>
+    <widget class="QWidget" name="widget_Home_Icon" native="true">
+     <property name="geometry">
+      <rect>
+       <x>-40</x>
+       <y>1640</y>
+       <width>200</width>
+       <height>200</height>
+      </rect>
+     </property>
+     <property name="styleSheet">
+      <string notr="true">border-image: url(:/icons/home_day.png) 0 0 0 0 stretch stretch;
+</string>
+     </property>
+    </widget>
+   </widget>
+  </widget>
+ </widget>
+ <layoutdefault spacing="6" margin="11"/>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/resources/popupwidget.ui b/HomeScreen/resources/popupwidget.ui
index ac43e09..5bda98b 100644
--- a/resources/popupwidget.ui
+++ b/HomeScreen/resources/popupwidget.ui
@@ -9,8 +9,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>800</width>
-    <height>600</height>
+    <width>1080</width>
+    <height>1920</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -19,8 +19,8 @@
   <widget class="QWidget" name="widget_Popup" native="true">
    <property name="geometry">
     <rect>
-     <x>200</x>
-     <y>200</y>
+     <x>350</x>
+     <y>430</y>
      <width>400</width>
      <height>200</height>
     </rect>
diff --git a/resources/settingswidget.ui b/HomeScreen/resources/settingswidget.ui
index 2f33087..2ec5076 100644
--- a/resources/settingswidget.ui
+++ b/HomeScreen/resources/settingswidget.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>800</width>
-    <height>480</height>
+    <width>1080</width>
+    <height>1800</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -18,34 +18,33 @@
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>800</width>
-     <height>480</height>
+     <width>1080</width>
+     <height>1800</height>
     </rect>
    </property>
    <property name="styleSheet">
     <string notr="true">background-image: url(:/images/backgrounds/bg_blue_day.png);
 </string>
    </property>
-  </widget>
-  <widget class="QComboBox" name="comboBoxLanguage">
-   <property name="geometry">
-    <rect>
-     <x>390</x>
-     <y>20</y>
-     <width>400</width>
-     <height>60</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>22</pointsize>
-    </font>
-   </property>
-   <property name="focusPolicy">
-    <enum>Qt::NoFocus</enum>
-   </property>
-   <property name="styleSheet">
-    <string notr="true">QComboBox {
+   <widget class="QComboBox" name="comboBoxLanguage">
+    <property name="geometry">
+     <rect>
+      <x>660</x>
+      <y>20</y>
+      <width>400</width>
+      <height>60</height>
+     </rect>
+    </property>
+    <property name="font">
+     <font>
+      <pointsize>22</pointsize>
+     </font>
+    </property>
+    <property name="focusPolicy">
+     <enum>Qt::NoFocus</enum>
+    </property>
+    <property name="styleSheet">
+     <string notr="true">QComboBox {
 border: 1px solid #D3D3D3;
 border-radius: 8px;
 background: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(242, 242, 249, 255), stop:1 rgba(255, 255, 255, 255));
@@ -62,7 +61,22 @@ border-radius: 0px;
 QComboBox::down-arrow:on {
 }
 </string>
-   </property>
+    </property>
+   </widget>
+   <widget class="QWidget" name="widget_Settings_Icon" native="true">
+    <property name="geometry">
+     <rect>
+      <x>-40</x>
+      <y>1640</y>
+      <width>200</width>
+      <height>200</height>
+     </rect>
+    </property>
+    <property name="styleSheet">
+     <string notr="true">border-image: url(:/icons/settings_day.png) 0 0 0 0 stretch stretch;
+</string>
+    </property>
+   </widget>
   </widget>
   <widget class="QLabel" name="labelLanguage">
    <property name="geometry">
@@ -82,20 +96,6 @@ QComboBox::down-arrow:on {
     <string>Language</string>
    </property>
   </widget>
-  <widget class="QWidget" name="widget_Settings_Icon" native="true">
-   <property name="geometry">
-    <rect>
-     <x>-40</x>
-     <y>320</y>
-     <width>200</width>
-     <height>200</height>
-    </rect>
-   </property>
-   <property name="styleSheet">
-    <string notr="true">border-image: url(:/icons/settings_day.png) 0 0 0 0 stretch stretch;
-</string>
-   </property>
-  </widget>
  </widget>
  <resources/>
  <connections/>
diff --git a/resources/statusbarwidget.ui b/HomeScreen/resources/statusbarwidget.ui
index 1a9ff41..d0747ab 100644
--- a/resources/statusbarwidget.ui
+++ b/HomeScreen/resources/statusbarwidget.ui
@@ -6,22 +6,19 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>800</width>
+    <width>1080</width>
     <height>60</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string/>
   </property>
-  <property name="styleSheet">
-   <string notr="true"/>
-  </property>
   <widget class="QWidget" name="widget" native="true">
    <property name="geometry">
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>800</width>
+     <width>1080</width>
      <height>60</height>
     </rect>
    </property>
@@ -33,7 +30,7 @@
      <rect>
       <x>20</x>
       <y>10</y>
-      <width>100</width>
+      <width>200</width>
       <height>40</height>
      </rect>
     </property>
@@ -55,9 +52,9 @@ background-image: url(:/images/transparency.png);</string>
    <widget class="QLabel" name="label_2">
     <property name="geometry">
      <rect>
-      <x>130</x>
+      <x>230</x>
       <y>10</y>
-      <width>100</width>
+      <width>200</width>
       <height>40</height>
      </rect>
     </property>
@@ -79,9 +76,9 @@ background-image: url(:/images/transparency.png);</string>
    <widget class="QLabel" name="label_3">
     <property name="geometry">
      <rect>
-      <x>240</x>
+      <x>440</x>
       <y>10</y>
-      <width>100</width>
+      <width>200</width>
       <height>40</height>
      </rect>
     </property>
@@ -100,12 +97,12 @@ background-image: url(:/images/transparency.png);</string>
      <set>Qt::AlignCenter</set>
     </property>
    </widget>
-   <widget class="QLabel" name="label_4_Time">
+   <widget class="QLabel" name="label_4">
     <property name="geometry">
      <rect>
-      <x>350</x>
+      <x>650</x>
       <y>10</y>
-      <width>100</width>
+      <width>200</width>
       <height>40</height>
      </rect>
     </property>
@@ -127,57 +124,9 @@ background-image: url(:/images/transparency.png);</string>
    <widget class="QLabel" name="label_5">
     <property name="geometry">
      <rect>
-      <x>460</x>
-      <y>10</y>
-      <width>100</width>
-      <height>40</height>
-     </rect>
-    </property>
-    <property name="font">
-     <font>
-      <pointsize>12</pointsize>
-      <weight>75</weight>
-      <bold>true</bold>
-     </font>
-    </property>
-    <property name="styleSheet">
-     <string notr="true">color: rgb(238, 238, 238);
-background-image: url(:/images/transparency.png);</string>
-    </property>
-    <property name="alignment">
-     <set>Qt::AlignCenter</set>
-    </property>
-   </widget>
-   <widget class="QLabel" name="label_6">
-    <property name="geometry">
-     <rect>
-      <x>570</x>
-      <y>10</y>
-      <width>100</width>
-      <height>40</height>
-     </rect>
-    </property>
-    <property name="font">
-     <font>
-      <pointsize>12</pointsize>
-      <weight>75</weight>
-      <bold>true</bold>
-     </font>
-    </property>
-    <property name="styleSheet">
-     <string notr="true">color: rgb(238, 238, 238);
-background-image: url(:/images/transparency.png);</string>
-    </property>
-    <property name="alignment">
-     <set>Qt::AlignCenter</set>
-    </property>
-   </widget>
-   <widget class="QLabel" name="label_7">
-    <property name="geometry">
-     <rect>
-      <x>680</x>
+      <x>860</x>
       <y>10</y>
-      <width>100</width>
+      <width>200</width>
       <height>40</height>
      </rect>
     </property>
diff --git a/HomeScreen/resources/translations/homescreen_de_DE.qm b/HomeScreen/resources/translations/homescreen_de_DE.qm
new file mode 100644
index 0000000..bf2aa8c
--- /dev/null
+++ b/HomeScreen/resources/translations/homescreen_de_DE.qm
diff --git a/HomeScreen/resources/translations/homescreen_de_DE.ts b/HomeScreen/resources/translations/homescreen_de_DE.ts
new file mode 100644
index 0000000..d512aaf
--- /dev/null
+++ b/HomeScreen/resources/translations/homescreen_de_DE.ts
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="de_DE">
+<context>
+    <name>ControlBarWidget</name>
+    <message>
+        <location filename="../controlbarwidget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>Exit</source>
+        <translation type="vanished">Beenden</translation>
+    </message>
+</context>
+<context>
+    <name>PopupWidget</name>
+    <message>
+        <location filename="../popupwidget.ui" line="17"/>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../popupwidget.ui" line="60"/>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SettingsWidget</name>
+    <message>
+        <location filename="../settingswidget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="96"/>
+        <source>Language</source>
+        <translation type="unfinished">Sprache</translation>
+    </message>
+</context>
+<context>
+    <name>SystemSettingsSimulator</name>
+    <message>
+        <source>Exit</source>
+        <translation type="obsolete">Beenden</translation>
+    </message>
+</context>
+</TS>
diff --git a/HomeScreen/resources/translations/homescreen_en_US.qm b/HomeScreen/resources/translations/homescreen_en_US.qm
new file mode 100644
index 0000000..ce75d11
--- /dev/null
+++ b/HomeScreen/resources/translations/homescreen_en_US.qm
diff --git a/HomeScreen/resources/translations/homescreen_en_US.ts b/HomeScreen/resources/translations/homescreen_en_US.ts
new file mode 100644
index 0000000..07199a4
--- /dev/null
+++ b/HomeScreen/resources/translations/homescreen_en_US.ts
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="en_US">
+<context>
+    <name>ControlBarWidget</name>
+    <message>
+        <location filename="../controlbarwidget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>Exit</source>
+        <translation type="vanished">Exit</translation>
+    </message>
+</context>
+<context>
+    <name>PopupWidget</name>
+    <message>
+        <location filename="../popupwidget.ui" line="17"/>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../popupwidget.ui" line="60"/>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SettingsWidget</name>
+    <message>
+        <location filename="../settingswidget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="96"/>
+        <source>Language</source>
+        <translation>Language</translation>
+    </message>
+</context>
+<context>
+    <name>SystemSettingsSimulator</name>
+    <message>
+        <source>Exit</source>
+        <translation type="obsolete">Exit</translation>
+    </message>
+</context>
+</TS>
diff --git a/HomeScreen/resources/translations/homescreen_ja_JP.qm b/HomeScreen/resources/translations/homescreen_ja_JP.qm
new file mode 100644
index 0000000..8e662d8
--- /dev/null
+++ b/HomeScreen/resources/translations/homescreen_ja_JP.qm
diff --git a/HomeScreen/resources/translations/homescreen_ja_JP.ts b/HomeScreen/resources/translations/homescreen_ja_JP.ts
new file mode 100644
index 0000000..cb943e4
--- /dev/null
+++ b/HomeScreen/resources/translations/homescreen_ja_JP.ts
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="ja_JP">
+<context>
+    <name>ControlBarWidget</name>
+    <message>
+        <location filename="../controlbarwidget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InputDeviceSimulator</name>
+    <message>
+        <source>Input Device Simulator</source>
+        <translation type="obsolete">入力デバイスシミュレータ</translation>
+    </message>
+    <message>
+        <source>Up</source>
+        <translation type="obsolete">アップ</translation>
+    </message>
+    <message>
+        <source>Left</source>
+        <translation type="obsolete">左</translation>
+    </message>
+    <message>
+        <source>Right</source>
+        <translation type="obsolete">右</translation>
+    </message>
+    <message>
+        <source>Down</source>
+        <translation type="obsolete">ダウン</translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation type="obsolete">OK</translation>
+    </message>
+</context>
+<context>
+    <name>PopupWidget</name>
+    <message>
+        <location filename="../popupwidget.ui" line="17"/>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../popupwidget.ui" line="60"/>
+        <source>OK</source>
+        <translation type="unfinished">OK</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsWidget</name>
+    <message>
+        <location filename="../settingswidget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="96"/>
+        <source>Language</source>
+        <translation>言語</translation>
+    </message>
+</context>
+<context>
+    <name>SystemSettingsSimulator</name>
+    <message>
+        <source>System Settings</source>
+        <translation type="obsolete">システム設定</translation>
+    </message>
+    <message>
+        <source>Exit</source>
+        <translation type="obsolete">出口</translation>
+    </message>
+    <message>
+        <source>Day/Night Mode</source>
+        <translation type="obsolete">昼/夜モード</translation>
+    </message>
+    <message>
+        <source>Night Mode</source>
+        <translation type="obsolete">ナイトモード</translation>
+    </message>
+    <message>
+        <source>Day Mode</source>
+        <translation type="obsolete">デイモード</translation>
+    </message>
+</context>
+</TS>
diff --git a/src/controlbarwidget.cpp b/HomeScreen/src/controlbarwidget.cpp
index 4627a7b..e01fe26 100644
--- a/src/controlbarwidget.cpp
+++ b/HomeScreen/src/controlbarwidget.cpp
@@ -21,34 +21,30 @@ ControlBarWidget::ControlBarWidget(QWidget *parent) :
     QWidget(parent),
     mp_ui(new Ui::ControlBarWidget),
     mp_settingsWidget(0),
-    mp_dBusDayNightMode_SettingsWidget(0),
     m_dayNightMode(SystemDayNight::DAYNIGHTMODE_DAY), // TODO: read from system
-    mp_daynightmodeAdaptor(0)
+    mp_dayNightModeProxy(0)
 {
-    // publish dbus day night mode interface
-    mp_daynightmodeAdaptor = new DaynightmodeAdaptor((QObject*)this);
-    QDBusConnection dbus = QDBusConnection::sessionBus();
-    dbus.registerObject("/ControlBarWidget", this);
-    dbus.registerService("org.agl.mainwindow");
+    // this has to be adopted to the system setup
+    mp_dayNightModeProxy = new org::agl::daynightmode("org.agl.homescreen.simulator", //"org.agl.systeminfoprovider"
+                                                      "/",
+                                                      QDBusConnection::sessionBus(),
+                                                      0);
+    QObject::connect(mp_dayNightModeProxy, SIGNAL(dayNightMode(int)), this, SLOT(dayNightModeSlot(int)));
 
     mp_ui->setupUi(this);
 }
 
 ControlBarWidget::~ControlBarWidget()
 {
-    delete mp_daynightmodeAdaptor;
+    delete mp_dayNightModeProxy;
     if (0 != mp_settingsWidget)
     {
         delete mp_settingsWidget;
     }
-    if (0 == mp_dBusDayNightMode_SettingsWidget)
-    {
-        delete mp_dBusDayNightMode_SettingsWidget;
-    }
     delete mp_ui;
 }
 
-void ControlBarWidget::setDayNightMode(int mode)
+void ControlBarWidget::dayNightModeSlot(int mode)
 {
     QIcon icon;
     switch (mode)
@@ -74,12 +70,6 @@ void ControlBarWidget::setDayNightMode(int mode)
     default:
         m_dayNightMode = SystemDayNight::DAYNIGHTMODE_UNDEFINED;
     }
-
-    // settings widget if present
-    if (0 != mp_dBusDayNightMode_SettingsWidget)
-    {
-        mp_dBusDayNightMode_SettingsWidget->setDayNightMode(m_dayNightMode);
-    }
 }
 
 void ControlBarWidget::on_pushButton_Settings_clicked()
@@ -91,16 +81,6 @@ void ControlBarWidget::on_pushButton_Settings_clicked()
 
     mp_settingsWidget->move(0, 60);
     mp_settingsWidget->show();
-
-    if (0 == mp_dBusDayNightMode_SettingsWidget)
-    {
-        // connect to the dBus interface provided by the settings widget
-        mp_dBusDayNightMode_SettingsWidget = new org::agl::daynightmode("org.agl.mainwindow",
-                                                  "/SettingsWidget",
-                                                  QDBusConnection::sessionBus(),
-                                                  0);
-        mp_dBusDayNightMode_SettingsWidget->setDayNightMode(m_dayNightMode);
-    }
 }
 
 void ControlBarWidget::on_pushButton_Home_clicked()
diff --git a/src/controlbarwidget.h b/HomeScreen/src/controlbarwidget.h
index 9d4fa7f..618fa35 100644
--- a/src/controlbarwidget.h
+++ b/HomeScreen/src/controlbarwidget.h
@@ -18,8 +18,7 @@
 #define CONTROLBARWIDGET_H
 
 #include <QWidget>
-#include "include/daynightmode.h"
-#include "daynightmode_adapter.h"
+#include "../interfaces/daynightmode.h"
 #include "daynightmode_proxy.h"
 #include "settingswidget.h"
 
@@ -35,13 +34,9 @@ public:
     explicit ControlBarWidget(QWidget *parent = 0);
     ~ControlBarWidget();
 
-// from daynightmode_adapter.h
+// day/night mode
 public Q_SLOTS:
-    void setDayNightMode(int mode);
-    inline int getDayNightMode()
-    {
-        return (int)m_dayNightMode;
-    }
+    void dayNightModeSlot(int mode);
 
 private slots:
     void on_pushButton_Settings_clicked();
@@ -53,8 +48,9 @@ private:
     SettingsWidget *mp_settingsWidget;
     org::agl::daynightmode *mp_dBusDayNightMode_SettingsWidget;
 
+    // D-Bus day/night
     SystemDayNight::eDayNightMode m_dayNightMode;
-    DaynightmodeAdaptor *mp_daynightmodeAdaptor;
+    org::agl::daynightmode *mp_dayNightModeProxy;
 };
 
 #endif // CONTROLBARWIDGET_H
diff --git a/HomeScreen/src/main.cpp b/HomeScreen/src/main.cpp
new file mode 100644
index 0000000..9108c35
--- /dev/null
+++ b/HomeScreen/src/main.cpp
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2016 Mentor Graphics Development (Deutschland) GmbH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mainwindow.h"
+#include <QApplication>
+#include <QSysInfo>
+#include <QSharedMemory>
+
+int main(int argc, char *argv[])
+{
+    // allow only one instance of this application
+    /*QSharedMemory appInstance;
+    appInstance.setKey("HomeScreen");
+    if (!appInstance.create(1))
+    {
+        qDebug("Only one instance of the Home Screen App allowed!");
+        exit(-1);
+    }*/
+
+    QApplication a(argc, argv);
+
+    // used for application settings (QSettings)
+    QCoreApplication::setOrganizationDomain("LinuxFoundation");
+    QCoreApplication::setOrganizationName("AutomotiveGradeLinux");
+    QCoreApplication::setApplicationName("HomeScreen");
+    QCoreApplication::setApplicationVersion("0.1.0");
+
+    MainWindow w;
+    w.move(0, 0);
+    w.show();
+
+
+#ifdef __arm__
+    qDebug("Running on ARM architecture");
+#endif
+#ifdef __i386__
+    qDebug("Running on x86 architecture");
+#endif
+
+    return a.exec();
+}
diff --git a/src/mainwindow.cpp b/HomeScreen/src/mainwindow.cpp
index 40189b3..e2b55a9 100644
--- a/src/mainwindow.cpp
+++ b/HomeScreen/src/mainwindow.cpp
@@ -21,25 +21,23 @@ MainWindow::MainWindow(QWidget *parent) :
     QMainWindow(parent),
     mp_ui(new Ui::MainWindow),
     mp_statusBarWidget(0),
-    mp_dBusDayNightMode_StatusBarWidget(0),
     mp_controlBarWidget(0),
-    mp_dBusDayNightMode_ControlBarWidget(0),
     m_dayNightMode(SystemDayNight::DAYNIGHTMODE_DAY), // TODO: read from system
-    mp_daynightmodeAdaptor(0),
-    mp_popupAdaptor(0),
-    mp_dBusPopup(0),
+    mp_dayNightModeProxy(0),
     mp_popupWidget(0)
 {
+    // this has to be adopted to the system setup
+    mp_dayNightModeProxy = new org::agl::daynightmode("org.agl.homescreen.simulator", //"org.agl.systeminfoprovider"
+                                                      "/",
+                                                      QDBusConnection::sessionBus(),
+                                                      0);
+    QObject::connect(mp_dayNightModeProxy, SIGNAL(dayNightMode(int)), this, SLOT(dayNightModeSlot(int)));
+
     // dbus setup
     QDBusConnection dbus = QDBusConnection::sessionBus();
 
-    // publish dbus day night mode interface
-    mp_daynightmodeAdaptor = new DaynightmodeAdaptor((QObject*)this);
-    // publish dbus popup interface
-    mp_popupAdaptor = new PopupAdaptor((QObject*)this);
-
     dbus.registerObject("/MainWindow", this);
-    dbus.registerService("org.agl.mainwindow");
+    dbus.registerService("org.agl.homescreen");
 
     // no window decoration
     setWindowFlags(Qt::FramelessWindowHint);
@@ -48,47 +46,30 @@ MainWindow::MainWindow(QWidget *parent) :
     mp_statusBarWidget = new StatusBarWidget(this);
     mp_statusBarWidget->raise();
     // apply layout
-    mp_statusBarWidget->setGeometry(0, 0, 800, 60);
-    // connect to the dBus interface provided by the status bar widget
-    mp_dBusDayNightMode_StatusBarWidget = new org::agl::daynightmode("org.agl.mainwindow",
-                                              "/StatusBarWidget",
-                                              QDBusConnection::sessionBus(),
-                                              0);
+    mp_statusBarWidget->move(0, 0);
 
     mp_controlBarWidget = new ControlBarWidget(this);
     mp_controlBarWidget->raise();
     // apply layout
-    mp_controlBarWidget->setGeometry(0, 540, 800, 60);
-    // connect to the dBus interface provided by the control bar widget
-    mp_dBusDayNightMode_ControlBarWidget = new org::agl::daynightmode("org.agl.mainwindow",
-                                              "/ControlBarWidget",
-                                              QDBusConnection::sessionBus(),
-                                              0);
+    mp_controlBarWidget->move(0, 1920-60);
+
+    mp_popupWidget = new PopupWidget(this);
+    mp_controlBarWidget->raise();
+    // apply layout
+    mp_popupWidget->move(0, 0);
+
+    setWindowIcon(QIcon(":/icons/home_day.png"));
 }
 
 MainWindow::~MainWindow()
 {
-    delete mp_dBusDayNightMode_ControlBarWidget;
-    delete mp_dBusDayNightMode_StatusBarWidget;
-
-    if (0 == mp_dBusPopup)
-    {
-        delete mp_dBusPopup;
-    }
-    if (0 != mp_popupWidget)
-    {
-        delete mp_popupWidget;
-    }
-
-
-
-    delete mp_popupAdaptor;
-    delete mp_daynightmodeAdaptor;
+    delete mp_popupWidget;
+    delete mp_dayNightModeProxy;
     delete mp_statusBarWidget;
     delete mp_ui;
 }
 
-void MainWindow::setDayNightMode(int mode)
+void MainWindow::dayNightModeSlot(int mode)
 {
     switch (mode)
     {
@@ -109,32 +90,6 @@ void MainWindow::setDayNightMode(int mode)
     default:
         m_dayNightMode = SystemDayNight::DAYNIGHTMODE_UNDEFINED;
     }
-
-    mp_dBusDayNightMode_StatusBarWidget->setDayNightMode(m_dayNightMode);
-    mp_dBusDayNightMode_ControlBarWidget->setDayNightMode(m_dayNightMode);
-}
-
-void MainWindow::showPopup(int type, const QString &text)
-{
-    if (0 == mp_popupWidget)
-    {
-        qDebug("0 == mp_popupWidget");
-        mp_popupWidget = new PopupWidget(this);
-    }
-
-    mp_popupWidget->move(0, 0);
-    mp_popupWidget->show();
-
-    if (0 == mp_dBusPopup)
-    {
-        qDebug("0 == mp_dBusPopup");
-        // connect to the dBus interface provided by the popup widget
-        mp_dBusPopup = new org::agl::popup("org.agl.mainwindow",
-                                                  "/PopupWidget",
-                                                  QDBusConnection::sessionBus(),
-                                                  0);
-    }
-    mp_dBusPopup->showPopup(type, text);
 }
 
 void MainWindow::changeEvent(QEvent* event)
diff --git a/src/mainwindow.h b/HomeScreen/src/mainwindow.h
index a87d88d..af725fd 100644
--- a/src/mainwindow.h
+++ b/HomeScreen/src/mainwindow.h
@@ -18,13 +18,10 @@
 #define MAINWINDOW_H
 
 #include <QMainWindow>
-#include "include/daynightmode.h"
-#include "daynightmode_adapter.h"
+#include "../interfaces/daynightmode.h"
 #include "daynightmode_proxy.h"
+
 #include "popupwidget.h"
-#include "include/popup.h"
-#include "popup_adapter.h"
-#include "popup_proxy.h"
 
 #include "statusbarwidget.h"
 #include "controlbarwidget.h"
@@ -41,17 +38,9 @@ public:
     explicit MainWindow(QWidget *parent = 0);
     ~MainWindow();
 
-// from daynightmode_adapter.h
+// day/night mode
 public Q_SLOTS:
-    void setDayNightMode(int mode);
-    inline int getDayNightMode()
-    {
-        return (int)m_dayNightMode;
-    }
-
-// from popup_adapter.h
-public Q_SLOTS: // METHODS
-    void showPopup(int type, const QString &text);
+    void dayNightModeSlot(int mode);
 
 protected:
     // called when the translator loaded a new language set
@@ -65,13 +54,8 @@ private:
     ControlBarWidget *mp_controlBarWidget;
     org::agl::daynightmode *mp_dBusDayNightMode_ControlBarWidget;
 
-    // dbus daynightmode
     SystemDayNight::eDayNightMode m_dayNightMode;
-    DaynightmodeAdaptor *mp_daynightmodeAdaptor;
-
-    // dbus popup
-    PopupAdaptor *mp_popupAdaptor;
-    org::agl::popup *mp_dBusPopup;
+    org::agl::daynightmode *mp_dayNightModeProxy;
 
     PopupWidget *mp_popupWidget;
 };
diff --git a/HomeScreen/src/popupwidget.cpp b/HomeScreen/src/popupwidget.cpp
new file mode 100644
index 0000000..81ffdf7
--- /dev/null
+++ b/HomeScreen/src/popupwidget.cpp
@@ -0,0 +1,103 @@
+/*
+ * Copyright (C) 2016 Mentor Graphics Development (Deutschland) GmbH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "popupwidget.h"
+#include "ui_popupwidget.h"
+
+PopupWidget::PopupWidget(QWidget *parent) :
+    QWidget(parent),
+    mp_ui(new Ui::PopupWidget),
+    m_dayNightMode(SystemDayNight::DAYNIGHTMODE_DAY), // TODO: read from system
+    mp_dayNightModeProxy(0),
+    mp_popupAdaptor(0)
+{
+    // this has to be adopted to the system setup
+    mp_dayNightModeProxy = new org::agl::daynightmode("org.agl.homescreen.simulator", //"org.agl.systeminfoprovider"
+                                                      "/",
+                                                      QDBusConnection::sessionBus(),
+                                                      0);
+    QObject::connect(mp_dayNightModeProxy, SIGNAL(dayNightMode(int)), this, SLOT(dayNightModeSlot(int)));
+
+    // publish dbus popup interface
+    mp_popupAdaptor = new PopupAdaptor((QObject*)this);
+    QDBusConnection dbus = QDBusConnection::sessionBus();
+    dbus.registerObject("/Popup", this);
+    dbus.registerService("org.agl.homescreen");
+
+    mp_ui->setupUi(this);
+    this->close();
+}
+
+PopupWidget::~PopupWidget()
+{
+    delete mp_dayNightModeProxy;
+    delete mp_popupAdaptor;
+    delete mp_ui;
+}
+
+void PopupWidget::dayNightModeSlot(int mode)
+{
+    switch (mode)
+    {
+    case SystemDayNight::DAYNIGHTMODE_DAY:
+        m_dayNightMode = SystemDayNight::DAYNIGHTMODE_DAY;
+        mp_ui->widget_Popup->setStyleSheet(QString("QWidget { \
+                                                   border: 1px solid #D3D3D3; \
+                                                   border-radius: 8px; \
+                                                   background: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(242, 242, 249, 255), stop:1 rgba(255, 255, 255, 255)); \
+                                                   color: #333; \
+                                                   padding: 0px; \
+                                                   }  \
+                                                   QWidget:on { \
+                                                   background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,stop: 0 #D5D5D5, stop: 1 #EEEEEE); \
+                                                   }"));
+        mp_ui->label_Text->setStyleSheet(QString("background-color: rgba(109, 109, 109, 0); \
+                                                 background-image: url(:/images/transparency.png); \
+                                                 border-image: url(:/images/transparency.png);"));
+        break;
+    case SystemDayNight::DAYNIGHTMODE_NIGHT:
+        m_dayNightMode = SystemDayNight::DAYNIGHTMODE_NIGHT;
+        mp_ui->widget_Popup->setStyleSheet(QString("QWidget { \
+                                                   border: 1px solid #D3D3D3; \
+                                                   border-radius: 8px; \
+                                                   background: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(147, 147, 151, 255), stop:1 rgba(255, 255, 255, 255)); \
+                                                   color: #333; \
+                                                   padding: 0px; \
+                                                   }  \
+                                                   QWidget:on { \
+                                                   background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,stop: 0 #D5D5D5, stop: 1 #EEEEEE); \
+                                                   }"));
+        mp_ui->label_Text->setStyleSheet(QString("background-color: rgba(109, 109, 109, 0); \
+                                                 background-image: url(:/images/transparency.png); \
+                                                 border-image: url(:/images/transparency.png);"));
+        break;
+    default:
+        m_dayNightMode = SystemDayNight::DAYNIGHTMODE_UNDEFINED;
+    }
+}
+
+void PopupWidget::showPopup(int type, const QString &text)
+{
+    this->show();
+    this->raise();
+    qDebug("PopupWidget::showPopup: type %d, text %s", type, text.toStdString().c_str());
+    mp_ui->label_Text->setText(text);
+}
+
+void PopupWidget::on_pushButton_OK_clicked()
+{
+    this->close();
+}
diff --git a/src/popupwidget.h b/HomeScreen/src/popupwidget.h
index 201cbc3..a876576 100644
--- a/src/popupwidget.h
+++ b/HomeScreen/src/popupwidget.h
@@ -18,8 +18,11 @@
 #define POPUPWIDGET_H
 
 #include <QWidget>
-#include "include/popup.h"
+#include "../interfaces/popup.h"
 #include "popup_adapter.h"
+#include "../interfaces/daynightmode.h"
+#include "daynightmode_proxy.h"
+
 
 namespace Ui {
 class PopupWidget;
@@ -33,7 +36,11 @@ public:
     explicit PopupWidget(QWidget *parent = 0);
     ~PopupWidget();
 
-// from popup_adapter.h
+// day/night mode
+public Q_SLOTS:
+    void dayNightModeSlot(int mode);
+
+    // from popup_adapter.h
 public Q_SLOTS: // METHODS
     void showPopup(int type, const QString &text);
 
@@ -43,6 +50,8 @@ private slots:
 private:
     Ui::PopupWidget *mp_ui;
 
+    SystemDayNight::eDayNightMode m_dayNightMode;
+    org::agl::daynightmode *mp_dayNightModeProxy;
     PopupAdaptor *mp_popupAdaptor;
 };
 
diff --git a/src/settingswidget.cpp b/HomeScreen/src/settingswidget.cpp
index 24085e8..039b99f 100644
--- a/src/settingswidget.cpp
+++ b/HomeScreen/src/settingswidget.cpp
@@ -16,21 +16,21 @@
 
 #include "settingswidget.h"
 #include "ui_settingswidget.h"
-#include "include/daynightmode.h"
 #include <QSettings>
 
 SettingsWidget::SettingsWidget(QWidget *parent) :
     QWidget(parent),
     mp_ui(new Ui::SettingsWidget),
     m_dayNightMode(SystemDayNight::DAYNIGHTMODE_DAY), // TODO: read from system
-    mp_daynightmodeAdaptor(0),
+    mp_dayNightModeProxy(0),
     mp_translator(0)
 {
-    // publish dbus day night mode interface
-    mp_daynightmodeAdaptor = new DaynightmodeAdaptor((QObject*)this);
-    QDBusConnection dbus = QDBusConnection::sessionBus();
-    dbus.registerObject("/SettingsWidget", this);
-    dbus.registerService("org.agl.mainwindow");
+    // this has to be adopted to the system setup
+    mp_dayNightModeProxy = new org::agl::daynightmode("org.agl.homescreen.simulator", //"org.agl.systeminfoprovider"
+                                                      "/",
+                                                      QDBusConnection::sessionBus(),
+                                                      0);
+    QObject::connect(mp_dayNightModeProxy, SIGNAL(dayNightMode(int)), this, SLOT(dayNightModeSlot(int)));
 
     // multi-language support
     mp_translator = new QTranslator();
@@ -50,14 +50,14 @@ SettingsWidget::SettingsWidget(QWidget *parent) :
 SettingsWidget::~SettingsWidget()
 {
     delete mp_translator;
-    delete mp_daynightmodeAdaptor;
+    delete mp_dayNightModeProxy;
 
     QSettings settings;
     settings.setValue("systemsettings/language", mp_ui->comboBoxLanguage->currentIndex());
     delete mp_ui;
 }
 
-void SettingsWidget::setDayNightMode(int mode)
+void SettingsWidget::dayNightModeSlot(int mode)
 {
     switch (mode)
     {
diff --git a/src/settingswidget.h b/HomeScreen/src/settingswidget.h
index f49da8d..15b24bd 100644
--- a/src/settingswidget.h
+++ b/HomeScreen/src/settingswidget.h
@@ -19,8 +19,9 @@
 
 #include <QWidget>
 #include <QTranslator>
-#include "include/daynightmode.h"
-#include "daynightmode_adapter.h"
+#include "../interfaces/daynightmode.h"
+#include "daynightmode_proxy.h"
+
 
 namespace Ui {
 class SettingsWidget;
@@ -34,13 +35,9 @@ public:
     explicit SettingsWidget(QWidget *parent = 0);
     ~SettingsWidget();
 
-// from daynightmode_adapter.h
+// day/night mode
 public Q_SLOTS:
-    void setDayNightMode(int mode);
-    inline int getDayNightMode()
-    {
-        return (int)m_dayNightMode;
-    }
+    void dayNightModeSlot(int mode);
 
 protected:
     // called when the translator loaded a new language set
@@ -53,7 +50,7 @@ private:
     Ui::SettingsWidget *mp_ui;
 
     SystemDayNight::eDayNightMode m_dayNightMode;
-    DaynightmodeAdaptor *mp_daynightmodeAdaptor;
+    org::agl::daynightmode *mp_dayNightModeProxy;
 
     QTranslator *mp_translator;
 };
diff --git a/HomeScreen/src/statusbarwidget.cpp b/HomeScreen/src/statusbarwidget.cpp
new file mode 100644
index 0000000..af144c5
--- /dev/null
+++ b/HomeScreen/src/statusbarwidget.cpp
@@ -0,0 +1,205 @@
+/*
+ * Copyright (C) 2016 Mentor Graphics Development (Deutschland) GmbH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "statusbarwidget.h"
+#include "ui_statusbarwidget.h"
+
+StatusBarWidget::StatusBarWidget(QWidget *parent) :
+    QWidget(parent),
+    mp_ui(new Ui::StatusBarWidget),
+    m_dayNightMode(SystemDayNight::DAYNIGHTMODE_DAY), // TODO: read from system
+    mp_dayNightModeProxy(0),
+    mp_statusbarAdaptor(0),
+    mp_statusbarIconURIs(new QMap<int, QString>)
+{
+    // this has to be adopted to the system setup
+    mp_dayNightModeProxy = new org::agl::daynightmode("org.agl.homescreen.simulator", //"org.agl.systeminfoprovider"
+                                                      "/",
+                                                      QDBusConnection::sessionBus(),
+                                                      0);
+    QObject::connect(mp_dayNightModeProxy, SIGNAL(dayNightMode(int)), this, SLOT(dayNightModeSlot(int)));
+
+    // publish statusbar interface
+    mp_statusbarAdaptor = new StatusbarAdaptor((QObject*)this);
+
+  QDBusConnection dbus = QDBusConnection::sessionBus();
+    dbus.registerObject("/StatusBar", this);
+    dbus.registerService("org.agl.homescreen");
+
+    mp_ui->setupUi(this);
+}
+
+StatusBarWidget::~StatusBarWidget()
+{
+    delete mp_statusbarAdaptor;
+    delete mp_dayNightModeProxy;
+    delete mp_ui;
+}
+
+void StatusBarWidget::dayNightModeSlot(int mode)
+{
+    switch (mode)
+    {
+    case SystemDayNight::DAYNIGHTMODE_DAY:
+        m_dayNightMode = SystemDayNight::DAYNIGHTMODE_DAY;
+        mp_ui->widget->setStyleSheet(QString("background-image: url(:/images/backgrounds/bg_stripes_day.png)"));
+        mp_ui->label_1->setStyleSheet(QString("color: rgb(238, 238, 238); background-image: url(") + mp_statusbarIconURIs->value(1) + QString("); background-repeat: no-repeat;"));
+        mp_ui->label_2->setStyleSheet(QString("color: rgb(238, 238, 238); background-image: url(") + mp_statusbarIconURIs->value(2) + QString("); background-repeat: no-repeat;"));
+        mp_ui->label_3->setStyleSheet(QString("color: rgb(238, 238, 238); background-image: url(") + mp_statusbarIconURIs->value(3) + QString("); background-repeat: no-repeat;"));
+        mp_ui->label_4->setStyleSheet(QString("color: rgb(238, 238, 238); background-image: url(") + mp_statusbarIconURIs->value(4) + QString("); background-repeat: no-repeat;"));
+        mp_ui->label_5->setStyleSheet(QString("color: rgb(238, 238, 238); background-image: url(") + mp_statusbarIconURIs->value(5) + QString("); background-repeat: no-repeat;"));
+        break;
+    case SystemDayNight::DAYNIGHTMODE_NIGHT:
+        m_dayNightMode = SystemDayNight::DAYNIGHTMODE_NIGHT;
+        mp_ui->widget->setStyleSheet(QString("background-image: url(:/images/backgrounds/bg_stripes_night.png)"));
+        mp_ui->label_1->setStyleSheet(QString("color: rgb(177, 177, 177); background-image: url(") + mp_statusbarIconURIs->value(1) + QString("); background-repeat: no-repeat;"));
+        mp_ui->label_2->setStyleSheet(QString("color: rgb(177, 177, 177); background-image: url(") + mp_statusbarIconURIs->value(2) + QString("); background-repeat: no-repeat;"));
+        mp_ui->label_3->setStyleSheet(QString("color: rgb(177, 177, 177); background-image: url(") + mp_statusbarIconURIs->value(3) + QString("); background-repeat: no-repeat;"));
+        mp_ui->label_4->setStyleSheet(QString("color: rgb(177, 177, 177); background-image: url(") + mp_statusbarIconURIs->value(4) + QString("); background-repeat: no-repeat;"));
+        mp_ui->label_5->setStyleSheet(QString("color: rgb(177, 177, 177); background-image: url(") + mp_statusbarIconURIs->value(5) + QString("); background-repeat: no-repeat;"));
+        break;
+    default:
+        m_dayNightMode = SystemDayNight::DAYNIGHTMODE_UNDEFINED;
+    }
+}
+
+QList<int> StatusBarWidget::getAvailablePlaceholders()
+{
+    QList<int> result;
+
+    // for now, all are available
+    result.append(1);
+    result.append(2);
+    result.append(3);
+    result.append(4);
+    result.append(5);
+
+    return result;
+}
+
+QString StatusBarWidget::getStatusIcon(int placeholderIndex)
+{
+    return mp_statusbarIconURIs->value(placeholderIndex);
+}
+
+QString StatusBarWidget::getStatusText(int placeholderIndex)
+{
+    QString result = "";
+
+    switch (placeholderIndex)
+    {
+    case 1:
+        result = mp_ui->label_1->text();
+        break;
+    case 2:
+        result = mp_ui->label_2->text();
+        break;
+    case 3:
+        result = mp_ui->label_3->text();
+        break;
+    case 4:
+        result = mp_ui->label_4->text();
+        break;
+    case 5:
+        result = mp_ui->label_5->text();
+        break;
+    default:
+        break;
+    }
+
+    return result;
+}
+
+void StatusBarWidget::setStatusIcon(int placeholderIndex, const QString &iconURI)
+{
+    mp_statusbarIconURIs->insert(placeholderIndex, iconURI);
+
+    switch (m_dayNightMode)
+    {
+    case SystemDayNight::DAYNIGHTMODE_DAY:
+        switch (placeholderIndex)
+        {
+        case 1:
+            mp_ui->label_1->setStyleSheet(QString("color: rgb(238, 238, 238); background-image: url(") + mp_statusbarIconURIs->value(placeholderIndex) + QString("); background-repeat: no-repeat;"));
+            break;
+        case 2:
+            mp_ui->label_2->setStyleSheet(QString("color: rgb(238, 238, 238); background-image: url(") + mp_statusbarIconURIs->value(placeholderIndex) + QString("); background-repeat: no-repeat;"));
+            break;
+        case 3:
+            mp_ui->label_3->setStyleSheet(QString("color: rgb(238, 238, 238); background-image: url(") + mp_statusbarIconURIs->value(placeholderIndex) + QString("); background-repeat: no-repeat;"));
+            break;
+        case 4:
+            mp_ui->label_4->setStyleSheet(QString("color: rgb(238, 238, 238); background-image: url(") + mp_statusbarIconURIs->value(placeholderIndex) + QString("); background-repeat: no-repeat;"));
+            break;
+        case 5:
+            mp_ui->label_5->setStyleSheet(QString("color: rgb(238, 238, 238); background-image: url(") + mp_statusbarIconURIs->value(placeholderIndex) + QString("); background-repeat: no-repeat;"));
+            break;
+        default:
+            break;
+        }
+        break;
+    case SystemDayNight::DAYNIGHTMODE_NIGHT:
+        switch (placeholderIndex)
+        {
+        case 1:
+            mp_ui->label_1->setStyleSheet(QString("color: rgb(177, 177, 177); background-image: url(") + mp_statusbarIconURIs->value(placeholderIndex) + QString("); background-repeat: no-repeat;"));
+            break;
+        case 2:
+            mp_ui->label_2->setStyleSheet(QString("color: rgb(177, 177, 177); background-image: url(") + mp_statusbarIconURIs->value(placeholderIndex) + QString("); background-repeat: no-repeat;"));
+            break;
+        case 3:
+            mp_ui->label_3->setStyleSheet(QString("color: rgb(177, 177, 177); background-image: url(") + mp_statusbarIconURIs->value(placeholderIndex) + QString("); background-repeat: no-repeat;"));
+            break;
+        case 4:
+            mp_ui->label_4->setStyleSheet(QString("color: rgb(177, 177, 177); background-image: url(") + mp_statusbarIconURIs->value(placeholderIndex) + QString("); background-repeat: no-repeat;"));
+            break;
+        case 5:
+            mp_ui->label_5->setStyleSheet(QString("color: rgb(177, 177, 177); background-image: url(") + mp_statusbarIconURIs->value(placeholderIndex) + QString("); background-repeat: no-repeat;"));
+            break;
+        default:
+            break;
+        }
+        break;
+    default:
+        break;
+    }
+}
+
+void StatusBarWidget::setStatusText(int placeholderIndex, const QString &text)
+{
+    switch (placeholderIndex)
+    {
+    case 1:
+        mp_ui->label_1->setText(text);
+        break;
+    case 2:
+        mp_ui->label_2->setText(text);
+        break;
+    case 3:
+        mp_ui->label_3->setText(text);
+        break;
+    case 4:
+        mp_ui->label_4->setText(text);
+        break;
+    case 5:
+        mp_ui->label_5->setText(text);
+        break;
+    default:
+        break;
+    }
+}
+
+
diff --git a/src/statusbarwidget.h b/HomeScreen/src/statusbarwidget.h
index 2547d34..e17f13e 100644
--- a/src/statusbarwidget.h
+++ b/HomeScreen/src/statusbarwidget.h
@@ -18,8 +18,9 @@
 #define STATUSBARWIDGET_H
 
 #include <QWidget>
-#include "include/daynightmode.h"
-#include "daynightmode_adapter.h"
+#include "../interfaces/daynightmode.h"
+#include "daynightmode_proxy.h"
+
 #include "statusbar_adapter.h"
 
 namespace Ui {
@@ -34,29 +35,26 @@ public:
     explicit StatusBarWidget(QWidget *parent = 0);
     ~StatusBarWidget();
 
-// from daynightmode_adapter.h
+// day/night mode
 public Q_SLOTS:
-    void setDayNightMode(int mode);
-    inline int getDayNightMode()
-    {
-        return (int)m_dayNightMode;
-    }
+    void dayNightModeSlot(int mode);
 
 // from statusbar_adapter.h
 public Q_SLOTS: // METHODS
-    void setStatus(int index, const QString &text);
-
-protected:
-    void timerEvent(QTimerEvent *e);
+    QList<int> getAvailablePlaceholders();
+    QString getStatusIcon(int placeholderIndex);
+    QString getStatusText(int placeholderIndex);
+    void setStatusIcon(int placeholderIndex, const QString &iconURI);
+    void setStatusText(int placeholderIndex, const QString &text);
 
 private:
     Ui::StatusBarWidget *mp_ui;
 
     SystemDayNight::eDayNightMode m_dayNightMode;
-    DaynightmodeAdaptor *mp_daynightmodeAdaptor;
+    org::agl::daynightmode *mp_dayNightModeProxy;
     StatusbarAdaptor *mp_statusbarAdaptor;
 
-    int m_secondsTimerId;
+    QMap<int, QString> *mp_statusbarIconURIs;
 };
 
 #endif // STATUSBARWIDGET_H
diff --git a/HomeScreenSimulator/HomeScreenSimulator.pro b/HomeScreenSimulator/HomeScreenSimulator.pro
new file mode 100644
index 0000000..3d8d7f0
--- /dev/null
+++ b/HomeScreenSimulator/HomeScreenSimulator.pro
@@ -0,0 +1,122 @@
+# Copyright (C) 2016 Mentor Graphics Development (Deutschland) GmbH
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+QT       += core gui dbus
+
+greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+
+TARGET = HomeScreenSimulator
+TEMPLATE = app
+
+
+SOURCES += \
+    src/main.cpp \
+    src/mainwindow.cpp \
+    $$OUT_PWD/daynightmode_adapter.cpp \        #generated dbus adapter
+    $$OUT_PWD/daynightmode_proxy.cpp \             #generated dbus proxy
+    $$OUT_PWD/popup_adapter.cpp \        #generated dbus adapter
+    $$OUT_PWD/popup_proxy.cpp \             #generated dbus proxy
+    $$OUT_PWD/statusbar_adapter.cpp \        #generated dbus adapter
+    $$OUT_PWD/statusbar_proxy.cpp              #generated dbus proxy
+
+HEADERS  += \
+    ../interfaces/daynightmode.h \
+    ../interfaces/popup.h \
+    src/mainwindow.h \
+    $$OUT_PWD/daynightmode_adapter.h \      #generated dbus adapter
+    $$OUT_PWD/daynightmode_proxy.h \           #generated dbus proxy
+    $$OUT_PWD/popup_adapter.h \      #generated dbus adapter
+    $$OUT_PWD/popup_proxy.h \           #generated dbus proxy
+    $$OUT_PWD/statusbar_adapter.h \      #generated dbus adapter
+    $$OUT_PWD/statusbar_proxy.h            #generated dbus proxy
+
+FORMS    += \
+    resources/mainwindow.ui
+
+OTHER_FILES += \
+    interfaces/daynightmode.xml \
+    interfaces/popup.xml \
+    interfaces/statusbar.xml \
+    README.md
+
+RESOURCES +=
+
+# remove generated files
+QMAKE_CLEAN += -r \
+    $$OUT_PWD/HomeScreen \
+    $$OUT_PWD/Makefile \
+    $$OUT_PWD/daynightmode_adapter.h \
+    $$OUT_PWD/daynightmode_adapter.cpp \
+    $$OUT_PWD/daynightmode_adapter.moc \
+    $$OUT_PWD/daynightmode_proxy.h \
+    $$OUT_PWD/daynightmode_proxy.cpp \
+    $$OUT_PWD/daynightmode_proxy.moc \
+    $$OUT_PWD/popup_adapter.h \
+    $$OUT_PWD/popup_adapter.cpp \
+    $$OUT_PWD/popup_adapter.moc \
+    $$OUT_PWD/popup_proxy.h \
+    $$OUT_PWD/popup_proxy.cpp \
+    $$OUT_PWD/popup_proxy.moc \
+    $$OUT_PWD/inputevent_adapter.h \
+    $$OUT_PWD/inputevent_adapter.cpp \
+    $$OUT_PWD/inputevent_adapter.moc \
+    $$OUT_PWD/inputevent_proxy.h \
+    $$OUT_PWD/inputevent_proxy.cpp \
+    $$OUT_PWD/inputevent_proxy.moc \
+    $$OUT_PWD/statusbar_adapter.h \
+    $$OUT_PWD/statusbar_adapter.cpp \
+    $$OUT_PWD/statusbar_adapter.moc \
+    $$OUT_PWD/statusbar_proxy.h \
+    $$OUT_PWD/statusbar_proxy.cpp \
+    $$OUT_PWD/statusbar_proxy.moc
+
+# Create custom targets for generating dbus proxy and adapter
+# OE_QMAKE_PATH_EXTERNAL_HOST_BINS is only defined in the yocto environment
+isEmpty(OE_QMAKE_PATH_EXTERNAL_HOST_BINS){
+  OE_QMAKE_PATH_EXTERNAL_HOST_BINS = "/"
+}
+# for daynightmode
+daynightmodegenerateadapter.target = $$OUT_PWD/daynightmode_adapter.cpp
+unix:daynightmodegenerateadapter.commands = "$(OE_QMAKE_PATH_EXTERNAL_HOST_BINS)qdbusxml2cpp -m -a daynightmode_adapter $$_PRO_FILE_PWD_/../interfaces/daynightmode.xml; $(OE_QMAKE_PATH_EXTERNAL_HOST_BINS)moc $$OUT_PWD/daynightmode_adapter.h -o $$OUT_PWD/daynightmode_adapter.moc"
+daynightmodegenerateproxy.target = $$OUT_PWD/daynightmode_proxy.cpp
+unix:daynightmodegenerateproxy.commands = "$(OE_QMAKE_PATH_EXTERNAL_HOST_BINS)qdbusxml2cpp -m -p daynightmode_proxy $$_PRO_FILE_PWD_/../interfaces/daynightmode.xml; $(OE_QMAKE_PATH_EXTERNAL_HOST_BINS)moc $$OUT_PWD/daynightmode_proxy.h -o $$OUT_PWD/daynightmode_proxy.moc"
+PRE_TARGETDEPS += \
+    $$OUT_PWD/daynightmode_adapter.cpp \
+    $$OUT_PWD/daynightmode_proxy.cpp
+QMAKE_EXTRA_TARGETS += \
+    daynightmodegenerateadapter \
+    daynightmodegenerateproxy
+# for popup
+popupgenerateadapter.target = $$OUT_PWD/popup_adapter.cpp
+unix:popupgenerateadapter.commands = "$(OE_QMAKE_PATH_EXTERNAL_HOST_BINS)qdbusxml2cpp -m -a popup_adapter $$_PRO_FILE_PWD_/../interfaces/popup.xml; $(OE_QMAKE_PATH_EXTERNAL_HOST_BINS)moc $$OUT_PWD/popup_adapter.h -o $$OUT_PWD/popup_adapter.moc"
+popupgenerateproxy.target = $$OUT_PWD/popup_proxy.cpp
+unix:popupgenerateproxy.commands = "$(OE_QMAKE_PATH_EXTERNAL_HOST_BINS)qdbusxml2cpp -m -p popup_proxy $$_PRO_FILE_PWD_/../interfaces/popup.xml; $(OE_QMAKE_PATH_EXTERNAL_HOST_BINS)moc $$OUT_PWD/popup_proxy.h -o $$OUT_PWD/popup_proxy.moc"
+PRE_TARGETDEPS += \
+    $$OUT_PWD/popup_adapter.cpp \
+    $$OUT_PWD/popup_proxy.cpp
+QMAKE_EXTRA_TARGETS += \
+    popupgenerateadapter \
+    popupgenerateproxy
+# for statusbar
+statusbargenerateadapter.target = $$OUT_PWD/statusbar_adapter.cpp
+unix:statusbargenerateadapter.commands = "$(OE_QMAKE_PATH_EXTERNAL_HOST_BINS)qdbusxml2cpp -m -a statusbar_adapter $$_PRO_FILE_PWD_/../interfaces/statusbar.xml; $(OE_QMAKE_PATH_EXTERNAL_HOST_BINS)moc $$OUT_PWD/statusbar_adapter.h -o $$OUT_PWD/statusbar_adapter.moc"
+statusbargenerateproxy.target = $$OUT_PWD/statusbar_proxy.cpp
+unix:statusbargenerateproxy.commands = "$(OE_QMAKE_PATH_EXTERNAL_HOST_BINS)qdbusxml2cpp -m -p statusbar_proxy $$_PRO_FILE_PWD_/../interfaces/statusbar.xml; $(OE_QMAKE_PATH_EXTERNAL_HOST_BINS)moc $$OUT_PWD/statusbar_proxy.h -o $$OUT_PWD/statusbar_proxy.moc"
+PRE_TARGETDEPS += \
+    $$OUT_PWD/statusbar_adapter.cpp \
+    $$OUT_PWD/statusbar_proxy.cpp
+QMAKE_EXTRA_TARGETS += \
+    statusbargenerateadapter \
+    statusbargenerateproxy
+
diff --git a/HomeScreenSimulator/LICENSE b/HomeScreenSimulator/LICENSE
new file mode 100644
index 0000000..31c692a
--- /dev/null
+++ b/HomeScreenSimulator/LICENSE
@@ -0,0 +1,54 @@
+Apache License
+
+Version 2.0, January 2004
+
+http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.
+
+"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.
+
+"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
+
+"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.
+
+"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.
+
+"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.
+
+"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).
+
+"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.
+
+"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."
+
+"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:
+
+    You must give any other recipients of the Work or Derivative Works a copy of this License; and
+    You must cause any modified files to carry prominent notices stating that You changed the files; and
+    You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and
+    If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License.
+
+    You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
diff --git a/HomeScreenSimulator/README.md b/HomeScreenSimulator/README.md
new file mode 100644
index 0000000..55152cd
--- /dev/null
+++ b/HomeScreenSimulator/README.md
@@ -0,0 +1,20 @@
+AGL Home Screen Simulator for development
+
+
+AGL repo for source code:
+https://gerrit.automotivelinux.org/gerrit/#/admin/projects/staging/HomeScreen
+
+
+v0.1.0
+06/24/2016
+
+#new features
+- initial version
+- set status bar texts and icons
+- set day/night mode
+- call popups
+
+#TODOs
+- define and implement input device event handler
+- more documentation ;)
+- much more...
diff --git a/HomeScreenSimulator/resources/mainwindow.ui b/HomeScreenSimulator/resources/mainwindow.ui
new file mode 100644
index 0000000..dc03c7a
--- /dev/null
+++ b/HomeScreenSimulator/resources/mainwindow.ui
@@ -0,0 +1,315 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>MainWindow</class>
+ <widget class="QMainWindow" name="MainWindow">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>731</width>
+    <height>507</height>
+   </rect>
+  </property>
+  <property name="focusPolicy">
+   <enum>Qt::NoFocus</enum>
+  </property>
+  <property name="windowTitle">
+   <string/>
+  </property>
+  <property name="styleSheet">
+   <string notr="true"/>
+  </property>
+  <widget class="QWidget" name="centralWidget">
+   <widget class="QTabWidget" name="tabWidget">
+    <property name="geometry">
+     <rect>
+      <x>10</x>
+      <y>10</y>
+      <width>711</width>
+      <height>451</height>
+     </rect>
+    </property>
+    <property name="currentIndex">
+     <number>0</number>
+    </property>
+    <widget class="QWidget" name="tab">
+     <attribute name="title">
+      <string>Status Bar</string>
+     </attribute>
+     <widget class="QPushButton" name="pushButton_Update">
+      <property name="geometry">
+       <rect>
+        <x>20</x>
+        <y>380</y>
+        <width>221</width>
+        <height>27</height>
+       </rect>
+      </property>
+      <property name="text">
+       <string>Read from Home Screen App</string>
+      </property>
+     </widget>
+     <widget class="QTableWidget" name="tableWidget_Status">
+      <property name="geometry">
+       <rect>
+        <x>20</x>
+        <y>20</y>
+        <width>681</width>
+        <height>341</height>
+       </rect>
+      </property>
+     </widget>
+     <widget class="QPushButton" name="pushButton_IconExample">
+      <property name="geometry">
+       <rect>
+        <x>550</x>
+        <y>380</y>
+        <width>141</width>
+        <height>27</height>
+       </rect>
+      </property>
+      <property name="text">
+       <string>Icon-Example</string>
+      </property>
+     </widget>
+    </widget>
+    <widget class="QWidget" name="tab_Popup">
+     <attribute name="title">
+      <string>Popup</string>
+     </attribute>
+     <widget class="QPushButton" name="pushButton_Send">
+      <property name="geometry">
+       <rect>
+        <x>600</x>
+        <y>380</y>
+        <width>99</width>
+        <height>27</height>
+       </rect>
+      </property>
+      <property name="text">
+       <string>Send</string>
+      </property>
+     </widget>
+     <widget class="QPlainTextEdit" name="plainTextEdit_Popup">
+      <property name="geometry">
+       <rect>
+        <x>10</x>
+        <y>10</y>
+        <width>681</width>
+        <height>361</height>
+       </rect>
+      </property>
+     </widget>
+    </widget>
+    <widget class="QWidget" name="tab_DayNightMode">
+     <attribute name="title">
+      <string>Day/Night Mode</string>
+     </attribute>
+     <widget class="QGroupBox" name="groupBox_DayNightMode">
+      <property name="geometry">
+       <rect>
+        <x>30</x>
+        <y>30</y>
+        <width>161</width>
+        <height>91</height>
+       </rect>
+      </property>
+      <property name="title">
+       <string>Day/Night Mode</string>
+      </property>
+      <widget class="QRadioButton" name="radioButton_NightMode">
+       <property name="geometry">
+        <rect>
+         <x>10</x>
+         <y>50</y>
+         <width>117</width>
+         <height>22</height>
+        </rect>
+       </property>
+       <property name="focusPolicy">
+        <enum>Qt::NoFocus</enum>
+       </property>
+       <property name="text">
+        <string>Night Mode</string>
+       </property>
+      </widget>
+      <widget class="QRadioButton" name="radioButton_DayMode">
+       <property name="geometry">
+        <rect>
+         <x>10</x>
+         <y>30</y>
+         <width>117</width>
+         <height>22</height>
+        </rect>
+       </property>
+       <property name="focusPolicy">
+        <enum>Qt::NoFocus</enum>
+       </property>
+       <property name="text">
+        <string>Day Mode</string>
+       </property>
+       <property name="checked">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </widget>
+    </widget>
+    <widget class="QWidget" name="tab_FutureFeatures">
+     <attribute name="title">
+      <string>Future features</string>
+     </attribute>
+     <widget class="QPushButton" name="pushButton_Right">
+      <property name="enabled">
+       <bool>false</bool>
+      </property>
+      <property name="geometry">
+       <rect>
+        <x>250</x>
+        <y>160</y>
+        <width>71</width>
+        <height>71</height>
+       </rect>
+      </property>
+      <property name="focusPolicy">
+       <enum>Qt::NoFocus</enum>
+      </property>
+      <property name="text">
+       <string>Right</string>
+      </property>
+     </widget>
+     <widget class="QPushButton" name="pushButton_OK">
+      <property name="enabled">
+       <bool>false</bool>
+      </property>
+      <property name="geometry">
+       <rect>
+        <x>170</x>
+        <y>160</y>
+        <width>71</width>
+        <height>71</height>
+       </rect>
+      </property>
+      <property name="focusPolicy">
+       <enum>Qt::NoFocus</enum>
+      </property>
+      <property name="text">
+       <string>OK</string>
+      </property>
+     </widget>
+     <widget class="QPushButton" name="pushButton_Left">
+      <property name="enabled">
+       <bool>false</bool>
+      </property>
+      <property name="geometry">
+       <rect>
+        <x>90</x>
+        <y>160</y>
+        <width>71</width>
+        <height>71</height>
+       </rect>
+      </property>
+      <property name="focusPolicy">
+       <enum>Qt::NoFocus</enum>
+      </property>
+      <property name="text">
+       <string>Left</string>
+      </property>
+     </widget>
+     <widget class="QPushButton" name="pushButton_Down">
+      <property name="enabled">
+       <bool>false</bool>
+      </property>
+      <property name="geometry">
+       <rect>
+        <x>170</x>
+        <y>240</y>
+        <width>71</width>
+        <height>71</height>
+       </rect>
+      </property>
+      <property name="focusPolicy">
+       <enum>Qt::NoFocus</enum>
+      </property>
+      <property name="text">
+       <string>Down</string>
+      </property>
+     </widget>
+     <widget class="QPushButton" name="pushButton_Up">
+      <property name="enabled">
+       <bool>false</bool>
+      </property>
+      <property name="geometry">
+       <rect>
+        <x>170</x>
+        <y>80</y>
+        <width>71</width>
+        <height>71</height>
+       </rect>
+      </property>
+      <property name="focusPolicy">
+       <enum>Qt::NoFocus</enum>
+      </property>
+      <property name="text">
+       <string>Up</string>
+      </property>
+     </widget>
+     <widget class="QLabel" name="label">
+      <property name="geometry">
+       <rect>
+        <x>120</x>
+        <y>20</y>
+        <width>181</width>
+        <height>51</height>
+       </rect>
+      </property>
+      <property name="text">
+       <string>under development
+not functional right now</string>
+      </property>
+     </widget>
+     <widget class="QPushButton" name="pushButton_Cancel">
+      <property name="enabled">
+       <bool>false</bool>
+      </property>
+      <property name="geometry">
+       <rect>
+        <x>90</x>
+        <y>240</y>
+        <width>71</width>
+        <height>71</height>
+       </rect>
+      </property>
+      <property name="focusPolicy">
+       <enum>Qt::NoFocus</enum>
+      </property>
+      <property name="text">
+       <string>Cancel/
+Back?</string>
+      </property>
+     </widget>
+    </widget>
+   </widget>
+   <widget class="QPushButton" name="pushButton_Exit">
+    <property name="geometry">
+     <rect>
+      <x>620</x>
+      <y>470</y>
+      <width>99</width>
+      <height>27</height>
+     </rect>
+    </property>
+    <property name="text">
+     <string>Exit</string>
+    </property>
+   </widget>
+  </widget>
+  <action name="actionAbout">
+   <property name="text">
+    <string>About</string>
+   </property>
+  </action>
+ </widget>
+ <layoutdefault spacing="6" margin="11"/>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/main.cpp b/HomeScreenSimulator/src/main.cpp
index fac6e2f..9c5a108 100644
--- a/src/main.cpp
+++ b/HomeScreenSimulator/src/main.cpp
@@ -15,43 +15,35 @@
  */
 
 #include "mainwindow.h"
-#include "include/daynightmode.h"
 #include <QApplication>
 #include <QSysInfo>
 #include <QSharedMemory>
-#include "inputeventdistributor.h"
-
-#ifdef __i386__
-#include "inputdevicesimulator.h"
-#include "systemsettingssimulator.h"
-#endif
-
 
 int main(int argc, char *argv[])
 {
     // allow only one instance of this application
-    QSharedMemory appInstance;
+    /*QSharedMemory appInstance;
     appInstance.setKey("AGLHomeScreenApp");
     if (!appInstance.create(1))
     {
         qDebug("Only one instance of the Home Screen App allowed!");
         exit(-1);
-    }
+    }*/
 
     QApplication a(argc, argv);
 
     // used for application settings (QSettings)
     QCoreApplication::setOrganizationDomain("LinuxFoundation");
     QCoreApplication::setOrganizationName("AutomotiveGradeLinux");
-    QCoreApplication::setApplicationName("HomeScreen");
-    QCoreApplication::setApplicationVersion("0.0.1");
+    QCoreApplication::setApplicationName("HomeScreenSimulator");
+    QCoreApplication::setApplicationVersion("0.1.0");
 
     MainWindow w;
-    w.move(0, 0);
     w.show();
 
-    InputEventDistributor *mp_inputEventDistributor;
-    mp_inputEventDistributor = new InputEventDistributor();
+    // TODO: input handling not defined right now...
+    /*InputEventDistributor *mp_inputEventDistributor;
+    mp_inputEventDistributor = new InputEventDistributor();*/
 
 
     // start input and system settings simulator on developer PCs
@@ -59,10 +51,6 @@ int main(int argc, char *argv[])
     qDebug("Running on ARM architecture");
 #endif
 #ifdef __i386__
-    InputDeviceSimulator inputdevicesimulator(&w);
-    inputdevicesimulator.show();
-    SystemSettingsSimulator systemsettingssimulator;
-    systemsettingssimulator.show();
     qDebug("Running on x86 architecture");
 #endif
 
diff --git a/HomeScreenSimulator/src/mainwindow.cpp b/HomeScreenSimulator/src/mainwindow.cpp
new file mode 100644
index 0000000..ffc5170
--- /dev/null
+++ b/HomeScreenSimulator/src/mainwindow.cpp
@@ -0,0 +1,146 @@
+/*
+ * Copyright (C) 2016 Mentor Graphics Development (Deutschland) GmbH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mainwindow.h"
+#include "ui_mainwindow.h"
+
+MainWindow::MainWindow(QWidget *parent) :
+    QMainWindow(parent),
+    mp_ui(new Ui::MainWindow),
+    mp_dBusDayNightModeAdapter(0),
+    mp_dBusStatusBarProxy(0),
+    mp_dBusPopupProxy(0)
+{
+    mp_ui->setupUi(this);
+
+    // dbus setup
+    QDBusConnection dbus = QDBusConnection::sessionBus();
+
+    // publish dbus day night mode interface
+    mp_dBusDayNightModeAdapter = new DaynightmodeAdaptor((QObject*)this);
+
+    dbus.registerService("org.agl.homescreen.simulator");
+    dbus.registerObject("/", this);
+
+    mp_dBusStatusBarProxy = new org::agl::statusbar("org.agl.homescreen",
+                                              "/StatusBar",
+                                              QDBusConnection::sessionBus(),
+                                              0);
+    mp_dBusPopupProxy = new org::agl::popup("org.agl.homescreen",
+                                              "/Popup",
+                                              QDBusConnection::sessionBus(),
+                                              0);
+    QSettings settings;
+    this->move(settings.value("homescreensimulator/pos").toPoint());
+    mp_ui->radioButton_DayMode->setChecked(settings.value("homescreensimulator/daymode", true).toBool()); // if nothing is stored, use "true"
+    mp_ui->radioButton_NightMode->setChecked(settings.value("homescreensimulator/nightmode", false).toBool()); // if nothing is stored, use "false"
+}
+
+MainWindow::~MainWindow()
+{
+    QSettings settings;
+    settings.setValue("homescreensimulator/pos", this->pos());
+    settings.setValue("homescreensimulator/daymode", mp_ui->radioButton_DayMode->isChecked());
+    settings.setValue("homescreensimulator/nightmode", mp_ui->radioButton_NightMode->isChecked());
+
+    delete mp_dBusPopupProxy;
+    delete mp_dBusStatusBarProxy;
+
+    if (0 == mp_dBusDayNightModeAdapter)
+    {
+        delete mp_dBusDayNightModeAdapter;
+    }
+    delete mp_ui;
+}
+
+void MainWindow::on_radioButton_DayMode_toggled(bool checked)
+{
+    if (checked)
+    {
+        emit(dayNightMode(SystemDayNight::DAYNIGHTMODE_DAY));
+    }
+}
+
+void MainWindow::on_radioButton_NightMode_toggled(bool checked)
+{
+    if (checked)
+    {
+        emit(dayNightMode(SystemDayNight::DAYNIGHTMODE_NIGHT));
+    }
+}
+
+void MainWindow::on_pushButton_Update_clicked()
+{
+    QList<int> availablePlaceholders = mp_dBusStatusBarProxy->getAvailablePlaceholders();
+    mp_ui->tableWidget_Status->verticalHeader()->setVisible(false);
+    mp_ui->tableWidget_Status->clear();
+    mp_ui->tableWidget_Status->setRowCount(availablePlaceholders.size());
+    mp_ui->tableWidget_Status->setColumnCount(3);
+
+    QList<QString> horizontalHeaderLabels;
+    horizontalHeaderLabels.append("Placeholder #");
+    horizontalHeaderLabels.append("Text");
+    horizontalHeaderLabels.append("iconURI");
+    mp_ui->tableWidget_Status->setHorizontalHeaderLabels(horizontalHeaderLabels);
+
+    // disable trigger for the update
+    mp_ui->tableWidget_Status->blockSignals(true);
+
+    for (int i = 0; i < availablePlaceholders.size(); ++i)
+    {
+        mp_ui->tableWidget_Status->setItem(i, 0, new QTableWidgetItem(QString::number(availablePlaceholders[i])));
+        mp_ui->tableWidget_Status->item(i, 0)->setFlags(Qt::ItemIsSelectable);
+        mp_ui->tableWidget_Status->setItem(i, 1, new QTableWidgetItem(mp_dBusStatusBarProxy->getStatusText(availablePlaceholders[i])));
+        mp_ui->tableWidget_Status->setItem(i, 2, new QTableWidgetItem(mp_dBusStatusBarProxy->getStatusIcon(availablePlaceholders[i])));
+    }
+
+    // enable trigger again
+    mp_ui->tableWidget_Status->blockSignals(false);
+}
+
+void MainWindow::on_pushButton_Exit_clicked()
+{
+    QApplication::exit();
+}
+
+void MainWindow::on_tableWidget_Status_cellChanged(int row, int column)
+{
+    // text
+    if (1 == column)
+    {
+        mp_dBusStatusBarProxy->setStatusText(mp_ui->tableWidget_Status->item(row, 0)->text().toInt(), mp_ui->tableWidget_Status->item(row, 1)->text());
+    }
+
+    // icon
+    if (2 == column)
+    {
+        mp_dBusStatusBarProxy->setStatusIcon(mp_ui->tableWidget_Status->item(row, 0)->text().toInt(), mp_ui->tableWidget_Status->item(row, 2)->text());
+    }
+}
+
+void MainWindow::on_pushButton_Send_clicked()
+{
+    mp_dBusPopupProxy->showPopup(0, mp_ui->plainTextEdit_Popup->toPlainText());
+}
+
+void MainWindow::on_pushButton_IconExample_clicked()
+{
+    on_pushButton_Update_clicked();
+
+    // THIS IS JUST AN EXAMPLE!!! It only works, because the alias for the pic is defined in the
+    // Home Screen app resources...
+    mp_ui->tableWidget_Status->setItem(0, 2, new QTableWidgetItem(":/icons/home_day.png"));
+}
diff --git a/src/systemsettingssimulator.h b/HomeScreenSimulator/src/mainwindow.h
index cba7a14..2eb6e11 100644
--- a/src/systemsettingssimulator.h
+++ b/HomeScreenSimulator/src/mainwindow.h
@@ -14,34 +14,52 @@
  * limitations under the License.
  */
 
-#ifndef SYSTEMSETTINGSSIMULATOR_H
-#define SYSTEMSETTINGSSIMULATOR_H
+#ifndef MAINWINDOW_H
+#define MAINWINDOW_H
 
-#include <QDialog>
-#include "include/daynightmode.h"
-#include "daynightmode_proxy.h"
+#include <QMainWindow>
+#include "../interfaces/daynightmode.h"
+#include "daynightmode_adapter.h"
+
+#include "statusbar_proxy.h"
+#include "popup_proxy.h"
 
 namespace Ui {
-class SystemSettingsSimulator;
+class MainWindow;
 }
 
-class SystemSettingsSimulator : public QDialog
+class MainWindow : public QMainWindow
 {
     Q_OBJECT
 
 public:
-    explicit SystemSettingsSimulator(QWidget *parent = 0);
-    ~SystemSettingsSimulator();
+    explicit MainWindow(QWidget *parent = 0);
+    ~MainWindow();
+
+// day/night mode
+Q_SIGNALS:
+    void dayNightMode(int mode);
 
 private slots:
-    void on_pushButton_Exit_clicked();
     void on_radioButton_DayMode_toggled(bool checked);
 
     void on_radioButton_NightMode_toggled(bool checked);
 
+    void on_pushButton_Update_clicked();
+
+    void on_pushButton_Exit_clicked();
+
+    void on_tableWidget_Status_cellChanged(int row, int column);
+
+    void on_pushButton_Send_clicked();
+
+    void on_pushButton_IconExample_clicked();
+
 private:
-    Ui::SystemSettingsSimulator *mp_ui;
-    org::agl::daynightmode *mp_dBusDayNightMode;
+    Ui::MainWindow *mp_ui;
+    DaynightmodeAdaptor *mp_dBusDayNightModeAdapter;
+    org::agl::statusbar *mp_dBusStatusBarProxy;
+    org::agl::popup *mp_dBusPopupProxy;
 };
 
-#endif // SYSTEMSETTINGSSIMULATOR_H
+#endif // MAINWINDOW_H
diff --git a/README.md b/README.md
index b3845aa..253ffa2 100644
--- a/README.md
+++ b/README.md
@@ -1,48 +1,10 @@
-AGL Home Screen reference implementation
+This project contains:
+
+HomeScreen: AGL Home Screen reference implementation
+HomeScreenSimulator: AGL Home Screen Simulator for development
+SampleAppTimeDate: AGL Sample Application for Home Screen Statusbar
 
 
 AGL repo for source code:
 https://gerrit.automotivelinux.org/gerrit/#/admin/projects/staging/HomeScreen
-AGL repo for bitbake recipe:
-https://gerrit.automotivelinux.org/gerrit/#/admin/projects/AGL/meta-agl-demo
-[...]/recipes-hmi/homescreen
-
-
-
-v0.0.1
-06/01/2016
-
-#new features
-- initial version
-- first implementation of home screen
-- fix HMI layout (will be configurable in the future)
-- dBus as IPC (may change in the future)
-- no interaction with application manager so far
-- multi-lanuage support
-- day/night mode support
-- initial status bar implementation (interface will be enhanced in the future)
-- initial control bar implementation
-- MPLv2.0 license
-- input device simulator for developer build (not functional right now)
-- system settings simulator for developer build (day/night mode switch functional right now)
-- using QSettings for local app setting storage (may change in the future)
-- first popup implementation (single popup support for now; multiple popup not defined; interface will change)
-- only one instance of the app allowed
-
-#TODOs
-- many settings have to be read from the system somewhere during app startup. This is not available right now
-- interaction with application manager
-- interaction with wayland compositor
-- define and implement input device event handler
-- replace my HMI design with the official AGL design (graphics/icons...)
-- implement example HMI layouts
-- rename dBus objects (internal/external)
-- fix font issues on target
-- more documentation ;)
-- add animations
-- much more...
-
-Thanks to Umar Irshad for his free iconset available here:
-https://dribbble.com/shots/1569128-Freebie-48-Bubbles-Iconset
-
 
diff --git a/SampleAppTimeDate/LICENSE b/SampleAppTimeDate/LICENSE
new file mode 100644
index 0000000..31c692a
--- /dev/null
+++ b/SampleAppTimeDate/LICENSE
@@ -0,0 +1,54 @@
+Apache License
+
+Version 2.0, January 2004
+
+http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.
+
+"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.
+
+"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
+
+"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.
+
+"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.
+
+"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.
+
+"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).
+
+"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.
+
+"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."
+
+"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:
+
+    You must give any other recipients of the Work or Derivative Works a copy of this License; and
+    You must cause any modified files to carry prominent notices stating that You changed the files; and
+    You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and
+    If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License.
+
+    You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
diff --git a/SampleAppTimeDate/README.md b/SampleAppTimeDate/README.md
new file mode 100644
index 0000000..5016865
--- /dev/null
+++ b/SampleAppTimeDate/README.md
@@ -0,0 +1,12 @@
+AGL Sample Application for Home Screen Statusbar
+This application simply shows the current time in the home screen status bar
+
+AGL repo for source code:
+https://gerrit.automotivelinux.org/gerrit/#/admin/projects/staging/HomeScreen
+
+
+v0.1.0
+06/24/2016
+
+#new features
+- initial version
diff --git a/SampleAppTimeDate/SampleAppTimeDate.pro b/SampleAppTimeDate/SampleAppTimeDate.pro
new file mode 100644
index 0000000..0bf4736
--- /dev/null
+++ b/SampleAppTimeDate/SampleAppTimeDate.pro
@@ -0,0 +1,45 @@
+#-------------------------------------------------
+#
+# Project created by QtCreator 2016-06-21T13:46:39
+#
+#-------------------------------------------------
+
+QT       += core dbus
+
+QT       -= gui
+
+TARGET = SampleAppTimeDate
+CONFIG   += console
+CONFIG   -= app_bundle
+
+TEMPLATE = app
+
+
+SOURCES += src/main.cpp \
+    $$OUT_PWD/statusbar_proxy.cpp \             #generated dbus proxy
+    src/timedateprovider.cpp
+
+HEADERS += \
+    $$OUT_PWD/statusbar_proxy.h \           #generated dbus proxy
+    src/timedateprovider.h
+
+OTHER_FILES += \
+    interfaces/statusbar.xml \
+    README.md
+
+# remove generated files
+QMAKE_CLEAN += -r \
+    $$OUT_PWD/HomeScreen \
+    $$OUT_PWD/Makefile \
+    $$OUT_PWD/statusbar_proxy.h \
+    $$OUT_PWD/statusbar_proxy.cpp \
+    $$OUT_PWD/statusbar_proxy.moc
+
+# Create custom targets for generating dbus proxy
+# for statusbar
+statusbargenerateproxy.target = $$OUT_PWD/statusbar_proxy.cpp
+unix:statusbargenerateproxy.commands = "$(OE_QMAKE_PATH_EXTERNAL_HOST_BINS)qdbusxml2cpp -m -p statusbar_proxy $$_PRO_FILE_PWD_/../interfaces/statusbar.xml; $(OE_QMAKE_PATH_EXTERNAL_HOST_BINS)moc $$OUT_PWD/statusbar_proxy.h -o $$OUT_PWD/statusbar_proxy.moc"
+PRE_TARGETDEPS += \
+    $$OUT_PWD/statusbar_proxy.cpp
+QMAKE_EXTRA_TARGETS += \
+    statusbargenerateproxy
diff --git a/SampleAppTimeDate/src/main.cpp b/SampleAppTimeDate/src/main.cpp
new file mode 100644
index 0000000..d432cba
--- /dev/null
+++ b/SampleAppTimeDate/src/main.cpp
@@ -0,0 +1,12 @@
+#include <QCoreApplication>
+#include "timedateprovider.h"
+
+int main(int argc, char *argv[])
+{
+    QCoreApplication a(argc, argv);
+
+    TimeDateProvider *tdp = new TimeDateProvider();
+    tdp->start();
+
+    return a.exec();
+}
diff --git a/SampleAppTimeDate/src/timedateprovider.cpp b/SampleAppTimeDate/src/timedateprovider.cpp
new file mode 100644
index 0000000..91d5e30
--- /dev/null
+++ b/SampleAppTimeDate/src/timedateprovider.cpp
@@ -0,0 +1,77 @@
+#include "timedateprovider.h"
+#include <QTimerEvent>
+
+TimeDateProvider::TimeDateProvider(QObject *parent) :
+    QObject(parent),
+    m_secondsTimerId(-1),
+    mp_dBusStatusBarProxy(0),
+    m_statusBarPlaceholder(-1)
+{
+    qDebug("D-Bus: register as org.agl.SampleAppTimeDate");
+    // dbus setup
+    QDBusConnection dbus = QDBusConnection::sessionBus();
+
+    dbus.registerObject("/", this);
+    dbus.registerService("org.agl.sampleapptimedate");
+
+
+    qDebug("D-Bus: connect to org.agl.mainwindow /StatusBar");
+    mp_dBusStatusBarProxy = new org::agl::statusbar("org.agl.homescreen",
+                                              "/StatusBar",
+                                              QDBusConnection::sessionBus(),
+                                              0);
+}
+
+TimeDateProvider::~TimeDateProvider()
+{
+    stop();
+
+    if (0 != mp_dBusStatusBarProxy)
+    {
+        qDebug("x");
+        mp_dBusStatusBarProxy->setStatusText(1, "");
+        delete mp_dBusStatusBarProxy;
+    }
+}
+
+void TimeDateProvider::start()
+{
+    qDebug("trying to start timer (if this lasts long, maybe the Home Screen Application is not launched.");
+    if ((-1 == m_statusBarPlaceholder) && (0 != mp_dBusStatusBarProxy))
+    {
+        QList<int> availablePlaceholder = mp_dBusStatusBarProxy->getAvailablePlaceholders();
+        if (availablePlaceholder.size() > 0)
+        {
+            // just take the first available placeholder
+            m_statusBarPlaceholder = availablePlaceholder[0];
+            qDebug("- using statusbar placeholder %d", m_statusBarPlaceholder);
+
+            qDebug("- timer started");
+            // callback every second
+            m_secondsTimerId = startTimer(1000);
+        }
+    }
+}
+
+void TimeDateProvider::stop()
+{
+    if (-1 != m_secondsTimerId)
+    {
+        killTimer(m_secondsTimerId);
+        m_secondsTimerId = -1;
+        m_statusBarPlaceholder = -1;
+    }
+}
+
+void TimeDateProvider::timerEvent(QTimerEvent *e)
+{
+    if (e->timerId() == m_secondsTimerId)
+    {
+        if (0 != mp_dBusStatusBarProxy)
+        {
+            QString toDisplay = QDateTime::currentDateTime().toString("hh:mm");
+            qDebug("%s", toDisplay.toStdString().c_str());
+            mp_dBusStatusBarProxy->setStatusText(m_statusBarPlaceholder, toDisplay);
+        }
+    }
+}
diff --git a/SampleAppTimeDate/src/timedateprovider.h b/SampleAppTimeDate/src/timedateprovider.h
new file mode 100644
index 0000000..039104a
--- /dev/null
+++ b/SampleAppTimeDate/src/timedateprovider.h
@@ -0,0 +1,27 @@
+#ifndef TIMEDATEPROVIDER_H
+#define TIMEDATEPROVIDER_H
+
+#include <QObject>
+#include "statusbar_proxy.h"
+
+class TimeDateProvider : public QObject
+{
+    Q_OBJECT
+public:
+    explicit TimeDateProvider(QObject *parent = 0);
+    ~TimeDateProvider();
+    void start();
+    void stop();
+protected:
+    void timerEvent(QTimerEvent *e);
+private:
+    int m_secondsTimerId;
+    org::agl::statusbar *mp_dBusStatusBarProxy;
+    int m_statusBarPlaceholder;
+signals:
+
+public slots:
+
+};
+
+#endif // TIMEDATEPROVIDER_H
diff --git a/dbus-introspections/inputevent.xml b/dbus-introspections/inputevent.xml
deleted file mode 100644
index 4d8dfc5..0000000
--- a/dbus-introspections/inputevent.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
-<!-- Copyright (C) 2016 Mentor Graphics Development (Deutschland) GmbH
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License. -->
-<node>
-  <interface name="org.agl.inputevent">
-    <method name="keyEvent">
-      <arg name="type" type="i" direction="in"/>
-      <arg name="zone" type="i" direction="in"/>
-      <arg name="key" type="i" direction="in"/>
-    </method>
-  </interface>
-</node>
diff --git a/dbus-introspections/statusbar.xml b/dbus-introspections/statusbar.xml
deleted file mode 100644
index fcfe939..0000000
--- a/dbus-introspections/statusbar.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
-<!-- Copyright (C) 2016 Mentor Graphics Development (Deutschland) GmbH
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License. -->
-<node>
-  <interface name="org.agl.statusbar">
-    <method name="setStatus">
-      <arg name="index" type="i" direction="in"/>
-      <arg name="text" type="s" direction="in"/>
-    </method>
-  </interface>
-</node>
diff --git a/include/inputevent.h b/include/inputevent.h
deleted file mode 100644
index 730ac57..0000000
--- a/include/inputevent.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2016 Mentor Graphics Development (Deutschland) GmbH
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef INPUTEVENT_H
-#define INPUTEVENT_H
-
-namespace SystemInputEvent
-{
-    typedef enum InputEventType
-    {
-        INPUTEVENTTYPE_UNDEFINED,
-        INPUTEVENTTYPE_KEY_PRESSED
-    } eInputEventType;
-
-    typedef enum InputEventZone
-    {
-        INPUTEVENTZONE_UNDEFINED,
-        INPUTEVENTZONE_1,
-        INPUTEVENTZONE_2
-    } eInputEventZone;
-}
-
-#endif // INPUTEVENT_H
diff --git a/include/daynightmode.h b/interfaces/daynightmode.h
index bf16f29..bf16f29 100644
--- a/include/daynightmode.h
+++ b/interfaces/daynightmode.h
diff --git a/dbus-introspections/daynightmode.xml b/interfaces/daynightmode.xml
index b88f0ca..f95adcd 100644
--- a/dbus-introspections/daynightmode.xml
+++ b/interfaces/daynightmode.xml
@@ -14,11 +14,8 @@
  limitations under the License. -->
 <node>
   <interface name="org.agl.daynightmode">
-    <method name="setDayNightMode">
-      <arg name="mode" type="i" direction="in"/>
-    </method>
-    <method name="getDayNightMode">
-      <arg type="i" direction="out"/>
-    </method>
+    <signal name="dayNightMode">
+      <arg name="mode" type="i" direction="out"/>
+    </signal>
   </interface>
 </node>
diff --git a/include/popup.h b/interfaces/popup.h
index 1b92333..1b92333 100644
--- a/include/popup.h
+++ b/interfaces/popup.h
diff --git a/dbus-introspections/popup.xml b/interfaces/popup.xml
index 0ec8db3..0ec8db3 100644
--- a/dbus-introspections/popup.xml
+++ b/interfaces/popup.xml
diff --git a/interfaces/statusbar.xml b/interfaces/statusbar.xml
new file mode 100644
index 0000000..934cf27
--- /dev/null
+++ b/interfaces/statusbar.xml
@@ -0,0 +1,38 @@
+<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<!-- Copyright (C) 2016 Mentor Graphics Development (Deutschland) GmbH
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License. -->
+<node>
+  <interface name="org.agl.statusbar">
+      <method name="getAvailablePlaceholders">
+        <arg name="placeholderIndexes" type="ai" direction="out"/>
+        <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QList&lt;int&gt;"/>
+      </method>
+      <method name="getStatusText">
+        <arg name="placeholderIndex" type="i" direction="in"/>
+        <arg name="text" type="s" direction="out"/>
+      </method>
+      <method name="getStatusIcon">
+        <arg name="placeholderIndex" type="i" direction="in"/>
+        <arg name="iconURI" type="s" direction="out"/>
+      </method>
+      <method name="setStatusText">
+        <arg name="placeholderIndex" type="i" direction="in"/>
+        <arg name="text" type="s" direction="in"/>
+      </method>
+      <method name="setStatusIcon">
+        <arg name="placeholderIndex" type="i" direction="in"/>
+        <arg name="iconURI" type="s" direction="in"/>
+      </method>
+  </interface>
+</node>
diff --git a/resources/images/backgrounds/bg_stripes_day.png b/resources/images/backgrounds/bg_stripes_day.png
deleted file mode 100755
index a9978bb..0000000
--- a/resources/images/backgrounds/bg_stripes_day.png
+++ /dev/null
diff --git a/resources/images/backgrounds/bg_stripes_night.png b/resources/images/backgrounds/bg_stripes_night.png
deleted file mode 100755
index 1ba1c39..0000000
--- a/resources/images/backgrounds/bg_stripes_night.png
+++ /dev/null
diff --git a/resources/inputdevicesimulator.ui b/resources/inputdevicesimulator.ui
deleted file mode 100644
index eb8d006..0000000
--- a/resources/inputdevicesimulator.ui
+++ /dev/null
@@ -1,163 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>InputDeviceSimulator</class>
- <widget class="QDialog" name="InputDeviceSimulator">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>300</width>
-    <height>600</height>
-   </rect>
-  </property>
-  <property name="minimumSize">
-   <size>
-    <width>300</width>
-    <height>600</height>
-   </size>
-  </property>
-  <property name="maximumSize">
-   <size>
-    <width>300</width>
-    <height>600</height>
-   </size>
-  </property>
-  <property name="focusPolicy">
-   <enum>Qt::NoFocus</enum>
-  </property>
-  <property name="windowTitle">
-   <string>Input Device Simulator</string>
-  </property>
-  <widget class="QPushButton" name="pushButtonUp">
-   <property name="enabled">
-    <bool>false</bool>
-   </property>
-   <property name="geometry">
-    <rect>
-     <x>110</x>
-     <y>60</y>
-     <width>71</width>
-     <height>71</height>
-    </rect>
-   </property>
-   <property name="focusPolicy">
-    <enum>Qt::NoFocus</enum>
-   </property>
-   <property name="text">
-    <string>Up</string>
-   </property>
-  </widget>
-  <widget class="QPushButton" name="pushButtonLeft">
-   <property name="enabled">
-    <bool>false</bool>
-   </property>
-   <property name="geometry">
-    <rect>
-     <x>30</x>
-     <y>140</y>
-     <width>71</width>
-     <height>71</height>
-    </rect>
-   </property>
-   <property name="focusPolicy">
-    <enum>Qt::NoFocus</enum>
-   </property>
-   <property name="text">
-    <string>Left</string>
-   </property>
-  </widget>
-  <widget class="QPushButton" name="pushButtonRight">
-   <property name="enabled">
-    <bool>false</bool>
-   </property>
-   <property name="geometry">
-    <rect>
-     <x>190</x>
-     <y>140</y>
-     <width>71</width>
-     <height>71</height>
-    </rect>
-   </property>
-   <property name="focusPolicy">
-    <enum>Qt::NoFocus</enum>
-   </property>
-   <property name="text">
-    <string>Right</string>
-   </property>
-  </widget>
-  <widget class="QPushButton" name="pushButtonDown">
-   <property name="enabled">
-    <bool>false</bool>
-   </property>
-   <property name="geometry">
-    <rect>
-     <x>110</x>
-     <y>220</y>
-     <width>71</width>
-     <height>71</height>
-    </rect>
-   </property>
-   <property name="focusPolicy">
-    <enum>Qt::NoFocus</enum>
-   </property>
-   <property name="text">
-    <string>Down</string>
-   </property>
-  </widget>
-  <widget class="QPushButton" name="pushButtonOK">
-   <property name="enabled">
-    <bool>false</bool>
-   </property>
-   <property name="geometry">
-    <rect>
-     <x>110</x>
-     <y>140</y>
-     <width>71</width>
-     <height>71</height>
-    </rect>
-   </property>
-   <property name="focusPolicy">
-    <enum>Qt::NoFocus</enum>
-   </property>
-   <property name="text">
-    <string>OK</string>
-   </property>
-  </widget>
-  <widget class="QLabel" name="label">
-   <property name="geometry">
-    <rect>
-     <x>60</x>
-     <y>0</y>
-     <width>181</width>
-     <height>51</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string>under development
-not functional right now</string>
-   </property>
-  </widget>
-  <widget class="QPushButton" name="pushButtonCancel">
-   <property name="enabled">
-    <bool>false</bool>
-   </property>
-   <property name="geometry">
-    <rect>
-     <x>30</x>
-     <y>220</y>
-     <width>71</width>
-     <height>71</height>
-    </rect>
-   </property>
-   <property name="focusPolicy">
-    <enum>Qt::NoFocus</enum>
-   </property>
-   <property name="text">
-    <string>Cancel/
-Back?</string>
-   </property>
-  </widget>
- </widget>
- <resources/>
- <connections/>
-</ui>
diff --git a/resources/mainwindow.ui b/resources/mainwindow.ui
deleted file mode 100644
index 69c5a08..0000000
--- a/resources/mainwindow.ui
+++ /dev/null
@@ -1,187 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>MainWindow</class>
- <widget class="QMainWindow" name="MainWindow">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>800</width>
-    <height>600</height>
-   </rect>
-  </property>
-  <property name="focusPolicy">
-   <enum>Qt::NoFocus</enum>
-  </property>
-  <property name="windowTitle">
-   <string/>
-  </property>
-  <property name="styleSheet">
-   <string notr="true"/>
-  </property>
-  <widget class="QWidget" name="centralWidget">
-   <widget class="QWidget" name="widget_Background" native="true">
-    <property name="geometry">
-     <rect>
-      <x>0</x>
-      <y>60</y>
-      <width>800</width>
-      <height>480</height>
-     </rect>
-    </property>
-    <property name="focusPolicy">
-     <enum>Qt::NoFocus</enum>
-    </property>
-    <property name="styleSheet">
-     <string notr="true">background-image: url(:/images/backgrounds/bg_blue_day.png)
-</string>
-    </property>
-    <widget class="QWidget" name="widget_Home_Icon" native="true">
-     <property name="geometry">
-      <rect>
-       <x>-40</x>
-       <y>320</y>
-       <width>200</width>
-       <height>200</height>
-      </rect>
-     </property>
-     <property name="styleSheet">
-      <string notr="true">border-image: url(:/icons/home_day.png) 0 0 0 0 stretch stretch;
-</string>
-     </property>
-    </widget>
-    <widget class="QPushButton" name="pushButton">
-     <property name="geometry">
-      <rect>
-       <x>40</x>
-       <y>40</y>
-       <width>150</width>
-       <height>150</height>
-      </rect>
-     </property>
-     <property name="focusPolicy">
-      <enum>Qt::NoFocus</enum>
-     </property>
-     <property name="text">
-      <string>App 1 (dummy entry!)</string>
-     </property>
-    </widget>
-    <widget class="QPushButton" name="pushButton_2">
-     <property name="geometry">
-      <rect>
-       <x>230</x>
-       <y>40</y>
-       <width>150</width>
-       <height>150</height>
-      </rect>
-     </property>
-     <property name="focusPolicy">
-      <enum>Qt::NoFocus</enum>
-     </property>
-     <property name="text">
-      <string>App 1 (dummy entry!)</string>
-     </property>
-    </widget>
-    <widget class="QPushButton" name="pushButton_3">
-     <property name="geometry">
-      <rect>
-       <x>430</x>
-       <y>40</y>
-       <width>150</width>
-       <height>150</height>
-      </rect>
-     </property>
-     <property name="focusPolicy">
-      <enum>Qt::NoFocus</enum>
-     </property>
-     <property name="text">
-      <string>App 1 (dummy entry!)</string>
-     </property>
-    </widget>
-    <widget class="QPushButton" name="pushButton_4">
-     <property name="geometry">
-      <rect>
-       <x>620</x>
-       <y>40</y>
-       <width>150</width>
-       <height>150</height>
-      </rect>
-     </property>
-     <property name="focusPolicy">
-      <enum>Qt::NoFocus</enum>
-     </property>
-     <property name="text">
-      <string>App 1 (dummy entry!)</string>
-     </property>
-    </widget>
-    <widget class="QPushButton" name="pushButton_5">
-     <property name="geometry">
-      <rect>
-       <x>620</x>
-       <y>250</y>
-       <width>150</width>
-       <height>150</height>
-      </rect>
-     </property>
-     <property name="focusPolicy">
-      <enum>Qt::NoFocus</enum>
-     </property>
-     <property name="text">
-      <string>App 1 (dummy entry!)</string>
-     </property>
-    </widget>
-    <widget class="QPushButton" name="pushButton_6">
-     <property name="geometry">
-      <rect>
-       <x>440</x>
-       <y>250</y>
-       <width>150</width>
-       <height>150</height>
-      </rect>
-     </property>
-     <property name="focusPolicy">
-      <enum>Qt::NoFocus</enum>
-     </property>
-     <property name="text">
-      <string>App 1 (dummy entry!)</string>
-     </property>
-    </widget>
-    <widget class="QPushButton" name="pushButton_7">
-     <property name="geometry">
-      <rect>
-       <x>40</x>
-       <y>250</y>
-       <width>150</width>
-       <height>150</height>
-      </rect>
-     </property>
-     <property name="focusPolicy">
-      <enum>Qt::NoFocus</enum>
-     </property>
-     <property name="text">
-      <string>App 1 (dummy entry!)</string>
-     </property>
-    </widget>
-    <widget class="QPushButton" name="pushButton_8">
-     <property name="geometry">
-      <rect>
-       <x>240</x>
-       <y>250</y>
-       <width>150</width>
-       <height>150</height>
-      </rect>
-     </property>
-     <property name="focusPolicy">
-      <enum>Qt::NoFocus</enum>
-     </property>
-     <property name="text">
-      <string>App 1 (dummy entry!)</string>
-     </property>
-    </widget>
-   </widget>
-  </widget>
- </widget>
- <layoutdefault spacing="6" margin="11"/>
- <resources/>
- <connections/>
-</ui>
diff --git a/resources/systemsettingssimulator.ui b/resources/systemsettingssimulator.ui
deleted file mode 100644
index c4f72cc..0000000
--- a/resources/systemsettingssimulator.ui
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>SystemSettingsSimulator</class>
- <widget class="QDialog" name="SystemSettingsSimulator">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>400</width>
-    <height>300</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>System Settings</string>
-  </property>
-  <widget class="QPushButton" name="pushButton_Exit">
-   <property name="geometry">
-    <rect>
-     <x>290</x>
-     <y>260</y>
-     <width>99</width>
-     <height>27</height>
-    </rect>
-   </property>
-   <property name="focusPolicy">
-    <enum>Qt::NoFocus</enum>
-   </property>
-   <property name="text">
-    <string>Exit</string>
-   </property>
-  </widget>
-  <widget class="QGroupBox" name="groupBoxDayNightMode">
-   <property name="geometry">
-    <rect>
-     <x>20</x>
-     <y>20</y>
-     <width>161</width>
-     <height>91</height>
-    </rect>
-   </property>
-   <property name="title">
-    <string>Day/Night Mode</string>
-   </property>
-   <widget class="QRadioButton" name="radioButton_NightMode">
-    <property name="geometry">
-     <rect>
-      <x>10</x>
-      <y>50</y>
-      <width>117</width>
-      <height>22</height>
-     </rect>
-    </property>
-    <property name="focusPolicy">
-     <enum>Qt::NoFocus</enum>
-    </property>
-    <property name="text">
-     <string>Night Mode</string>
-    </property>
-   </widget>
-   <widget class="QRadioButton" name="radioButton_DayMode">
-    <property name="geometry">
-     <rect>
-      <x>10</x>
-      <y>30</y>
-      <width>117</width>
-      <height>22</height>
-     </rect>
-    </property>
-    <property name="focusPolicy">
-     <enum>Qt::NoFocus</enum>
-    </property>
-    <property name="text">
-     <string>Day Mode</string>
-    </property>
-    <property name="checked">
-     <bool>true</bool>
-    </property>
-   </widget>
-  </widget>
- </widget>
- <resources/>
- <connections/>
-</ui>
diff --git a/resources/translations/homescreen_de_DE.qm b/resources/translations/homescreen_de_DE.qm
deleted file mode 100644
index 3a9c77f..0000000
--- a/resources/translations/homescreen_de_DE.qm
+++ /dev/null
diff --git a/resources/translations/homescreen_de_DE.ts b/resources/translations/homescreen_de_DE.ts
deleted file mode 100644
index 19af3d1..0000000
--- a/resources/translations/homescreen_de_DE.ts
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.1" language="de_DE">
-<context>
-    <name>InputDeviceSimulator</name>
-    <message>
-        <location filename="../inputdevicesimulator.ui" line="26"/>
-        <source>Input Device Simulator</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../inputdevicesimulator.ui" line="41"/>
-        <source>Up</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../inputdevicesimulator.ui" line="57"/>
-        <source>Left</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../inputdevicesimulator.ui" line="73"/>
-        <source>Right</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../inputdevicesimulator.ui" line="89"/>
-        <source>Down</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../inputdevicesimulator.ui" line="105"/>
-        <source>OK</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MainWindow</name>
-    <message>
-        <source>Exit</source>
-        <translation type="vanished">Beenden</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="56"/>
-        <source>00:00</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SettingsWidget</name>
-    <message>
-        <location filename="../settingswidget.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="41"/>
-        <source>Language</source>
-        <translation>Sprache</translation>
-    </message>
-</context>
-<context>
-    <name>SystemSettingsSimulator</name>
-    <message>
-        <location filename="../systemsettingssimulator.ui" line="14"/>
-        <source>System Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../systemsettingssimulator.ui" line="29"/>
-        <source>Exit</source>
-        <translation type="unfinished">Beenden</translation>
-    </message>
-    <message>
-        <location filename="../systemsettingssimulator.ui" line="42"/>
-        <source>Day/Night Mode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../systemsettingssimulator.ui" line="57"/>
-        <source>Night Mode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../systemsettingssimulator.ui" line="73"/>
-        <source>Day Mode</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/resources/translations/homescreen_en_US.qm b/resources/translations/homescreen_en_US.qm
deleted file mode 100644
index c77ee40..0000000
--- a/resources/translations/homescreen_en_US.qm
+++ /dev/null
diff --git a/resources/translations/homescreen_en_US.ts b/resources/translations/homescreen_en_US.ts
deleted file mode 100644
index ca6d32e..0000000
--- a/resources/translations/homescreen_en_US.ts
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.1" language="en_US">
-<context>
-    <name>InputDeviceSimulator</name>
-    <message>
-        <location filename="../inputdevicesimulator.ui" line="26"/>
-        <source>Input Device Simulator</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../inputdevicesimulator.ui" line="41"/>
-        <source>Up</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../inputdevicesimulator.ui" line="57"/>
-        <source>Left</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../inputdevicesimulator.ui" line="73"/>
-        <source>Right</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../inputdevicesimulator.ui" line="89"/>
-        <source>Down</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../inputdevicesimulator.ui" line="105"/>
-        <source>OK</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MainWindow</name>
-    <message>
-        <source>Exit</source>
-        <translation type="vanished">Exit</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="56"/>
-        <source>00:00</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SettingsWidget</name>
-    <message>
-        <location filename="../settingswidget.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="41"/>
-        <source>Language</source>
-        <translation>Language</translation>
-    </message>
-</context>
-<context>
-    <name>SystemSettingsSimulator</name>
-    <message>
-        <location filename="../systemsettingssimulator.ui" line="14"/>
-        <source>System Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../systemsettingssimulator.ui" line="29"/>
-        <source>Exit</source>
-        <translation type="unfinished">Exit</translation>
-    </message>
-    <message>
-        <location filename="../systemsettingssimulator.ui" line="42"/>
-        <source>Day/Night Mode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../systemsettingssimulator.ui" line="57"/>
-        <source>Night Mode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../systemsettingssimulator.ui" line="73"/>
-        <source>Day Mode</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/resources/translations/homescreen_ja_JP.qm b/resources/translations/homescreen_ja_JP.qm
deleted file mode 100644
index 8d336bc..0000000
--- a/resources/translations/homescreen_ja_JP.qm
+++ /dev/null
diff --git a/resources/translations/homescreen_ja_JP.ts b/resources/translations/homescreen_ja_JP.ts
deleted file mode 100644
index 5a43233..0000000
--- a/resources/translations/homescreen_ja_JP.ts
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.1" language="ja_JP">
-<context>
-    <name>InputDeviceSimulator</name>
-    <message>
-        <location filename="../inputdevicesimulator.ui" line="26"/>
-        <source>Input Device Simulator</source>
-        <translation type="unfinished">入力デバイスシミュレータ</translation>
-    </message>
-    <message>
-        <location filename="../inputdevicesimulator.ui" line="41"/>
-        <source>Up</source>
-        <translation type="unfinished">アップ</translation>
-    </message>
-    <message>
-        <location filename="../inputdevicesimulator.ui" line="57"/>
-        <source>Left</source>
-        <translation type="unfinished">左</translation>
-    </message>
-    <message>
-        <location filename="../inputdevicesimulator.ui" line="73"/>
-        <source>Right</source>
-        <translation type="unfinished">右</translation>
-    </message>
-    <message>
-        <location filename="../inputdevicesimulator.ui" line="89"/>
-        <source>Down</source>
-        <translation type="unfinished">ダウン</translation>
-    </message>
-    <message>
-        <location filename="../inputdevicesimulator.ui" line="105"/>
-        <source>OK</source>
-        <translation type="unfinished">OK</translation>
-    </message>
-</context>
-<context>
-    <name>MainWindow</name>
-    <message>
-        <location filename="../mainwindow.ui" line="56"/>
-        <source>00:00</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SettingsWidget</name>
-    <message>
-        <location filename="../settingswidget.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="41"/>
-        <source>Language</source>
-        <translation>言語</translation>
-    </message>
-</context>
-<context>
-    <name>SystemSettingsSimulator</name>
-    <message>
-        <location filename="../systemsettingssimulator.ui" line="14"/>
-        <source>System Settings</source>
-        <translation type="unfinished">システム設定</translation>
-    </message>
-    <message>
-        <location filename="../systemsettingssimulator.ui" line="29"/>
-        <source>Exit</source>
-        <translation type="unfinished">出口</translation>
-    </message>
-    <message>
-        <location filename="../systemsettingssimulator.ui" line="42"/>
-        <source>Day/Night Mode</source>
-        <translation type="unfinished">昼/夜モード</translation>
-    </message>
-    <message>
-        <location filename="../systemsettingssimulator.ui" line="57"/>
-        <source>Night Mode</source>
-        <translation type="unfinished">ナイトモード</translation>
-    </message>
-    <message>
-        <location filename="../systemsettingssimulator.ui" line="73"/>
-        <source>Day Mode</source>
-        <translation type="unfinished">デイモード</translation>
-    </message>
-</context>
-</TS>
diff --git a/src/inputdevicesimulator.cpp b/src/inputdevicesimulator.cpp
deleted file mode 100644
index fcadbc6..0000000
--- a/src/inputdevicesimulator.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (C) 2016 Mentor Graphics Development (Deutschland) GmbH
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "inputdevicesimulator.h"
-#include "ui_inputdevicesimulator.h"
-#include <QSettings>
-
-
-InputDeviceSimulator::InputDeviceSimulator(QWidget *parent) :
-    QDialog(parent),
-    mp_ui(new Ui::InputDeviceSimulator),
-    mp_dBusInputevent(0)
-{
-    mp_ui->setupUi(this);
-
-    // connect to the dBus interface provided by the input device distributor
-    mp_dBusInputevent = new org::agl::inputevent("org.agl.main",
-                                              "/InputEventDistributor",
-                                              QDBusConnection::sessionBus(),
-                                              0);
-
-    QSettings settings;
-    this->restoreGeometry(settings.value("inputdevicesimulator/geometry").toByteArray());
-}
-
-InputDeviceSimulator::~InputDeviceSimulator()
-{
-    QSettings settings;
-    settings.setValue("inputdevicesimulator/geometry", saveGeometry());
-
-    if (0 == mp_dBusInputevent)
-    {
-        delete mp_dBusInputevent;
-    }
-
-    delete mp_ui;
-}
-
-void InputDeviceSimulator::on_pushButtonRight_clicked()
-{
-    qDebug("right");
-    mp_dBusInputevent->keyEvent(SystemInputEvent::INPUTEVENTTYPE_KEY_PRESSED, SystemInputEvent::INPUTEVENTZONE_1, Qt::Key_Right);
-}
diff --git a/src/inputdevicesimulator.h b/src/inputdevicesimulator.h
deleted file mode 100644
index e22beee..0000000
--- a/src/inputdevicesimulator.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2016 Mentor Graphics Development (Deutschland) GmbH
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef INPUTDEVICESIMULATOR_H
-#define INPUTDEVICESIMULATOR_H
-
-#include <QDialog>
-#include "include/inputevent.h"
-#include "inputevent_proxy.h"
-
-namespace Ui {
-class InputDeviceSimulator;
-}
-
-class InputDeviceSimulator : public QDialog
-{
-    Q_OBJECT
-
-public:
-    explicit InputDeviceSimulator(QWidget *parent = 0);
-    ~InputDeviceSimulator();
-
-private slots:
-    void on_pushButtonRight_clicked();
-
-private:
-    Ui::InputDeviceSimulator *mp_ui;
-    org::agl::inputevent *mp_dBusInputevent;
-};
-
-#endif // INPUTDEVICESIMULATOR_H
diff --git a/src/inputeventdistributor.cpp b/src/inputeventdistributor.cpp
deleted file mode 100644
index 911b90f..0000000
--- a/src/inputeventdistributor.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2016 Mentor Graphics Development (Deutschland) GmbH
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "inputeventdistributor.h"
-#include <QEvent>
-
-InputEventDistributor::InputEventDistributor(QObject *parent) :
-    QObject(parent),
-    mp_inputEventAdaptor(0)
-{
-    // publish dbus popup interface
-    mp_inputEventAdaptor = new InputeventAdaptor((QObject*)this);
-    QDBusConnection dbus = QDBusConnection::sessionBus();
-    dbus.registerObject("/InputEventDistributor", this);
-    dbus.registerService("org.agl.main");
-}
-
-InputEventDistributor::~InputEventDistributor()
-{
-    delete mp_inputEventAdaptor;
-}
-
-void InputEventDistributor::keyEvent(int type, int zone, int key)
-{
-    qDebug("InputEventDistributor::keyEvent type 0x%x, key 0x%x", type, key);
-
-    //QEvent *event;
-    switch (type)
-    {
-    case SystemInputEvent::INPUTEVENTTYPE_KEY_PRESSED:
-
-        break;
-    default:
-        qDebug("InputEventDistributor::keyEvent: Type 0x%x undefined", type);
-    }
-
-}
diff --git a/src/inputeventdistributor.h b/src/inputeventdistributor.h
deleted file mode 100644
index fe8ed89..0000000
--- a/src/inputeventdistributor.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2016 Mentor Graphics Development (Deutschland) GmbH
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef INPUTEVENTDISTRIBUTOR_H
-#define INPUTEVENTDISTRIBUTOR_H
-
-#include <QObject>
-#include "include/inputevent.h"
-#include "inputevent_adapter.h"
-
-
-class InputEventDistributor : public QObject
-{
-    Q_OBJECT
-public:
-    explicit InputEventDistributor(QObject *parent = 0);
-    ~InputEventDistributor();
-
-signals:
-
-public slots:
-public Q_SLOTS: // METHODS
-    void keyEvent(int type, int zone, int key);
-private:
-    InputeventAdaptor *mp_inputEventAdaptor;
-};
-
-#endif // INPUTEVENTDISTRIBUTOR_H
diff --git a/src/popupwidget.cpp b/src/popupwidget.cpp
deleted file mode 100644
index 54573ad..0000000
--- a/src/popupwidget.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2016 Mentor Graphics Development (Deutschland) GmbH
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "popupwidget.h"
-#include "ui_popupwidget.h"
-
-PopupWidget::PopupWidget(QWidget *parent) :
-    QWidget(parent),
-    mp_ui(new Ui::PopupWidget),
-    mp_popupAdaptor(0)
-{
-    mp_ui->setupUi(this);
-
-    // publish dbus popup interface
-    mp_popupAdaptor = new PopupAdaptor((QObject*)this);
-    QDBusConnection dbus = QDBusConnection::sessionBus();
-    dbus.registerObject("/PopupWidget", this);
-    dbus.registerService("org.agl.mainwindow");
-}
-
-PopupWidget::~PopupWidget()
-{
-    delete mp_popupAdaptor;
-    delete mp_ui;
-}
-
-void PopupWidget::showPopup(int type, const QString &text)
-{
-    qDebug("PopupWidget::showPopup: type %d, text %s", type, text.toStdString().c_str());
-    mp_ui->label_Text->setText(text);
-}
-
-void PopupWidget::on_pushButton_OK_clicked()
-{
-    this->close();
-}
diff --git a/src/statusbarwidget.cpp b/src/statusbarwidget.cpp
deleted file mode 100644
index 775a9ec..0000000
--- a/src/statusbarwidget.cpp
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Copyright (C) 2016 Mentor Graphics Development (Deutschland) GmbH
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "statusbarwidget.h"
-#include "ui_statusbarwidget.h"
-
-StatusBarWidget::StatusBarWidget(QWidget *parent) :
-    QWidget(parent),
-    mp_ui(new Ui::StatusBarWidget),
-    m_dayNightMode(SystemDayNight::DAYNIGHTMODE_DAY), // TODO: read from system
-    mp_daynightmodeAdaptor(0),
-    mp_statusbarAdaptor(0),
-    m_secondsTimerId(-1)
-{
-    // publish dbus day night mode interface
-    mp_daynightmodeAdaptor = new DaynightmodeAdaptor((QObject*)this);
-    // publish statusbar interface
-    mp_statusbarAdaptor = new StatusbarAdaptor((QObject*)this);
-
-    QDBusConnection dbus = QDBusConnection::sessionBus();
-    dbus.registerObject("/StatusBarWidget", this);
-    dbus.registerService("org.agl.mainwindow");
-
-    mp_ui->setupUi(this);
-
-    // callback every second
-    m_secondsTimerId = startTimer(1000);
-}
-
-StatusBarWidget::~StatusBarWidget()
-{
-    delete mp_statusbarAdaptor;
-    delete mp_daynightmodeAdaptor;
-    delete mp_ui;
-}
-
-void StatusBarWidget::setDayNightMode(int mode)
-{
-    switch (mode)
-    {
-    case SystemDayNight::DAYNIGHTMODE_DAY:
-        m_dayNightMode = SystemDayNight::DAYNIGHTMODE_DAY;
-        mp_ui->widget->setStyleSheet(QString("background-image: url(:/images/backgrounds/bg_stripes_day.png)"));
-        mp_ui->label_1->setStyleSheet(QString("color: rgb(238, 238, 238); background-image: url(:/images/transparency.png);"));
-        mp_ui->label_2->setStyleSheet(QString("color: rgb(238, 238, 238); background-image: url(:/images/transparency.png);"));
-        mp_ui->label_3->setStyleSheet(QString("color: rgb(238, 238, 238); background-image: url(:/images/transparency.png);"));
-        mp_ui->label_4_Time->setStyleSheet(QString("color: rgb(238, 238, 238); background-image: url(:/images/transparency.png);"));
-        mp_ui->label_5->setStyleSheet(QString("color: rgb(238, 238, 238); background-image: url(:/images/transparency.png);"));
-        mp_ui->label_6->setStyleSheet(QString("color: rgb(238, 238, 238); background-image: url(:/images/transparency.png);"));
-        mp_ui->label_7->setStyleSheet(QString("color: rgb(238, 238, 238); background-image: url(:/images/transparency.png);"));
-        break;
-    case SystemDayNight::DAYNIGHTMODE_NIGHT:
-        m_dayNightMode = SystemDayNight::DAYNIGHTMODE_NIGHT;
-        mp_ui->widget->setStyleSheet(QString("background-image: url(:/images/backgrounds/bg_stripes_night.png)"));
-        mp_ui->label_1->setStyleSheet(QString("color: rgb(177, 177, 177); background-image: url(:/images/transparency.png);"));
-        mp_ui->label_2->setStyleSheet(QString("color: rgb(177, 177, 177); background-image: url(:/images/transparency.png);"));
-        mp_ui->label_3->setStyleSheet(QString("color: rgb(177, 177, 177); background-image: url(:/images/transparency.png);"));
-        mp_ui->label_4_Time->setStyleSheet(QString("color: rgb(177, 177, 177); background-image: url(:/images/transparency.png);"));
-        mp_ui->label_5->setStyleSheet(QString("color: rgb(177, 177, 177); background-image: url(:/images/transparency.png);"));
-        mp_ui->label_6->setStyleSheet(QString("color: rgb(177, 177, 177); background-image: url(:/images/transparency.png);"));
-        mp_ui->label_7->setStyleSheet(QString("color: rgb(177, 177, 177); background-image: url(:/images/transparency.png);"));
-        break;
-    default:
-        m_dayNightMode = SystemDayNight::DAYNIGHTMODE_UNDEFINED;
-    }
-}
-
-void StatusBarWidget::setStatus(int index, const QString &text)
-{
-    switch (index)
-    {
-    case 1:
-        mp_ui->label_1->setText(text);
-        break;
-    case 2:
-        mp_ui->label_2->setText(text);
-        break;
-    case 3:
-        mp_ui->label_3->setText(text);
-        break;
-    case 4:
-        qDebug("reserved for the time status");
-        break;
-    case 5:
-        mp_ui->label_5->setText(text);
-        break;
-    case 6:
-        mp_ui->label_6->setText(text);
-        break;
-    case 7:
-        mp_ui->label_7->setText(text);
-        break;
-    default:
-        break;
-    }
-}
-
-void StatusBarWidget::timerEvent(QTimerEvent *e)
-{
-    if (e->timerId() == m_secondsTimerId)
-    {
-        mp_ui->label_4_Time->setText(QDateTime::currentDateTime().toString("hh:mm"));
-    }
-}
-
diff --git a/src/systemsettingssimulator.cpp b/src/systemsettingssimulator.cpp
deleted file mode 100644
index b1ed6b3..0000000
--- a/src/systemsettingssimulator.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (C) 2016 Mentor Graphics Development (Deutschland) GmbH
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "systemsettingssimulator.h"
-#include "ui_systemsettingssimulator.h"
-#include "include/daynightmode.h"
-#include <QSettings>
-
-SystemSettingsSimulator::SystemSettingsSimulator(QWidget *parent) :
-    QDialog(parent),
-    mp_ui(new Ui::SystemSettingsSimulator),
-    mp_dBusDayNightMode(0)
-{
-    mp_ui->setupUi(this);
-
-    // connect to the dBus interface provided by the main window
-    mp_dBusDayNightMode = new org::agl::daynightmode("org.agl.mainwindow",
-                                              "/MainWindow",
-                                              QDBusConnection::sessionBus(),
-                                              0);
-
-    QSettings settings;
-    this->restoreGeometry(settings.value("systemsettingssimulator/geometry").toByteArray());
-    mp_ui->radioButton_DayMode->setChecked(settings.value("systemsettingssimulator/daymode", true).toBool()); // if nothing is stored, use "true"
-    mp_ui->radioButton_NightMode->setChecked(settings.value("systemsettingssimulator/nightmode", false).toBool()); // if nothing is stored, use "false"
-}
-
-SystemSettingsSimulator::~SystemSettingsSimulator()
-{
-    QSettings settings;
-    settings.setValue("systemsettingssimulator/geometry", saveGeometry());
-    settings.setValue("systemsettingssimulator/daymode", mp_ui->radioButton_DayMode->isChecked());
-    settings.setValue("systemsettingssimulator/nightmode", mp_ui->radioButton_NightMode->isChecked());
-
-    if (0 == mp_dBusDayNightMode)
-    {
-        delete mp_dBusDayNightMode;
-    }
-    delete mp_ui;
-}
-
-void SystemSettingsSimulator::on_pushButton_Exit_clicked()
-{
-    QApplication::exit();
-}
-
-void SystemSettingsSimulator::on_radioButton_DayMode_toggled(bool checked)
-{
-    if (checked)
-    {
-        mp_dBusDayNightMode->setDayNightMode(SystemDayNight::DAYNIGHTMODE_DAY);
-    }
-}
-
-void SystemSettingsSimulator::on_radioButton_NightMode_toggled(bool checked)
-{
-    if (checked)
-    {
-        mp_dBusDayNightMode->setDayNightMode(SystemDayNight::DAYNIGHTMODE_NIGHT);
-    }
-}