diff --git a/QmlMirror.qml b/QmlMirror.qml
index 8dbc7dd..474e514 100644
--- a/QmlMirror.qml
+++ b/QmlMirror.qml
@@ -30,8 +30,6 @@ ApplicationWindow {
         width: 360
         height: 480
         color: "black"
-        border.color: "grey"
-        border.width: 0
     }
 
 }
diff --git a/Weather.qml b/Weather.qml
index ef26761..2b0b239 100644
--- a/Weather.qml
+++ b/Weather.qml
@@ -2,6 +2,12 @@ import QtQuick 2.0
 import net.frozentux.weatherinfo 1.0
 
 
-WeatherInfo {
-    id: weatherdata
+Rectangle {
+    width: 360
+    height: 600
+    color: "black"
+    WeatherInfo {
+
+        id: weatherdata
+    }
 }
diff --git a/weatherinfo/WeatherInfo.qml b/weatherinfo/WeatherInfo.qml
index 877f4bb..7aca3a7 100644
--- a/weatherinfo/WeatherInfo.qml
+++ b/weatherinfo/WeatherInfo.qml
@@ -96,43 +96,6 @@ Item {
                 topMargin: 6; bottomMargin: 6; leftMargin: 6; rightMargin: 6
             }
 
-            Rectangle {
-                width: parent.width
-                height: 25
-                color: "lightgrey"
-
-                Text {
-                    text: (model.hasValidCity ? model.city : "Unknown location") + (model.useGps ? " (GPS)" : "")
-                    anchors.fill: parent
-                    horizontalAlignment: Text.AlignHCenter
-                    verticalAlignment: Text.AlignVCenter
-                }
-
-                MouseArea {
-                    anchors.fill: parent
-                    onClicked: {
-                        if (model.useGps) {
-                            model.useGps = false
-                            model.city = "Brisbane"
-                        } else {
-                            switch (model.city) {
-                            case "Brisbane":
-                                model.city = "Oslo"
-                                break
-                            case "Oslo":
-                                model.city = "Helsinki"
-                                break
-                            case "Helsinki":
-                                model.city = "New York"
-                                break
-                            case "New York":
-                                model.useGps = true
-                                break
-                            }
-                        }
-                    }
-                }
-            }
 
 //! [3]
             BigForecastIcon {
diff --git a/weatherinfo/components/BigForecastIcon.qml b/weatherinfo/components/BigForecastIcon.qml
index 16e99bf..bbd7d84 100644
--- a/weatherinfo/components/BigForecastIcon.qml
+++ b/weatherinfo/components/BigForecastIcon.qml
@@ -51,6 +51,7 @@ Item {
     Text {
         text: current.topText
         font.pointSize: 28
+        color: "white"
         anchors {
             top: current.top
             left: current.left
@@ -70,6 +71,7 @@ Item {
 
     Text {
         text: current.bottomText
+        color: "white"
         font.pointSize: 23
         wrapMode: Text.WordWrap
         width: parent.width
diff --git a/weatherinfo/components/ForecastIcon.qml b/weatherinfo/components/ForecastIcon.qml
index a139393..5f4ffd1 100644
--- a/weatherinfo/components/ForecastIcon.qml
+++ b/weatherinfo/components/ForecastIcon.qml
@@ -52,6 +52,8 @@ Item {
         horizontalAlignment: Text.AlignHCenter
         width: top.width
         text: top.topText
+        color: "white"
+
 
         anchors.top: parent.top
         anchors.topMargin: top.height / 5 - dayText.paintedHeight
@@ -81,6 +83,7 @@ Item {
         horizontalAlignment: Text.AlignHCenter
         width: top.width
         text: top.bottomText
+        color: "white"
 
         anchors.bottom: parent.bottom
         anchors.bottomMargin: top.height / 5 - tempText.paintedHeight
diff --git a/weatherinfo/weatherinfo.pro b/weatherinfo/weatherinfo.pro
index 8b31c76..47f2ec1 100644
--- a/weatherinfo/weatherinfo.pro
+++ b/weatherinfo/weatherinfo.pro
@@ -15,24 +15,6 @@ INSTALLS += target
 uri=net.frozentux.weatherinfo
 
 
-OTHER_FILES += \
-    components/BigForecastIcon.qml \
-    components/ForecastIcon.qml \
-    components/WeatherIcon.qml \
-    icons/weather-few-clouds.xcf \
-    icons/weather-fog.xcf \
-    icons/weather-haze.xcf \
-    icons/weather-icy.xcf \
-    icons/weather-overcast.xcf \
-    icons/weather-showers.xcf \
-    icons/weather-sleet.xcf \
-    icons/weather-snow.xcf \
-    icons/weather-storm.xcf \
-    icons/weather-sunny.xcf \
-    icons/weather-sunny-very-few-clouds.xcf \
-    icons/weather-thundershower.xcf \
-    icons/README.txt
-
 DISTFILES += \
     WeatherInfo.qml