moving scanner logic to ui, new icon

23 files changed, 122 insertions, 348 deletions

diff --git a/sowatchd/allscanner.cpp b/libsowatch/allwatchscanner.cpp
index a3e7d33..8a49b86 100644
--- a/sowatchd/allscanner.cpp
+++ b/libsowatch/allwatchscanner.cpp
@@ -1,8 +1,8 @@
-#include "allscanner.h"
+#include "allwatchscanner.h"
 
 using namespace sowatch;
 
-AllScanner::AllScanner(QObject *parent) :
+AllWatchScanner::AllWatchScanner(QObject *parent) :
 	WatchScanner(parent), _finishedCount(0)
 {
 	QList<WatchPluginInterface*> plugins = Registry::registry()->getWatchPlugins();
@@ -17,7 +17,7 @@ AllScanner::AllScanner(QObject *parent) :
 	}
 }
 
-void AllScanner::start()
+void AllWatchScanner::start()
 {
 	if (_scanners.empty()) {
 		emit finished();
@@ -29,7 +29,7 @@ void AllScanner::start()
 	}
 }
 
-void AllScanner::handleFinished()
+void AllWatchScanner::handleFinished()
 {
 	qDebug() << "one finished";
 	_finishedCount++;
diff --git a/sowatchd/allscanner.h b/libsowatch/allwatchscanner.h
index 6a7160f..ac0baae 100644
--- a/sowatchd/allscanner.h
+++ b/libsowatch/allwatchscanner.h
@@ -1,5 +1,5 @@
-#ifndef ALLSCANNER_H
-#define ALLSCANNER_H
+#ifndef SOWATCH_ALLWATCHSCANNER_H
+#define SOWATCH_ALLWATCHSCANNER_H
 
 #include <QtCore/QObject>
 #include <QtCore/QList>
@@ -9,11 +9,11 @@
 namespace sowatch
 {
 
-class AllScanner : public WatchScanner
+class AllWatchScanner : public WatchScanner
 {
 	Q_OBJECT
 public:
-	explicit AllScanner(QObject *parent = 0);
+	explicit AllWatchScanner(QObject *parent = 0);
 	void start();
 
 private:
@@ -26,4 +26,4 @@ private slots:
 
 }
 
-#endif // ALLSCANNER_H
+#endif // SOWATCH_ALLWATCHSCANNER_H
diff --git a/libsowatch/libsowatch.pro b/libsowatch/libsowatch.pro
index 7a5b8eb..1057a87 100644
--- a/libsowatch/libsowatch.pro
+++ b/libsowatch/libsowatch.pro
@@ -32,6 +32,7 @@ SOURCES += \
     watchletplugininterface.cpp \
 	registry.cpp \
     watchscanner.cpp \
+    allwatchscanner.cpp \
     configkey.cpp \
     gconfkey.cpp
 
@@ -54,6 +55,7 @@ HEADERS += \
     watchletplugininterface.h \
 	registry.h \
     watchscanner.h \
+    allwatchscanner.h \
     configkey.h \
     gconfkey.h
 
diff --git a/libsowatch/sowatch.h b/libsowatch/sowatch.h
index efc5ee8..921e69c 100644
--- a/libsowatch/sowatch.h
+++ b/libsowatch/sowatch.h
@@ -23,5 +23,6 @@
 #include "watchletplugininterface.h"
 
 #include "registry.h"
+#include "allwatchscanner.h"
 
 #endif // SOWATCH_H
diff --git a/sowatchd/main.cpp b/sowatchd/main.cpp
index 29eee28..2816830 100644
--- a/sowatchd/main.cpp
+++ b/sowatchd/main.cpp
@@ -4,9 +4,7 @@
 
 #include <sowatch.h>
 #include "global.h"
-#include "allscanner.h"
 #include "daemonadaptor.h"
-#include "scanneradaptor.h"
 
 namespace sowatch
 {
@@ -26,17 +24,11 @@ int main(int argc, char *argv[])
 
 	sowatch::daemon = new Daemon(&a);
 	new DaemonAdaptor(sowatch::daemon);
-	AllScanner *scanner = new AllScanner(&a);
-	new ScannerAdaptor(scanner);
 
 	QDBusConnection connection = QDBusConnection::sessionBus();
 	if (!connection.registerService("com.javispedro.sowatchd")) {
 		qCritical("Could not register D-Bus service");
 	}
-
-	if (!connection.registerObject("/com/javispedro/sowatch/allscanner", scanner)) {
-		qCritical("Could not register scanner object");
-	}
 	if (!connection.registerObject("/com/javispedro/sowatch/daemon", sowatch::daemon)) {
 		qCritical("Could not register daemon object");
 	}
diff --git a/sowatchd/scanner.xml b/sowatchd/scanner.xml
deleted file mode 100644
index 948ce0b..0000000
--- a/sowatchd/scanner.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
-<node>
-	<interface name="com.javispedro.sowatch.WatchScanner">
-		<method name="Start" />
-		<signal name="Started" />
-		<signal name="Finished" />
-		<signal name="WatchFound">
-			<annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QVariantMap" />
-			<arg name="info" type="a{sv}" />
-		</signal>
-	</interface>
-</node>
diff --git a/sowatchd/scanneradaptor.cpp b/sowatchd/scanneradaptor.cpp
deleted file mode 100644
index a3d9ad1..0000000
--- a/sowatchd/scanneradaptor.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * This file was generated by qdbusxml2cpp version 0.7
- * Command line was: qdbusxml2cpp -c ScannerAdaptor -a scanneradaptor scanner.xml
- *
- * qdbusxml2cpp is Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
- *
- * This is an auto-generated file.
- * Do not edit! All changes made to it will be lost.
- */
-
-#include "scanneradaptor.h"
-#include <QtCore/QMetaObject>
-#include <QtCore/QByteArray>
-#include <QtCore/QList>
-#include <QtCore/QMap>
-#include <QtCore/QString>
-#include <QtCore/QStringList>
-#include <QtCore/QVariant>
-
-/*
- * Implementation of adaptor class ScannerAdaptor
- */
-
-ScannerAdaptor::ScannerAdaptor(QObject *parent)
-    : QDBusAbstractAdaptor(parent)
-{
-    // constructor
-	connect(parent, SIGNAL(started()), this, SIGNAL(Started()));
-	connect(parent, SIGNAL(finished()), this, SIGNAL(Finished()));
-	connect(parent, SIGNAL(watchFound(QVariantMap)),
-	        this, SIGNAL(WatchFound(QVariantMap)));
-}
-
-ScannerAdaptor::~ScannerAdaptor()
-{
-    // destructor
-}
-
-void ScannerAdaptor::Start()
-{
-    // handle method call com.javispedro.sowatch.WatchScanner.Start
-    QMetaObject::invokeMethod(parent(), "start");
-}
diff --git a/sowatchd/scanneradaptor.h b/sowatchd/scanneradaptor.h
deleted file mode 100644
index 17ffe54..0000000
--- a/sowatchd/scanneradaptor.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * This file was generated by qdbusxml2cpp version 0.7
- * Command line was: qdbusxml2cpp -c ScannerAdaptor -a scanneradaptor scanner.xml
- *
- * qdbusxml2cpp is Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
- *
- * This is an auto-generated file.
- * This file may have been hand-edited. Look for HAND-EDIT comments
- * before re-generating it.
- */
-
-#ifndef SCANNERADAPTOR_H_1335303169
-#define SCANNERADAPTOR_H_1335303169
-
-#include <QtCore/QObject>
-#include <QtDBus/QtDBus>
-class QByteArray;
-template<class T> class QList;
-template<class Key, class Value> class QMap;
-class QString;
-class QStringList;
-class QVariant;
-
-/*
- * Adaptor class for interface com.javispedro.sowatch.WatchScanner
- */
-class ScannerAdaptor: public QDBusAbstractAdaptor
-{
-    Q_OBJECT
-    Q_CLASSINFO("D-Bus Interface", "com.javispedro.sowatch.WatchScanner")
-    Q_CLASSINFO("D-Bus Introspection", ""
-"  <interface name=\"com.javispedro.sowatch.WatchScanner\">\n"
-"    <method name=\"Start\"/>\n"
-"    <signal name=\"Started\"/>\n"
-"    <signal name=\"Finished\"/>\n"
-"    <signal name=\"WatchFound\">\n"
-"      <annotation value=\"QVariantMap\" name=\"com.trolltech.QtDBus.QtTypeName.In0\"/>\n"
-"      <arg type=\"a{sv}\" name=\"info\"/>\n"
-"    </signal>\n"
-"  </interface>\n"
-        "")
-public:
-    ScannerAdaptor(QObject *parent);
-    virtual ~ScannerAdaptor();
-
-public: // PROPERTIES
-public Q_SLOTS: // METHODS
-    void Start();
-Q_SIGNALS: // SIGNALS
-    void Finished();
-    void Started();
-    void WatchFound(const QVariantMap &info);
-};
-
-#endif
diff --git a/sowatchd/sowatchd.pro b/sowatchd/sowatchd.pro
index 0794c2c..4b1b668 100644
--- a/sowatchd/sowatchd.pro
+++ b/sowatchd/sowatchd.pro
@@ -5,8 +5,8 @@ TEMPLATE = app
 QT       += core gui dbus
 CONFIG   -= app_bundle
 
-SOURCES += main.cpp daemon.cpp allscanner.cpp scanneradaptor.cpp daemonadaptor.cpp
-HEADERS += global.h daemon.h allscanner.h scanneradaptor.h daemonadaptor.h
+SOURCES += main.cpp daemon.cpp daemonadaptor.cpp
+HEADERS += global.h daemon.h daemonadaptor.h
 
 LIBS += -L$$OUT_PWD/../libsowatch/ -lsowatch
 INCLUDEPATH += $$PWD/../libsowatch
diff --git a/sowatchui/main.cpp b/sowatchui/main.cpp
index ea4a172..f8c58af 100644
--- a/sowatchui/main.cpp
+++ b/sowatchui/main.cpp
@@ -4,11 +4,11 @@
 #include <sowatch.h>
 
 #include "watchesmodel.h"
-#include "scanwatchesmodel.h"
+#include "watchscannermodel.h"
 
 static sowatch::Registry *registry;
 static WatchesModel *watches;
-static ScanWatchesModel *watchScanner;
+static WatchScannerModel *watchScanner;
 
 Q_DECL_EXPORT int main(int argc, char *argv[])
 {
@@ -17,7 +17,7 @@ Q_DECL_EXPORT int main(int argc, char *argv[])
 
 	registry = sowatch::Registry::registry();
 	watches = new WatchesModel(app.data());
-	watchScanner = new ScanWatchesModel(app.data());
+	watchScanner = new WatchScannerModel(app.data());
 
 	qDebug() << "Starting" << watches << endl;
 
diff --git a/sowatchui/qml/MainPage.qml b/sowatchui/qml/MainPage.qml
index b660161..d722b3d 100644
--- a/sowatchui/qml/MainPage.qml
+++ b/sowatchui/qml/MainPage.qml
@@ -6,6 +6,7 @@ Page {
 	id: mainPage
 	anchors.leftMargin: UiConstants.DefaultMargin
 	anchors.rightMargin: UiConstants.DefaultMargin
+	orientationLock: PageOrientation.LockPortrait
 
 	tools: ToolBarLayout {
 		ToolIcon {
@@ -30,6 +31,11 @@ Page {
                 anchors.right: parent.right;
                 anchors.verticalCenter: parent.verticalCenter
             }
+
+			onClicked: {
+				var page = Qt.createComponent("WatchPage.qml");
+				pageStack.push(page);
+			}
 		}
 	}
 	ScrollDecorator {
diff --git a/sowatchui/qml/WatchPage.qml b/sowatchui/qml/WatchPage.qml
index fb7011c..8159834 100644
--- a/sowatchui/qml/WatchPage.qml
+++ b/sowatchui/qml/WatchPage.qml
@@ -6,6 +6,7 @@ Page {
 	id: watchPage
 	anchors.leftMargin: UiConstants.DefaultMargin
 	anchors.rightMargin: UiConstants.DefaultMargin
+	orientationLock: PageOrientation.LockPortrait
 
 	tools: ToolBarLayout {
 		ToolIcon {
diff --git a/sowatchui/qml/main.qml b/sowatchui/qml/main.qml
index ca838a2..0fd3ad0 100644
--- a/sowatchui/qml/main.qml
+++ b/sowatchui/qml/main.qml
@@ -9,17 +9,4 @@ PageStackWindow {
     MainPage {
         id: mainPage
     }
-
-    Menu {
-        id: myMenu
-        visualParent: pageStack
-        MenuLayout {
-			MenuItem {
-				text: qsTr("Crap")
-				onClicked: {
-					console.log("Crap")
-				}
-			}
-        }
-    }
 }
diff --git a/sowatchui/scannerproxy.cpp b/sowatchui/scannerproxy.cpp
deleted file mode 100644
index cfa4365..0000000
--- a/sowatchui/scannerproxy.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * This file was generated by qdbusxml2cpp version 0.7
- * Command line was: qdbusxml2cpp -c ScannerProxy -p scannerproxy ../sowatchd/scanner.xml
- *
- * qdbusxml2cpp is Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
- *
- * This is an auto-generated file.
- * This file may have been hand-edited. Look for HAND-EDIT comments
- * before re-generating it.
- */
-
-#include "scannerproxy.h"
-
-/*
- * Implementation of interface class ScannerProxy
- */
-
-ScannerProxy::ScannerProxy(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent)
-    : QDBusAbstractInterface(service, path, staticInterfaceName(), connection, parent)
-{
-}
-
-ScannerProxy::~ScannerProxy()
-{
-}
-
diff --git a/sowatchui/scannerproxy.h b/sowatchui/scannerproxy.h
deleted file mode 100644
index 3b1b9c8..0000000
--- a/sowatchui/scannerproxy.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * This file was generated by qdbusxml2cpp version 0.7
- * Command line was: qdbusxml2cpp -c ScannerProxy -p scannerproxy ../sowatchd/scanner.xml
- *
- * qdbusxml2cpp is Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
- *
- * This is an auto-generated file.
- * Do not edit! All changes made to it will be lost.
- */
-
-#ifndef SCANNERPROXY_H_1344446154
-#define SCANNERPROXY_H_1344446154
-
-#include <QtCore/QObject>
-#include <QtCore/QByteArray>
-#include <QtCore/QList>
-#include <QtCore/QMap>
-#include <QtCore/QString>
-#include <QtCore/QStringList>
-#include <QtCore/QVariant>
-#include <QtDBus/QtDBus>
-
-/*
- * Proxy class for interface com.javispedro.sowatch.WatchScanner
- */
-class ScannerProxy: public QDBusAbstractInterface
-{
-    Q_OBJECT
-public:
-    static inline const char *staticInterfaceName()
-    { return "com.javispedro.sowatch.WatchScanner"; }
-
-public:
-    ScannerProxy(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0);
-
-    ~ScannerProxy();
-
-public Q_SLOTS: // METHODS
-    inline QDBusPendingReply<> Start()
-    {
-        QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QLatin1String("Start"), argumentList);
-    }
-
-Q_SIGNALS: // SIGNALS
-    void Finished();
-    void Started();
-    void WatchFound(const QVariantMap &info);
-};
-
-namespace com {
-  namespace javispedro {
-    namespace sowatch {
-      typedef ::ScannerProxy WatchScanner;
-    }
-  }
-}
-#endif
diff --git a/sowatchui/sowatch.svg b/sowatchui/sowatch.svg
index 566acfa..f2385c4 100644
--- a/sowatchui/sowatch.svg
+++ b/sowatchui/sowatch.svg
@@ -1,93 +1,34 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   height="44px"
-   version="1.1"
-   viewBox="0 0 44 44"
-   width="44px"
-   x="0px"
-   y="0px"
-   id="svg2"
-   inkscape:version="0.47 r22583"
-   sodipodi:docname="qt.svg">
-  <metadata
-     id="metadata18">
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" height="80" width="80">
+ <defs>
+  <linearGradient id="hicg_overlay_grad" gradientUnits="userSpaceOnUse" x1="39.9995" y1="5.1816" x2="39.9995" y2="58.8019">
+   <stop offset="0" style="stop-color:#FFFFFF"/>
+   <stop offset="1" style="stop-color:#000000"/>
+  </linearGradient>
+  <filter id="hicg_drop_shadow">
+    <feOffset in="SourceAlpha" dx="0" dy="4"/>
+    <feGaussianBlur stdDeviation="4"/>
+	<feColorMatrix type="matrix" values="1 0 0 0 0  0 1 0 0 0  0 0 1 0 0  0 0 0 0.5 0" result="shadow"/>
+    <feBlend in="SourceGraphic" in2="shadow" mode="normal"/>
+  </filter>
+ </defs>
+ <g>
+  <path id="hicg_background" fill="#808080" d="M79,40c0,28.893-10.105,39-39,39S1,68.893,1,40C1,11.106,11.105,1,40,1S79,11.106,79,40z"/>
+  <path id="hicg_highlight" fill="#fff" opacity="0.25" d="M39.999,1C11.105,1,1,11.106,1,40c0,28.893,10.105,39,38.999,39   C68.896,79,79,68.893,79,40C79,11.106,68.896,1,39.999,1z M39.999,78.025C11.57,78.025,1.976,68.43,1.976,40   c0-28.429,9.595-38.024,38.023-38.024c28.43,0,38.024,9.596,38.024,38.024C78.023,68.43,68.429,78.025,39.999,78.025z"/>
+  <path id="hicg_overlay" opacity="0.4" fill="url(#hicg_overlay_grad)" d="M78.977,40c0,28.893-10.1,39-38.977,39S1.023,68.893,1.023,40c0-28.894,10.1-39,38.977-39S78.977,11.106,78.977,40z"/>
+ </g>
+<g xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" transform="translate(25.929104477612, 13) scale(0.033582089552239)" filter="url(#hicg_drop_shadow)">
+  <defs xmlns="http://www.w3.org/2000/svg" id="defs3645"/>
+  <metadata xmlns="http://www.w3.org/2000/svg" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" id="metadata3648">
     <rdf:RDF>
-      <cc:Work
-         rdf:about="">
+      <cc:Work rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <defs
-     id="defs16">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 22 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="44 : 22 : 1"
-       inkscape:persp3d-origin="22 : 14.666667 : 1"
-       id="perspective2836" />
-  </defs>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1020"
-     id="namedview14"
-     showgrid="false"
-     inkscape:zoom="21.454545"
-     inkscape:cx="49.412871"
-     inkscape:cy="21.894358"
-     inkscape:window-x="-4"
-     inkscape:window-y="-4"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g3" />
-  <g
-     transform="matrix(0.18308778,0,0,0.18308778,6.6100946,3.2385199)"
-     id="g3">
-    <path
-       d="M 43.09,0.3586 C 40.94,0.0036 38.84,-0.0824 36.81,0.0776 31.968136,0.39505671 27.122677,0.73638425 22.28,1.0696 9.62,2.0816 0,12.4996 0,26.8896 l 0,169.7 14.19,13.2 28.87,-209.42 0.03,-0.011 z"
-       style="fill:#006225"
-       id="path5"
-       sodipodi:nodetypes="cccccccc" />
-    <path
-       d="m 174.4,160 c 0,12.5 -7.75,24.07 -17.57,25.77 L 14.23,209.73 V 25.93 C 14.23,9.21 27.57,-2.27 43.12,0.3 l 131.3,21.52 v 138.2 z"
-       style="fill:#80c342"
-       id="path7" />
-    <path
-       d="m 154.9,80.96 -12.96,-0.598 0,0.278 6.945,0.32 6.016,0 z"
-       style="fill:#006225"
-       id="path11" />
-    <path
-       d="m 144.6,135.6 c 0.66,0.328 1.43,0.476 2.351,0.476 0.161,0 0.329,-0.004 0.497,-0.016 2.55,-0.148 5.32,-0.933 8.343,-2.308 h -6.015 c -1.821,0.832 -3.532,1.457 -5.176,1.848 z"
-       style="fill:#006225"
-       id="path13" />
-    <path
-       id="path17"
-       style="fill:#ffffff"
-       d="m 91.15,132.4 c 2.351,-6.051 3.511,-17.91 3.511,-35.62 0,-15.89 -1.148,-26.82 -3.484,-32.81 -2.336,-6.027 -5.832,-9.281 -10.52,-9.691 -0.359,-0.031 -0.714,-0.051 -1.058,-0.051 -4.34,0 -7.68,2.535 -10.01,7.625 -2.52,5.543 -3.793,17.04 -3.793,34.44 0,16.82 1.238,28.75 3.734,35.75 2.356,6.672 5.879,9.976 10.5,9.976 0.207,0 0.41,-0.008 0.621,-0.019 4.633,-0.293 8.121,-3.496 10.49,-9.602 m 17.98,3.75 c -4.117,9.707 -10.39,16.06 -18.99,19 0.867,4.449 2.176,7.441 3.922,9.019 1.351,1.211 3.433,1.821 6.222,1.821 0.805,0 1.668,-0.055 2.59,-0.157 v 13.12 l -5.961,0.782 c -1.758,0.23 -3.426,0.343 -5.004,0.343 -5.218,0 -9.445,-1.265 -12.62,-3.824 -4.207,-3.379 -7.308,-9.894 -9.297,-19.54 -9.136,-1.945 -16.26,-7.754 -21.19,-17.5 -5.004,-9.902 -7.551,-24.39 -7.551,-43.34 0,-20.43 3.484,-35.51 10.34,-45.07 5.789,-8.07 13.86,-12.04 24.02,-12.04 1.629,0 3.309,0.102 5.043,0.305 11.95,1.375 20.62,7.016 26.26,16.79 5.535,9.562 8.254,23.27 8.254,41.26 0,16.48 -2,29.45 -6.043,39.02 z M 130.4,45.91 l 11.52,1.238 0,20.21 12.96,0.914 0,12.68 -12.96,-0.598 0,46.33 c 0,4.032 0.445,6.625 1.34,7.789 0.8,1.067 2.046,1.594 3.71,1.594 0.161,0 0.329,-0.004 0.497,-0.016 2.55,-0.148 5.32,-0.933 8.343,-2.308 v 11.65 c -5.136,2.258 -10.18,3.598 -15.12,4.02 -0.718,0.055 -1.41,0.086 -2.078,0.086 -4.48,0 -7.906,-1.301 -10.25,-3.934 -2.73,-3.051 -4.09,-7.949 -4.09,-14.67 V 79.535 L 118.046,79.25 V 65.66 l 7.586,0.547 4.773,-20.3 z" />
-    <path
-       d="m 100.3,166 c 0.809,0 1.672,-0.055 2.59,-0.157 H 98.054 C 98.73,165.949 99.507,166 100.3,166 z"
-       style="fill:#006225"
-       id="path19" />
-    <path
-       id="path21"
-       style="fill:#006225"
-       d="m 84.85,63.98 c 2.336,5.997 3.484,16.92 3.484,32.81 0,17.7 -1.16,29.57 -3.512,35.62 -1.894,4.879 -4.527,7.902 -7.863,9.07 0.965,0.368 1.992,0.551 3.078,0.551 0.207,0 0.41,-0.008 0.621,-0.019 4.633,-0.293 8.121,-3.496 10.49,-9.602 2.351,-6.051 3.511,-17.91 3.511,-35.62 0,-15.89 -1.148,-26.82 -3.484,-32.81 -2.336,-6.027 -5.832,-9.281 -10.52,-9.691 -0.359,-0.031 -0.714,-0.051 -1.058,-0.051 -1.09,0 -2.117,0.16 -3.082,0.481 h -0.004 c 3.601,1.121 6.379,4.215 8.336,9.261 z m -2.344,114.3 c -0.113,-0.05 -0.227,-0.105 -0.336,-0.16 -0.012,-0.004 -0.023,-0.012 -0.035,-0.015 -0.102,-0.051 -0.207,-0.106 -0.309,-0.157 -0.019,-0.011 -0.039,-0.019 -0.058,-0.031 -0.09,-0.051 -0.184,-0.098 -0.278,-0.148 -0.027,-0.016 -0.054,-0.036 -0.086,-0.051 -0.082,-0.043 -0.164,-0.09 -0.242,-0.137 -0.039,-0.023 -0.078,-0.047 -0.113,-0.07 -0.07,-0.039 -0.145,-0.082 -0.215,-0.125 -0.047,-0.031 -0.094,-0.059 -0.14,-0.09 -0.059,-0.039 -0.118,-0.074 -0.176,-0.113 -0.059,-0.039 -0.114,-0.075 -0.168,-0.114 -0.051,-0.031 -0.102,-0.066 -0.149,-0.097 -0.066,-0.047 -0.132,-0.094 -0.195,-0.137 -0.039,-0.027 -0.078,-0.055 -0.113,-0.082 -0.078,-0.055 -0.153,-0.113 -0.231,-0.172 -0.023,-0.016 -0.05,-0.035 -0.078,-0.055 -0.098,-0.078 -0.199,-0.156 -0.297,-0.234 -4.207,-3.379 -7.308,-9.894 -9.297,-19.54 -9.136,-1.945 -16.26,-7.754 -21.19,-17.5 -5.004,-9.902 -7.551,-24.39 -7.551,-43.34 0,-20.43 3.484,-35.51 10.34,-45.07 5.789,-8.07 13.86,-12.04 24.02,-12.04 h -6.351 c -10.15,0.008 -18.22,3.977 -24,12.04 -6.855,9.563 -10.34,24.64 -10.34,45.07 0,18.95 2.547,33.44 7.551,43.34 4.934,9.75 12.05,15.56 21.19,17.5 1.989,9.641 5.09,16.16 9.297,19.54 3.176,2.559 7.403,3.824 12.62,3.824 0.098,0 0.199,0 0.297,-0.004 h 5.539 c -3.406,-0.05 -6.383,-0.66 -8.906,-1.828 L 82.498,178.28 z M 128.4,145.6 c -2.73,-3.051 -4.09,-7.949 -4.09,-14.67 V 79.57 l -6.226,-0.285 v -13.59 h -6.016 v 3.035 c 0.871,3.273 1.555,6.82 2.063,10.64 l 4.164,0.192 v 51.36 c 0,6.723 1.367,11.62 4.09,14.67 2.343,2.633 5.765,3.934 10.25,3.934 h 6.015 c -4.48,0 -7.906,-1.301 -10.25,-3.934 z m 2.043,-99.66 -6.016,0 -4.668,19.88 5.911,0.422 4.773,-20.3 z" />
+  <g xmlns="http://www.w3.org/2000/svg" transform="translate(76.849917,268.58047)" id="layer1">
+    <path d="m 284.92352,1339.9526 c -54.28976,-1.3038 -111.68126,-1.1214 -161.43796,-25.3074 -15.37128,-80.9401 -3.83549,-169.5149 -13.45839,-248.0677 -0.81874,-26.7881 -6.00611,-79.98939 2.17966,-105.7557 154.83853,-2.48247 309.77884,1.84276 464.56247,-2.59392 C 547.8706,924.3671 459.49098,953.02781 408.02643,943.61636 309.21196,945.14413 207.32771,941.09769 110.5,947.36238 64.797025,975.78121 -21.492681,932.93452 -6.67654,921.21778 c -57.252985,3.62787 -2.5709946,7.69714 1.8444275,-10.61092 C -17.799483,857.13385 -6.1990262,787.87317 -10.865543,729.04942 -11.634074,620.08216 -14.014866,512.3384 -10.554589,403.95093 -11.630441,309.56219 -9.3030011,214.67309 -7.00021,120.36223 -7.882684,47.650282 89.329397,71.980253 107.64106,41.72816 96.574282,4.475064 25.737273,72.625644 -14.46031,59.75176 -79.940556,102.48293 14.23104,14.624449 48.437806,15.770846 63.338508,-7.6785175 106.07655,-4.9993275 107.98829,2.62234 c -3.37427,-35.071436 -17.20292,-19.747018 6.4116,-45.050471 3.32576,-70.845559 -4.53492,-143.082349 8.85729,-212.940259 73.27224,-21.22823 151.78465,-8.1374 227.22763,-13.21208 65.18361,3.44353 136.20867,-8.95087 197.02419,17.54259 22.93072,69.16425 8.8434,153.14139 20.2349,219.16612 37.10724,-7.090918 73.26375,46.496817 22.7025,8.70271 -36.4006,-27.438648 -15.26775,68.68084 -14.2726,15.21158 63.06292,27.585523 159.98907,49.228579 157.34714,136.19061 4.99886,37.58 -2.89453,87.11518 5.38726,119.31644 32.40495,4.32669 18.26184,39.08063 21.0918,61.49378 1.72307,24.58057 2.98616,43.27301 -17.75,53.28799 -12.71447,32.66437 1.28223,76.65064 4.2313,108.91491 -6.04704,26.9644 9.76876,67.46141 -6.8663,88.05237 -1.8304,37.5457 2.44461,74.77502 9.86977,106.06416 4.684,48.52118 -8.77167,84.57298 -7.37855,130.20963 -4.05776,40.81567 18.13705,130.01318 -48.54841,119.78976 -21.99534,41.65607 -103.00163,17.44993 -115.23859,47.55511 -5.57781,22.27248 15.34189,139.74571 -1.31922,74.49011 -4.32868,45.6014 -1.31592,119.6017 -4.60353,175.7583 14.20541,70.1502 -16.62327,131.8966 -96.83597,122.2203 -63.37557,5.3826 -127.04969,4.4786 -190.63698,4.5666 z M 724,902.30318 c -15.25581,-17.64567 13.55042,-20.21524 10.393,-42.941 9.99337,-83.09263 -4.12961,-173.397 3.448,-255 -4.23258,-63.6349 -2.23186,-154.71498 -3.64508,-228.3295 C 729.74063,282.58995 741.24929,186.81104 722.39933,94.990761 701.03748,37.683285 610.27606,49.281016 572.8241,27.44358 c -3.33936,53.774212 107.0093,5.958819 114.9843,75.9186 15.88755,91.66947 4.78375,186.60699 10.21791,279.55625 6.12244,162.99106 -2.92093,326.34719 5.66299,489.19375 13.83961,10.48968 -11.40364,36.42374 20.3107,30.191 z m -20.5821,-18.2161 c 8.07303,-20.19652 -9.35197,-1.94417 0,0 z M 140.30902,740.37588 c 108.53217,-1.36804 215.065,-0.52244 324.07287,-1.8089 32.40097,0.27481 55.00871,0.95553 85.28707,-0.55207 86.63698,23.25677 40.9258,-87.99469 51.40081,-135.28666 -3.20023,-122.3188 0.66886,-245.68637 -4.82927,-367.36457 -83.67529,-7.8986 -170.02155,-2.10912 -254.88545,-3.67399 -52.15727,-0.2664 -105.24457,1.66427 -155.57633,-3.48113 -45.78597,3.17569 -126.917901,-18.33734 -100.945101,55.97093 -0.911631,117.03365 0.36005,235.44113 -1.460619,351.68419 9.752169,-2.84279 -18.611303,96.59588 13.877,105.1288 14.34322,-0.68145 28.70562,-0.53022 43.05902,-0.6166 z m 338.35765,-50.68037 c 4.1775,-28.424 19.30254,-28.81049 1.27583,-39.33333 47.19165,-19.98766 -6.77715,41.04887 22.42667,31.5 4.46731,15.88704 -16.76331,5.33953 -23.7025,7.83333 z M 109,641.86764 c -18.052347,-90.87749 112.86588,-30.42542 166.77168,-47.54181 10.44177,11.16086 17.39356,82.01204 0.51727,94.56025 -55.76298,0.16234 -111.52597,0.32468 -167.28895,0.48702 0,-15.83515 0,-31.67031 0,-47.50546 z m 94,35.66023 c -11.61989,-8.29767 -19.44081,7.70346 0,0 z m 54,-17.75931 c -10.4846,-17.27694 -9.08447,3.68057 0,0 z m -70.81955,-12.65638 c 9.15696,-54.51238 -21.20384,-37.22603 -3.25003,2.25 l 3.25,-2.25 z m 26.81955,0.25 c 12.30274,-29.08722 -26.4613,-25.98768 4.00005,-39.99983 -37.42466,-5.7393 -16.8849,23.57424 -7.00694,32.85089 -19.71408,-8.03982 -21.22256,13.4314 3.00689,7.14894 z m 148.66667,30.33333 C 363.12346,655.56675 328.7578,653.72525 330,630.92504 c 3.45528,-17.16563 21.19136,-36.04278 39.31663,-34.56286 23.78508,0.14716 44.56599,-4.30691 59.95682,14.45106 12.77153,12.68333 9.93694,35.29439 -6.84084,45.54894 -14.91411,10.9245 -43.36299,8.44154 -60.76594,21.33333 z m 8.79574,-7.45175 c 12.52528,-17.56529 55.37695,-4.26253 60.53759,-32.88158 8.53347,-33.87227 -42.84351,-41.62346 -69.4375,-34.73114 -19.43491,4.85991 -31.15966,25.4339 -21.20139,42.91864 10.40034,9.5284 30.90355,16.32138 30.1013,24.69408 z m 164.63919,0.86842 c -17.04301,-9.29739 -32.01292,-27.00225 -44.90605,-42.43758 -19.61969,-27.27624 23.47908,-44.96311 23.99419,-12.09926 -12.77893,18.22414 15.92054,40.52282 32.72549,29.19292 24.76906,4.79394 12.80572,36.95059 -11.81363,25.34392 z m -4.8798,-56.5 c -0.46883,-31.85807 14.68067,8.82417 23.66006,-17.90108 21.86461,3.98909 -14.05848,20.5741 4.11814,30.75662 -10.94143,-1.21614 -35.23557,9.80051 -27.7782,-12.85554 z m 69.1853,-75.25 c 0.61566,-29.33392 0.61566,29.33392 0,0 z M 465.45972,524.47506 c -310.30648,351.92475 -155.15324,175.96237 0,0 z m 42.53795,24.13712 c 35.97898,1.48498 -27.68129,-23.06993 15.53934,-24.25 16.03212,5.9117 -22.68218,7.70827 6.73782,14.60554 3.97187,10.60754 -21.68623,18.79978 -22.27716,9.64446 z M 546.209,524.57905 c 27.05113,3.827 -26.13299,7.90454 11.5508,17.53313 -21.13332,23.55521 -20.01013,-15.39135 -11.5508,-17.53313 z m -264.21036,8.53313 C 263.79312,520.42971 310.41766,483.49726 299,520.46772 c 4.81222,9.06766 -12.04587,19.38712 -17.00136,12.64446 z m 10.5432,-11.25 c -10.98724,-22.84747 -7.23246,26.51854 0,0 z M 314,527.91208 c -16.97936,-8.06911 17.82249,-40.71355 17,-22.99242 1.81463,12.80802 0.1281,31.71833 -17,22.99242 z m 11,-11.5499 c -8.82079,-27.16759 -13.49297,32.50602 0,0 z m -70,0.56642 c -19.88358,-8.38982 19.15338,-41.91219 17,-22.35533 2.37016,13.48282 -1.70362,30.92206 -17,22.35533 z m 10.79381,-11.31642 c -5.24222,-25.35406 -17.42948,30.68772 0,0 z m 81.08119,8.25 c -13.74372,-12.46923 5.22866,-28.3004 17.02887,-32.5 -0.74686,14.7534 5.21447,36.65701 -17.02887,32.5 z M 357,499.76149 c -9.84347,-21.11454 -7.73772,26.48577 0,0 z m 38,0.60069 c -1.39685,-28.17647 14.00868,11.17364 22.5,-14.00027 2.63048,37.10363 -4.32826,16.62478 -16.5,21.10581 -2.08229,17.34259 -8.92141,1.00147 -6,-7.10554 z m 27,10.5 c -6.34713,-16.17783 17.0839,-36.33484 11.82831,-17.07321 -0.24901,15.79568 12.07293,28.78286 -11.82831,17.07321 z m 27,0.5 c -24.426,-15.79592 28.34377,-35.51787 1,-14.89446 -1.43891,26.18182 21.66765,-17.24012 10.10682,17.5375 -2.73284,-1.15041 -11.65538,3.60771 -11.10682,-2.64304 z m 21.59513,2.15392 c -9.32837,-52.15745 13.31565,1.31537 15.40483,-27.15392 14.69376,11.98982 7.48254,36.79209 -9.3307,17.5 -0.60509,4.24536 2.02987,13.17964 -6.07413,9.65392 z m 42.92297,-0.33695 c 22.01121,-23.07003 -24.86853,-25.39496 14.01489,-26.81697 9.39526,3.37046 -9.85873,26.98107 -14.01489,26.81697 z M 535,510.86218 c 13.52946,-13.77959 19.43933,-18.45491 -0.15404,-16.26542 19.38271,-21.53922 13.62049,16.91805 17.13494,12.76542 21.46001,4.86341 -19.41477,12.53853 -16.9809,3.5 z M 310.25,497.71612 c -4.11032,-25.83715 -24.54325,-2.14047 -33.3023,-19.60394 -20.80376,1.02749 -40.43932,-22.06699 -16.76412,-37.5 8.70938,-16.56837 18.17594,-29.18582 42.06663,-24.25 11.70031,-22.03574 50.55576,-3.13736 55.95935,13.25 6.83802,11.69407 35.27867,28.50167 10.79044,46.75 -23.16827,-1.01723 -37.55554,2.18522 -47.94308,16.94175 0.21315,6.69919 -6.48776,4.45967 -10.80692,4.41219 z m 9.54381,-13.60394 c -10.54638,-23.40926 -9.74809,27.37501 0,0 z m -27.18682,-4.33179 c 7.37857,-31.19962 -24.56743,5.41454 -0.46848,1.28407 z M 314,472.9286 c 12.63051,-8.96305 23.51715,6.04567 48.71109,-2.56642 30.83272,-16.5654 -18.60714,-23.43547 -10.71148,-45.53331 -13.87422,-2.08973 -36.25983,-26.00208 -47.99961,-4.96669 -24.26539,-4.18028 -29.2673,14.62913 -42.18292,24.93843 -19.61037,20.24689 14.78441,37.77753 27.6165,14.56157 C 309.41075,436.88811 286.29957,493.52763 314,472.9286 z M 84.38536,471.36218 c 0.630844,-22.2282 0.630844,22.2282 0,0 z M 137,478.85039 c 9.01434,-25.56197 16.77863,-25.10817 26.81336,-0.23821 C 159.48469,477.0254 142.38011,478.2021 137,478.85039 z m 15.81955,-10.73821 c -8.75161,-10.17319 -4.07773,9.89353 0,0 z M 169,478.69685 c -0.29738,-27.97318 13.83667,-32.07799 15.99598,-2.33955 7.88065,7.11506 -20.34216,8.5186 -15.99598,2.33955 z m 21.63512,2.88397 c -8.13821,-38.27626 8.55654,-22.50437 21.03945,-12.29694 -0.17815,-46.23203 15.58699,30.41843 -2.42454,6.89472 -20.67621,-20.88749 -2.69375,-2.99413 -18.61491,5.40222 z M 109.5,467.92625 c -2.85742,-28.18882 29.36777,-8.01581 21.60533,4.52238 -2.14714,14.10319 -11.97412,-7.45023 -21.60499,8.90955 -3.6e-4,-4.47679 6.1e-4,-8.95636 -3.4e-4,-13.43193 z m 16.31955,-5.31407 c -12.72369,-11.10206 -14.90419,10.19483 0,0 z m 301.84712,8.08333 c -14.4838,-23.03494 32.63216,-52.43086 -8.42766,-48.33333 -11.89981,-25.61343 55.94489,-7.78182 25.16157,11.66505 -10.64673,8.96672 4.50506,44.5672 -16.73391,36.66828 z m 26.55058,-10.58333 c -5.43543,-17.52695 32.14466,-25.60762 17.67721,-37.75 -46.99338,14.68108 17.52787,-37.30498 15.10554,6.54384 3.29782,15.84494 -39.98062,31.94658 -6.39446,30.45616 31.98952,11.39151 -39.29232,22.83241 -26.38829,0.75 z m 70.01805,-19 c 7.19404,-63.22116 20.97001,-8.0812 33.2647,-2.75 -22.8682,-1.05405 -15.61468,27.79474 -31.62024,33 -4.45099,-5.79823 -0.40878,-21.13877 -1.64446,-30.25 z M 497,430.93173 c -20.36067,-25.38633 34.33455,-21.47717 12,-0.0695 0.62613,3.97174 -12.49973,3.89912 -12,0.0695 z m 11,-8.56955 c -12.12092,-25.09378 -15.66158,23.71675 0,0 z m -82.99998,-60 c 4.49925,-24.7187 25.82464,-36.75558 18.99998,0.21109 -31.61404,42.20137 -33.08417,-46.1934 -18.99998,-0.21109 z m 50.07673,-15.23306 c 7.92077,21.32136 15.69252,31.26128 -8.57675,16.23306 -35.67687,17.32938 0.59163,-32.8952 8.57675,-16.23306 z M 469,351.86218 c -6.0414,-16.39053 -3.37475,15.49469 0,0 z M 132.57736,301.65162 c -4.23844,-34.42206 23.94351,-31.01396 21.19144,-49.06072 5.36143,-4.87206 18.39233,14.16636 25.28347,-8.2982 11.75238,7.70957 -11.06027,27.04509 -22.05232,34.27045 1.45974,19.26482 42.54799,-0.85347 41.98901,20.57411 22.27393,22.98873 -1.63104,47.26833 -4.98896,65.79465 -47.67692,38.0569 -64.09359,-26.8615 -61.42264,-63.28029 z m 48.51557,45.46056 c 10.80481,-52.29145 -38.49152,-41.09046 -24.09293,1.25 8.04597,-0.12064 16.13208,0.51465 24.09293,-1.25 z m -22.78226,-92.5 c -4.50096,-12.5088 -2.44231,22.07305 0,0 z m 113.54388,81.06022 c 7.50377,10.06239 39.18344,23.98328 32.14545,-9.88498 4.06953,-19.61465 -54.34109,-18.00934 -11.89301,-39.42524 36.39693,-12.87417 -14.03279,-38.11997 -24.60699,-10.99995 -28.77663,0.13828 3.28801,-42.52968 -0.5,-36.10554 11.09311,1.65929 54.65015,-13.66656 50,10.01011 23.08949,-3.25232 15.34759,45.23887 0,42.20097 15.47909,7.49736 13.52941,31.98953 12.90311,55.06605 -25.94739,81.20441 -104.61653,-21.80028 -58.04856,-10.86142 z M 353,324.44196 c 3.72294,-27.93059 -2.18967,-46.18425 -11.7703,-61.89344 2.34603,-16.4217 11.95488,-26.49732 32.48139,-25.18634 11.4733,25.94135 0.7353,74.19353 4.65915,107.81649 16.48092,27.76151 -32.01566,43.24888 -25.37023,11.82109 -10e-6,-10.8526 1e-5,-21.70522 -10e-6,-32.5578 z m 145.78498,38.67022 c 0.50013,-12.65684 -27.67884,-35.09359 -4.78498,-19.75 4.24672,20.59111 32.72595,-20.97507 22.08198,-1.05548 -13.15175,2.08393 -11.21764,52.27067 -17.297,20.80548 z M 218,335.86218 c -3.06443,-25.7521 39.70195,-12.64534 25,12.31663 -10.6367,-2.42778 -31.85541,8.53221 -25,-12.31663 z m 201.75,-7.29446 c 6.43477,-18.13416 -23.66713,-44.38865 -1.20637,-40.20554 35.60376,-8.57721 -10.67176,20.69969 1.20637,40.20554 z m 24.2477,-2.45554 c -15.17928,-16.39538 4.97934,-59.2025 1.0023,-12.60227 16.0132,33.47213 33.83357,-26.2502 23.04723,-25.14773 0.084,19.42424 3.82495,52.04523 -24.04953,37.75 z m 29.00034,-16.5 c -2.33792,-35.46622 39.71667,-17.24948 6.00196,-9.25 22.86417,7.05451 -19.05959,22.95897 16.71109,22 -1.80196,13.01787 -33.46913,9.34628 -22.71305,-12.75 z M 218,286.86218 c -3.06443,-25.7521 39.70195,-12.64534 25,12.31663 -10.6367,-2.42778 -31.85541,8.53221 -25,-12.31663 z m 188,-29 c -12.60955,-31.74935 37.36258,-19.37451 16.81642,0.16924 -14.72616,4.32592 -14.82481,36.76318 -16.81642,-0.1692 z m 15.80479,-8.25 c -11.65004,-18.86077 -10.14709,19.63238 0,0 z m 11.12468,27 c -8.49339,-38.71687 10.31841,-46.66865 17.47673,-12.21265 6.07534,-13.06646 25.50781,-42.93577 20.59376,-2.43181 -3.09811,37.69072 -8.54214,-30.55829 -19,15.39446 -20.38422,-31.06487 -0.39326,-21.63818 -19.07049,-0.75 z m 167.81643,184.5 c -0.94036,27.12278 0.7695,27.17461 0,0 z M 141.25,8.6999 c 11.80101,-1.8866105 21.2975,-13.3583022 5.48552,-8.43734 -3.43178,2.507135 -27.1317,3.3304549 -5.48552,8.43734 z m 21.1091,-6.03016 c 17.32781,-1.96092341 49.05905,-17.548439 40.92066,-14.55756 4.28249,10.5690441 27.71411,-13.189295 24.18361,1.69348 16.58684,-11.934901 5.08679,-6.152714 22.5979,-0.908576 9.17694,-3.055893 7.89492,-0.937684 17.93875,-0.475904 -0.59972,-10.308052 23.62003,8.1683562 21.29531,-5.592709 18.10482,0.770021 30.82896,6.541671 55.70465,3.365499 -9.55839,-3.462374 -7.22626,-14.542185 -32.07231,-6.89042 -11.84501,-4.69893 -80.89706,4.118254 -49.67767,-2.40195 -15.15979,0.132325 -61.31184,5.499188 -54.58558,5.0912 -5.19322,8.417172 -43.48929,21.4316308 -37.03942,13.23354 19.96454,1.5769483 -23.79881,-4.3547188 -9.2659,7.4434 z m 340.10974,-15.1689 c -10.43858,-9.509364 -10.17966,12.27867649 0,0 z m -104.41699,0.22496 c 16.73241,-0.965168 -0.98533,-8.053348 1.94815,-9.39798 -1.01302,11.586596 -18.51817,-2.879767 -31.61666,-1.21564 0.0954,-10.51365 -33.03027,13.135131 -9.36674,5.101778 5.40221,15.3575169 16.52868,-5.232713 23.32896,5.412081 -4.41969,-18.539471 11.00113,13.21504595 15.70629,0.09976 z m 31.93591,-1.36362 c 22.55219,5.6495363 14.97088,-6.486622 44.41968,1.300276 35.49449,-3.011613 -21.33132,-2.977356 -15.43924,-6.050276 -24.20628,-4.448895 -19.64674,-8.956379 -28.60576,-4.205563 -29.642,1.152812 -6.25612,-1.152928 -15.55407,10.242133 0.91988,2.7803478 22.95268,-12.129775 15.17939,-1.28657 z m -34.18659,-3.85595 c 0.90327,-13.307441 -14.23475,-0.168106 0,0 z m -50.57233,-5.61945 c -9.56368,-9.981026 2.22048,11.816493 0,0 z m -388.15855,940.2254 c -22.381416,-52.73153 0.114587,-116.09775 -16.39772,-167.7104 -32.552727,-14.38054 -13.043217,-139.68764 7.438015,-94.58601 0.304059,80.25919 -2.141972,131.4207 2.889395,208.62971 -3.468031,21.12497 11.280278,36.7095 6.07031,53.6667 z M 754.619,676.64789 c 0.38751,-18.58727 7.99799,-38.64143 0,0 z m 7.4599,-24.09473 c -17.31867,-7.22537 -7.76283,-15.4896 0,0 z M -53.1063,639.77885 c -7.524645,-25.6483 9.189111,-74.23782 -7.7409,-90.17258 -8.879728,-5.65991 -33.557921,-94.06131 4.90622,-106.24409 22.177289,-65.14877 -30.079141,-98.9097 -18.311686,-160.40291 5.246293,-32.6278 30.351576,-44.17711 20.257666,-85.9749 -1.795154,-38.52542 4.236506,-105.219877 1.806146,-31.55656 2.217467,95.02877 0.418903,195.88184 0.09211,287.43437 1.472307,61.91654 -0.416911,126.79313 -1.009556,186.91667 z M -50,528.06218 c 2.117661,-21.6479 4.965047,8.32034 0,0 z m 4.85312,-11.7 c -2.102522,-51.4129 4.215284,-34.82966 0.54236,6.5 l -0.34138,-4.09133 z m 804.11598,-35.75 c -11.62632,-43.67204 0.49144,-29.73265 0.6449,10.75 z M 60.00755,-5.3288 c 8.526173,-38.839898 66.16925,-22.970935 9.26401,-9.204598 -5.901895,-0.934798 -5.576074,9.0521251 -9.26401,9.204598 z" id="path3718" style="fill:#000000"/>
   </g>
-</svg>
+</g></svg>
diff --git a/sowatchui/sowatch64.png b/sowatchui/sowatch64.png
index 707d5c4..520e068 100644
--- a/sowatchui/sowatch64.png
+++ b/sowatchui/sowatch64.png
diff --git a/sowatchui/sowatch80.png b/sowatchui/sowatch80.png
index 6ad8096..7b38390 100644
--- a/sowatchui/sowatch80.png
+++ b/sowatchui/sowatch80.png
diff --git a/sowatchui/sowatch_src.svg b/sowatchui/sowatch_src.svg
new file mode 100644
index 0000000..2975252
--- /dev/null
+++ b/sowatchui/sowatch_src.svg
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="838.92883"
+   height="1608.5415"
+   id="svg3643">
+  <defs
+     id="defs3645" />
+  <metadata
+     id="metadata3648">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(76.849917,268.58047)"
+     id="layer1">
+    <path
+       d="m 284.92352,1339.9526 c -54.28976,-1.3038 -111.68126,-1.1214 -161.43796,-25.3074 -15.37128,-80.9401 -3.83549,-169.5149 -13.45839,-248.0677 -0.81874,-26.7881 -6.00611,-79.98939 2.17966,-105.7557 154.83853,-2.48247 309.77884,1.84276 464.56247,-2.59392 C 547.8706,924.3671 459.49098,953.02781 408.02643,943.61636 309.21196,945.14413 207.32771,941.09769 110.5,947.36238 64.797025,975.78121 -21.492681,932.93452 -6.67654,921.21778 c -57.252985,3.62787 -2.5709946,7.69714 1.8444275,-10.61092 C -17.799483,857.13385 -6.1990262,787.87317 -10.865543,729.04942 -11.634074,620.08216 -14.014866,512.3384 -10.554589,403.95093 -11.630441,309.56219 -9.3030011,214.67309 -7.00021,120.36223 -7.882684,47.650282 89.329397,71.980253 107.64106,41.72816 96.574282,4.475064 25.737273,72.625644 -14.46031,59.75176 -79.940556,102.48293 14.23104,14.624449 48.437806,15.770846 63.338508,-7.6785175 106.07655,-4.9993275 107.98829,2.62234 c -3.37427,-35.071436 -17.20292,-19.747018 6.4116,-45.050471 3.32576,-70.845559 -4.53492,-143.082349 8.85729,-212.940259 73.27224,-21.22823 151.78465,-8.1374 227.22763,-13.21208 65.18361,3.44353 136.20867,-8.95087 197.02419,17.54259 22.93072,69.16425 8.8434,153.14139 20.2349,219.16612 37.10724,-7.090918 73.26375,46.496817 22.7025,8.70271 -36.4006,-27.438648 -15.26775,68.68084 -14.2726,15.21158 63.06292,27.585523 159.98907,49.228579 157.34714,136.19061 4.99886,37.58 -2.89453,87.11518 5.38726,119.31644 32.40495,4.32669 18.26184,39.08063 21.0918,61.49378 1.72307,24.58057 2.98616,43.27301 -17.75,53.28799 -12.71447,32.66437 1.28223,76.65064 4.2313,108.91491 -6.04704,26.9644 9.76876,67.46141 -6.8663,88.05237 -1.8304,37.5457 2.44461,74.77502 9.86977,106.06416 4.684,48.52118 -8.77167,84.57298 -7.37855,130.20963 -4.05776,40.81567 18.13705,130.01318 -48.54841,119.78976 -21.99534,41.65607 -103.00163,17.44993 -115.23859,47.55511 -5.57781,22.27248 15.34189,139.74571 -1.31922,74.49011 -4.32868,45.6014 -1.31592,119.6017 -4.60353,175.7583 14.20541,70.1502 -16.62327,131.8966 -96.83597,122.2203 -63.37557,5.3826 -127.04969,4.4786 -190.63698,4.5666 z M 724,902.30318 c -15.25581,-17.64567 13.55042,-20.21524 10.393,-42.941 9.99337,-83.09263 -4.12961,-173.397 3.448,-255 -4.23258,-63.6349 -2.23186,-154.71498 -3.64508,-228.3295 C 729.74063,282.58995 741.24929,186.81104 722.39933,94.990761 701.03748,37.683285 610.27606,49.281016 572.8241,27.44358 c -3.33936,53.774212 107.0093,5.958819 114.9843,75.9186 15.88755,91.66947 4.78375,186.60699 10.21791,279.55625 6.12244,162.99106 -2.92093,326.34719 5.66299,489.19375 13.83961,10.48968 -11.40364,36.42374 20.3107,30.191 z m -20.5821,-18.2161 c 8.07303,-20.19652 -9.35197,-1.94417 0,0 z M 140.30902,740.37588 c 108.53217,-1.36804 215.065,-0.52244 324.07287,-1.8089 32.40097,0.27481 55.00871,0.95553 85.28707,-0.55207 86.63698,23.25677 40.9258,-87.99469 51.40081,-135.28666 -3.20023,-122.3188 0.66886,-245.68637 -4.82927,-367.36457 -83.67529,-7.8986 -170.02155,-2.10912 -254.88545,-3.67399 -52.15727,-0.2664 -105.24457,1.66427 -155.57633,-3.48113 -45.78597,3.17569 -126.917901,-18.33734 -100.945101,55.97093 -0.911631,117.03365 0.36005,235.44113 -1.460619,351.68419 9.752169,-2.84279 -18.611303,96.59588 13.877,105.1288 14.34322,-0.68145 28.70562,-0.53022 43.05902,-0.6166 z m 338.35765,-50.68037 c 4.1775,-28.424 19.30254,-28.81049 1.27583,-39.33333 47.19165,-19.98766 -6.77715,41.04887 22.42667,31.5 4.46731,15.88704 -16.76331,5.33953 -23.7025,7.83333 z M 109,641.86764 c -18.052347,-90.87749 112.86588,-30.42542 166.77168,-47.54181 10.44177,11.16086 17.39356,82.01204 0.51727,94.56025 -55.76298,0.16234 -111.52597,0.32468 -167.28895,0.48702 0,-15.83515 0,-31.67031 0,-47.50546 z m 94,35.66023 c -11.61989,-8.29767 -19.44081,7.70346 0,0 z m 54,-17.75931 c -10.4846,-17.27694 -9.08447,3.68057 0,0 z m -70.81955,-12.65638 c 9.15696,-54.51238 -21.20384,-37.22603 -3.25003,2.25 l 3.25,-2.25 z m 26.81955,0.25 c 12.30274,-29.08722 -26.4613,-25.98768 4.00005,-39.99983 -37.42466,-5.7393 -16.8849,23.57424 -7.00694,32.85089 -19.71408,-8.03982 -21.22256,13.4314 3.00689,7.14894 z m 148.66667,30.33333 C 363.12346,655.56675 328.7578,653.72525 330,630.92504 c 3.45528,-17.16563 21.19136,-36.04278 39.31663,-34.56286 23.78508,0.14716 44.56599,-4.30691 59.95682,14.45106 12.77153,12.68333 9.93694,35.29439 -6.84084,45.54894 -14.91411,10.9245 -43.36299,8.44154 -60.76594,21.33333 z m 8.79574,-7.45175 c 12.52528,-17.56529 55.37695,-4.26253 60.53759,-32.88158 8.53347,-33.87227 -42.84351,-41.62346 -69.4375,-34.73114 -19.43491,4.85991 -31.15966,25.4339 -21.20139,42.91864 10.40034,9.5284 30.90355,16.32138 30.1013,24.69408 z m 164.63919,0.86842 c -17.04301,-9.29739 -32.01292,-27.00225 -44.90605,-42.43758 -19.61969,-27.27624 23.47908,-44.96311 23.99419,-12.09926 -12.77893,18.22414 15.92054,40.52282 32.72549,29.19292 24.76906,4.79394 12.80572,36.95059 -11.81363,25.34392 z m -4.8798,-56.5 c -0.46883,-31.85807 14.68067,8.82417 23.66006,-17.90108 21.86461,3.98909 -14.05848,20.5741 4.11814,30.75662 -10.94143,-1.21614 -35.23557,9.80051 -27.7782,-12.85554 z m 69.1853,-75.25 c 0.61566,-29.33392 0.61566,29.33392 0,0 z M 465.45972,524.47506 c -310.30648,351.92475 -155.15324,175.96237 0,0 z m 42.53795,24.13712 c 35.97898,1.48498 -27.68129,-23.06993 15.53934,-24.25 16.03212,5.9117 -22.68218,7.70827 6.73782,14.60554 3.97187,10.60754 -21.68623,18.79978 -22.27716,9.64446 z M 546.209,524.57905 c 27.05113,3.827 -26.13299,7.90454 11.5508,17.53313 -21.13332,23.55521 -20.01013,-15.39135 -11.5508,-17.53313 z m -264.21036,8.53313 C 263.79312,520.42971 310.41766,483.49726 299,520.46772 c 4.81222,9.06766 -12.04587,19.38712 -17.00136,12.64446 z m 10.5432,-11.25 c -10.98724,-22.84747 -7.23246,26.51854 0,0 z M 314,527.91208 c -16.97936,-8.06911 17.82249,-40.71355 17,-22.99242 1.81463,12.80802 0.1281,31.71833 -17,22.99242 z m 11,-11.5499 c -8.82079,-27.16759 -13.49297,32.50602 0,0 z m -70,0.56642 c -19.88358,-8.38982 19.15338,-41.91219 17,-22.35533 2.37016,13.48282 -1.70362,30.92206 -17,22.35533 z m 10.79381,-11.31642 c -5.24222,-25.35406 -17.42948,30.68772 0,0 z m 81.08119,8.25 c -13.74372,-12.46923 5.22866,-28.3004 17.02887,-32.5 -0.74686,14.7534 5.21447,36.65701 -17.02887,32.5 z M 357,499.76149 c -9.84347,-21.11454 -7.73772,26.48577 0,0 z m 38,0.60069 c -1.39685,-28.17647 14.00868,11.17364 22.5,-14.00027 2.63048,37.10363 -4.32826,16.62478 -16.5,21.10581 -2.08229,17.34259 -8.92141,1.00147 -6,-7.10554 z m 27,10.5 c -6.34713,-16.17783 17.0839,-36.33484 11.82831,-17.07321 -0.24901,15.79568 12.07293,28.78286 -11.82831,17.07321 z m 27,0.5 c -24.426,-15.79592 28.34377,-35.51787 1,-14.89446 -1.43891,26.18182 21.66765,-17.24012 10.10682,17.5375 -2.73284,-1.15041 -11.65538,3.60771 -11.10682,-2.64304 z m 21.59513,2.15392 c -9.32837,-52.15745 13.31565,1.31537 15.40483,-27.15392 14.69376,11.98982 7.48254,36.79209 -9.3307,17.5 -0.60509,4.24536 2.02987,13.17964 -6.07413,9.65392 z m 42.92297,-0.33695 c 22.01121,-23.07003 -24.86853,-25.39496 14.01489,-26.81697 9.39526,3.37046 -9.85873,26.98107 -14.01489,26.81697 z M 535,510.86218 c 13.52946,-13.77959 19.43933,-18.45491 -0.15404,-16.26542 19.38271,-21.53922 13.62049,16.91805 17.13494,12.76542 21.46001,4.86341 -19.41477,12.53853 -16.9809,3.5 z M 310.25,497.71612 c -4.11032,-25.83715 -24.54325,-2.14047 -33.3023,-19.60394 -20.80376,1.02749 -40.43932,-22.06699 -16.76412,-37.5 8.70938,-16.56837 18.17594,-29.18582 42.06663,-24.25 11.70031,-22.03574 50.55576,-3.13736 55.95935,13.25 6.83802,11.69407 35.27867,28.50167 10.79044,46.75 -23.16827,-1.01723 -37.55554,2.18522 -47.94308,16.94175 0.21315,6.69919 -6.48776,4.45967 -10.80692,4.41219 z m 9.54381,-13.60394 c -10.54638,-23.40926 -9.74809,27.37501 0,0 z m -27.18682,-4.33179 c 7.37857,-31.19962 -24.56743,5.41454 -0.46848,1.28407 z M 314,472.9286 c 12.63051,-8.96305 23.51715,6.04567 48.71109,-2.56642 30.83272,-16.5654 -18.60714,-23.43547 -10.71148,-45.53331 -13.87422,-2.08973 -36.25983,-26.00208 -47.99961,-4.96669 -24.26539,-4.18028 -29.2673,14.62913 -42.18292,24.93843 -19.61037,20.24689 14.78441,37.77753 27.6165,14.56157 C 309.41075,436.88811 286.29957,493.52763 314,472.9286 z M 84.38536,471.36218 c 0.630844,-22.2282 0.630844,22.2282 0,0 z M 137,478.85039 c 9.01434,-25.56197 16.77863,-25.10817 26.81336,-0.23821 C 159.48469,477.0254 142.38011,478.2021 137,478.85039 z m 15.81955,-10.73821 c -8.75161,-10.17319 -4.07773,9.89353 0,0 z M 169,478.69685 c -0.29738,-27.97318 13.83667,-32.07799 15.99598,-2.33955 7.88065,7.11506 -20.34216,8.5186 -15.99598,2.33955 z m 21.63512,2.88397 c -8.13821,-38.27626 8.55654,-22.50437 21.03945,-12.29694 -0.17815,-46.23203 15.58699,30.41843 -2.42454,6.89472 -20.67621,-20.88749 -2.69375,-2.99413 -18.61491,5.40222 z M 109.5,467.92625 c -2.85742,-28.18882 29.36777,-8.01581 21.60533,4.52238 -2.14714,14.10319 -11.97412,-7.45023 -21.60499,8.90955 -3.6e-4,-4.47679 6.1e-4,-8.95636 -3.4e-4,-13.43193 z m 16.31955,-5.31407 c -12.72369,-11.10206 -14.90419,10.19483 0,0 z m 301.84712,8.08333 c -14.4838,-23.03494 32.63216,-52.43086 -8.42766,-48.33333 -11.89981,-25.61343 55.94489,-7.78182 25.16157,11.66505 -10.64673,8.96672 4.50506,44.5672 -16.73391,36.66828 z m 26.55058,-10.58333 c -5.43543,-17.52695 32.14466,-25.60762 17.67721,-37.75 -46.99338,14.68108 17.52787,-37.30498 15.10554,6.54384 3.29782,15.84494 -39.98062,31.94658 -6.39446,30.45616 31.98952,11.39151 -39.29232,22.83241 -26.38829,0.75 z m 70.01805,-19 c 7.19404,-63.22116 20.97001,-8.0812 33.2647,-2.75 -22.8682,-1.05405 -15.61468,27.79474 -31.62024,33 -4.45099,-5.79823 -0.40878,-21.13877 -1.64446,-30.25 z M 497,430.93173 c -20.36067,-25.38633 34.33455,-21.47717 12,-0.0695 0.62613,3.97174 -12.49973,3.89912 -12,0.0695 z m 11,-8.56955 c -12.12092,-25.09378 -15.66158,23.71675 0,0 z m -82.99998,-60 c 4.49925,-24.7187 25.82464,-36.75558 18.99998,0.21109 -31.61404,42.20137 -33.08417,-46.1934 -18.99998,-0.21109 z m 50.07673,-15.23306 c 7.92077,21.32136 15.69252,31.26128 -8.57675,16.23306 -35.67687,17.32938 0.59163,-32.8952 8.57675,-16.23306 z M 469,351.86218 c -6.0414,-16.39053 -3.37475,15.49469 0,0 z M 132.57736,301.65162 c -4.23844,-34.42206 23.94351,-31.01396 21.19144,-49.06072 5.36143,-4.87206 18.39233,14.16636 25.28347,-8.2982 11.75238,7.70957 -11.06027,27.04509 -22.05232,34.27045 1.45974,19.26482 42.54799,-0.85347 41.98901,20.57411 22.27393,22.98873 -1.63104,47.26833 -4.98896,65.79465 -47.67692,38.0569 -64.09359,-26.8615 -61.42264,-63.28029 z m 48.51557,45.46056 c 10.80481,-52.29145 -38.49152,-41.09046 -24.09293,1.25 8.04597,-0.12064 16.13208,0.51465 24.09293,-1.25 z m -22.78226,-92.5 c -4.50096,-12.5088 -2.44231,22.07305 0,0 z m 113.54388,81.06022 c 7.50377,10.06239 39.18344,23.98328 32.14545,-9.88498 4.06953,-19.61465 -54.34109,-18.00934 -11.89301,-39.42524 36.39693,-12.87417 -14.03279,-38.11997 -24.60699,-10.99995 -28.77663,0.13828 3.28801,-42.52968 -0.5,-36.10554 11.09311,1.65929 54.65015,-13.66656 50,10.01011 23.08949,-3.25232 15.34759,45.23887 0,42.20097 15.47909,7.49736 13.52941,31.98953 12.90311,55.06605 -25.94739,81.20441 -104.61653,-21.80028 -58.04856,-10.86142 z M 353,324.44196 c 3.72294,-27.93059 -2.18967,-46.18425 -11.7703,-61.89344 2.34603,-16.4217 11.95488,-26.49732 32.48139,-25.18634 11.4733,25.94135 0.7353,74.19353 4.65915,107.81649 16.48092,27.76151 -32.01566,43.24888 -25.37023,11.82109 -10e-6,-10.8526 1e-5,-21.70522 -10e-6,-32.5578 z m 145.78498,38.67022 c 0.50013,-12.65684 -27.67884,-35.09359 -4.78498,-19.75 4.24672,20.59111 32.72595,-20.97507 22.08198,-1.05548 -13.15175,2.08393 -11.21764,52.27067 -17.297,20.80548 z M 218,335.86218 c -3.06443,-25.7521 39.70195,-12.64534 25,12.31663 -10.6367,-2.42778 -31.85541,8.53221 -25,-12.31663 z m 201.75,-7.29446 c 6.43477,-18.13416 -23.66713,-44.38865 -1.20637,-40.20554 35.60376,-8.57721 -10.67176,20.69969 1.20637,40.20554 z m 24.2477,-2.45554 c -15.17928,-16.39538 4.97934,-59.2025 1.0023,-12.60227 16.0132,33.47213 33.83357,-26.2502 23.04723,-25.14773 0.084,19.42424 3.82495,52.04523 -24.04953,37.75 z m 29.00034,-16.5 c -2.33792,-35.46622 39.71667,-17.24948 6.00196,-9.25 22.86417,7.05451 -19.05959,22.95897 16.71109,22 -1.80196,13.01787 -33.46913,9.34628 -22.71305,-12.75 z M 218,286.86218 c -3.06443,-25.7521 39.70195,-12.64534 25,12.31663 -10.6367,-2.42778 -31.85541,8.53221 -25,-12.31663 z m 188,-29 c -12.60955,-31.74935 37.36258,-19.37451 16.81642,0.16924 -14.72616,4.32592 -14.82481,36.76318 -16.81642,-0.1692 z m 15.80479,-8.25 c -11.65004,-18.86077 -10.14709,19.63238 0,0 z m 11.12468,27 c -8.49339,-38.71687 10.31841,-46.66865 17.47673,-12.21265 6.07534,-13.06646 25.50781,-42.93577 20.59376,-2.43181 -3.09811,37.69072 -8.54214,-30.55829 -19,15.39446 -20.38422,-31.06487 -0.39326,-21.63818 -19.07049,-0.75 z m 167.81643,184.5 c -0.94036,27.12278 0.7695,27.17461 0,0 z M 141.25,8.6999 c 11.80101,-1.8866105 21.2975,-13.3583022 5.48552,-8.43734 -3.43178,2.507135 -27.1317,3.3304549 -5.48552,8.43734 z m 21.1091,-6.03016 c 17.32781,-1.96092341 49.05905,-17.548439 40.92066,-14.55756 4.28249,10.5690441 27.71411,-13.189295 24.18361,1.69348 16.58684,-11.934901 5.08679,-6.152714 22.5979,-0.908576 9.17694,-3.055893 7.89492,-0.937684 17.93875,-0.475904 -0.59972,-10.308052 23.62003,8.1683562 21.29531,-5.592709 18.10482,0.770021 30.82896,6.541671 55.70465,3.365499 -9.55839,-3.462374 -7.22626,-14.542185 -32.07231,-6.89042 -11.84501,-4.69893 -80.89706,4.118254 -49.67767,-2.40195 -15.15979,0.132325 -61.31184,5.499188 -54.58558,5.0912 -5.19322,8.417172 -43.48929,21.4316308 -37.03942,13.23354 19.96454,1.5769483 -23.79881,-4.3547188 -9.2659,7.4434 z m 340.10974,-15.1689 c -10.43858,-9.509364 -10.17966,12.27867649 0,0 z m -104.41699,0.22496 c 16.73241,-0.965168 -0.98533,-8.053348 1.94815,-9.39798 -1.01302,11.586596 -18.51817,-2.879767 -31.61666,-1.21564 0.0954,-10.51365 -33.03027,13.135131 -9.36674,5.101778 5.40221,15.3575169 16.52868,-5.232713 23.32896,5.412081 -4.41969,-18.539471 11.00113,13.21504595 15.70629,0.09976 z m 31.93591,-1.36362 c 22.55219,5.6495363 14.97088,-6.486622 44.41968,1.300276 35.49449,-3.011613 -21.33132,-2.977356 -15.43924,-6.050276 -24.20628,-4.448895 -19.64674,-8.956379 -28.60576,-4.205563 -29.642,1.152812 -6.25612,-1.152928 -15.55407,10.242133 0.91988,2.7803478 22.95268,-12.129775 15.17939,-1.28657 z m -34.18659,-3.85595 c 0.90327,-13.307441 -14.23475,-0.168106 0,0 z m -50.57233,-5.61945 c -9.56368,-9.981026 2.22048,11.816493 0,0 z m -388.15855,940.2254 c -22.381416,-52.73153 0.114587,-116.09775 -16.39772,-167.7104 -32.552727,-14.38054 -13.043217,-139.68764 7.438015,-94.58601 0.304059,80.25919 -2.141972,131.4207 2.889395,208.62971 -3.468031,21.12497 11.280278,36.7095 6.07031,53.6667 z M 754.619,676.64789 c 0.38751,-18.58727 7.99799,-38.64143 0,0 z m 7.4599,-24.09473 c -17.31867,-7.22537 -7.76283,-15.4896 0,0 z M -53.1063,639.77885 c -7.524645,-25.6483 9.189111,-74.23782 -7.7409,-90.17258 -8.879728,-5.65991 -33.557921,-94.06131 4.90622,-106.24409 22.177289,-65.14877 -30.079141,-98.9097 -18.311686,-160.40291 5.246293,-32.6278 30.351576,-44.17711 20.257666,-85.9749 -1.795154,-38.52542 4.236506,-105.219877 1.806146,-31.55656 2.217467,95.02877 0.418903,195.88184 0.09211,287.43437 1.472307,61.91654 -0.416911,126.79313 -1.009556,186.91667 z M -50,528.06218 c 2.117661,-21.6479 4.965047,8.32034 0,0 z m 4.85312,-11.7 c -2.102522,-51.4129 4.215284,-34.82966 0.54236,6.5 l -0.34138,-4.09133 z m 804.11598,-35.75 c -11.62632,-43.67204 0.49144,-29.73265 0.6449,10.75 z M 60.00755,-5.3288 c 8.526173,-38.839898 66.16925,-22.970935 9.26401,-9.204598 -5.901895,-0.934798 -5.576074,9.0521251 -9.26401,9.204598 z"
+       id="path3718"
+       style="fill:#000000" />
+  </g>
+</svg>
diff --git a/sowatchui/sowatchui.pro b/sowatchui/sowatchui.pro
index 53abe73..93a2438 100644
--- a/sowatchui/sowatchui.pro
+++ b/sowatchui/sowatchui.pro
@@ -28,16 +28,17 @@ DEPENDPATH += $$PWD/../libsowatch
 # Source files
 SOURCES += main.cpp \
     watchesmodel.cpp daemonproxy.cpp \
-    scanwatchesmodel.cpp scannerproxy.cpp
+    watchscannermodel.cpp
 
 HEADERS += \
     watchesmodel.h daemonproxy.h \
-    scanwatchesmodel.h scannerproxy.h
+    watchscannermodel.h
 
 OTHER_FILES += qml/main.qml \
 	qml/MainPage.qml \
 	qml/NewWatchSheet.qml \
 	qml/WatchPage.qml \
+	sowatch.svg sowatch_src.svg sowatch64.png sowatch80.png \
     sowatch_harmattan.desktop \
     sowatch.desktop
 
diff --git a/sowatchui/watchesmodel.cpp b/sowatchui/watchesmodel.cpp
index 4531544..5644466 100644
--- a/sowatchui/watchesmodel.cpp
+++ b/sowatchui/watchesmodel.cpp
@@ -97,9 +97,14 @@ void WatchesModel::reload()
 	foreach (ConfigKey* conf, _list) {
 		conf->deleteLater();
 	}
+	_status.clear();
 	_list.clear();
 	foreach (const QString& s, dirs) {
 		_list.append(_config->getSubkey(s, this));
+		QDBusReply<QString> reply = _daemon->GetWatchStatus(s);
+		if (reply.isValid()) {
+			_status[s] = reply.value();
+		}
 	}
 	endResetModel();
 
diff --git a/sowatchui/scanwatchesmodel.cpp b/sowatchui/watchscannermodel.cpp
index 5b7c331..2f58523 100644
--- a/sowatchui/scanwatchesmodel.cpp
+++ b/sowatchui/watchscannermodel.cpp
@@ -1,10 +1,8 @@
-#include <QtDebug>
+#include "watchscannermodel.h"
 
-#include "scanwatchesmodel.h"
-
-ScanWatchesModel::ScanWatchesModel(QObject *parent) :
+WatchScannerModel::WatchScannerModel(QObject *parent) :
     QAbstractListModel(parent),
-    _scanner(new ScannerProxy("com.javispedro.sowatchd", "/com/javispedro/sowatch/allscanner", QDBusConnection::sessionBus())),
+    _scanner(new sowatch::AllWatchScanner(this)),
     _timer(new QTimer(this)),
     _enabled(false), _active(false)
 {
@@ -17,43 +15,43 @@ ScanWatchesModel::ScanWatchesModel(QObject *parent) :
 	_timer->setSingleShot(true);
 	_timer->setInterval(3000);
 
-	connect(_scanner, SIGNAL(WatchFound(QVariantMap)), SLOT(handleWatchFound(QVariantMap)));
-	connect(_scanner, SIGNAL(Started()), SLOT(handleStarted()));
-	connect(_scanner, SIGNAL(Finished()), SLOT(handleFinished()));
+	connect(_scanner, SIGNAL(watchFound(QVariantMap)), SLOT(handleWatchFound(QVariantMap)));
+	connect(_scanner, SIGNAL(started()), SLOT(handleStarted()));
+	connect(_scanner, SIGNAL(finished()), SLOT(handleFinished()));
 	connect(_timer, SIGNAL(timeout()), SLOT(handleTimeout()));
 }
 
-ScanWatchesModel::~ScanWatchesModel()
+WatchScannerModel::~WatchScannerModel()
 {
 }
 
-bool ScanWatchesModel::enabled() const
+bool WatchScannerModel::enabled() const
 {
 	return _enabled;
 }
 
-void ScanWatchesModel::setEnabled(bool enabled)
+void WatchScannerModel::setEnabled(bool enabled)
 {
 	_timer->stop();
 
 	_enabled = enabled;
 
 	if (_enabled && !_active) {
-		_scanner->Start();
+		_scanner->start();
 	}
 }
 
-bool ScanWatchesModel::active() const
+bool WatchScannerModel::active() const
 {
 	return _active;
 }
 
-int ScanWatchesModel::rowCount(const QModelIndex &parent) const
+int WatchScannerModel::rowCount(const QModelIndex &parent) const
 {
 	return _list.count();
 }
 
-QVariant ScanWatchesModel::data(const QModelIndex &index, int role) const
+QVariant WatchScannerModel::data(const QModelIndex &index, int role) const
 {
 	qDebug() << "Asked for data" << index.row() << index.column() << role;
 	const QVariantMap &info = _list.at(index.row());
@@ -68,7 +66,7 @@ QVariant ScanWatchesModel::data(const QModelIndex &index, int role) const
 	return QVariant();
 }
 
-void ScanWatchesModel::handleWatchFound(const QVariantMap &info)
+void WatchScannerModel::handleWatchFound(const QVariantMap &info)
 {
 	qDebug() << "Watch found" << info << endl;
 	if (!_list.contains(info)) {
@@ -79,13 +77,13 @@ void ScanWatchesModel::handleWatchFound(const QVariantMap &info)
 	}
 }
 
-void ScanWatchesModel::handleStarted()
+void WatchScannerModel::handleStarted()
 {
 	_active = true;
 	emit activeChanged();
 }
 
-void ScanWatchesModel::handleFinished()
+void WatchScannerModel::handleFinished()
 {
 	qDebug() << "Scan finished";
 	_active = false;
@@ -95,8 +93,8 @@ void ScanWatchesModel::handleFinished()
 	emit activeChanged();
 }
 
-void ScanWatchesModel::handleTimeout()
+void WatchScannerModel::handleTimeout()
 {
 	qDebug() << "Restarting scan";
-	_scanner->Start();
+	_scanner->start();
 }
diff --git a/sowatchui/scanwatchesmodel.h b/sowatchui/watchscannermodel.h
index 424ded4..32701f7 100644
--- a/sowatchui/scanwatchesmodel.h
+++ b/sowatchui/watchscannermodel.h
@@ -1,21 +1,19 @@
-#ifndef SCANWATCHESMODEL_H
-#define SCANWATCHESMODEL_H
+#ifndef WATCHSCANNERMODEL_H
+#define WATCHSCANNERMODEL_H
 
 #include <QtCore/QAbstractListModel>
-#include <QtCore/QTimer>
-#include <sowatch.h>
 
-#include "scannerproxy.h"
+#include <sowatch.h>
 
-class ScanWatchesModel : public QAbstractListModel
+class WatchScannerModel : public QAbstractListModel
 {
 	Q_OBJECT
 	Q_PROPERTY(bool enabled READ enabled WRITE setEnabled)
 	Q_PROPERTY(bool active READ active NOTIFY activeChanged)
 
 public:
-	explicit ScanWatchesModel(QObject *parent = 0);
-	~ScanWatchesModel();
+	explicit WatchScannerModel(QObject *parent = 0);
+	~WatchScannerModel();
 
 	enum DataRoles {
 		ObjectRole = Qt::UserRole
@@ -39,11 +37,11 @@ private slots:
 	void handleTimeout();
 
 private:
-	ScannerProxy *_scanner;
+	sowatch::WatchScanner *_scanner;
 	QList<QVariantMap> _list;
 	QTimer *_timer;
 	bool _enabled;
 	bool _active;
 };
 
-#endif // SCANWATCHESMODEL_H
+#endif // WATCHSCANNERMODEL_H