diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..e95e584
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,6 @@
+build/
+obj-*
+CMakeFiles*
+src/dependencies/*
+debian/debhelper-build-stamp
+debian/.debhelper*
diff --git a/build.sh b/build.sh
new file mode 100755
index 0000000..2865dd1
--- /dev/null
+++ b/build.sh
@@ -0,0 +1,36 @@
+#!/bin/bash
+
+#Vars:
+buildmode="deb"
+
+#Get mode:
+if [ ! -z "$1" ]; then
+  if [ "$1" == "deb" ]; then
+    buildmode="deb"
+  elif [ "$1" == "imager" ]; then
+    buildmode="make"
+  fi
+fi
+
+#Main:
+if [ "$buildmode" == "deb" ]; then
+  echo "Building .deb"
+  debuild -uc -us
+elif [ "$buildmode" == "make" ]; then
+  echo "Building imager only"
+  if [ ! -d "build" ]; then
+    mkdir -p "build"
+  fi
+  cd build
+  if [ -d "CMakeFiles" ]; then
+    rm -r CMakeFiles
+  fi
+  echo "Configuring build"
+  cmake ../src
+  echo "Building"
+  make
+  cd ..
+else
+  echo "Unkown build option: $1, valid options are: deb, imager"
+  exit 1
+fi
diff --git a/src/config.h b/src/config.h
index 60708e5..732defe 100644
--- a/src/config.h
+++ b/src/config.h
@@ -9,6 +9,8 @@
 /* Imager info */
 #define IMAGER_NAME                       "HooverHigh Imager"
 #define IMAGER_VERSION                    "1.7.5"
+#define IMAGER_ORG                        "HooverHigh"
+#define IMAGER_DOMAIN                     "https://github.com/hooverhigh/hooverhigh-imager"
 
 /* Repository URL */
 #define OSLIST_URL                        "https://server1.hooverhigh.ml/rpi/imaging_utility_list.json"
diff --git a/src/icons/hooverhigh.png b/src/icons/hooverhigh.png
new file mode 100644
index 0000000..f339c19
Binary files /dev/null and b/src/icons/hooverhigh.png differ
diff --git a/src/imagewriter.cpp b/src/imagewriter.cpp
index 4518d1f..3366601 100644
--- a/src/imagewriter.cpp
+++ b/src/imagewriter.cpp
@@ -282,7 +282,7 @@ void ImageWriter::startWrite()
     connect(_thread, SIGNAL(finalizing()), SLOT(onFinalizing()));
     connect(_thread, SIGNAL(preparationStatusUpdate(QString)), SLOT(onPreparationStatusUpdate(QString)));
     _thread->setVerifyEnabled(_verifyEnabled);
-    _thread->setUserAgent(QString("Mozilla/5.0 %1/%2").arg(constantName().toUtf8()).arg(constantVersion()).toUtf8());
+    _thread->setUserAgent(QString("Mozilla/5.0 %1/%2").arg(constantName()).arg(constantVersion()).toUtf8());
     _thread->setImageCustomization(_config, _cmdline, _firstrun, _cloudinit, _cloudinitNetwork, _initFormat);
 
     if (!_expectedHash.isEmpty() && _cachedFileHash != _expectedHash && _cachingEnabled)
diff --git a/src/main.cpp b/src/main.cpp
index 5b55870..31e04f4 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -85,11 +85,11 @@ int main(int argc, char *argv[])
 #else
     QApplication app(argc, argv);
 #endif
-    app.setOrganizationName(imagewriter.constantOrg());
-    app.setOrganizationDomain(imagewriter.constantDomain());
-    app.setApplicationName(imagewriter.constantName());
-    app.setWindowIcon(QIcon(":/icons/rpi-imager.ico"));
     ImageWriter imageWriter;
+    app.setOrganizationName(imageWriter.constantOrg());
+    app.setOrganizationDomain(imageWriter.constantDomain());
+    app.setApplicationName(imageWriter.constantName());
+    app.setWindowIcon(QIcon(":/icons/rpi-imager.ico"));
     NetworkAccessManagerFactory namf;
     QQmlApplicationEngine engine;
     QString customQm;
diff --git a/src/main.qml b/src/main.qml
index e27f511..0b7325d 100644
--- a/src/main.qml
+++ b/src/main.qml
@@ -64,7 +64,7 @@ ApplicationWindow {
                 Layout.fillWidth: true
                 Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
                 fillMode: Image.PreserveAspectFit
-                source: "icons/logo_stacked_imager.png"
+                source: "icons/hooverhigh.png"
                 width: window.width
                 height: window.height/2
             }
@@ -516,13 +516,6 @@ ApplicationWindow {
             name: qsTr("Use custom")
             description: qsTr("Select a custom .img from your computer")
         }
-        
-        ListElement {
-            url: ""
-            icon: "icons/use_custom.png"
-            name: qsTr("Use custom")
-            description: qsTr("Select a custom .img from a URL")
-        }
 
         Component.onCompleted: {
             if (imageWriter.isOnline()) {
@@ -1151,6 +1144,14 @@ ApplicationWindow {
             for (var i in oslist) {
                 osmodel.insert(osmodel.count-2, oslist[i])
             }
+            
+            if (imageWriter.isOnline()) {
+                osmodel.insert(osmodel.count+1, '{
+                "url": "internal://img_url",
+                "icon": "icons/use_custom.png",
+                "name": "Use custom",
+                "description": "Select a custom .img from a URL"
+        }')
 
             if ("imager" in o) {
                 var imager = o["imager"]
diff --git a/src/qml.qrc b/src/qml.qrc
index d29ef7a..ac5c907 100644
--- a/src/qml.qrc
+++ b/src/qml.qrc
@@ -32,6 +32,7 @@
         <file>icons/cat_language_specific_operating_systems.png</file>
         <file>icons/cat_3d_printing.png</file>
         <file>icons/logo_stacked_imager.png</file>
+        <file>icons/hooverhigh.png</file>
         <file>qmlcomponents/ImButton.qml</file>
         <file>qmlcomponents/ImCheckBox.qml</file>
         <file>qmlcomponents/ImRadioButton.qml</file>