148 files changed, 110 insertions, 115 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7e4e5f53d..74b9d0d94 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,10 +37,10 @@ set(CMAKE_MODULE_PATH
 include_directories(.
 	${CMAKE_CURRENT_BINARY_DIR}
 	${CMAKE_BINARY_DIR}
-	${CMAKE_BINARY_DIR}/qt-ui
-	qt-ui
+	${CMAKE_BINARY_DIR}/desktop-widgets
+	desktop-widgets/
 	qt-models
-	qt-ui/profile
+	desktop-widgets/profile
 	subsurface-core/
 )
 
@@ -362,7 +362,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND NOT ANDROID)
 	set(SUBSURFACE_LINK_LIBRARIES ${SUBSURFACE_LINK_LIBRARIES} -lpthread)
 endif()
 
-add_subdirectory(qt-ui)
+add_subdirectory(desktop-widgets)
 
 # create the executables
 if(SUBSURFACE_MOBILE)
diff --git a/qt-ui/CMakeLists.txt b/desktop-widgets/CMakeLists.txt
index 45447771a..2c373b83f 100644
--- a/qt-ui/CMakeLists.txt
+++ b/desktop-widgets/CMakeLists.txt
@@ -23,12 +23,10 @@ set(SUBSURFACE_INTERFACE
 	diveshareexportdialog.cpp
 	downloadfromdivecomputer.cpp
 	globe.cpp
-	graphicsview-common.cpp
 	kmessagewidget.cpp
 	maintab.cpp
 	mainwindow.cpp
 	modeldelegates.cpp
-	metrics.cpp
 	notificationwidget.cpp
 	preferences.cpp
 	simplewidgets.cpp
diff --git a/qt-ui/about.cpp b/desktop-widgets/about.cpp
index e0df55980..e0df55980 100644
--- a/qt-ui/about.cpp
+++ b/desktop-widgets/about.cpp
diff --git a/qt-ui/about.h b/desktop-widgets/about.h
index 47423aea2..47423aea2 100644
--- a/qt-ui/about.h
+++ b/desktop-widgets/about.h
diff --git a/qt-ui/about.ui b/desktop-widgets/about.ui
index 0c1735e26..0c1735e26 100644
--- a/qt-ui/about.ui
+++ b/desktop-widgets/about.ui
diff --git a/qt-ui/btdeviceselectiondialog.cpp b/desktop-widgets/btdeviceselectiondialog.cpp
index fb2cbc1f3..fb2cbc1f3 100644
--- a/qt-ui/btdeviceselectiondialog.cpp
+++ b/desktop-widgets/btdeviceselectiondialog.cpp
diff --git a/qt-ui/btdeviceselectiondialog.h b/desktop-widgets/btdeviceselectiondialog.h
index 7651f164b..7651f164b 100644
--- a/qt-ui/btdeviceselectiondialog.h
+++ b/desktop-widgets/btdeviceselectiondialog.h
diff --git a/qt-ui/btdeviceselectiondialog.ui b/desktop-widgets/btdeviceselectiondialog.ui
index 4aa83cf1c..4aa83cf1c 100644
--- a/qt-ui/btdeviceselectiondialog.ui
+++ b/desktop-widgets/btdeviceselectiondialog.ui
diff --git a/qt-ui/configuredivecomputerdialog.cpp b/desktop-widgets/configuredivecomputerdialog.cpp
index ddb9450de..ddb9450de 100644
--- a/qt-ui/configuredivecomputerdialog.cpp
+++ b/desktop-widgets/configuredivecomputerdialog.cpp
diff --git a/qt-ui/configuredivecomputerdialog.h b/desktop-widgets/configuredivecomputerdialog.h
index 9ad30ac67..9ad30ac67 100644
--- a/qt-ui/configuredivecomputerdialog.h
+++ b/desktop-widgets/configuredivecomputerdialog.h
diff --git a/qt-ui/configuredivecomputerdialog.ui b/desktop-widgets/configuredivecomputerdialog.ui
index 0986d71ca..0986d71ca 100644
--- a/qt-ui/configuredivecomputerdialog.ui
+++ b/desktop-widgets/configuredivecomputerdialog.ui
diff --git a/qt-ui/css/tableviews.css b/desktop-widgets/css/tableviews.css
index e69de29bb..e69de29bb 100644
--- a/qt-ui/css/tableviews.css
+++ b/desktop-widgets/css/tableviews.css
diff --git a/qt-ui/divecomponentselection.ui b/desktop-widgets/divecomponentselection.ui
index 8262a5c2a..8262a5c2a 100644
--- a/qt-ui/divecomponentselection.ui
+++ b/desktop-widgets/divecomponentselection.ui
diff --git a/qt-ui/divecomputermanagementdialog.cpp b/desktop-widgets/divecomputermanagementdialog.cpp
index fd9273ffb..fd9273ffb 100644
--- a/qt-ui/divecomputermanagementdialog.cpp
+++ b/desktop-widgets/divecomputermanagementdialog.cpp
diff --git a/qt-ui/divecomputermanagementdialog.h b/desktop-widgets/divecomputermanagementdialog.h
index d065a0208..d065a0208 100644
--- a/qt-ui/divecomputermanagementdialog.h
+++ b/desktop-widgets/divecomputermanagementdialog.h
diff --git a/qt-ui/divecomputermanagementdialog.ui b/desktop-widgets/divecomputermanagementdialog.ui
index 0e5db2c41..0e5db2c41 100644
--- a/qt-ui/divecomputermanagementdialog.ui
+++ b/desktop-widgets/divecomputermanagementdialog.ui
diff --git a/qt-ui/divelistview.cpp b/desktop-widgets/divelistview.cpp
index d2386ecf1..d2386ecf1 100644
--- a/qt-ui/divelistview.cpp
+++ b/desktop-widgets/divelistview.cpp
diff --git a/qt-ui/divelistview.h b/desktop-widgets/divelistview.h
index aaec37af5..aaec37af5 100644
--- a/qt-ui/divelistview.h
+++ b/desktop-widgets/divelistview.h
diff --git a/qt-ui/divelogexportdialog.cpp b/desktop-widgets/divelogexportdialog.cpp
index 7a406b982..7a406b982 100644
--- a/qt-ui/divelogexportdialog.cpp
+++ b/desktop-widgets/divelogexportdialog.cpp
diff --git a/qt-ui/divelogexportdialog.h b/desktop-widgets/divelogexportdialog.h
index a5b5cc770..a5b5cc770 100644
--- a/qt-ui/divelogexportdialog.h
+++ b/desktop-widgets/divelogexportdialog.h
diff --git a/qt-ui/divelogexportdialog.ui b/desktop-widgets/divelogexportdialog.ui
index 02c8cf38b..02c8cf38b 100644
--- a/qt-ui/divelogexportdialog.ui
+++ b/desktop-widgets/divelogexportdialog.ui
diff --git a/qt-ui/divelogimportdialog.cpp b/desktop-widgets/divelogimportdialog.cpp
index 025d181d1..025d181d1 100644
--- a/qt-ui/divelogimportdialog.cpp
+++ b/desktop-widgets/divelogimportdialog.cpp
diff --git a/qt-ui/divelogimportdialog.h b/desktop-widgets/divelogimportdialog.h
index 2d12c7cac..2d12c7cac 100644
--- a/qt-ui/divelogimportdialog.h
+++ b/desktop-widgets/divelogimportdialog.h
diff --git a/qt-ui/divelogimportdialog.ui b/desktop-widgets/divelogimportdialog.ui
index 6d154b7c6..6d154b7c6 100644
--- a/qt-ui/divelogimportdialog.ui
+++ b/desktop-widgets/divelogimportdialog.ui
diff --git a/qt-ui/divepicturewidget.cpp b/desktop-widgets/divepicturewidget.cpp
index bed3d3bd1..bed3d3bd1 100644
--- a/qt-ui/divepicturewidget.cpp
+++ b/desktop-widgets/divepicturewidget.cpp
diff --git a/qt-ui/divepicturewidget.h b/desktop-widgets/divepicturewidget.h
index 54f5bb826..54f5bb826 100644
--- a/qt-ui/divepicturewidget.h
+++ b/desktop-widgets/divepicturewidget.h
diff --git a/qt-ui/diveplanner.cpp b/desktop-widgets/diveplanner.cpp
index b4413d11a..b4413d11a 100644
--- a/qt-ui/diveplanner.cpp
+++ b/desktop-widgets/diveplanner.cpp
diff --git a/qt-ui/diveplanner.h b/desktop-widgets/diveplanner.h
index b2e03a97b..b2e03a97b 100644
--- a/qt-ui/diveplanner.h
+++ b/desktop-widgets/diveplanner.h
diff --git a/qt-ui/diveplanner.ui b/desktop-widgets/diveplanner.ui
index adb44fad9..adb44fad9 100644
--- a/qt-ui/diveplanner.ui
+++ b/desktop-widgets/diveplanner.ui
diff --git a/qt-ui/diveshareexportdialog.cpp b/desktop-widgets/diveshareexportdialog.cpp
index 9fe6eefd6..9fe6eefd6 100644
--- a/qt-ui/diveshareexportdialog.cpp
+++ b/desktop-widgets/diveshareexportdialog.cpp
diff --git a/qt-ui/diveshareexportdialog.h b/desktop-widgets/diveshareexportdialog.h
index 85dadf5f1..85dadf5f1 100644
--- a/qt-ui/diveshareexportdialog.h
+++ b/desktop-widgets/diveshareexportdialog.h
diff --git a/qt-ui/diveshareexportdialog.ui b/desktop-widgets/diveshareexportdialog.ui
index 2235740c8..2235740c8 100644
--- a/qt-ui/diveshareexportdialog.ui
+++ b/desktop-widgets/diveshareexportdialog.ui
diff --git a/qt-ui/downloadfromdivecomputer.cpp b/desktop-widgets/downloadfromdivecomputer.cpp
index 4c8fa6b4a..4c8fa6b4a 100644
--- a/qt-ui/downloadfromdivecomputer.cpp
+++ b/desktop-widgets/downloadfromdivecomputer.cpp
diff --git a/qt-ui/downloadfromdivecomputer.h b/desktop-widgets/downloadfromdivecomputer.h
index 7acd49e95..7acd49e95 100644
--- a/qt-ui/downloadfromdivecomputer.h
+++ b/desktop-widgets/downloadfromdivecomputer.h
diff --git a/qt-ui/downloadfromdivecomputer.ui b/desktop-widgets/downloadfromdivecomputer.ui
index b1f152034..b1f152034 100644
--- a/qt-ui/downloadfromdivecomputer.ui
+++ b/desktop-widgets/downloadfromdivecomputer.ui
diff --git a/qt-ui/filterwidget.ui b/desktop-widgets/filterwidget.ui
index 1450d81b2..1450d81b2 100644
--- a/qt-ui/filterwidget.ui
+++ b/desktop-widgets/filterwidget.ui
diff --git a/qt-ui/globe.cpp b/desktop-widgets/globe.cpp
index 135f195a1..135f195a1 100644
--- a/qt-ui/globe.cpp
+++ b/desktop-widgets/globe.cpp
diff --git a/qt-ui/globe.h b/desktop-widgets/globe.h
index 8cc1265e4..8cc1265e4 100644
--- a/qt-ui/globe.h
+++ b/desktop-widgets/globe.h
diff --git a/qt-ui/groupedlineedit.cpp b/desktop-widgets/groupedlineedit.cpp
index 9ce5e175c..9ce5e175c 100644
--- a/qt-ui/groupedlineedit.cpp
+++ b/desktop-widgets/groupedlineedit.cpp
diff --git a/qt-ui/groupedlineedit.h b/desktop-widgets/groupedlineedit.h
index c9cd1a0e0..c9cd1a0e0 100644
--- a/qt-ui/groupedlineedit.h
+++ b/desktop-widgets/groupedlineedit.h
diff --git a/qt-ui/kmessagewidget.cpp b/desktop-widgets/kmessagewidget.cpp
index 2e506af2d..2e506af2d 100644
--- a/qt-ui/kmessagewidget.cpp
+++ b/desktop-widgets/kmessagewidget.cpp
diff --git a/qt-ui/kmessagewidget.h b/desktop-widgets/kmessagewidget.h
index 885d2a78f..885d2a78f 100644
--- a/qt-ui/kmessagewidget.h
+++ b/desktop-widgets/kmessagewidget.h
diff --git a/qt-ui/listfilter.ui b/desktop-widgets/listfilter.ui
index 48d813d21..48d813d21 100644
--- a/qt-ui/listfilter.ui
+++ b/desktop-widgets/listfilter.ui
diff --git a/qt-ui/locationInformation.ui b/desktop-widgets/locationInformation.ui
index 58d065648..58d065648 100644
--- a/qt-ui/locationInformation.ui
+++ b/desktop-widgets/locationInformation.ui
diff --git a/qt-ui/locationinformation.cpp b/desktop-widgets/locationinformation.cpp
index aee0b7328..aee0b7328 100644
--- a/qt-ui/locationinformation.cpp
+++ b/desktop-widgets/locationinformation.cpp
diff --git a/qt-ui/locationinformation.h b/desktop-widgets/locationinformation.h
index 243df939b..243df939b 100644
--- a/qt-ui/locationinformation.h
+++ b/desktop-widgets/locationinformation.h
diff --git a/qt-ui/maintab.cpp b/desktop-widgets/maintab.cpp
index 0afb7b4c0..0afb7b4c0 100644
--- a/qt-ui/maintab.cpp
+++ b/desktop-widgets/maintab.cpp
diff --git a/qt-ui/maintab.h b/desktop-widgets/maintab.h
index 20b4da690..20b4da690 100644
--- a/qt-ui/maintab.h
+++ b/desktop-widgets/maintab.h
diff --git a/qt-ui/maintab.ui b/desktop-widgets/maintab.ui
index 2c515a225..7bc516b1a 100644
--- a/qt-ui/maintab.ui
+++ b/desktop-widgets/maintab.ui
@@ -525,8 +525,8 @@
         <rect>
          <x>0</x>
          <y>0</y>
-         <width>70</width>
-         <height>16</height>
+         <width>445</width>
+         <height>754</height>
         </rect>
        </property>
        <layout class="QGridLayout" name="equipmentTabScrollAreaLayout">
@@ -1229,7 +1229,7 @@
   <customwidget>
    <class>TagWidget</class>
    <extends>QPlainTextEdit</extends>
-   <header>qt-ui/tagwidget.h</header>
+   <header>tagwidget.h</header>
   </customwidget>
   <customwidget>
    <class>DivePictureWidget</class>
diff --git a/qt-ui/mainwindow.cpp b/desktop-widgets/mainwindow.cpp
index e0476381f..e1e0d81a2 100644
--- a/qt-ui/mainwindow.cpp
+++ b/desktop-widgets/mainwindow.cpp
@@ -50,6 +50,7 @@
 #include <QUndoStack>
 #include <qthelper.h>
 #include <QtConcurrentRun>
+#include "subsurface-core/color.h"
 
 #if defined(FBSUPPORT)
 #include "socialnetworks.h"
diff --git a/qt-ui/mainwindow.h b/desktop-widgets/mainwindow.h
index 02ec2478c..02ec2478c 100644
--- a/qt-ui/mainwindow.h
+++ b/desktop-widgets/mainwindow.h
diff --git a/qt-ui/mainwindow.ui b/desktop-widgets/mainwindow.ui
index 5e3200cfc..5e3200cfc 100644
--- a/qt-ui/mainwindow.ui
+++ b/desktop-widgets/mainwindow.ui
diff --git a/qt-ui/marble/GeoDataTreeModel.h b/desktop-widgets/marble/GeoDataTreeModel.h
index 39eff8388..39eff8388 100644
--- a/qt-ui/marble/GeoDataTreeModel.h
+++ b/desktop-widgets/marble/GeoDataTreeModel.h
diff --git a/qt-ui/modeldelegates.cpp b/desktop-widgets/modeldelegates.cpp
index 881037a83..881037a83 100644
--- a/qt-ui/modeldelegates.cpp
+++ b/desktop-widgets/modeldelegates.cpp
diff --git a/qt-ui/modeldelegates.h b/desktop-widgets/modeldelegates.h
index 95701775a..95701775a 100644
--- a/qt-ui/modeldelegates.h
+++ b/desktop-widgets/modeldelegates.h
diff --git a/qt-ui/notificationwidget.cpp b/desktop-widgets/notificationwidget.cpp
index 103c0d068..103c0d068 100644
--- a/qt-ui/notificationwidget.cpp
+++ b/desktop-widgets/notificationwidget.cpp
diff --git a/qt-ui/notificationwidget.h b/desktop-widgets/notificationwidget.h
index 8a551a0b3..8a551a0b3 100644
--- a/qt-ui/notificationwidget.h
+++ b/desktop-widgets/notificationwidget.h
diff --git a/qt-ui/plannerDetails.ui b/desktop-widgets/plannerDetails.ui
index 1f2790d85..1f2790d85 100644
--- a/qt-ui/plannerDetails.ui
+++ b/desktop-widgets/plannerDetails.ui
diff --git a/qt-ui/plannerSettings.ui b/desktop-widgets/plannerSettings.ui
index 4db69f883..4db69f883 100644
--- a/qt-ui/plannerSettings.ui
+++ b/desktop-widgets/plannerSettings.ui
diff --git a/qt-ui/preferences.cpp b/desktop-widgets/preferences.cpp
index 6450c41cb..6450c41cb 100644
--- a/qt-ui/preferences.cpp
+++ b/desktop-widgets/preferences.cpp
diff --git a/qt-ui/preferences.h b/desktop-widgets/preferences.h
index 326b1f964..326b1f964 100644
--- a/qt-ui/preferences.h
+++ b/desktop-widgets/preferences.h
diff --git a/qt-ui/preferences.ui b/desktop-widgets/preferences.ui
index de2d79b91..de2d79b91 100644
--- a/qt-ui/preferences.ui
+++ b/desktop-widgets/preferences.ui
diff --git a/qt-ui/printdialog.cpp b/desktop-widgets/printdialog.cpp
index cf08062d2..cf08062d2 100644
--- a/qt-ui/printdialog.cpp
+++ b/desktop-widgets/printdialog.cpp
diff --git a/qt-ui/printdialog.h b/desktop-widgets/printdialog.h
index a00c4c5d9..a00c4c5d9 100644
--- a/qt-ui/printdialog.h
+++ b/desktop-widgets/printdialog.h
diff --git a/qt-ui/printer.cpp b/desktop-widgets/printer.cpp
index f0197d446..f0197d446 100644
--- a/qt-ui/printer.cpp
+++ b/desktop-widgets/printer.cpp
diff --git a/qt-ui/printer.h b/desktop-widgets/printer.h
index 979cacd6a..979cacd6a 100644
--- a/qt-ui/printer.h
+++ b/desktop-widgets/printer.h
diff --git a/qt-ui/printoptions.cpp b/desktop-widgets/printoptions.cpp
index 769c89ff4..769c89ff4 100644
--- a/qt-ui/printoptions.cpp
+++ b/desktop-widgets/printoptions.cpp
diff --git a/qt-ui/printoptions.h b/desktop-widgets/printoptions.h
index 9c50b10f3..9c50b10f3 100644
--- a/qt-ui/printoptions.h
+++ b/desktop-widgets/printoptions.h
diff --git a/qt-ui/printoptions.ui b/desktop-widgets/printoptions.ui
index 1c2523d39..1c2523d39 100644
--- a/qt-ui/printoptions.ui
+++ b/desktop-widgets/printoptions.ui
diff --git a/qt-ui/profile/animationfunctions.cpp b/desktop-widgets/profile/animationfunctions.cpp
index a19d50c9d..a19d50c9d 100644
--- a/qt-ui/profile/animationfunctions.cpp
+++ b/desktop-widgets/profile/animationfunctions.cpp
diff --git a/qt-ui/profile/animationfunctions.h b/desktop-widgets/profile/animationfunctions.h
index 3cfcff563..3cfcff563 100644
--- a/qt-ui/profile/animationfunctions.h
+++ b/desktop-widgets/profile/animationfunctions.h
diff --git a/qt-ui/profile/divecartesianaxis.cpp b/desktop-widgets/profile/divecartesianaxis.cpp
index bf5a5380c..bf5a5380c 100644
--- a/qt-ui/profile/divecartesianaxis.cpp
+++ b/desktop-widgets/profile/divecartesianaxis.cpp
diff --git a/qt-ui/profile/divecartesianaxis.h b/desktop-widgets/profile/divecartesianaxis.h
index 27cfa62d8..cc7d0bcf7 100644
--- a/qt-ui/profile/divecartesianaxis.h
+++ b/desktop-widgets/profile/divecartesianaxis.h
@@ -3,7 +3,7 @@
 
 #include <QObject>
 #include <QGraphicsLineItem>
-#include <graphicsview-common.h>
+#include "subsurface-core/color.h"
 
 class QPropertyAnimation;
 class DiveTextItem;
diff --git a/qt-ui/profile/diveeventitem.cpp b/desktop-widgets/profile/diveeventitem.cpp
index 0bbc84267..0bbc84267 100644
--- a/qt-ui/profile/diveeventitem.cpp
+++ b/desktop-widgets/profile/diveeventitem.cpp
diff --git a/qt-ui/profile/diveeventitem.h b/desktop-widgets/profile/diveeventitem.h
index f358fee6d..f358fee6d 100644
--- a/qt-ui/profile/diveeventitem.h
+++ b/desktop-widgets/profile/diveeventitem.h
diff --git a/qt-ui/profile/divelineitem.cpp b/desktop-widgets/profile/divelineitem.cpp
index f9e288a44..f9e288a44 100644
--- a/qt-ui/profile/divelineitem.cpp
+++ b/desktop-widgets/profile/divelineitem.cpp
diff --git a/qt-ui/profile/divelineitem.h b/desktop-widgets/profile/divelineitem.h
index ec88e9da5..ec88e9da5 100644
--- a/qt-ui/profile/divelineitem.h
+++ b/desktop-widgets/profile/divelineitem.h
diff --git a/qt-ui/profile/divepixmapitem.cpp b/desktop-widgets/profile/divepixmapitem.cpp
index 581f6f9b4..581f6f9b4 100644
--- a/qt-ui/profile/divepixmapitem.cpp
+++ b/desktop-widgets/profile/divepixmapitem.cpp
diff --git a/qt-ui/profile/divepixmapitem.h b/desktop-widgets/profile/divepixmapitem.h
index 02c1523f7..02c1523f7 100644
--- a/qt-ui/profile/divepixmapitem.h
+++ b/desktop-widgets/profile/divepixmapitem.h
diff --git a/qt-ui/profile/diveprofileitem.cpp b/desktop-widgets/profile/diveprofileitem.cpp
index 2c814678a..2c814678a 100644
--- a/qt-ui/profile/diveprofileitem.cpp
+++ b/desktop-widgets/profile/diveprofileitem.cpp
diff --git a/qt-ui/profile/diveprofileitem.h b/desktop-widgets/profile/diveprofileitem.h
index 2160782f7..0bba7f7a3 100644
--- a/qt-ui/profile/diveprofileitem.h
+++ b/desktop-widgets/profile/diveprofileitem.h
@@ -5,7 +5,6 @@
 #include <QGraphicsPolygonItem>
 #include <QModelIndex>
 
-#include "graphicsview-common.h"
 #include "divelineitem.h"
 
 /* This is the Profile Item, it should be used for quite a lot of things
diff --git a/qt-ui/profile/diverectitem.cpp b/desktop-widgets/profile/diverectitem.cpp
index 8cb60c3f5..8cb60c3f5 100644
--- a/qt-ui/profile/diverectitem.cpp
+++ b/desktop-widgets/profile/diverectitem.cpp
diff --git a/qt-ui/profile/diverectitem.h b/desktop-widgets/profile/diverectitem.h
index e616cf591..e616cf591 100644
--- a/qt-ui/profile/diverectitem.h
+++ b/desktop-widgets/profile/diverectitem.h
diff --git a/qt-ui/profile/divetextitem.cpp b/desktop-widgets/profile/divetextitem.cpp
index 9c7848cd4..3bf00d68f 100644
--- a/qt-ui/profile/divetextitem.cpp
+++ b/desktop-widgets/profile/divetextitem.cpp
@@ -1,6 +1,9 @@
 #include "divetextitem.h"
 #include "mainwindow.h"
 #include "profilewidget2.h"
+#include "subsurface-core/color.h"
+
+#include <QBrush>
 
 DiveTextItem::DiveTextItem(QGraphicsItem *parent) : QGraphicsItemGroup(parent),
 	internalAlignFlags(Qt::AlignHCenter | Qt::AlignVCenter),
diff --git a/qt-ui/profile/divetextitem.h b/desktop-widgets/profile/divetextitem.h
index 3991fe7f3..be0adf292 100644
--- a/qt-ui/profile/divetextitem.h
+++ b/desktop-widgets/profile/divetextitem.h
@@ -3,8 +3,8 @@
 
 #include <QObject>
 #include <QGraphicsItemGroup>
-#include "graphicsview-common.h"
-#include <QBrush>
+
+class QBrush;
 
 /* A Line Item that has animated-properties. */
 class DiveTextItem : public QObject, public QGraphicsItemGroup {
diff --git a/qt-ui/profile/divetooltipitem.cpp b/desktop-widgets/profile/divetooltipitem.cpp
index d4818422b..d4818422b 100644
--- a/qt-ui/profile/divetooltipitem.cpp
+++ b/desktop-widgets/profile/divetooltipitem.cpp
diff --git a/qt-ui/profile/divetooltipitem.h b/desktop-widgets/profile/divetooltipitem.h
index 4fa7ec2d7..4fa7ec2d7 100644
--- a/qt-ui/profile/divetooltipitem.h
+++ b/desktop-widgets/profile/divetooltipitem.h
diff --git a/qt-ui/profile/profilewidget2.cpp b/desktop-widgets/profile/profilewidget2.cpp
index 3ccd1bb6d..3ccd1bb6d 100644
--- a/qt-ui/profile/profilewidget2.cpp
+++ b/desktop-widgets/profile/profilewidget2.cpp
diff --git a/qt-ui/profile/profilewidget2.h b/desktop-widgets/profile/profilewidget2.h
index 2d1a7bfb4..f11ec5be1 100644
--- a/qt-ui/profile/profilewidget2.h
+++ b/desktop-widgets/profile/profilewidget2.h
@@ -13,7 +13,6 @@
 //  *
 //  * It needs to be dynamic, things should *flow* on it, not just appear / disappear.
 //  */
-#include "graphicsview-common.h"
 #include "divelineitem.h"
 #include "diveprofileitem.h"
 #include "display.h"
diff --git a/qt-ui/profile/ruleritem.cpp b/desktop-widgets/profile/ruleritem.cpp
index 830985552..830985552 100644
--- a/qt-ui/profile/ruleritem.cpp
+++ b/desktop-widgets/profile/ruleritem.cpp
diff --git a/qt-ui/profile/ruleritem.h b/desktop-widgets/profile/ruleritem.h
index 4fad0451c..4fad0451c 100644
--- a/qt-ui/profile/ruleritem.h
+++ b/desktop-widgets/profile/ruleritem.h
diff --git a/qt-ui/profile/tankitem.cpp b/desktop-widgets/profile/tankitem.cpp
index c0e75a371..c0e75a371 100644
--- a/qt-ui/profile/tankitem.cpp
+++ b/desktop-widgets/profile/tankitem.cpp
diff --git a/qt-ui/profile/tankitem.h b/desktop-widgets/profile/tankitem.h
index fd685fc82..fd685fc82 100644
--- a/qt-ui/profile/tankitem.h
+++ b/desktop-widgets/profile/tankitem.h
diff --git a/qt-ui/qtwaitingspinner.cpp b/desktop-widgets/qtwaitingspinner.cpp
index 14e8669b0..14e8669b0 100644
--- a/qt-ui/qtwaitingspinner.cpp
+++ b/desktop-widgets/qtwaitingspinner.cpp
diff --git a/qt-ui/qtwaitingspinner.h b/desktop-widgets/qtwaitingspinner.h
index 254b52ec7..254b52ec7 100644
--- a/qt-ui/qtwaitingspinner.h
+++ b/desktop-widgets/qtwaitingspinner.h
diff --git a/qt-ui/renumber.ui b/desktop-widgets/renumber.ui
index 00e7b84bb..00e7b84bb 100644
--- a/qt-ui/renumber.ui
+++ b/desktop-widgets/renumber.ui
diff --git a/qt-ui/searchbar.ui b/desktop-widgets/searchbar.ui
index 22bce39c6..22bce39c6 100644
--- a/qt-ui/searchbar.ui
+++ b/desktop-widgets/searchbar.ui
diff --git a/qt-ui/setpoint.ui b/desktop-widgets/setpoint.ui
index d96488a31..d96488a31 100644
--- a/qt-ui/setpoint.ui
+++ b/desktop-widgets/setpoint.ui
diff --git a/qt-ui/shiftimagetimes.ui b/desktop-widgets/shiftimagetimes.ui
index 0478a62b4..0478a62b4 100644
--- a/qt-ui/shiftimagetimes.ui
+++ b/desktop-widgets/shiftimagetimes.ui
diff --git a/qt-ui/shifttimes.ui b/desktop-widgets/shifttimes.ui
index 486b1f43b..486b1f43b 100644
--- a/qt-ui/shifttimes.ui
+++ b/desktop-widgets/shifttimes.ui
diff --git a/qt-ui/simplewidgets.cpp b/desktop-widgets/simplewidgets.cpp
index 62a9cc646..62a9cc646 100644
--- a/qt-ui/simplewidgets.cpp
+++ b/desktop-widgets/simplewidgets.cpp
diff --git a/qt-ui/simplewidgets.h b/desktop-widgets/simplewidgets.h
index 595c4cd4b..595c4cd4b 100644
--- a/qt-ui/simplewidgets.h
+++ b/desktop-widgets/simplewidgets.h
diff --git a/qt-ui/socialnetworks.cpp b/desktop-widgets/socialnetworks.cpp
index 6e191267a..6e191267a 100644
--- a/qt-ui/socialnetworks.cpp
+++ b/desktop-widgets/socialnetworks.cpp
diff --git a/qt-ui/socialnetworks.h b/desktop-widgets/socialnetworks.h
index 2f63915ca..2f63915ca 100644
--- a/qt-ui/socialnetworks.h
+++ b/desktop-widgets/socialnetworks.h
diff --git a/qt-ui/socialnetworksdialog.ui b/desktop-widgets/socialnetworksdialog.ui
index e8953d1c7..e8953d1c7 100644
--- a/qt-ui/socialnetworksdialog.ui
+++ b/desktop-widgets/socialnetworksdialog.ui
diff --git a/qt-ui/starwidget.cpp b/desktop-widgets/starwidget.cpp
index d959ed3b9..d959ed3b9 100644
--- a/qt-ui/starwidget.cpp
+++ b/desktop-widgets/starwidget.cpp
diff --git a/qt-ui/starwidget.h b/desktop-widgets/starwidget.h
index 989aa527d..989aa527d 100644
--- a/qt-ui/starwidget.h
+++ b/desktop-widgets/starwidget.h
diff --git a/qt-ui/statistics/monthstatistics.cpp b/desktop-widgets/statistics/monthstatistics.cpp
index e69de29bb..e69de29bb 100644
--- a/qt-ui/statistics/monthstatistics.cpp
+++ b/desktop-widgets/statistics/monthstatistics.cpp
diff --git a/qt-ui/statistics/monthstatistics.h b/desktop-widgets/statistics/monthstatistics.h
index e69de29bb..e69de29bb 100644
--- a/qt-ui/statistics/monthstatistics.h
+++ b/desktop-widgets/statistics/monthstatistics.h
diff --git a/qt-ui/statistics/statisticsbar.cpp b/desktop-widgets/statistics/statisticsbar.cpp
index e69de29bb..e69de29bb 100644
--- a/qt-ui/statistics/statisticsbar.cpp
+++ b/desktop-widgets/statistics/statisticsbar.cpp
diff --git a/qt-ui/statistics/statisticsbar.h b/desktop-widgets/statistics/statisticsbar.h
index e69de29bb..e69de29bb 100644
--- a/qt-ui/statistics/statisticsbar.h
+++ b/desktop-widgets/statistics/statisticsbar.h
diff --git a/qt-ui/statistics/statisticswidget.cpp b/desktop-widgets/statistics/statisticswidget.cpp
index 3e91fa317..3e91fa317 100644
--- a/qt-ui/statistics/statisticswidget.cpp
+++ b/desktop-widgets/statistics/statisticswidget.cpp
diff --git a/qt-ui/statistics/statisticswidget.h b/desktop-widgets/statistics/statisticswidget.h
index ae988292d..ae988292d 100644
--- a/qt-ui/statistics/statisticswidget.h
+++ b/desktop-widgets/statistics/statisticswidget.h
diff --git a/qt-ui/statistics/yearstatistics.cpp b/desktop-widgets/statistics/yearstatistics.cpp
index e69de29bb..e69de29bb 100644
--- a/qt-ui/statistics/yearstatistics.cpp
+++ b/desktop-widgets/statistics/yearstatistics.cpp
diff --git a/qt-ui/statistics/yearstatistics.h b/desktop-widgets/statistics/yearstatistics.h
index e69de29bb..e69de29bb 100644
--- a/qt-ui/statistics/yearstatistics.h
+++ b/desktop-widgets/statistics/yearstatistics.h
diff --git a/qt-ui/subsurfacewebservices.cpp b/desktop-widgets/subsurfacewebservices.cpp
index ee079cc48..ee079cc48 100644
--- a/qt-ui/subsurfacewebservices.cpp
+++ b/desktop-widgets/subsurfacewebservices.cpp
diff --git a/qt-ui/subsurfacewebservices.h b/desktop-widgets/subsurfacewebservices.h
index 2b454ebc7..2b454ebc7 100644
--- a/qt-ui/subsurfacewebservices.h
+++ b/desktop-widgets/subsurfacewebservices.h
diff --git a/qt-ui/tableview.cpp b/desktop-widgets/tableview.cpp
index 40d5199ec..40d5199ec 100644
--- a/qt-ui/tableview.cpp
+++ b/desktop-widgets/tableview.cpp
diff --git a/qt-ui/tableview.h b/desktop-widgets/tableview.h
index f72b256ea..f72b256ea 100644
--- a/qt-ui/tableview.h
+++ b/desktop-widgets/tableview.h
diff --git a/qt-ui/tableview.ui b/desktop-widgets/tableview.ui
index 73867231e..73867231e 100644
--- a/qt-ui/tableview.ui
+++ b/desktop-widgets/tableview.ui
diff --git a/qt-ui/tagwidget.cpp b/desktop-widgets/tagwidget.cpp
index 3b61b492a..3b61b492a 100644
--- a/qt-ui/tagwidget.cpp
+++ b/desktop-widgets/tagwidget.cpp
diff --git a/qt-ui/tagwidget.h b/desktop-widgets/tagwidget.h
index 6a16129f3..6a16129f3 100644
--- a/qt-ui/tagwidget.h
+++ b/desktop-widgets/tagwidget.h
diff --git a/qt-ui/templateedit.cpp b/desktop-widgets/templateedit.cpp
index 4964016b9..4964016b9 100644
--- a/qt-ui/templateedit.cpp
+++ b/desktop-widgets/templateedit.cpp
diff --git a/qt-ui/templateedit.h b/desktop-widgets/templateedit.h
index 5e548ae19..5e548ae19 100644
--- a/qt-ui/templateedit.h
+++ b/desktop-widgets/templateedit.h
diff --git a/qt-ui/templateedit.ui b/desktop-widgets/templateedit.ui
index 60a0fc7e6..60a0fc7e6 100644
--- a/qt-ui/templateedit.ui
+++ b/desktop-widgets/templateedit.ui
diff --git a/qt-ui/templatelayout.cpp b/desktop-widgets/templatelayout.cpp
index a376459a6..a376459a6 100644
--- a/qt-ui/templatelayout.cpp
+++ b/desktop-widgets/templatelayout.cpp
diff --git a/qt-ui/templatelayout.h b/desktop-widgets/templatelayout.h
index a2868e7ff..a2868e7ff 100644
--- a/qt-ui/templatelayout.h
+++ b/desktop-widgets/templatelayout.h
diff --git a/qt-ui/undocommands.cpp b/desktop-widgets/undocommands.cpp
index 0fd182cb3..0fd182cb3 100644
--- a/qt-ui/undocommands.cpp
+++ b/desktop-widgets/undocommands.cpp
diff --git a/qt-ui/undocommands.h b/desktop-widgets/undocommands.h
index 8e359db51..8e359db51 100644
--- a/qt-ui/undocommands.h
+++ b/desktop-widgets/undocommands.h
diff --git a/qt-ui/updatemanager.cpp b/desktop-widgets/updatemanager.cpp
index 0760d6407..0760d6407 100644
--- a/qt-ui/updatemanager.cpp
+++ b/desktop-widgets/updatemanager.cpp
diff --git a/qt-ui/updatemanager.h b/desktop-widgets/updatemanager.h
index f91c82dc8..f91c82dc8 100644
--- a/qt-ui/updatemanager.h
+++ b/desktop-widgets/updatemanager.h
diff --git a/qt-ui/urldialog.ui b/desktop-widgets/urldialog.ui
index 397f90a64..397f90a64 100644
--- a/qt-ui/urldialog.ui
+++ b/desktop-widgets/urldialog.ui
diff --git a/qt-ui/usermanual.cpp b/desktop-widgets/usermanual.cpp
index 6b676f16b..6b676f16b 100644
--- a/qt-ui/usermanual.cpp
+++ b/desktop-widgets/usermanual.cpp
diff --git a/qt-ui/usermanual.h b/desktop-widgets/usermanual.h
index 5101a3c3b..5101a3c3b 100644
--- a/qt-ui/usermanual.h
+++ b/desktop-widgets/usermanual.h
diff --git a/qt-ui/usersurvey.cpp b/desktop-widgets/usersurvey.cpp
index 05da582a1..05da582a1 100644
--- a/qt-ui/usersurvey.cpp
+++ b/desktop-widgets/usersurvey.cpp
diff --git a/qt-ui/usersurvey.h b/desktop-widgets/usersurvey.h
index 1dd5aaab3..1dd5aaab3 100644
--- a/qt-ui/usersurvey.h
+++ b/desktop-widgets/usersurvey.h
diff --git a/qt-ui/usersurvey.ui b/desktop-widgets/usersurvey.ui
index c118fe89d..c118fe89d 100644
--- a/qt-ui/usersurvey.ui
+++ b/desktop-widgets/usersurvey.ui
diff --git a/qt-ui/webservices.ui b/desktop-widgets/webservices.ui
index bcca35f1e..bcca35f1e 100644
--- a/qt-ui/webservices.ui
+++ b/desktop-widgets/webservices.ui
diff --git a/main.cpp b/main.cpp
index 171876abf..e7259c3f3 100644
--- a/main.cpp
+++ b/main.cpp
@@ -8,9 +8,9 @@
 #include "dive.h"
 #include "qt-gui.h"
 #include "subsurfacestartup.h"
-#include "qt-ui/mainwindow.h"
-#include "qt-ui/diveplanner.h"
-#include "qt-ui/graphicsview-common.h"
+#include "desktop-widgets/mainwindow.h"
+#include "desktop-widgets/diveplanner.h"
+#include "subsurface-core/color.h"
 #include "qthelper.h"
 
 #include <QStringList>
diff --git a/qt-gui.cpp b/qt-gui.cpp
index a4997a6fe..5c7157fe6 100644
--- a/qt-gui.cpp
+++ b/qt-gui.cpp
@@ -2,7 +2,7 @@
 /* Qt UI implementation */
 #include "dive.h"
 #include "display.h"
-#include "qt-ui/mainwindow.h"
+#include "desktop-widgets/mainwindow.h"
 #include "helpers.h"
 
 #include <QApplication>
diff --git a/qt-models/diveplotdatamodel.cpp b/qt-models/diveplotdatamodel.cpp
index f219947ac..de156bfac 100644
--- a/qt-models/diveplotdatamodel.cpp
+++ b/qt-models/diveplotdatamodel.cpp
@@ -1,8 +1,8 @@
 #include "diveplotdatamodel.h"
 #include "dive.h"
 #include "profile.h"
-#include "graphicsview-common.h"
 #include "divelist.h"
+#include "subsurface-core/color.h"
 
 DivePlotDataModel::DivePlotDataModel(QObject *parent) :
 	QAbstractTableModel(parent),
diff --git a/qt-models/filtermodels.cpp b/qt-models/filtermodels.cpp
index 29853cb3d..f56f4be1c 100644
--- a/qt-models/filtermodels.cpp
+++ b/qt-models/filtermodels.cpp
@@ -1,7 +1,9 @@
 #include "filtermodels.h"
 #include "models.h"
-#include "divelistview.h"
 #include "display.h"
+#include "divetripmodel.h"
+
+#include <QDebug>
 
 #define CREATE_INSTANCE_METHOD( CLASS ) \
 CLASS *CLASS::instance() \
diff --git a/qt-ui/graphicsview-common.h b/qt-ui/graphicsview-common.h
deleted file mode 100644
index 2a757b2ae..000000000
--- a/qt-ui/graphicsview-common.h
+++ /dev/null
@@ -1,94 +0,0 @@
-#ifndef GRAPHICSVIEW_COMMON_H
-#define GRAPHICSVIEW_COMMON_H
-
-#include "subsurface-core/color.h"
-#include <QMap>
-#include <QVector>
-#include <QColor>
-
-#define SAC_COLORS_START_IDX SAC_1
-#define SAC_COLORS 9
-#define VELOCITY_COLORS_START_IDX VELO_STABLE
-#define VELOCITY_COLORS 5
-
-typedef enum {
-	/* SAC colors. Order is important, the SAC_COLORS_START_IDX define above. */
-	SAC_1,
-	SAC_2,
-	SAC_3,
-	SAC_4,
-	SAC_5,
-	SAC_6,
-	SAC_7,
-	SAC_8,
-	SAC_9,
-
-	/* Velocity colors.  Order is still important, ref VELOCITY_COLORS_START_IDX. */
-	VELO_STABLE,
-	VELO_SLOW,
-	VELO_MODERATE,
-	VELO_FAST,
-	VELO_CRAZY,
-
-	/* gas colors */
-	PO2,
-	PO2_ALERT,
-	PN2,
-	PN2_ALERT,
-	PHE,
-	PHE_ALERT,
-	O2SETPOINT,
-	CCRSENSOR1,
-	CCRSENSOR2,
-	CCRSENSOR3,
-	PP_LINES,
-
-	/* Other colors */
-	TEXT_BACKGROUND,
-	ALERT_BG,
-	ALERT_FG,
-	EVENTS,
-	SAMPLE_DEEP,
-	SAMPLE_SHALLOW,
-	SMOOTHED,
-	MINUTE,
-	TIME_GRID,
-	TIME_TEXT,
-	DEPTH_GRID,
-	MEAN_DEPTH,
-	HR_TEXT,
-	HR_PLOT,
-	HR_AXIS,
-	DEPTH_TOP,
-	DEPTH_BOTTOM,
-	TEMP_TEXT,
-	TEMP_PLOT,
-	SAC_DEFAULT,
-	BOUNDING_BOX,
-	PRESSURE_TEXT,
-	BACKGROUND,
-	BACKGROUND_TRANS,
-	CEILING_SHALLOW,
-	CEILING_DEEP,
-	CALC_CEILING_SHALLOW,
-	CALC_CEILING_DEEP,
-	TISSUE_PERCENTAGE,
-	GF_LINE,
-	AMB_PRESSURE_LINE
-} color_indice_t;
-
-
-/* profile_color[color indice] = COLOR(screen color, b/w printer color, color printer}} printer & screen colours could be different */
-
-extern QMap<color_indice_t, QVector<QColor> > profile_color;
-void fill_profile_color();
-QColor getColor(const color_indice_t i, bool isGrayscale = false);
-QColor getSacColor(int sac, int diveSac);
-struct text_render_options {
-	double size;
-	color_indice_t color;
-	double hpos, vpos;
-};
-
-typedef text_render_options text_render_options_t;
-#endif // GRAPHICSVIEW_COMMON_H
diff --git a/subsurface-core/CMakeLists.txt b/subsurface-core/CMakeLists.txt
index e7f531527..60efb7d92 100644
--- a/subsurface-core/CMakeLists.txt
+++ b/subsurface-core/CMakeLists.txt
@@ -70,6 +70,8 @@ set(SUBSURFACE_CORE_LIB_SRCS
 	divelogexportlogic.cpp
 	qt-init.cpp
 	qtserialbluetooth.cpp
+	metrics.cpp
+	color.cpp
 	${SERIAL_FTDI}
 	${PLATFORM_SRC}
 	${BT_CORE_SRC_FILES}
diff --git a/qt-ui/graphicsview-common.cpp b/subsurface-core/color.cpp
index a1813ce2d..cf6f43916 100644
--- a/qt-ui/graphicsview-common.cpp
+++ b/subsurface-core/color.cpp
@@ -1,4 +1,4 @@
-#include "graphicsview-common.h"
+#include "color.h"
 
 QMap<color_indice_t, QVector<QColor> > profile_color;
 
diff --git a/subsurface-core/color.h b/subsurface-core/color.h
index 7938e59a6..57ad77242 100644
--- a/subsurface-core/color.h
+++ b/subsurface-core/color.h
@@ -5,6 +5,8 @@
    from http://chir.ag/projects/name-that-color */
 
 #include <QColor>
+#include <QMap>
+#include <QVector>
 
 // Greens
 #define CAMARONE1 QColor::fromRgbF(0.0, 0.4, 0.0, 1)
@@ -64,4 +66,87 @@
 // Magentas
 #define MEDIUMREDVIOLET1_HIGHER_TRANS QColor::fromRgbF(0.7, 0.2, 0.7, 0.1)
 
+#define SAC_COLORS_START_IDX SAC_1
+#define SAC_COLORS 9
+#define VELOCITY_COLORS_START_IDX VELO_STABLE
+#define VELOCITY_COLORS 5
+
+typedef enum {
+	/* SAC colors. Order is important, the SAC_COLORS_START_IDX define above. */
+	SAC_1,
+	SAC_2,
+	SAC_3,
+	SAC_4,
+	SAC_5,
+	SAC_6,
+	SAC_7,
+	SAC_8,
+	SAC_9,
+
+	/* Velocity colors.  Order is still important, ref VELOCITY_COLORS_START_IDX. */
+	VELO_STABLE,
+	VELO_SLOW,
+	VELO_MODERATE,
+	VELO_FAST,
+	VELO_CRAZY,
+
+	/* gas colors */
+	PO2,
+	PO2_ALERT,
+	PN2,
+	PN2_ALERT,
+	PHE,
+	PHE_ALERT,
+	O2SETPOINT,
+	CCRSENSOR1,
+	CCRSENSOR2,
+	CCRSENSOR3,
+	PP_LINES,
+
+	/* Other colors */
+	TEXT_BACKGROUND,
+	ALERT_BG,
+	ALERT_FG,
+	EVENTS,
+	SAMPLE_DEEP,
+	SAMPLE_SHALLOW,
+	SMOOTHED,
+	MINUTE,
+	TIME_GRID,
+	TIME_TEXT,
+	DEPTH_GRID,
+	MEAN_DEPTH,
+	HR_TEXT,
+	HR_PLOT,
+	HR_AXIS,
+	DEPTH_TOP,
+	DEPTH_BOTTOM,
+	TEMP_TEXT,
+	TEMP_PLOT,
+	SAC_DEFAULT,
+	BOUNDING_BOX,
+	PRESSURE_TEXT,
+	BACKGROUND,
+	BACKGROUND_TRANS,
+	CEILING_SHALLOW,
+	CEILING_DEEP,
+	CALC_CEILING_SHALLOW,
+	CALC_CEILING_DEEP,
+	TISSUE_PERCENTAGE,
+	GF_LINE,
+	AMB_PRESSURE_LINE
+} color_indice_t;
+
+extern QMap<color_indice_t, QVector<QColor> > profile_color;
+void fill_profile_color();
+QColor getColor(const color_indice_t i, bool isGrayscale = false);
+QColor getSacColor(int sac, int diveSac);
+struct text_render_options {
+	double size;
+	color_indice_t color;
+	double hpos, vpos;
+};
+
+typedef text_render_options text_render_options_t;
+
 #endif // COLOR_H
diff --git a/qt-ui/metrics.cpp b/subsurface-core/metrics.cpp
index 203c2e5e2..203c2e5e2 100644
--- a/qt-ui/metrics.cpp
+++ b/subsurface-core/metrics.cpp
diff --git a/qt-ui/metrics.h b/subsurface-core/metrics.h
index 30295a3d8..30295a3d8 100644
--- a/qt-ui/metrics.h
+++ b/subsurface-core/metrics.h