diff --git a/.gitignore b/.gitignore
index ee3bed5..f497923 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ build/
 repo/
 app/
 linz/
+.flatpak-state/
diff --git a/files/nz.govt.linz.qgis.svg b/files/nz.govt.linz.qgis.svg
index a82a3be..08058af 100644
--- a/files/nz.govt.linz.qgis.svg
+++ b/files/nz.govt.linz.qgis.svg
@@ -241,7 +241,7 @@
      inkscape:deskcolor="#d1d1d1"
      showgrid="false"
      inkscape:zoom="2.8007812"
-     inkscape:cx="83.548117"
+     inkscape:cx="83.548119"
      inkscape:cy="127.82148"
      inkscape:window-width="2560"
      inkscape:window-height="1300"
@@ -275,7 +275,7 @@
      transform="translate(90.955478,95.821478)"><g
        clip-path="url(#a-1)"
        id="g6318"
-       transform="matrix(2.5395909,0,0,2.5395909,-56.758559,-49.266909)"
+       transform="matrix(2.7505611,0,0,2.7505611,-61.443725,-56.138597)"
        style="display:inline"><path
          d="m 32.717,13.515 c -9.484,9.703 -19.37,33.541 -22.616,49.828 10.834,-1.605 28.726,-1.824 46.71,0.383 2.243,-15.028 7.441,-36.842 15.521,-50.503 a 227.887,227.887 0 0 0 -19.169,-0.82 c -6.831,-0.04 -13.659,0.331 -20.446,1.112 z"
          fill="url(#b)"
diff --git a/modules/Draco.json b/modules/Draco.json
index cbefe05..9cb78b2 100644
--- a/modules/Draco.json
+++ b/modules/Draco.json
@@ -1,5 +1,8 @@
 {
     "name": "Draco",
+    "config-opts": [
+        "-DCMAKE_INSTALL_LIBDIR=lib"
+    ],
     "buildsystem": "cmake-ninja",
     "builddir": true,
     "build-options": {
diff --git a/modules/exiv2.json b/modules/exiv2.json
index 59e7c5d..3ce0412 100644
--- a/modules/exiv2.json
+++ b/modules/exiv2.json
@@ -8,7 +8,9 @@
         "-DCMAKE_BUILD_TYPE=Release",
         "-DEXIV2_BUILD_EXIV2_COMMAND=OFF",
         "-DEXIV2_BUILD_SAMPLES=OFF",
-        "-DEXIV2_ENABLE_INIH=OFF"
+        "-DEXIV2_ENABLE_INIH=OFF",
+        "-DCMAKE_INSTALL_LIBDIR=lib"
+
     ],
     "sources": [
         {
diff --git a/modules/gdal.json b/modules/gdal.json
index ea30ac1..264bff2 100644
--- a/modules/gdal.json
+++ b/modules/gdal.json
@@ -2,6 +2,7 @@
     "name": "gdal",
     "buildsystem": "cmake-ninja",
     "config-opts": [
+        "-DCMAKE_INSTALL_LIBDIR=lib",
         "-DGDAL_USE_EXPAT=ON",
         "-DENABLE_IPO=ON",
         "-DBUILD_PYTHON_BINDINGS=ON",
diff --git a/modules/geographiclib.json b/modules/geographiclib.json
index b413942..e4578af 100644
--- a/modules/geographiclib.json
+++ b/modules/geographiclib.json
@@ -2,7 +2,8 @@
     "name": "geographiclib",
     "buildsystem": "cmake-ninja",
     "config-opts": [
-        "-DCMAKE_BUILD_TYPE=Release"
+        "-DCMAKE_BUILD_TYPE=Release",
+        "-DCMAKE_INSTALL_LIBDIR=lib"
     ],
     "sources": [
         {
diff --git a/modules/geos.json b/modules/geos.json
index 0f3111a..69ac85f 100644
--- a/modules/geos.json
+++ b/modules/geos.json
@@ -1,6 +1,9 @@
 {
     "name": "geos",
     "buildsystem": "cmake-ninja",
+    "config-opts": [
+        "-DCMAKE_INSTALL_LIBDIR=lib"
+    ],
     "sources": [
         {
             "type": "archive",
diff --git a/modules/libzip.json b/modules/libzip.json
index 871b6ac..1c31881 100644
--- a/modules/libzip.json
+++ b/modules/libzip.json
@@ -1,6 +1,9 @@
 {
     "name": "libzip",
-    "buildsystem": "cmake-ninja",
+    "config-opts": [
+        "-DCMAKE_INSTALL_LIBDIR=lib"
+    ],
+	"buildsystem": "cmake-ninja",
     "cleanup": [
         "/bin",
         "/include",
diff --git a/modules/pdal.json b/modules/pdal.json
index 7e75590..755d50d 100644
--- a/modules/pdal.json
+++ b/modules/pdal.json
@@ -3,6 +3,7 @@
     "config-opts": [
         "-DCMAKE_BUILD_TYPE=Release",
         "-DWITH_BACKTRACE=OFF",
+        "-DCMAKE_INSTALL_LIBDIR=lib",
         "-DWITH_TESTS=OFF"
     ],
     "buildsystem": "cmake-ninja",
diff --git a/modules/proj.json b/modules/proj.json
index 87c9bb9..882dcf2 100644
--- a/modules/proj.json
+++ b/modules/proj.json
@@ -2,7 +2,8 @@
     "name": "proj",
     "buildsystem": "cmake-ninja",
     "config-opts": [
-        "-DBUILD_TESTING=OFF"
+        "-DBUILD_TESTING=OFF",
+        "-DCMAKE_INSTALL_LIBDIR=lib"
     ],
     "sources": [
         {
diff --git a/modules/protobuf.json b/modules/protobuf.json
index 4acb208..49fc7f9 100644
--- a/modules/protobuf.json
+++ b/modules/protobuf.json
@@ -5,7 +5,8 @@
         "-DCMAKE_POSITION_INDEPENDENT_CODE=ON",
         "-Dprotobuf_ABSL_PROVIDER=package",
         "-Dprotobuf_BUILD_SHARED_LIBS=ON",
-        "-Dprotobuf_BUILD_TESTS=OFF"
+        "-Dprotobuf_BUILD_TESTS=OFF",
+        "-DCMAKE_INSTALL_LIBDIR=lib"
     ],
     "cleanup": [
         "/bin/protoc*",
diff --git a/modules/qca.json b/modules/qca.json
index a363ee2..af62440 100644
--- a/modules/qca.json
+++ b/modules/qca.json
@@ -3,7 +3,8 @@
     "buildsystem": "cmake-ninja",
     "config-opts": [
         "-DBUILD_TESTS=OFF",
-        "-DBUILD_WITH_QT6=ON"
+        "-DBUILD_WITH_QT6=ON",
+        "-DCMAKE_INSTALL_LIBDIR=lib"
     ],
     "sources": [
         {
diff --git a/modules/spatialindex.json b/modules/spatialindex.json
index 8e229a4..8931399 100644
--- a/modules/spatialindex.json
+++ b/modules/spatialindex.json
@@ -2,7 +2,8 @@
     "name": "spatialindex",
     "buildsystem": "cmake-ninja",
     "config-opts": [
-        "-DBUILD_TESTING=OFF"
+        "-DBUILD_TESTING=OFF",
+        "-DCMAKE_INSTALL_LIBDIR=lib"
     ],
     "sources": [
         {
diff --git a/modules/spatialite.json b/modules/spatialite.json
index 4e29a76..49d884e 100644
--- a/modules/spatialite.json
+++ b/modules/spatialite.json
@@ -52,6 +52,9 @@
         },
         {
             "name": "rttopo",
+            "config-opts": [
+                "--with-geosconfig=/app/bin/geos-config"
+            ],
             "sources": [
                 {
                     "type": "git",
diff --git a/modules/zstd.json b/modules/zstd.json
index 3217212..a4724dc 100644
--- a/modules/zstd.json
+++ b/modules/zstd.json
@@ -2,7 +2,8 @@
     "name": "zstd",
     "buildsystem": "cmake-ninja",
     "config-opts": [
-        "-DCMAKE_BUILD_TYPE=Release"
+        "-DCMAKE_BUILD_TYPE=Release",
+        "-DCMAKE_INSTALL_LIBDIR=lib"
     ],
     "subdir": "build/cmake",
     "sources": [
diff --git a/nz.govt.linz.qgis.json b/nz.govt.linz.qgis.json
index 4085e07..e54849f 100644
--- a/nz.govt.linz.qgis.json
+++ b/nz.govt.linz.qgis.json
@@ -74,6 +74,7 @@
                 }
             ],
             "config-opts": [
+                "-DCMAKE_INSTALL_LIBDIR=lib",
                 "-DBUILD_WITH_QT6=TRUE",
                 "-DENABLE_TESTS=FALSE",
                 "-DWITH_3D=FALSE",
@@ -90,7 +91,7 @@
             ],
             "post-install": [
                 "mv /app/share/applications/org.qgis.qgis.desktop /app/share/applications/nz.govt.linz.qgis.desktop",
-                "NEWNAME=\"LINZ QGIS ($(git rev-parse --short HEAD)) $(git log -1 --format=%cs HEAD)\";sed -i \"s;^Name=.*;Name=$NEWNAME;g\" /app/share/applications/nz.govt.linz.qgis.desktop"
+                "NEWNAME=\"LINZ QGIS ($(git rev-parse --short HEAD)) $(git log -1 --format=%cs HEAD)\"; sed -i \"s;^Name=.*;Name=$NEWNAME;; s;^Icon=.*;Icon=nz.govt.linz.qgis;\" /app/share/applications/nz.govt.linz.qgis.desktop"
             ]
         },
         {