packagechooser: rename PackageModel -> PackageChooiserModel to allow netinstall PackageModel inclusion

clean up a little
fix
2024-01-06 01:43:52 +01:00 · 2024-01-06 01:32:34 +01:00 · 2024-01-06 00:06:37 +01:00 · 2024-01-06 00:04:46 +01:00 · 2024-01-05 23:43:40 +01:00 · 2024-01-05 23:39:35 +01:00
137 changed files with 434 additions and 30833 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -119,19 +119,8 @@ include( CTest )
 # Typically you would use only one branding, since that's
 # the (single) branding for your distro.
 #
-# calamares_add_branding_subdirectory( branding/default NAME default )
-# calamares_add_branding_subdirectory( branding/default-mobile NAME default-mobile )
-# calamares_add_branding_subdirectory( branding/fancy NAME fancy )
-
-# This one has files in subdirectories
-# calamares_add_branding_subdirectory( branding/samegame NAME samegame SUBDIRECTORIES img )
-
-# KaOS branding, with translations, note we can *NAME* something
-# different from the source directory it lives in; this will be installed
-# to a directory called *NAME* though -- and the `branding.desc` must
-# have a *componentName* that matches this *NAME*.
-# calamares_add_branding_subdirectory( branding/kaos_branding NAME kaos )
 calamares_add_branding_subdirectory( branding/artix NAME artix )
+calamares_add_branding_subdirectory( branding/artix-next NAME artix-next )

 ### MODULES
 #
@@ -139,19 +128,8 @@ calamares_add_branding_subdirectory( branding/artix NAME artix )
 #
 set(LIST_SKIPPED_MODULES "")

-# calamares_add_module_subdirectory( modules/freebsddisk LIST_SKIPPED_MODULES )  # C++ viewmodule
-# calamares_add_module_subdirectory( modules/mobile LIST_SKIPPED_MODULES )
-# calamares_add_module_subdirectory( modules/os-freebsd LIST_SKIPPED_MODULES )
-# calamares_add_module_subdirectory( modules/os-nixos LIST_SKIPPED_MODULES )
-# calamares_add_module_subdirectory( modules/refind LIST_SKIPPED_MODULES )
-# calamares_add_module_subdirectory( modules/slowpython LIST_SKIPPED_MODULES )  # Python job
-# calamares_add_module_subdirectory( modules/unpackfsc LIST_SKIPPED_MODULES )
-
 calamares_add_module_subdirectory( modules/basestrap LIST_SKIPPED_MODULES )
 calamares_add_module_subdirectory( modules/services-artix LIST_SKIPPED_MODULES )
-# calamares_add_module_subdirectory( modules/services-runit LIST_SKIPPED_MODULES )
-# calamares_add_module_subdirectory( modules/services-dinit LIST_SKIPPED_MODULES )
-# calamares_add_module_subdirectory( modules/services-s6 LIST_SKIPPED_MODULES )
 calamares_add_module_subdirectory( modules/postcfg LIST_SKIPPED_MODULES )
 calamares_add_module_subdirectory( modules/packagechooser LIST_SKIPPED_MODULES )
 calamares_add_module_subdirectory( modules/packagechooserq LIST_SKIPPED_MODULES )
--- a/branding/artix-next/1.png
+++ b/branding/artix-next/1.png
--- a/branding/artix-next/2.png
+++ b/branding/artix-next/2.png
--- a/branding/artix-next/3.png
+++ b/branding/artix-next/3.png
--- a/branding/artix-next/4.png
+++ b/branding/artix-next/4.png
--- a/branding/artix-next/5.png
+++ b/branding/artix-next/5.png
--- a/branding/artix-next/6.png
+++ b/branding/artix-next/6.png
--- a/branding/artix-next/artix.png
+++ b/branding/artix-next/artix.png
--- a/branding/artix-next/branding.desc
+++ b/branding/artix-next/branding.desc
@@ -0,0 +1,42 @@
+---
+componentName:  artix-next
+
+welcomeStyleCalamares:   false
+
+# Should the welcome image (productWelcome, below) be scaled
+# up beyond its natural size?
+welcomeExpandingLogo:   true
+
+windowExpanding:    normal
+windowSize: 920px,630px
+windowPlacement: center
+
+sidebar: qml,top
+navigation: qml,bottom
+
+strings:
+    productName:         Artix Linux
+    shortProductName:    Artix
+    version:             rolling
+    shortVersion:        rolling
+    versionedName:       Artix Linux "rolling"
+    shortVersionedName:  Artix rolling
+    bootloaderEntryName: Artix
+    productUrl:          https://www.artixlinux.org/
+    supportUrl:          https://github.com/calamares/calamares/issues
+    knownIssuesUrl:      https://calamares.io/about/
+    releaseNotesUrl:     https://calamares.io/about/
+
+images:
+    productLogo:         "artix.png"
+    productIcon:         "artix.png"
+    productWelcome:      "languages.png"
+
+slideshow:               "show.qml"
+slideshowAPI:            1
+
+style:
+    SidebarBackground:        "#292F34"
+    SidebarText:              "#FFFFFF"
+    SidebarTextCurrent:       "#292F34"
+    SidebarBackgroundCurrent: "#16a3f5"
--- a/branding/artix-next/calamares-navigation.qml
+++ b/branding/artix-next/calamares-navigation.qml
@@ -0,0 +1,167 @@
+/* Sample of QML navigation.
+
+   SPDX-FileCopyrightText: 2020 Adriaan de Groot <groot@kde.org>
+   SPDX-License-Identifier: GPL-3.0-or-later
+
+
+   The navigation panel is generally "horizontal" in layout, with
+   buttons for next and previous; this particular one copies
+   the layout and size of the widgets panel.
+*/
+import io.calamares.ui 1.0
+import io.calamares.core 1.0
+
+import QtQuick 2.3
+import QtQuick.Controls 2.10
+import QtQuick.Layouts 1.3
+
+Rectangle {
+    id: navigationBar;
+    color: Branding.styleString( Branding.SidebarBackground );
+    height: 48;
+
+    RowLayout {
+        id: buttonBar
+        anchors.fill: parent;
+
+        Item {
+            Layout.fillHeight: true;
+        }
+
+        Image {
+            id: logo;
+            height: 40;
+            width: height;
+            source: "file:/" + Branding.imagePath(Branding.ProductLogo);
+            sourceSize.width: width;
+            sourceSize.height: height;
+        }
+
+        Item {
+            Layout.fillHeight: true;
+        }
+
+        Rectangle {
+            id: metaArea
+            Layout.fillWidth: true;
+            Layout.topMargin: 3;
+            Layout.bottomMargin: 3;
+            height: 40
+            Layout.alignment: Qt.AlignLeft | Qt.AlignBottom
+            color: Branding.styleString( Branding.SidebarBackground );
+            visible: true;
+
+
+
+            Rectangle {
+                id: aboutArea
+                height: 40
+                width: parent.width / 2;
+                anchors.left: parent.left
+                color: Branding.styleString( mouseAreaAbout.containsMouse ? Branding.SidebarBackgroundCurrent : Branding.SidebarBackground);
+                visible: true;
+
+                MouseArea {
+                    id: mouseAreaAbout
+                    anchors.fill: parent;
+                    cursorShape: Qt.PointingHandCursor
+                    hoverEnabled: true
+                    Text {
+                        anchors.verticalCenter: parent.verticalCenter;
+                        anchors.horizontalCenter: parent.horizontalCenter;
+                        x: parent.x + 4;
+                        text: qsTr("About")
+                        color: Branding.styleString( mouseAreaAbout.containsMouse ? Branding.SidebarTextCurrent : Branding.SidebarBackgroundCurrent );
+                        font.pointSize : 9
+                    }
+
+                    onClicked: debug.about()
+                }
+            }
+
+            Rectangle {
+                id: debugArea
+                height: 40
+                width: parent.width / 2;
+                anchors.right: parent.right
+                color: Branding.styleString( mouseAreaDebug.containsMouse ? Branding.SidebarBackgroundCurrent : Branding.SidebarBackground);
+                visible: debug.enabled
+
+                MouseArea {
+                    id: mouseAreaDebug
+                    anchors.fill: parent;
+                    cursorShape: Qt.PointingHandCursor
+                    hoverEnabled: true
+                    Text {
+                        anchors.verticalCenter: parent.verticalCenter;
+                        anchors.horizontalCenter: parent.horizontalCenter;
+                        x: parent.x + 4;
+                        text: qsTr("Debug")
+                        color: Branding.styleString( mouseAreaDebug.containsMouse ? Branding.SidebarTextCurrent : Branding.SidebarBackgroundCurrent );
+                        font.pointSize : 9
+                    }
+
+                    onClicked: debug.toggle()
+                }
+            }
+        }
+
+        Item
+        {
+            Layout.fillWidth: true;
+        }
+
+        Button
+        {
+            text: ViewManager.backLabel;
+            icon.name: ViewManager.backIcon;
+
+            enabled: ViewManager.backEnabled;
+            visible: ViewManager.backAndNextVisible;
+            onClicked: { ViewManager.back(); }
+        }
+        Button
+        {
+            text: ViewManager.nextLabel;
+            icon.name: ViewManager.nextIcon;
+
+            enabled: ViewManager.nextEnabled;
+            visible: ViewManager.backAndNextVisible;
+            onClicked: { ViewManager.next(); }
+            // This margin goes in the "next" button, because the "quit"
+            // button can vanish and we want to keep the margin to
+            // the next-thing-in-the-navigation-panel around.
+            Layout.rightMargin: 3 * buttonBar.spacing;
+        }
+        Button
+        {
+            Layout.rightMargin: 2 * buttonBar.spacing
+            text: ViewManager.quitLabel;
+            icon.name: ViewManager.quitIcon;
+
+            ToolTip.visible: hovered
+            ToolTip.timeout: 5000
+            ToolTip.delay: 1000
+            ToolTip.text: ViewManager.quitTooltip;
+
+            /*
+             * The ViewManager has settings -- user-controlled via the
+             * branding component, and party based on program state --
+             * whether the quit button should be enabled and visible.
+             *
+             * QML navigation *should* follow this pattern, but can also
+             * add other qualifications. For instance, you may have a
+             * "finished" module that handles quit in its own way, and
+             * want to hide the quit button then. The ViewManager has a
+             * current step and a total count, so compare them:
+             *
+             * visible: ViewManager.quitVisible && ( ViewManager.currentStepIndex < ViewManager.rowCount()-1);
+             */
+            enabled: ViewManager.quitEnabled;
+            visible: ViewManager.quitVisible;
+            onClicked: { ViewManager.quit(); }
+        }
+
+
+    }
+}
--- a/branding/kaos_branding/calamares-sidebar.qml
+++ b/branding/kaos_branding/calamares-sidebar.qml
--- a/branding/kaos_branding/draw-rectangle.svg
+++ b/branding/kaos_branding/draw-rectangle.svg
--- a/branding/kaos_branding/languages.png
+++ b/branding/kaos_branding/languages.png
--- a/branding/kaos_branding/pan-up-symbolic.svg
+++ b/branding/kaos_branding/pan-up-symbolic.svg
--- a/branding/kaos_branding/show.qml
+++ b/branding/kaos_branding/show.qml
@@ -36,7 +36,7 @@ Presentation

        Image {
            id: background
-            source: "1.svg"
+            source: "1.png"
            anchors.fill: parent

            Text {
@@ -45,11 +45,11 @@ Presentation
                anchors.horizontalCenterOffset: -125
                font.pixelSize: parent.width *.015
                color: 'white'
-                text: qsTr("Here the actual install of KaOS will start.<br/>"+
-                    "Use the left <b>mouse button</b> to go to the next slide, right for previous.<br/>"+
-                    "After creating your chosen disk setup in the first 10 % <br/>"+
-                    "the full copying of the ISO will take the longest of this install phase <br/>"+
-                    "and will run until approximately 30%.<br/>")
+                text: qsTr(".<br/>"+
+                    ".<br/>"+
+                    "<br/>"+
+                    "<br/>"+
+                    ".<br/>")
                wrapMode: Text.WordWrap
                width: 500
                horizontalAlignment: Text.AlignLeft
@@ -62,7 +62,7 @@ Presentation

        Image {
            id: background1
-            source: "2.svg"
+            source: "2.png"
            anchors.fill: parent

            Text {
@@ -71,10 +71,10 @@ Presentation
                anchors.horizontalCenterOffset: 250
                font.pixelSize: parent.width *.015
                color: 'white'
-                text: qsTr("After the ISO is copied some 25 post-install modules will run.<br/>"+
-                    "This includes setting user specific options, <br/>"+
-                    "removing Live Session only packages<br/>"+
-                    "and adjusting hardware setup.<br/>")
+                text: qsTr(".<br/>"+
+                    "<br/>"+
+                    "<br/>"+
+                    ".<br/>")
                wrapMode: Text.WordWrap
                width: 450
                horizontalAlignment: Text.AlignLeft
@@ -87,7 +87,7 @@ Presentation

        Image {
            id: background2
-            source: "3.svg"
+            source: "3.png"
            anchors.fill: parent

            Text {
@@ -96,8 +96,8 @@ Presentation
                anchors.horizontalCenterOffset: -100
                font.pixelSize: parent.width *.015
                color: 'white'
-                text: qsTr("The default Office Suite is LibreOffice.<br/>"+
-                    "Calligra is available in the repositories. <br/>")
+                text: qsTr(".<br/>"+
+                    ".<br/>")
                wrapMode: Text.WordWrap
                width: 450
                horizontalAlignment: Text.AlignLeft
@@ -110,7 +110,7 @@ Presentation

        Image {
            id: background3
-            source: "4.svg"
+            source: "4.png"
            anchors.fill: parent

            Text {
@@ -119,9 +119,9 @@ Presentation
                anchors.horizontalCenterOffset: 250
                font.pixelSize: parent.width *.015
                color: 'white'
-                text: qsTr("Qt/KDE specific internet applications include the <br/>"+
-                    "Falkon web-browser and kde-telepathy for <br/>"+
-                    "chat and Instant Messaging. <br/>")
+                text: qsTr("<br/>"+
+                    "<br/>"+
+                    ".<br/>")
                wrapMode: Text.WordWrap
                width: 450
                horizontalAlignment: Text.AlignLeft
@@ -134,7 +134,7 @@ Presentation

        Image {
            id: background4
-            source: "5.svg"
+            source: "5.png"
            anchors.fill: parent

            Text {
@@ -143,7 +143,7 @@ Presentation
                anchors.horizontalCenterOffset: -200
                font.pixelSize: parent.width *.015
                color: 'white'
-                text: qsTr("For package management Octopi is the GUI application.<br/>")
+                text: qsTr(".<br/>")
                wrapMode: Text.WordWrap
                width: 450
                horizontalAlignment: Text.Center
@@ -156,7 +156,7 @@ Presentation

        Image {
            id: background5
-            source: "6.svg"
+            source: "6.png"
            anchors.fill: parent

            Text {
@@ -165,7 +165,7 @@ Presentation
                anchors.horizontalCenterOffset: 250
                font.pixelSize: parent.width *.015
                color: 'white'
-                text: qsTr("May using KaOS be a pleasant experience for you.")
+                text: qsTr(".")
                wrapMode: Text.WordWrap
                width: 450
                horizontalAlignment: Text.Center
--- a/branding/default-mobile/stylesheet.qss
+++ b/branding/default-mobile/stylesheet.qss
@@ -1,5 +1,9 @@
 /*
+ * SPDX-FileCopyrightText: no
+ * SPDX-License-Identifier: CC0-1.0
+ */

+/*
 A branding component can ship a stylesheet (like this one)
 which is applied to parts of the Calamares user-interface.
 In principle, all parts can be styled through CSS.
--- a/branding/default-mobile/branding.desc
+++ b/branding/default-mobile/branding.desc
@@ -1,179 +0,0 @@
-# Product branding information. This influences some global
-# user-visible aspects of Calamares, such as the product
-# name, window behavior, and the slideshow during installation.
-#
-# Additional styling can be done using the stylesheet.qss
-# file, also in the branding directory.
---
-componentName:  default-mobile
-
-# This selects between different welcome texts. When false, uses
-# the traditional "Welcome to the %1 installer.", and when true,
-# uses "Welcome to the Calamares installer for %1." This allows
-# to distinguish this installer from other installers for the
-# same distribution.
-welcomeStyleCalamares:   false
-
-# Should the welcome image (productWelcome, below) be scaled
-# up beyond its natural size? If false, the image does not grow
-# with the window but remains the same size throughout (this
-# may have surprising effects on HiDPI monitors).
-welcomeExpandingLogo:   true
-
-# Size and expansion policy for Calamares.
-#  - "normal" or unset, expand as needed, use *windowSize*
-#  - "fullscreen", start as large as possible, ignore *windowSize*
-#  - "noexpand", don't expand automatically, use *windowSize*
-windowExpanding:    fullscreen
-
-# Size of Calamares window, expressed as w,h. Both w and h
-# may be either pixels (suffix px) or font-units (suffix em).
-#   e.g.    "800px,600px"
-#           "60em,480px"
-# This setting is ignored if "fullscreen" is selected for
-# *windowExpanding*, above. If not set, use constants defined
-# in CalamaresUtilsGui, 800x520.
-windowSize: 800px,520px
-
-# Placement of Calamares window. Either "center" or "free".
-# Whether "center" actually works does depend on the window
-# manager in use (and only makes sense if you're not using
-# *windowExpanding* set to "fullscreen").
-windowPlacement: center
-
-# Kind of sidebar (panel on the left, showing progress).
-#  - "widget" or unset, use traditional sidebar (logo, items)
-#  - "none", hide it entirely
-#  - "qml", use calamares-sidebar.qml from branding folder
-# In addition, you **may** specify a side, separated by a comma,
-# from the kind. Valid sides are:
-#  - "left" (if not specified, uses this)
-#  - "right"
-#  - "top"
-#  - "bottom"
-# For instance, "widget,right" is valid; so is "qml", which defaults
-# to putting the sidebar on the left. Also valid is "qml,top".
-# While "widget,top" is valid, the widgets code is **not** flexible
-# and results will be terrible.
-sidebar: none
-
-# Kind of navigation (button panel on the bottom).
-#  - "widget" or unset, use traditional navigation
-#  - "none", hide it entirely
-#  - "qml", use calamares-navigation.qml from branding folder
-# In addition, you **may** specify a side, separated by a comma,
-# from the kind. The same sides are valid as for *sidebar*,
-# except the default is *bottom*.
-navigation: none
-
-# These are strings shown to the user in the user interface.
-# There is no provision for translating them -- since they
-# are names, the string is included as-is.
-#
-# The four Url strings are the Urls used by the buttons in
-# the welcome screen, and are not shown to the user. Clicking
-# on the "Support" button, for instance, opens the link supportUrl.
-# If a Url is empty, the corresponding button is not shown.
-#
-# bootloaderEntryName is how this installation / distro is named
-# in the boot loader (e.g. in the GRUB menu).
-#
-# These strings support substitution from /etc/os-release
-# if KDE Frameworks 5.58 are available at build-time. When
-# enabled, @{var-name} is replaced by the equivalent value
-# from os-release. All the supported var-names are in all-caps,
-# and are listed on the FreeDesktop.org site,
-#       https://www.freedesktop.org/software/systemd/man/os-release.html
-# Note that ANSI_COLOR and CPE_NAME don't make sense here, and
-# are not supported (the rest are). Remember to quote the string
-# if it contains substitutions, or you'll get YAML exceptions.
-#
-# The *Url* entries are used on the welcome page, and they
-# are visible as buttons there if the corresponding *show* keys
-# are set to "true" (they can also be overridden).
-strings:
-    productName:         "NextGenMobileLinuxDistro"
-    shortProductName:    NextGenMobileLinuxDistro
-
-# These images are loaded from the branding module directory.
-#
-# productBanner is an optional image, which if present, will be shown
-#       on the welcome page of the application, above the welcome text.
-#       It is intended to have a width much greater than height.
-#       It is displayed at 64px height (also on HiDPI).
-#       Recommended size is 64px tall, and up to 460px wide.
-# productIcon is used as the window icon, and will (usually) be used
-#       by the window manager to represent the application. This image
-#       should be square, and may be displayed by the window manager
-#       as small as 16x16 (but possibly larger).
-# productLogo is used as the logo at the top of the left-hand column
-#       which shows the steps to be taken. The image should be square,
-#       and is displayed at 80x80 pixels (also on HiDPI).
-# productWallpaper is an optional image, which if present, will replace
-#       the normal solid background on every page of the application.
-#       It can be any size and proportion,
-#       and will be tiled to fit the entire window.
-#       For a non-tiled wallpaper, the size should be the same as
-#       the overall window, see *windowSize* above (800x520).
-# productWelcome is shown on the welcome page of the application in
-#       the middle of the window, below the welcome text. It can be
-#       any size and proportion, and will be scaled to fit inside
-#       the window. Use `welcomeExpandingLogo` to make it non-scaled.
-#       Recommended size is 320x150.
-#
-# These filenames can also use substitutions from os-release (see above).
-images:
-    # productBanner:       "banner.png"
-    productIcon:         "logo.png"
-    productLogo:         "logo.png"
-    # productWallpaper:    "wallpaper.png"
-    productWelcome:      "logo.png"
-
-# The slideshow is displayed during execution steps (e.g. when the
-# installer is actually writing to disk and doing other slow things).
-#
-# The slideshow can be a QML file (recommended) which can display
-# arbitrary things -- text, images, animations, or even play a game --
-# during the execution step. The QML **is** abruptly stopped when the
-# execution step is done, though, so maybe a game isn't a great idea.
-#
-# The slideshow can also be a sequence of images (not recommended unless
-# you don't want QML at all in your Calamares). The images are displayed
-# at a rate of 1 every 2 seconds during the execution step.
-#
-# To configure a QML file, list a single filename:
-#   slideshow:               "show.qml"
-# To configure images, like the filenames (here, as an inline list):
-#   slideshow: [ "/etc/calamares/slideshow/0.png", "/etc/logo.png" ]
-slideshow:               "show.qml"
-
-# There are two available APIs for a QML slideshow:
-#  - 1 (the default) loads the entire slideshow when the installation-
-#      slideshow page is shown and starts the QML then. The QML
-#      is never stopped (after installation is done, times etc.
-#      continue to fire).
-#  - 2 loads the slideshow on startup and calls onActivate() and
-#      onLeave() in the root object. After the installation is done,
-#      the show is stopped (first by calling onLeave(), then destroying
-#      the QML components).
-#
-# An image slideshow does not need to have the API defined.
-slideshowAPI: 2
-
-
-# Colors for text and background components.
-#
-#  - sidebarBackground is the background of the sidebar
-#  - sidebarText is the (foreground) text color
-#  - sidebarTextHighlight sets the background of the selected (current) step.
-#    Optional, and defaults to the application palette.
-#  - sidebarSelect is the text color of the selected step.
-#
-# These colors can **also** be set through the stylesheet, if the
-# branding component also ships a stylesheet.qss. Then they are
-# the corresponding CSS attributes of #sidebarApp.
-style:
-   sidebarBackground:    "#292F34"
-   sidebarText:          "#FFFFFF"
-   sidebarTextSelect:    "#292F34"
-   sidebarTextHighlight: "#D35400"
--- a/branding/default-mobile/show.qml
+++ b/branding/default-mobile/show.qml
@@ -1,19 +0,0 @@
-/* SPDX-FileCopyrightText: 2020 Oliver Smith <ollieparanoid@postmarketos.org>
- * SPDX-License-Identifier: GPL-3.0-or-later */
-import QtQuick 2.0;
-import calamares.slideshow 1.0;
-
-Presentation
-{
-    id: presentation
-
-    Slide {
-        Image {
-            id: background
-            source: "logo.png"
-            height: 250
-            fillMode: Image.PreserveAspectFit
-            anchors.centerIn: parent
-        }
-    }
-}
--- a/branding/default/branding.desc
+++ b/branding/default/branding.desc
@@ -1,189 +0,0 @@
-# Product branding information. This influences some global
-# user-visible aspects of Calamares, such as the product
-# name, window behavior, and the slideshow during installation.
-#
-# Additional styling can be done using the stylesheet.qss
-# file, also in the branding directory.
---
-componentName:  default
-
-# This selects between different welcome texts. When false, uses
-# the traditional "Welcome to the %1 installer.", and when true,
-# uses "Welcome to the Calamares installer for %1." This allows
-# to distinguish this installer from other installers for the
-# same distribution.
-welcomeStyleCalamares:   false
-
-# Should the welcome image (productWelcome, below) be scaled
-# up beyond its natural size? If false, the image does not grow
-# with the window but remains the same size throughout (this
-# may have surprising effects on HiDPI monitors).
-welcomeExpandingLogo:   true
-
-# Size and expansion policy for Calamares.
-#  - "normal" or unset, expand as needed, use *windowSize*
-#  - "fullscreen", start as large as possible, ignore *windowSize*
-#  - "noexpand", don't expand automatically, use *windowSize*
-windowExpanding:    normal
-
-# Size of Calamares window, expressed as w,h. Both w and h
-# may be either pixels (suffix px) or font-units (suffix em).
-#   e.g.    "800px,600px"
-#           "60em,480px"
-# This setting is ignored if "fullscreen" is selected for
-# *windowExpanding*, above. If not set, use constants defined
-# in CalamaresUtilsGui, 800x520.
-windowSize: 800px,520px
-
-# Placement of Calamares window. Either "center" or "free".
-# Whether "center" actually works does depend on the window
-# manager in use (and only makes sense if you're not using
-# *windowExpanding* set to "fullscreen").
-windowPlacement: center
-
-# Kind of sidebar (panel on the left, showing progress).
-#  - "widget" or unset, use traditional sidebar (logo, items)
-#  - "none", hide it entirely
-#  - "qml", use calamares-sidebar.qml from branding folder
-# In addition, you **may** specify a side, separated by a comma,
-# from the kind. Valid sides are:
-#  - "left" (if not specified, uses this)
-#  - "right"
-#  - "top"
-#  - "bottom"
-# For instance, "widget,right" is valid; so is "qml", which defaults
-# to putting the sidebar on the left. Also valid is "qml,top".
-# While "widget,top" is valid, the widgets code is **not** flexible
-# and results will be terrible.
-sidebar: widget
-
-# Kind of navigation (button panel on the bottom).
-#  - "widget" or unset, use traditional navigation
-#  - "none", hide it entirely
-#  - "qml", use calamares-navigation.qml from branding folder
-# In addition, you **may** specify a side, separated by a comma,
-# from the kind. The same sides are valid as for *sidebar*,
-# except the default is *bottom*.
-navigation: widget
-
-# These are strings shown to the user in the user interface.
-# There is no provision for translating them -- since they
-# are names, the string is included as-is.
-#
-# The four Url strings are the Urls used by the buttons in
-# the welcome screen, and are not shown to the user. Clicking
-# on the "Support" button, for instance, opens the link supportUrl.
-# If a Url is empty, the corresponding button is not shown.
-#
-# bootloaderEntryName is how this installation / distro is named
-# in the boot loader (e.g. in the GRUB menu).
-#
-# These strings support substitution from /etc/os-release
-# if KDE Frameworks 5.58 are available at build-time. When
-# enabled, @{var-name} is replaced by the equivalent value
-# from os-release. All the supported var-names are in all-caps,
-# and are listed on the FreeDesktop.org site,
-#       https://www.freedesktop.org/software/systemd/man/os-release.html
-# Note that ANSI_COLOR and CPE_NAME don't make sense here, and
-# are not supported (the rest are). Remember to quote the string
-# if it contains substitutions, or you'll get YAML exceptions.
-#
-# The *Url* entries are used on the welcome page, and they
-# are visible as buttons there if the corresponding *show* keys
-# are set to "true" (they can also be overridden).
-strings:
-    productName:         "@{NAME}"
-    shortProductName:    Generic
-    version:             2020.2 LTS
-    shortVersion:        2020.2
-    versionedName:       Fancy GNU/Linux 2020.2 LTS "Turgid Tuba"
-    shortVersionedName:  FancyGL 2020.2
-    bootloaderEntryName: FancyGL
-    productUrl:          https://calamares.io/
-    supportUrl:          https://github.com/calamares/calamares/issues
-    knownIssuesUrl:      https://calamares.io/about/
-    releaseNotesUrl:     https://calamares.io/about/
-    donateUrl:           https://kde.org/community/donations/index.php
-
-# These images are loaded from the branding module directory.
-#
-# productBanner is an optional image, which if present, will be shown
-#       on the welcome page of the application, above the welcome text.
-#       It is intended to have a width much greater than height.
-#       It is displayed at 64px height (also on HiDPI).
-#       Recommended size is 64px tall, and up to 460px wide.
-# productIcon is used as the window icon, and will (usually) be used
-#       by the window manager to represent the application. This image
-#       should be square, and may be displayed by the window manager
-#       as small as 16x16 (but possibly larger).
-# productLogo is used as the logo at the top of the left-hand column
-#       which shows the steps to be taken. The image should be square,
-#       and is displayed at 80x80 pixels (also on HiDPI).
-# productWallpaper is an optional image, which if present, will replace
-#       the normal solid background on every page of the application.
-#       It can be any size and proportion,
-#       and will be tiled to fit the entire window.
-#       For a non-tiled wallpaper, the size should be the same as
-#       the overall window, see *windowSize* above (800x520).
-# productWelcome is shown on the welcome page of the application in
-#       the middle of the window, below the welcome text. It can be
-#       any size and proportion, and will be scaled to fit inside
-#       the window. Use `welcomeExpandingLogo` to make it non-scaled.
-#       Recommended size is 320x150.
-#
-# These filenames can also use substitutions from os-release (see above).
-images:
-    # productBanner:       "banner.png"
-    productIcon:         "squid.png"
-    productLogo:         "squid.png"
-    # productWallpaper:    "wallpaper.png"
-    productWelcome:      "languages.png"
-
-# The slideshow is displayed during execution steps (e.g. when the
-# installer is actually writing to disk and doing other slow things).
-#
-# The slideshow can be a QML file (recommended) which can display
-# arbitrary things -- text, images, animations, or even play a game --
-# during the execution step. The QML **is** abruptly stopped when the
-# execution step is done, though, so maybe a game isn't a great idea.
-#
-# The slideshow can also be a sequence of images (not recommended unless
-# you don't want QML at all in your Calamares). The images are displayed
-# at a rate of 1 every 2 seconds during the execution step.
-#
-# To configure a QML file, list a single filename:
-#   slideshow:               "show.qml"
-# To configure images, like the filenames (here, as an inline list):
-#   slideshow: [ "/etc/calamares/slideshow/0.png", "/etc/logo.png" ]
-slideshow:               "show.qml"
-
-# There are two available APIs for a QML slideshow:
-#  - 1 (the default) loads the entire slideshow when the installation-
-#      slideshow page is shown and starts the QML then. The QML
-#      is never stopped (after installation is done, times etc.
-#      continue to fire).
-#  - 2 loads the slideshow on startup and calls onActivate() and
-#      onLeave() in the root object. After the installation is done,
-#      the show is stopped (first by calling onLeave(), then destroying
-#      the QML components).
-#
-# An image slideshow does not need to have the API defined.
-slideshowAPI: 2
-
-
-# Colors for text and background components.
-#
-#  - sidebarBackground is the background of the sidebar
-#  - sidebarText is the (foreground) text color
-#  - sidebarTextHighlight sets the background of the selected (current) step.
-#    Optional, and defaults to the application palette.
-#  - sidebarSelect is the text color of the selected step.
-#
-# These colors can **also** be set through the stylesheet, if the
-# branding component also ships a stylesheet.qss. Then they are
-# the corresponding CSS attributes of #sidebarApp.
-style:
-   sidebarBackground:    "#292F34"
-   sidebarText:          "#FFFFFF"
-   sidebarTextSelect:    "#292F34"
-   sidebarTextHighlight: "#D35400"
--- a/branding/default/languages.png
+++ b/branding/default/languages.png
--- a/branding/default/show.qml
+++ b/branding/default/show.qml
@@ -1,66 +0,0 @@
-/* === This file is part of Calamares - <https://github.com/calamares> ===
- *
- *   Copyright 2015, Teo Mrnjavac <teo@kde.org>
- *
- *   Calamares is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   Calamares is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.0;
-import calamares.slideshow 1.0;
-
-Presentation
-{
-    id: presentation
-
-    Timer {
-        id: advanceTimer
-        interval: 5000
-        running: false
-        repeat: true
-        onTriggered: presentation.goToNextSlide()
-    }
-    
-    Slide {
-
-        Image {
-            id: background
-            source: "squid.png"
-            width: 200; height: 200
-            fillMode: Image.PreserveAspectFit
-            anchors.centerIn: parent
-        }
-        Text {
-            anchors.horizontalCenter: background.horizontalCenter
-            anchors.top: background.bottom
-            text: "This is a customizable QML slideshow.<br/>"+
-                  "Distributions should provide their own slideshow and list it in <br/>"+
-                  "their custom branding.desc file.<br/>"+
-                  "To create a Calamares presentation in QML, import calamares.slideshow,<br/>"+
-                  "define a Presentation element with as many Slide elements as needed."
-            wrapMode: Text.WordWrap
-            width: presentation.width
-            horizontalAlignment: Text.Center
-        }
-    }
-
-    Slide {
-        centeredText: "This is a second Slide element."
-    }
-
-    Slide {
-        centeredText: "This is a third Slide element."
-    }
-
-    Component.onCompleted: advanceTimer.running = true
-}
--- a/branding/default/squid.png
+++ b/branding/default/squid.png
--- a/branding/fancy/branding.desc
+++ b/branding/fancy/branding.desc
@@ -1,33 +0,0 @@
---
-componentName:  fancy
-
-welcomeStyleCalamares:   false
-
-strings:
-    productName:         Fancy GNU/Linux
-    shortProductName:    Fancy
-    version:             2018.3 LTS
-    shortVersion:        2018.3
-    versionedName:       Fancy GNU/Linux 2018.3 LTS "Terrible Tubas"
-    shortVersionedName:  Fancy 2018.3
-    bootloaderEntryName: Fancy
-    productUrl:          https://calamares.io/
-    supportUrl:          https://github.com/calamares/calamares/issues
-    knownIssuesUrl:      https://calamares.io/about/
-    releaseNotesUrl:     https://calamares.io/about/
-
-welcomeExpandingLogo:   true
-
-images:
-    productLogo:         "squid.png"
-    productIcon:         "squid.png"
-    productWelcome:      "languages.png"
-
-slideshow:               "show.qml"
-slideshowAPI:            1
-
-style:
-   sidebarBackground:    "#392F34"
-   sidebarText:          "#eFFFFF"
-   sidebarTextSelect:    "#392F34"
-   sidebarTextHighlight: "#c35400"
--- a/branding/fancy/go-next.svgz
+++ b/branding/fancy/go-next.svgz
--- a/branding/fancy/go-previous.svgz
+++ b/branding/fancy/go-previous.svgz
--- a/branding/fancy/lang/calamares-fancy_en.ts
+++ b/branding/fancy/lang/calamares-fancy_en.ts
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.1" language="en">
-<context>
-    <name>show</name>
-    <message>
-        <location filename="../src/branding/fancy/show.qml" line="59"/>
-        <location filename="../src/branding/fancy/show.qml" line="108"/>
-        <source>This is a customizable QML slideshow.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/branding/fancy/show.qml" line="71"/>
-        <location filename="../src/branding/fancy/show.qml" line="107"/>
-        <source>Welcome to Fancy GNU/Linux.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/branding/fancy/show.qml" line="72"/>
-        <location filename="../src/branding/fancy/show.qml" line="99"/>
-        <source>This is example branding for your GNU/Linux distribution. Long texts in the slideshow are translated and word-wrapped appropriately. Calamares is a distribution-independent installer framework. </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/branding/fancy/show.qml" line="78"/>
-        <location filename="../src/branding/fancy/show.qml" line="109"/>
-        <source>This is a third Slide element.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/branding/fancy/show.qml" line="94"/>
-        <source>This is a fourth Slide element.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/branding/fancy/show.qml" line="98"/>
-        <location filename="../src/branding/fancy/show.qml" line="105"/>
-        <source>Slide number five</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
--- a/branding/fancy/lang/calamares-fancy_nl.ts
+++ b/branding/fancy/lang/calamares-fancy_nl.ts
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.1" language="en">
-<context>
-    <name>show</name>
-    <message>
-        <location filename="../src/branding/fancy/show.qml" line="59"/>
-        <location filename="../src/branding/fancy/show.qml" line="108"/>
-        <source>This is a customizable QML slideshow.</source>
-        <translation>Dit is een zelf-aan-te-passen QML presentatie.</translation>
-    </message>
-    <message>
-        <location filename="../src/branding/fancy/show.qml" line="71"/>
-        <location filename="../src/branding/fancy/show.qml" line="107"/>
-        <source>Welcome to Fancy GNU/Linux.</source>
-        <translation>Welkom bij Fancy GNU/Linux.</translation>
-    </message>
-    <message>
-        <location filename="../src/branding/fancy/show.qml" line="72"/>
-        <location filename="../src/branding/fancy/show.qml" line="99"/>
-        <source>This is example branding for your GNU/Linux distribution. Long texts in the slideshow are translated and word-wrapped appropriately. Calamares is a distribution-independent installer framework. </source>
-        <translation>Dit is voorbeeld merk-materiaal voor uw GNU/Linux distributie. Lange teksten in de presentatie kunnen automatisch worden ge-layout. Calamares is een distributie-onafhankelijke installatie raamwerk.</translation>
-    </message>
-    <message>
-        <location filename="../src/branding/fancy/show.qml" line="78"/>
-        <location filename="../src/branding/fancy/show.qml" line="109"/>
-        <source>This is a third Slide element.</source>
-        <translation>Dit is de derde slide.</translation>
-    </message>
-    <message>
-        <location filename="../src/branding/fancy/show.qml" line="94"/>
-        <source>This is a fourth Slide element.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/branding/fancy/show.qml" line="98"/>
-        <location filename="../src/branding/fancy/show.qml" line="105"/>
-        <source>Slide number five</source>
-        <translation>Slide nummer vijf</translation>
-    </message>
-</context>
-</TS>
--- a/branding/fancy/languages.png
+++ b/branding/fancy/languages.png
--- a/branding/fancy/show.qml
+++ b/branding/fancy/show.qml
@@ -1,112 +0,0 @@
-/* === This file is part of Calamares - <https://github.com/calamares> ===
- *
- *   Copyright 2015, Teo Mrnjavac <teo@kde.org>
- *   Copyright 2018, Adriaan de Groot <groot@kde.org>
- *
- *   Calamares is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   Calamares is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.5;
-import calamares.slideshow 1.0;
-
-Presentation
-{
-    id: presentation
-
-    mouseNavigation: false /* Only the fwd/back buttons */
-    loopSlides: false
-    
-    BackButton {
-        width: 60
-        height: 60
-        source: "go-previous.svgz"
-    }
-    
-    ForwardButton {
-        width: 60
-        height: 60
-        source: "go-next.svgz"
-    }
-
-    SlideCounter {}
-    
-    Slide {
-        /* This first slide ignores the "normal" slide layout and places
-         * an image and text by itself. The anchors need to be connected
-         * to place the items properly.
-         */
-        Image {
-            id: background1  // Must be unique
-            source: "squid.png"
-            width: 200; height: 200
-            fillMode: Image.PreserveAspectFit
-            anchors.centerIn: parent
-        }
-        Text {
-            anchors.horizontalCenter: background1.horizontalCenter
-            anchors.top: background1.bottom
-            text: qsTr("This is a customizable QML slideshow.")
-            wrapMode: Text.WordWrap
-            width: presentation.width
-            horizontalAlignment: Text.Center
-        }
-    }
-
-    Slide {
-        /* Make this one narrower to prevent overlap of wide text with nav buttons */
-        width: parent.width * 0.9 - 120
-        x: parent.width * 0.05 + 60
-        /* For just a slide with text, things can be simplified using properties */
-        title: qsTr("Welcome to Fancy GNU/Linux.")
-        centeredText: qsTr("This is example branding for your GNU/Linux distribution. " +
-                "Long texts in the slideshow are translated and word-wrapped appropriately. " +
-                "Calamares is a distribution-independent installer framework. ")
-    }
-
-    Slide {
-        centeredText: qsTr("This is a third Slide element.")
-    }
-
-    Slide {
-        /* Note that these overlap because both are centered. The z-order puts the background 
-         * in back. While you can use the properties of the Slide, it's not easy to get at
-         * the anchors of the items.
-         */
-        Image {
-            id: background4
-            source: "squid4.png"
-            width: 200; height: 200
-            fillMode: Image.PreserveAspectFit
-            anchors.centerIn: parent
-            z: -1
-        }
-        centeredText: qsTr("This is a fourth Slide element.")
-    }
-    
-    Slide {
-        title: qsTr("Slide number five")
-        writeInText: qsTr("This is example branding for your GNU/Linux distribution. " +
-                "Long texts in the slideshow are translated and word-wrapped appropriately. " +
-                "Calamares is a distribution-independent installer framework. ")
-    }
-    
-    Slide {
-        title: qsTr("Slide number five")
-        content: [ 
-            qsTr("Welcome to Fancy GNU/Linux."), 
-            qsTr("This is a customizable QML slideshow."),
-            qsTr("This is a third Slide element.")
-            ]
-    }
-}
--- a/branding/fancy/squid.png
+++ b/branding/fancy/squid.png
--- a/branding/fancy/squid2.png
+++ b/branding/fancy/squid2.png
--- a/branding/fancy/squid3.png
+++ b/branding/fancy/squid3.png
--- a/branding/fancy/squid4.png
+++ b/branding/fancy/squid4.png
--- a/branding/image-slideshow/ImageSlide.qml
+++ b/branding/image-slideshow/ImageSlide.qml
@@ -1,64 +0,0 @@
-/* === This file is part of Calamares Extensions - <http://github.com/calamares-extensions> ===
- *
- * SPDX-FileCopyrightText: 2021 Adriaan de Groot <groot@kde.org>
- * SPDX-License-Identifier: BSD-2-Clause
- */
-
-/* An *ImageSlide* is a *Slide* (it offers the API that *Presentation*
- * expects) while displaying only a single image. This is useful
- * for presentations that are all images, with no interaction or text.
- */
-
-import QtQuick 2.5
-
-/* To use an *ImageSlide*, instantiate it inside your *Presentation*
- * and set the *src* property to a path to an image file in a supported
- * format. Relative paths are ok.
- */
-Item {
-    id: imageslide
-
-    /* Slides should be non-visible at the start; the *Presentation*
-     * handles visibility (so that one slide at a time is visible).
-     */
-    visible: false
-    /* Make this item fill up the parent, so that alignment of the
-     * image (below) works out to "middle of the parent".
-     */
-    anchors.fill: parent
-
-    /* The *Presentation* manages visibility of children that have
-     * attribute *isSlide* and *isSlide* is set to *true*. Other
-     * children are ignored, so we need to set this so that the
-     * *ImageSlide* elements are treated like slides.
-     */
-    property bool isSlide: true;
-    /* The *Presentation* allows slides to have notes, so just leave
-     * an empty string here.
-     */
-    property string notes;
-
-
-    /* This is the important property for *ImageSlide*: the path to the
-     * image to display. When instantiating *ImageSlide*, set this for
-     * each instance. Relative paths are ok.
-     */
-    property string src;
-
-    /* The image itself. It has fixed sizes (300x150px). You could set
-     * an aspect ratio here (e.g. `height: width / 2`) as well.
-     *
-     * This binds the image source (filename) to the string *src*
-     * in the *ImageSlide* element, for convenience in setting things
-     * up in the overall slideshow. If you want to make width and
-     * height configurable, add a property above and then bind to
-     * them from the Image element.
-     */
-    Image {
-        id: image
-        source: src
-        width: 300
-        height: 150
-        anchors.centerIn: parent
-    }
-}
--- a/branding/image-slideshow/branding.desc
+++ b/branding/image-slideshow/branding.desc
@@ -1,40 +0,0 @@
-# SPDX-FileCopyrightText: 2021 Adriaan de Groot <groot@kde.org>
-# SPDX-License-Identifier: BSD-2-Clause
---
-componentName:  default
-# image-slideshow
-
-# Branding must define some strings for the welcome page,
-# even though this example is about the slideshow, not the rest.
-strings:
-    productName:         Mirror Linux
-    shortProductName:    Mirror
-    version:
-    shortVersion:
-    versionedName:       Mirror Linux 1.0
-    shortVersionedName:  Mirror 1.0
-    bootloaderEntryName: Mirror
-
-# These images do not exist in this branding example.
-images:
-    productLogo:         "logo.png"
-    productIcon:         "logo.png"
-    productWelcome:      "languages.png"
-
-# Dark-mode for Calamares. The slideshow can access these color values
-# through the Branding object which is always available to QML inside Calamares.
-style:
-   sidebarBackground:    "#36393e"
-   sidebarText:          "#efefef"
-   sidebarTextSelect:    "#2eb69b"
-   sidebarTextHighlight: "#313338"
-
-# The actual slideshow. API version 2 means that the QML is loaded at
-# startup. This is **slightly** slower at startup, but means that by
-# the time we reach the slideshow, it is loaded and ready-to-go.
-#
-# A v2 slideshow **may** have an onActivate() and onLeave() function,
-# although Calamares will complain if it does not.
-slideshow:               "show.qml"
-slideshowAPI:            2
-
--- a/branding/image-slideshow/show.qml
+++ b/branding/image-slideshow/show.qml
@@ -1,103 +0,0 @@
-/* === This file is part of Calamares Extensions - <http://github.com/calamares-extensions> ===
- *
- * SPDX-FileCopyrightText: 2021 Adriaan de Groot <groot@kde.org>
- * SPDX-License-Identifier: BSD-2-Clause
- */
-
-/* This is a simple slideshow for use during the *exec* phase of
- * installation, that displays a handful of slides. It uses
- * the *Presentation* QML components -- this allows, for instance,
- * notes to be added to slides, and for arrow navigation to be
- * used. But at its core it's just a bunch of images, repeating.
- *
- * For this kind of limited functionality, it may be better to
- * use the "plain images" slideshow format in Calamares, although
- * then you don't have any say in how things are animated.
- *
- * This slideshow is written for *slideshowAPI* version 1, so in
- * `branding.desc` set that appropriately.
- */
-
-
-import QtQuick 2.0  // Basic QML
-import calamares.slideshow 1.0  // Calamares slideshow: Presentation
-import io.calamares.ui 1.0  // Calamares internals: Branding
-
-/* *Presentation* comes from the pre-installed calamares.slideshow
- * that comes with Calamares itself. See `Presentation.qml` in the
- * Calamares repository for details and documentation.
- *
- * The important parts of presentation are:
- *  - it has a property *activatedInCalamares* which is set to *true*
- *    when the slideshow becomes visible, *false* afterwards.
- *  - it expects one or more children with a property *isSlide*
- *    set to *true*.
- *  - it has a function *goToNextSlide()* to do just that (where
- *    "slides" is the sequence of children that have property
- *    *isSlide* set to *true*.
- *
- */
-Presentation
-{
-    id: presentation
-
-    /* This timer ticks once per second (1000ms, set in *interval*)
-     * and calls *goToNextSlide()* each time. Note that it needs
-     * to know the *id* of the presentation, so keep *id* (above)
-     * matched with the function call.
-     *
-     * The timer starts when the presentation is activated; you could
-     * also set *running* to true, but that might cost extra resources.
-     */
-    Timer {
-        interval: 1000
-        running: presentation.activatedInCalamares
-        repeat: true
-        onTriggered: presentation.goToNextSlide()
-    }
-
-    /* These functions are called when the presentation starts and
-     * ends, respectively. They could be used to start the timer,
-     * but that is done automatically through *activatedInCalamares*,
-     * so there's nothing **to** do.
-     *
-     * Leaving these functions out is fine, although Calamares will
-     * complain that they are missing, then.
-     */
-    function onActivate() { }
-    function onLeave() { }
-
-
-    /* A presentation is an Item: it has no visual appearance at all.
-     * Give it a background, which fills the whole area of the presentation.
-     * Setting *z* to a low value places this rectangle **behind** other
-     * things in the presentation -- which is correct for a background.
-     *
-     * This uses the background set in the styles section of `branding.desc`.
-     */
-    Rectangle {
-        id: mybackground
-        anchors.fill: parent
-        color: Branding.styleString(Branding.SidebarBackground)
-        z: -1
-    }
-
-    /* The *ImageSlide* is a component unique to this branding directory.
-     * The QML file `ImageSlide.qml` can be stored alongside `show.qml`
-     * and it will be loaded on-demand. See the documentation in that
-     * file for details, but it comes down to this: for each *ImageSlide*,
-     * set *src* to a suitable value (an image path in this directory)
-     * and that will be displayed.
-     */
-    ImageSlide {
-        src: "slide1.png"
-    }
-
-    ImageSlide {
-        src: "slide2.png"
-    }
-
-    ImageSlide {
-        src: "slide3.png"
-    }
-}
--- a/branding/image-slideshow/slide1.png
+++ b/branding/image-slideshow/slide1.png
--- a/branding/image-slideshow/slide2.png
+++ b/branding/image-slideshow/slide2.png
--- a/branding/image-slideshow/slide3.png
+++ b/branding/image-slideshow/slide3.png
--- a/branding/kaos_branding/1.svg
+++ b/branding/kaos_branding/1.svg
@@ -1,557 +0,0 @@
-<?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"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="1280"
-   height="800"
-   viewBox="0 0 1280 800.00002"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="1.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4749">
-      <stop
-         style="stop-color:#6a7b8d;stop-opacity:1;"
-         offset="0"
-         id="stop4751" />
-      <stop
-         style="stop-color:#6a7b8d;stop-opacity:0;"
-         offset="1"
-         id="stop4753" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4749"
-       id="linearGradient4755"
-       x1="328.04813"
-       y1="339.76974"
-       x2="637.28412"
-       y2="4.0816321"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.9957355,0,0,2.0029772,-1.276584,-2.4767375)" />
-    <clipPath
-       id="clipPath16"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path18"
-         d="M 0,792 612,792 612,0 0,0 0,792 Z" />
-    </clipPath>
-    <clipPath
-       id="clipPath24"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path26"
-         d="m 558.893,526.62 37.604,0 0,-14.904 -37.604,0 0,14.904 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath28"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         style="clip-rule:evenodd"
-         inkscape:connector-curvature="0"
-         id="path30"
-         d="m 596.497,511.716 c -6.962,6.661 -20.973,17.643 -31.626,14.277 -5.954,-1.882 -8.839,-7.319 -2.055,-7.441 13.837,-0.25 20.622,0.731 33.681,-6.836" />
-    </clipPath>
-    <clipPath
-       id="clipPath58"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path60"
-         d="m 558.323,524.527 38.192,0 0,-12.815 -38.192,0 0,12.815 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath62"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         style="clip-rule:evenodd"
-         inkscape:connector-curvature="0"
-         id="path64"
-         d="m 596.515,511.712 c -7.452,6.109 -22.261,15.989 -32.626,11.818 -5.793,-2.332 -8.254,-7.974 -1.48,-7.577 13.816,0.809 20.506,2.306 34.106,-4.241" />
-    </clipPath>
-    <clipPath
-       id="clipPath92"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path94"
-         d="m 556.75,546.201 27.01,0 0,-29.575 -27.01,0 0,29.575 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath96"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         style="clip-rule:evenodd"
-         inkscape:connector-curvature="0"
-         id="path98"
-         d="m 556.75,516.626 c 2.252,9.368 8.092,26.186 18.874,29.118 6.024,1.639 11.393,-1.373 5.753,-5.147 -11.502,-7.696 -17.738,-10.542 -24.627,-23.971" />
-    </clipPath>
-    <clipPath
-       id="clipPath126"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path128"
-         d="m 556.739,544.61 28.84,0 0,-27.979 -28.84,0 0,27.979 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath160"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path162"
-         d="m 548.843,543.235 11.247,0 0,-38.495 -11.247,0 0,38.495 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath194"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path196"
-         d="m 547.048,542.875 13.046,0 0,-38.137 -13.046,0 0,38.137 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath16-6"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path18-3"
-         d="m 311.058,513.261 c -5.352,-35.909 119.201,-29.157 70.17,-108.22 l 0,0 c 15.4,24.832 72.067,107.631 78.014,128.069 l 0,0 c 6.969,23.957 -13.916,33.881 -42.06,33.879 l 0,0 c -42.481,-0.003 -101.489,-22.62 -106.124,-53.728" />
-    </clipPath>
-    <clipPath
-       id="clipPath36"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path38"
-         d="m 195.725,405.366 c -17.489,-60.118 140.478,-31.868 148.184,19.849 l 0,0 c 5.351,35.909 -119.202,29.156 -70.17,108.22 l 0,0 c -15.4,-24.832 -72.068,-107.631 -78.014,-128.069" />
-    </clipPath>
-    <clipPath
-       id="clipPath16-0"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path18-1"
-         d="M 0,792 612,792 612,0 0,0 0,792 Z" />
-    </clipPath>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.69044441"
-     inkscape:cx="534.4714"
-     inkscape:cy="272.9935"
-     inkscape:document-units="px"
-     inkscape:current-layer="svg2"
-     showgrid="false"
-     units="px"
-     inkscape:snap-bbox="true"
-     inkscape:snap-nodes="true"
-     inkscape:snap-global="true"
-     inkscape:snap-path-clip="true"
-     inkscape:snap-path-mask="true"
-     inkscape:window-width="1830"
-     inkscape:window-height="1056"
-     inkscape:window-x="642"
-     inkscape:window-y="105"
-     inkscape:window-maximized="0"
-     inkscape:snap-others="false"
-     inkscape:bbox-paths="true"
-     inkscape:bbox-nodes="false" />
-  <metadata
-     id="metadata7">
-    <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
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-252.36216)" />
-  <rect
-     style="opacity:0.95;fill:url(#linearGradient4755);fill-opacity:1"
-     id="rect4745"
-     width="1277.2708"
-     height="801.19086"
-     x="1.2820513"
-     y="0.091166265" />
-  <g
-     id="g3732"
-     transform="matrix(0.37715146,0,0,0.37715146,942.21624,209.16251)">
-    <g
-       id="layer1-1"
-       inkscape:label="Layer 1" />
-    <g
-       id="g12"
-       transform="matrix(11.55905,0,0,-11.55905,-6222.3344,6553.8075)">
-      <g
-         clip-path="url(#clipPath16)"
-         id="g14">
-        <g
-           id="g20">
-          <g
-             id="g22" />
-          <g
-             id="g40">
-            <g
-               id="g42"
-               clip-path="url(#clipPath24)">
-              <g
-                 id="g44">
-                <g
-                   id="g46"
-                   clip-path="url(#clipPath28)">
-                  <g
-                     id="g48">
-                    <g
-                       id="g50">
-                      <path
-                         inkscape:connector-curvature="0"
-                         id="path52"
-                         style="fill:#3498db;fill-rule:evenodd;stroke:none"
-                         d="m 596.497,511.716 c -6.962,6.661 -20.973,17.643 -31.626,14.277 -5.954,-1.882 -8.839,-7.319 -2.055,-7.441 13.837,-0.25 20.622,0.731 33.681,-6.836" />
-                    </g>
-                  </g>
-                </g>
-              </g>
-            </g>
-          </g>
-        </g>
-        <g
-           id="g54">
-          <g
-             id="g56" />
-          <g
-             id="g74">
-            <g
-               id="g76"
-               clip-path="url(#clipPath58)">
-              <g
-                 id="g78">
-                <g
-                   id="g80"
-                   clip-path="url(#clipPath62)">
-                  <g
-                     id="g82">
-                    <g
-                       id="g84">
-                      <path
-                         inkscape:connector-curvature="0"
-                         id="path86"
-                         style="fill:#75b9e7;fill-rule:evenodd;stroke:none"
-                         d="m 596.515,511.712 c -7.452,6.109 -22.261,15.989 -32.626,11.818 -5.793,-2.332 -8.254,-7.974 -1.48,-7.577 13.816,0.809 20.506,2.306 34.106,-4.241" />
-                    </g>
-                  </g>
-                </g>
-              </g>
-            </g>
-          </g>
-        </g>
-        <g
-           id="g88">
-          <g
-             id="g90" />
-          <g
-             id="g108">
-            <g
-               id="g110"
-               clip-path="url(#clipPath92)">
-              <g
-                 id="g112">
-                <g
-                   id="g114"
-                   clip-path="url(#clipPath96)">
-                  <g
-                     id="g116">
-                    <g
-                       id="g118">
-                      <path
-                         inkscape:connector-curvature="0"
-                         id="path120"
-                         style="fill:#1d6fa5;fill-rule:evenodd;stroke:none"
-                         d="m 556.75,516.626 c 2.252,9.368 8.092,26.186 18.874,29.118 6.024,1.639 11.393,-1.373 5.753,-5.147 -11.502,-7.696 -17.738,-10.542 -24.627,-23.971" />
-                    </g>
-                  </g>
-                </g>
-              </g>
-            </g>
-          </g>
-        </g>
-        <g
-           id="g122">
-          <g
-             id="g124" />
-          <g
-             id="g142">
-            <g
-               id="g144"
-               clip-path="url(#clipPath126)">
-              <g
-                 id="g146">
-                <g
-                   id="g148">
-                  <g
-                     id="g150">
-                    <g
-                       id="g152">
-                      <path
-                         inkscape:connector-curvature="0"
-                         id="path154"
-                         style="fill:#3498db;fill-rule:evenodd;stroke:none"
-                         d="m 556.739,516.631 c 2.902,9.188 9.905,25.556 20.865,27.727 6.125,1.213 11.269,-2.167 5.379,-5.537 -12.011,-6.873 -18.432,-9.276 -26.244,-22.19" />
-                    </g>
-                  </g>
-                </g>
-              </g>
-            </g>
-          </g>
-        </g>
-        <g
-           id="g156">
-          <g
-             id="g158" />
-          <g
-             id="g176">
-            <g
-               id="g178"
-               clip-path="url(#clipPath160)">
-              <g
-                 id="g180">
-                <g
-                   id="g182">
-                  <g
-                     id="g184">
-                    <g
-                       id="g186">
-                      <path
-                         inkscape:connector-curvature="0"
-                         id="path188"
-                         style="fill:#1d6fa5;fill-rule:evenodd;stroke:none"
-                         d="m 560.09,504.74 c -5.666,7.793 -14.668,23.152 -9.902,33.257 2.664,5.648 8.439,7.776 7.65,1.037 -1.61,-13.745 -3.493,-20.337 2.252,-34.294" />
-                    </g>
-                  </g>
-                </g>
-              </g>
-            </g>
-          </g>
-        </g>
-        <g
-           id="g190">
-          <g
-             id="g192" />
-          <g
-             id="g210">
-            <g
-               id="g212"
-               clip-path="url(#clipPath194)">
-              <g
-                 id="g214">
-                <g
-                   id="g216">
-                  <g
-                     id="g218">
-                    <g
-                       id="g220">
-                      <path
-                         inkscape:connector-curvature="0"
-                         id="path222"
-                         style="fill:#124364;fill-rule:evenodd;stroke:none"
-                         d="m 560.094,504.738 c -6.172,7.399 -16.178,22.124 -12.094,32.524 2.281,5.812 7.902,8.321 7.563,1.544 -0.691,-13.823 -2.131,-20.525 4.531,-34.068" />
-                    </g>
-                  </g>
-                </g>
-              </g>
-            </g>
-          </g>
-        </g>
-      </g>
-    </g>
-    <g
-       transform="matrix(0.82695969,0,0,-0.82695969,215.592,1022.5325)"
-       inkscape:label="s_letter_alphabet_vector_logo_inspiration"
-       id="g10">
-      <g
-         id="g12-6">
-        <g
-           clip-path="url(#clipPath16-6)"
-           id="g14-1">
-          <g
-             id="g20-0">
-            <g
-               id="g22-9">
-              <path
-                 inkscape:connector-curvature="0"
-                 id="path30-6"
-                 style="fill:#1d6fa5;stroke:none"
-                 d="m 311.058,513.261 c -5.352,-35.909 119.201,-29.157 70.17,-108.22 l 0,0 c 15.4,24.832 72.067,107.631 78.014,128.069 l 0,0 c 6.969,23.957 -13.916,33.881 -42.06,33.879 l 0,0 c -42.481,-0.003 -101.489,-22.62 -106.124,-53.728" />
-            </g>
-          </g>
-        </g>
-      </g>
-      <g
-         id="g32-4">
-        <g
-           clip-path="url(#clipPath36)"
-           id="g34">
-          <g
-             id="g40-0">
-            <g
-               id="g42-9">
-              <path
-                 inkscape:connector-curvature="0"
-                 id="path50"
-                 style="fill:#1d6fa5;stroke:none"
-                 d="m 195.725,405.366 c -17.489,-60.118 140.478,-31.868 148.184,19.849 l 0,0 c 5.351,35.909 -119.202,29.156 -70.17,108.22 l 0,0 c -15.4,-24.832 -72.068,-107.631 -78.014,-128.069" />
-            </g>
-          </g>
-        </g>
-      </g>
-    </g>
-    <g
-       clip-path="url(#clipPath16-0)"
-       id="g14-5"
-       transform="matrix(2.4071368,0,0,-2.4071368,-497.48778,1789.7658)">
-      <g
-         transform="translate(367.541,461.6597)"
-         id="g20-7">
-        <path
-           inkscape:connector-curvature="0"
-           id="path22"
-           style="fill:#3498db;fill-opacity:1;fill-rule:evenodd;stroke:none"
-           d="m 0,0 -0.979,3.286 -0.732,4.018 -0.321,4.048 0.093,4.08 0.576,4.085 1.062,4.092 1.287,3.534 1.751,3.471 2.02,3.303 2.267,3.063 2.631,2.946 2.949,2.685 3.099,2.395 3.343,2.155 3.572,1.843 3.764,1.457 3.892,1.094 4.022,0.733 4.217,0.346 4.297,-0.161 2.091,-0.263 2.215,-0.384 2.168,-0.531 2.214,-0.624 2.754,-0.96 2.516,-1.203 2.469,-1.352 2.327,-1.546 2.109,-1.72 1.966,-1.916 1.774,-2.015 1.655,-2.139 1.44,-2.309 1.172,-2.388 1.052,-2.511 0.858,-2.61 0.593,-2.686 0.403,-2.786 0.133,-2.862 -0.033,-2.889 0.555,1.998 0.481,2.02 0.367,1.899 0.215,1.945 0.073,1.99 0.023,1.844 -0.123,1.892 -0.217,1.842 -0.315,1.792 -0.411,1.742 -0.486,1.765 -0.579,1.715 -1.454,3.282 -1.834,3.081 -2.127,2.935 -2.437,2.709 -2.728,2.561 -2.989,2.242 -3.207,2.069 -3.396,1.728 -3.615,1.556 -3.799,1.21 -2.775,0.643 -2.773,0.401 -2.916,0.203 -2.96,0.058 -3.055,-0.234 -2.956,-0.428 -3.002,-0.572 -2.999,-0.816 -2.88,-1.018 C 17.094,59.214 13.969,57.168 11.075,54.686 -4.829,41.039 -8.785,18.525 0,0 m 83.517,37.735 c 8.613,-18.47 4.618,-40.826 -11.204,-54.404 -2.904,-2.491 -6.042,-4.543 -9.329,-6.165 l -2.86,-1.012 -2.926,-0.839 -3.002,-0.572 -3.029,-0.404 -2.982,-0.258 -2.959,0.058 -2.916,0.205 -2.844,0.424 -2.777,0.643 -3.8,1.212 -3.615,1.554 -3.396,1.726 -3.207,2.071 -2.989,2.24 -2.655,2.537 -2.436,2.711 -2.128,2.933 -1.834,3.084 -1.453,3.28 -1.139,3.504 -0.724,3.535 -0.269,3.709 0.096,3.836 0.579,3.842 1.04,4.018 -0.107,-2.865 0.205,-2.886 0.329,-2.761 0.668,-2.711 0.788,-2.585 1.049,-2.513 1.245,-2.409 1.44,-2.31 1.582,-2.116 1.847,-2.037 1.966,-1.918 2.109,-1.72 2.254,-1.522 2.47,-1.351 2.584,-1.227 2.685,-0.936 2.218,-0.626 2.165,-0.529 2.214,-0.385 2.165,-0.286 4.223,-0.139 4.217,0.348 4.019,0.731 3.969,1.073 3.69,1.479 3.568,1.842 3.347,2.157 3.175,2.372 2.873,2.708 2.632,2.945 2.266,3.064 2.02,3.303 1.751,3.469 1.288,3.535 1.062,4.093 0.576,4.085 0.092,2.064 0,2.014 -0.076,2.037 -0.245,2.013 -0.317,2.034 -0.414,1.984 -0.51,1.935 -0.324,1.079 z" />
-      </g>
-      <g
-         transform="translate(393.4619,426.25)"
-         id="g24">
-        <path
-           inkscape:connector-curvature="0"
-           id="path26-1"
-           style="fill:#3498db;fill-opacity:1;fill-rule:evenodd;stroke:none"
-           d="m 0,0 -3.872,1.728 -4.366,2.55 -4.059,2.961 -3.753,3.372 -3.37,3.833 -2.985,4.293 -2.282,4.058 -1.846,4.437 -1.473,4.557 -1.053,4.596 -0.645,4.841 -0.143,4.933 0.248,4.84 0.672,4.876 1.143,4.832 1.665,4.709 2.111,4.536 2.553,4.364 3.068,4.239 3.615,3.904 1.933,1.75 2.141,1.77 2.245,1.608 2.373,1.575 3.118,1.814 3.157,1.391 3.258,1.231 3.326,0.937 3.314,0.595 3.383,0.302 3.32,0.041 3.34,-0.169 3.326,-0.511 3.188,-0.823 3.204,-1.034 3.141,-1.296 2.999,-1.607 2.94,-1.868 2.794,-2.179 2.684,-2.36 -1.427,2.132 -1.509,2.08 -1.487,1.87 -1.651,1.77 -1.811,1.671 -1.714,1.508 -1.874,1.41 -1.903,1.28 -1.936,1.147 -1.967,1.017 -2.049,0.968 -2.075,0.838 -4.25,1.281 -4.373,0.758 -4.465,0.368 -4.509,-0.106 -4.6,-0.497 -4.515,-1.001 -4.526,-1.344 -4.356,-1.796 -4.372,-2.138 -4.197,-2.594 -2.84,-2.087 -2.609,-2.279 -2.539,-2.571 -2.442,-2.733 -2.241,-3.058 -1.98,-3.119 -1.88,-3.28 -1.652,-3.473 -1.36,-3.521 C -41.819,63.748 -42.415,59.168 -42.415,54.453 -42.415,28.528 -24.468,6.678 0,0 m 31.856,108.799 c 24.277,-6.795 42.045,-28.556 42.045,-54.346 0,-4.734 -0.602,-9.328 -1.727,-13.722 L 70.816,37.23 69.247,33.808 67.367,30.529 65.309,27.36 63.147,24.354 60.707,21.62 58.165,19.05 55.478,16.72 52.638,14.632 48.437,12.041 44.067,9.902 39.712,8.105 35.184,6.761 30.672,5.76 26.15,5.313 21.646,5.208 17.177,5.573 12.804,6.334 8.554,7.613 4.35,9.369 l -3.903,2.167 -3.697,2.735 -3.525,3.182 -3.138,3.639 -2.937,4.212 2.603,-2.408 2.876,-2.13 2.856,-1.92 3.082,-1.555 3.062,-1.345 3.204,-1.035 3.264,-0.773 3.33,-0.512 3.261,-0.22 3.399,0.093 3.383,0.303 3.316,0.594 3.244,0.889 3.254,1.228 3.24,1.441 3.036,1.764 2.377,1.578 2.241,1.607 2.144,1.767 2.013,1.801 3.535,3.855 3.068,4.238 2.553,4.363 2.188,4.586 1.586,4.66 1.144,4.833 0.672,4.878 0.328,4.89 -0.221,4.878 -0.649,4.846 -1.05,4.592 -1.472,4.558 -1.848,4.437 -2.28,4.057 -2.986,4.295 -3.37,3.832 -1.863,1.752 -1.891,1.621 -1.972,1.572 -2.089,1.39 -2.164,1.339 -2.196,1.21 -2.227,1.08 -1.275,0.566 z" />
-      </g>
-      <g
-         transform="translate(422.0479,441.4932)"
-         id="g28">
-        <path
-           inkscape:connector-curvature="0"
-           id="path30-1"
-           style="fill:#1d6fa5;fill-opacity:1;fill-rule:evenodd;stroke:none"
-           d="m 0,0 c 16.521,5.225 28.5,20.673 28.5,38.922 0,0.66 -0.017,1.317 -0.05,1.969 l 0.342,1.759 0.268,2.352 0.202,2.185 0.029,2.251 -0.086,2.201 -0.205,2.152 -0.327,2.1 -0.407,2.138 -0.527,2.087 -1.414,4.022 -1.889,3.823 -2.248,3.669 -2.631,3.439 -2.993,3.289 -3.336,2.933 -3.605,2.751 -3.859,2.361 -4.138,2.177 -4.39,1.789 -3.227,1.021 -3.247,0.731 -3.433,0.517 -3.502,0.344 -3.64,0.005 -3.542,-0.23 -3.609,-0.397 -3.628,-0.692 -3.647,-0.973 -3.512,-1.128 -3.446,-1.451 -3.317,-1.604 -3.244,-1.925 -3.111,-2.08 -2.93,-2.352 -2.74,-2.623 2.83,3.08 3.218,2.826 3.405,2.55 3.622,2.365 3.77,2.006 3.992,1.819 4.055,1.497 4.157,1.26 4.227,0.937 4.284,0.617 4.306,0.409 4.164,0.076 4.148,-0.215 4.094,-0.584 3.87,-0.887 3.77,-1.144 4.862,-2.082 4.608,-2.47 2.188,-1.382 2.125,-1.555 2.006,-1.606 1.883,-1.653 1.853,-1.743 1.732,-1.787 1.612,-1.843 1.546,-2.005 2.767,-4.081 2.374,-4.317 0.986,-2.175 0.953,-2.257 0.745,-2.269 0.715,-2.365 0.506,-2.372 0.424,-2.34 0.307,-2.387 0.19,-2.441 0.102,-2.403 L 39.758,44.187 39.569,41.801 39.268,39.365 38.202,34.581 36.563,29.835 34.707,25.766 32.313,21.818 29.609,18.093 26.64,14.677 23.254,11.432 19.593,8.492 15.614,5.977 11.453,3.735 7.051,1.885 2.539,0.475 0,0 Z m -30.856,-15.748 3.77,-1.142 3.955,-0.923 4.009,-0.55 4.147,-0.215 4.25,0.04 4.304,0.412 4.203,0.65 4.224,0.937 4.158,1.261 4.055,1.496 3.992,1.819 3.769,2.008 3.623,2.365 3.405,2.55 3.218,2.824 2.83,3.082 -2.742,-2.627 -2.928,-2.35 -3.112,-2.08 -3.248,-1.927 -3.309,-1.6 -3.452,-1.452 -3.513,-1.13 -3.644,-0.973 -3.542,-0.722 -3.611,-0.399 -3.621,-0.199 -3.559,-0.028 -3.505,0.346 -3.433,0.513 -3.333,0.77 -3.224,1.018 -4.392,1.789 -4.135,2.178 -3.862,2.361 -3.605,2.75 -3.334,2.936 -2.909,3.252 -2.632,3.439 -2.247,3.671 -1.887,3.825 -1.414,4.02 -1.019,4.256 -0.532,4.254 0.029,4.419 0.47,4.535 1.043,4.497 0.04,0.114 c 0.671,19.91 15.6,36.205 34.904,38.992 l -0.198,0 -4.827,-0.494 -4.713,-0.934 -4.598,-1.373 -4.396,-1.852 -4.164,-2.243 -3.892,-2.545 -3.747,-2.908 -3.39,-3.246 -2.969,-3.418 -2.698,-3.723 -2.399,-3.948 -1.854,-4.066 -1.639,-4.749 -1.062,-4.784 -0.49,-4.821 0,-4.826 0.493,-4.828 1.019,-4.752 1.46,-4.629 1.937,-4.432 2.29,-4.28 2.851,-4.121 3.161,-3.846 3.499,-3.494 3.971,-3.294 4.234,-2.908 4.604,-2.467 4.863,-2.081 z" />
-      </g>
-      <g
-         transform="translate(417.5039,429.4678)"
-         id="g32">
-        <path
-           inkscape:connector-curvature="0"
-           id="path34"
-           style="fill:#1d6fa5;fill-opacity:1;fill-rule:evenodd;stroke:none"
-           d="m 0,0 -3.883,-0.084 -4.608,0.401 -4.518,0.866 -4.426,1.321 -4.29,1.855 -4.15,2.385 -3.473,2.466 -3.266,2.951 -2.999,3.196 -2.668,3.391 -2.43,3.755 -2.049,4.027 -1.685,4.103 -1.354,4.298 -0.943,4.449 -0.46,4.55 -0.03,4.577 0.404,4.612 0.884,4.708 1.466,4.646 0.914,2.204 1.082,2.304 1.228,2.207 1.347,2.233 1.874,2.72 2.068,2.388 2.215,2.29 2.387,2.077 2.509,1.788 2.681,1.576 2.731,1.332 2.833,1.167 2.953,0.877 2.959,0.566 3.058,0.396 3.109,0.157 3.108,-0.157 3.164,-0.396 3.164,-0.712 3.145,-0.903 -2.016,1.206 -2.062,1.132 -1.963,0.965 -2.059,0.821 -2.151,0.674 -2.009,0.579 -2.103,0.433 -2.075,0.315 -2.052,0.194 -2.026,0.071 -2.072,0 -2.045,-0.12 -4.022,-0.602 -3.917,-1.081 -3.838,-1.443 -3.692,-1.852 -3.611,-2.209 -3.347,-2.595 -3.22,-2.882 -2.903,-3.191 -2.78,-3.479 -2.46,-3.79 -1.536,-2.837 -1.268,-2.907 -1.095,-3.122 -0.95,-3.217 -0.662,-3.408 -0.417,-3.354 -0.275,-3.45 -0.007,-3.52 0.249,-3.449 c 0.787,-4.063 2.085,-8.087 3.929,-11.989 C -46.266,7.022 -22.863,-4.043 0,0 M -16.187,102.513 C 6.566,106.383 29.78,95.32 39.869,73.974 41.72,70.056 43.021,66.018 43.806,61.94 l 0.248,-3.426 0.04,-3.446 -0.276,-3.451 -0.466,-3.428 -0.613,-3.334 -0.95,-3.216 -1.096,-3.121 -1.317,-2.981 -1.532,-2.838 -2.463,-3.789 -2.78,-3.479 -2.904,-3.191 -3.22,-2.883 -3.343,-2.593 -3.566,-2.139 -3.69,-1.85 -3.84,-1.443 L 8.119,10.25 4.101,9.649 -0.066,9.457 l -4.076,0.265 -4.13,0.82 -4.161,1.253 -4.022,1.785 -4.078,2.338 3.098,-0.977 3.211,-0.637 3.115,-0.471 3.161,-0.082 3.058,0.085 3.059,0.395 3.006,0.638 2.952,0.877 2.784,1.094 2.777,1.407 2.685,1.574 2.509,1.787 2.34,2.006 2.215,2.291 2.115,2.457 1.823,2.65 1.351,2.233 1.228,2.208 1.082,2.3 0.96,2.279 1.42,4.573 0.881,4.71 0.407,4.608 0.017,4.652 -0.51,4.477 -0.943,4.449 -1.351,4.3 -1.639,4.175 -2.094,3.951 -2.434,3.757 -2.664,3.391 -3.003,3.196 -3.264,2.951 -3.475,2.466 -4.148,2.385 -4.29,1.855 -2.227,0.721 -2.198,0.601 -2.248,0.53 -2.27,0.334 -2.317,0.262 -2.291,0.144 -2.267,0.022 -1.275,-0.029 z" />
-      </g>
-    </g>
-  </g>
-  <g
-     id="g3986"
-     transform="matrix(0.12026875,0,0,0.12026875,811.13039,524.32524)">
-    <g
-       id="g3969">
-      <path
-         id="path3971"
-         d="M 250.5,4.1 C 117.3,-17.9 5,80.4 5,223.6 L 5,1798 1224.5,1592.7 C 1308.6,1578.1 1373,1479 1373,1371.9 L 1373,188.4 250.5,4.1 Z"
-         class="st0"
-         inkscape:connector-curvature="0"
-         style="fill:#80c342" />
-      <path
-         id="path3973"
-         d="m 1144,1166.6 c -14.3,0 -23.3,-4.5 -30.2,-13.6 -7.7,-10 -9.8,-32.2 -9.8,-66.7 l 0,-396.9 103,5.1 0,-108.6 -103,-7.9 0,-173.1 -100.3,-10.6 -40.9,173.9 -65,-4.7 0,116.4 45.8,2.4 0,439.9 c 0,57.6 14.6,99.6 38,125.7 20,22.6 50.9,33.7 89.2,33.7 5.7,0 11.8,-0.3 17.9,-0.8 42.4,-3.6 83.9,-15.1 129.6,-34.4 l 0,-99.8 c -22.9,11.8 -49,18.5 -70.8,19.8 -1.3,0.2 -2.1,0.2 -3.5,0.2"
-         class="st1"
-         inkscape:connector-curvature="0"
-         style="fill:#ffffff" />
-      <path
-         id="path3975"
-         d="m 819.7,1167.3 c -35.3,83.1 -89,137.6 -162.6,162.8 7.4,38.1 18.6,63.7 33.6,77.3 11.6,10.4 29.4,15.6 53.3,15.6 6.9,0 14.3,-0.5 22.2,-1.3 l 0,112.3 -51.1,6.7 c -15.1,2 -29.3,2.9 -42.8,2.9 -44.7,0 -80.9,-10.9 -108.1,-32.8 -36,-28.9 -62.6,-84.7 -79.6,-167.3 -78.3,-16.7 -139.3,-66.4 -181.5,-149.9 -42.9,-84.8 -64.7,-208.9 -64.7,-371.2 0,-175 29.9,-304.2 88.6,-386.1 49.6,-69.1 118.8,-103.1 205.8,-103.1 13.9,0 28.3,0.9 43.2,2.6 102.4,11.8 176.6,60.1 224.9,143.8 47.4,81.9 70.7,199.3 70.7,353.4 -0.1,141.2 -17.3,252.3 -51.9,334.3 z m -154,-32.1 c 20.2,-51.8 30.1,-153.5 30.1,-305.1 0,-136.1 -9.8,-229.7 -29.9,-281.1 -20,-51.6 -50,-79.5 -90.1,-83 -3.1,-0.3 -6.1,-0.4 -9.1,-0.4 -37.2,0 -65.8,21.7 -85.7,65.3 -21.6,47.5 -32.5,146 -32.5,295 0,144 10.6,246.2 32,306.2 20.2,57.1 50.4,85.5 90,85.5 1.8,0 3.5,-0.1 5.3,-0.2 39.7,-2.5 69.6,-29.9 89.9,-82.2"
-         class="st1"
-         inkscape:connector-curvature="0"
-         style="fill:#ffffff" />
-    </g>
-    <rect
-       id="rect3977"
-       height="1800"
-       width="1380"
-       class="st2"
-       x="0"
-       y="0"
-       style="fill:none" />
-  </g>
-  <g
-     style="overflow:visible"
-     id="g3901"
-     transform="matrix(1.0835302,0,0,1.0835302,812.45849,47.204086)">
-    <path
-       id="path1575"
-       d="m 20.305,7.488 140.184,0 c 7.057,0 12.816,5.76 12.816,12.816 l 0,139.248 c 0,7.057 -5.76,12.889 -12.816,12.889 l -140.184,0 c -7.057,0 -12.816,-5.832 -12.816,-12.889 l 0,-139.248 C 7.488,13.248 13.248,7.488 20.305,7.488 Z"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd"
-       inkscape:connector-curvature="0" />
-    <path
-       style="clip-rule:evenodd;fill:#0068c6;fill-rule:evenodd"
-       id="path1065"
-       d="m 20.305,7.488 140.184,0 c 7.057,0 12.816,5.76 12.816,12.816 l 0,139.248 c 0,7.057 -5.76,12.889 -12.816,12.889 l -140.184,0 c -7.057,0 -12.816,-5.832 -12.816,-12.889 l 0,-139.248 C 7.488,13.248 13.248,7.488 20.305,7.488 Z M 18.721,0 162.073,0 c 10.297,0 18.721,8.424 18.721,18.72 l 0,142.416 c 0,10.297 -8.424,18.721 -18.721,18.721 l -143.352,0 C 8.424,179.856 0,171.433 0,161.136 L 0,18.72 C 0,8.424 8.424,0 18.721,0 Z"
-       inkscape:connector-curvature="0" />
-    <path
-       style="clip-rule:evenodd;fill:#0068c6;fill-rule:evenodd"
-       id="path1067"
-       d="m 20.592,10.296 139.609,0 c 5.615,0 10.223,4.608 10.223,10.296 l 0,138.745 c 0,5.615 -4.607,10.223 -10.223,10.223 l -139.609,0 c -5.615,0 -10.223,-4.607 -10.223,-10.223 l 0,-138.745 c 0,-5.688 4.608,-10.296 10.223,-10.296 z"
-       inkscape:connector-curvature="0" />
-    <path
-       style="clip-rule:evenodd;fill:#ffffff;fill-rule:evenodd"
-       id="path1084"
-       d="m 76.020451,20.674017 24.100089,-1.754121 c 0,14.490561 0,28.904856 0,43.319151 9.60953,-14.490561 20.28679,-28.904856 32.33577,-42.861554 l 25.85422,6.558885 c -11.59139,12.888973 -23.4137,27.227002 -32.86964,41.565031 9.07567,15.253222 19.06653,29.210979 32.4131,45.073271 l -24.93796,7.39781 C 118.95933,104.33794 110.57006,89.313516 100.12054,73.145101 l 0,42.937819 -24.100089,3.0517 0,-98.460603 0,0 z"
-       inkscape:connector-curvature="0" />
-    <path
-       style="clip-rule:evenodd;fill:#ffffff;fill-rule:evenodd"
-       id="path1086"
-       d="m 100.3504,139.80274 c 14.10923,-2.97544 10.52472,-7.24528 22.03985,-0.53386 l 7.47513,5.2613 c 1.37385,0.6864 2.66932,1.90771 3.96584,0.61013 2.82185,-2.66931 5.56743,-5.41384 8.38927,-8.08315 1.22026,-1.29758 0,-2.7477 -0.61012,-3.7381 l -0.0773,0 -5.41383,-7.70182 -3.58557,1.29759 c -0.91413,0.61013 -2.13545,0.304 -3.20212,-1.14399 l -7.93167,-10.37325 c -7.32155,10.14339 -19.1428,16.70227 -32.565633,16.70227 -22.116113,0 -40.114915,-17.99668 -40.114915,-40.114912 0,-15.710818 9.075668,-29.362452 22.268645,-35.921338 l 0,-9.228199 c -0.457596,0.228798 -0.914134,0.381331 -1.297583,0.533863 -5.185036,2.135451 -5.49116,3.12691 -13.956698,-1.754121 l -7.473019,-5.338627 c -1.37385,-0.610129 -2.670374,-1.906653 -3.965838,-0.610129 -2.821846,2.74558 -5.567426,5.49116 -8.389272,8.23674 -1.220258,1.220257 0.07627,2.74558 0.610129,3.737039 l 5.717839,8.084208 4.195696,5.948756 c 0.610128,0.838928 0.837868,0.915194 0.533862,1.525323 -0.380271,0.610128 -0.686395,1.143991 -1.067725,1.75412 C 40.327942,78.562113 44.217513,79.324774 32.32,82.451685 l -9.075667,1.525322 c -1.371731,0.457597 -3.202117,0.457597 -3.279443,2.364249 0,3.889572 -0.07627,7.779144 -0.07627,11.668715 -0.07627,1.754121 1.907712,1.907712 3.051704,2.211719 l 9.686855,1.75412 7.245281,1.29758 c 0.991459,0.15359 1.218139,0 1.447996,0.7616 2.975438,12.88898 6.86395,9.83939 0.380272,21.05051 l -5.261303,7.54929 c -0.686395,1.29758 -1.907712,2.5941 -0.610128,3.88957 2.745579,2.82184 5.413834,5.56954 8.159414,8.39139 1.220258,1.21814 2.74558,-0.0763 3.738099,-0.61013 l 8.083148,-5.71996 6.025023,-4.11943 c 0.839986,-0.68639 0.916252,-0.91413 1.526381,-0.53386 12.048987,7.5514 12.506583,2.13545 16.014824,14.87295 l 1.677855,9.07355 c 0.457596,1.37385 0.533862,3.12797 2.364249,3.20423 3.889572,0 7.85541,0 11.744981,0 1.754121,0 1.907712,-1.98397 2.135451,-3.12797 l 1.677855,-9.761 1.143993,-7.17113 c 0.0763,-0.6864 0.0763,-0.99358 0.22986,-1.22026 z m 14.56683,-6.10129 c -0.0763,0.0742 -0.15359,0.0742 -0.22986,0.0742 0.0763,0 0.0763,-0.0742 0.15359,-0.0742 l 0.0763,0 z m -13.80629,5.79517 c -0.22774,0.0763 -0.53386,0.15359 -0.7616,0.30612 0.15147,-0.15359 0.38133,-0.22986 0.7616,-0.30612 z"
-       inkscape:connector-curvature="0" />
-    <path
-       style="clip-rule:evenodd;fill:#ffffff;fill-rule:evenodd"
-       id="path1088"
-       d="m 89.139282,129.20175 c 12.659118,0 23.793968,-6.40741 30.505388,-16.17053 l -0.4576,-0.7616 c -7.85541,8.69327 -16.62495,14.33696 -30.124054,14.64309 C 72.284471,127.21671 55.277129,112.19335 55.199803,92.515634 55.04833,79.855459 60.919762,71.313655 70.910622,65.212366 l 0,-5.338628 c -11.211118,6.330087 -18.83667,18.456399 -18.83667,32.261624 0,20.361988 16.624953,37.066388 37.06533,37.066388 z"
-       inkscape:connector-curvature="0" />
-  </g>
-  <rect
-     style="fill:#292f34;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.47990656px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0"
-     id="rect3483"
-     width="765.92114"
-     height="181.55545"
-     x="0.73995328"
-     y="309.22226" />
-  <path
-     style="opacity:0.95;fill:#292f34;fill-opacity:1;stroke:none;stroke-width:0.28222224px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="m 692.56439,563.6737 74.83712,-74.83617 -74.83712,0 z"
-     id="path4120"
-     inkscape:connector-curvature="0" />
-</svg>
--- a/branding/kaos_branding/2.svg
+++ b/branding/kaos_branding/2.svg
--- a/branding/kaos_branding/3.svg
+++ b/branding/kaos_branding/3.svg
--- a/branding/kaos_branding/4.svg
+++ b/branding/kaos_branding/4.svg
--- a/branding/kaos_branding/5.svg
+++ b/branding/kaos_branding/5.svg
--- a/branding/kaos_branding/6.svg
+++ b/branding/kaos_branding/6.svg
--- a/branding/kaos_branding/about.qml
+++ b/branding/kaos_branding/about.qml
@@ -1,101 +0,0 @@
-/* === This file is part of Calamares - <https://calamares.io> ===
- *
- *   SPDX-FileCopyrightText: 2020 2022 Anke Boersma <demm@kaosx.us>
- *   SPDX-License-Identifier: GPL-3.0-or-later
- *
- *   Calamares is Free Software: see the License-Identifier above.
- *
- */
-
-import io.calamares.core 1.0
-import io.calamares.ui 1.0
-
-import QtQuick 2.7
-import QtQuick.Controls 2.0
-import QtQuick.Layouts 1.3
-import QtQuick.Window 2.3
-
-ApplicationWindow {
-    id: about
-    visible: true
-    width: 760
-    height: 400
-    title: qsTr("About Calamares")
-
-    property var appName: "Calamares"
-    property var appVersion: "3.3 RC"
-
-    Rectangle {
-        id: textArea
-        anchors.fill: parent
-        color: "#f2f2f2"
-
-        Column {
-            id: column
-            anchors.centerIn: parent
-
-
-            Rectangle {
-                width: 560
-                height: 250
-                radius: 10
-                border.width: 0
-
-                Text {
-                    width: 400
-                    height: 250
-                    anchors.centerIn: parent
-                    text: qsTr("<h1>%1</h1><br/>
-                        <strong>%2<br/>
-                        for %3</strong><br/><br/>
-                        Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>
-                        Copyright 2017-2022 Adriaan de Groot &lt;groot@kde.org&gt;<br/>
-                        Thanks to <a href='https://calamares.io/team/'>the Calamares team</a>
-                        and the <a href=\"https://www.transifex.com/kaos/kaos/\">KaOS
-                        translators team</a>.<br/><br/>
-                        <a href='https://calamares.io/'>Calamares</a>
-                        development is sponsored by <br/>
-                        <a href='http://www.blue-systems.com/'>Blue Systems</a> -
-                        Liberating Software." )
-                        .arg(appName)
-                        .arg(appVersion)
-                        .arg(Branding.string(Branding.VersionedName))
-
-                        onLinkActivated: Qt.openUrlExternally(link)
-
-                        MouseArea {
-                            anchors.fill: parent
-                            acceptedButtons: Qt.NoButton
-                            cursorShape: parent.hoveredLink ? Qt.PointingHandCursor : Qt.ArrowCursor
-                        }
-
-                    font.pointSize: 10
-                    anchors.verticalCenterOffset: 10
-                    anchors.horizontalCenterOffset: 40
-                    wrapMode: Text.WordWrap
-                }
-
-                Image {
-                    id: image
-                    x: 8
-                    y: 12
-                    height: 100
-                    fillMode: Image.PreserveAspectFit
-                    source: "squid.png"
-                }
-
-            }
-
-        }
-
-        Button {
-            anchors.horizontalCenter: parent.horizontalCenter
-            anchors.bottom: parent.bottom
-            icon.name: "window-close"
-            text: qsTr("Close")
-            hoverEnabled: true
-            onClicked: about.close();
-        }
-    }
-
-}
--- a/branding/kaos_branding/branding.desc
+++ b/branding/kaos_branding/branding.desc
@@ -1,43 +0,0 @@
---
-componentName:  kaos
-
-welcomeStyleCalamares:   false
-
-# Should the welcome image (productWelcome, below) be scaled
-# up beyond its natural size?
-welcomeExpandingLogo:   true
-
-windowExpanding:    normal
-windowSize: 920px,630px
-windowPlacement: center
-
-sidebar: qml,bottom
-navigation: qml,right
-
-strings:
-    productName:         KaOS
-    shortProductName:    KaOS
-    version:             2022.08
-    shortVersion:        KaOS
-    versionedName:       KaOS 2022.08
-    shortVersionedName:  KaOS 2018.03
-    bootloaderEntryName: KaOS
-    productUrl:          https://kaosx.us/
-    supportUrl:          https://kaosx.us/docs/
-    knownIssuesUrl:      https://kaosx.us/pages/download/#known-issues
-    releaseNotesUrl:     https://kaosx.us/pages/release_notes
-    donateUrl:           https://kaosx.us/about/donors
-
-images:
-    productLogo:         "kaos.png"
-    productIcon:         "kaos.png"
-    productWelcome:      "languages.png"
-
-slideshow:               "show.qml"
-slideshowAPI:            1
-
-style:
-   SidebarBackground:    "#bdc3c7"
-   SidebarText:          "#1F1F1F"
-   SidebarTextCurrent:    "#3498DB"
-   SidebarBackgroundCurrent: "#eff0f1"
--- a/branding/kaos_branding/calamares-navigation.qml
+++ b/branding/kaos_branding/calamares-navigation.qml
@@ -1,224 +0,0 @@
-/* Sample of QML navigation.
-
-   SPDX-FileCopyrightText: 2020 Adriaan de Groot <groot@kde.org>
-   SPDX-FileCopyrightText: 2021 - 2022 Anke Boersma <demm@kaosx.us>
-   SPDX-License-Identifier: GPL-3.0-or-later
-
-
-   This navigation panel is for a "vertical" layout, with
-   mouse areas for next and previous and it includes the logo
-   plus About & Debug buttons.
-*/
-import io.calamares.ui 1.0
-import io.calamares.core 1.0
-
-import QtQuick 2.3
-import QtQuick.Controls 2.10
-import QtQuick.Layouts 1.3
-
-Rectangle {
-    id: navigationBar;
-    color: Branding.styleString( Branding.SidebarBackground );
-    height: parent.height;
-    width:64;
-
-    ColumnLayout {
-        id: buttonBar
-        anchors.fill: parent;
-        spacing: 1
-
-        Image {
-            Layout.topMargin: 1;
-            Layout.bottomMargin:parent.height / 7;
-            Layout.alignment: Qt.AlignHCenter | Qt.AlignTop
-            id: logo;
-            width: 62;
-            height: width;  // square
-            source: "file:/" + Branding.imagePath(Branding.ProductLogo);
-            sourceSize.width: width;
-            sourceSize.height: height;
-        }
-
-        Rectangle {
-            id: backArea
-            Layout.fillWidth: true;
-            Layout.preferredHeight: parent.height / 7;
-            color: mouseBack.containsMouse ? "#e6e9ea" : "#d9dcde";
-            enabled: ViewManager.backEnabled;
-            visible: ViewManager.backAndNextVisible;
-
-            MouseArea {
-                id: mouseBack
-                anchors.fill: parent;
-                cursorShape: Qt.PointingHandCursor
-                hoverEnabled: true
-
-                Text {
-                    anchors.centerIn: parent
-                    text: qsTr("Back")
-                    color: Branding.styleString( !backArea.enabled ? Branding.SidebarBackground : (mouseBack.containsMouse ? Branding.SidebarTextCurrent : Branding.SidebarText ));
-                    font.pointSize : 8
-                }
-                Image {
-                    source: "pan-start-symbolic.svg"
-                    anchors.centerIn: parent
-                    anchors.verticalCenterOffset : 18
-                    fillMode: Image.PreserveAspectFit
-                    height: 32
-                    opacity: backArea.enabled ? 1 : 0.2
-                }
-
-                onClicked: { ViewManager.back(); }
-            }
-        }
-
-        Rectangle {
-            id: nextArea
-            Layout.preferredHeight: parent.height / 7;
-            Layout.fillWidth: true
-            color: mouseNext.containsMouse ? "#f4f5f6" : "#e6e9ea";
-            enabled: ViewManager.nextEnabled;
-            visible: ViewManager.backAndNextVisible;
-
-            MouseArea {
-                id: mouseNext
-                anchors.fill: parent;
-                cursorShape: Qt.PointingHandCursor
-                hoverEnabled: true
-                Text {
-                    anchors.centerIn: parent
-                    text: qsTr("Next")
-                    color: Branding.styleString( !nextArea.enabled ? Branding.SidebarBackground : (mouseNext.containsMouse ? Branding.SidebarTextCurrent : Branding.SidebarText ));
-                    font.pointSize : 8
-                }
-                Image {
-                    source: "pan-end-symbolic.svg"
-                    anchors.centerIn: parent
-                    anchors.verticalCenterOffset : 18
-                    fillMode: Image.PreserveAspectFit
-                    height: 32
-                    opacity: nextArea.enabled ? 1 : 0.2
-                }
-
-                onClicked: { ViewManager.next(); }
-            }
-        }
-
-        Rectangle {
-            id: cancelArea
-            height: parent.height / 7;
-            Layout.fillWidth: true
-            color: mouseCancel.containsMouse ? "#e6e9ea" : "#d9dcde";
-
-             /*
-             * The ViewManager has settings -- user-controlled via the
-             * branding component, and party based on program state --
-             * whether the quit button should be enabled and visible.
-             *
-             * QML navigation *should* follow this pattern, but can also
-             * add other qualifications. For instance, you may have a
-             * "finished" module that handles quit in its own way, and
-             * want to hide the quit button then. The ViewManager has a
-             * current step and a total count, so compare them:
-             *
-             * visible: ViewManager.quitVisible && ( ViewManager.currentStepIndex < ViewManager.rowCount()-1);
-             */
-
-             enabled: ViewManager.quitEnabled;
-             visible: ViewManager.quitVisible && ( ViewManager.currentStepIndex < ViewManager.rowCount()-1);
-
-            ToolTip {
-                width: 59
-                visible: mouseCancel.containsMouse
-                timeout: 5000
-                delay: 1000
-                text: ViewManager.quitTooltip;
-            }
-
-            MouseArea {
-                id: mouseCancel
-                anchors.fill: parent;
-                cursorShape: Qt.PointingHandCursor
-                hoverEnabled: true
-                Text {
-                    anchors.centerIn: parent
-                    text: qsTr("Cancel")
-                    color: Branding.styleString( !cancelArea.enabled ? Branding.SidebarBackground : (mouseCancel.containsMouse ? Branding.SidebarTextCurrent : Branding.SidebarText ));
-                    font.pointSize : 8
-                }
-                Image {
-                    source: "draw-rectangle.svg"
-                    anchors.centerIn: parent
-                    anchors.verticalCenterOffset : 18
-                    fillMode: Image.PreserveAspectFit
-                    height: 9
-                    opacity: cancelArea.enabled ? 1 : 0.2
-                }
-
-                onClicked: { ViewManager.quit(); }
-            }
-        }
-
-        Item {
-            Layout.fillHeight: true;
-        }
-
-        Rectangle {
-            id: debugArea
-            Layout.fillWidth: true;
-            height: 35
-            Layout.alignment: Qt.AlignHCenter | Qt.AlignBottom
-            color: Branding.styleString( mouseAreaDebug.containsMouse ? Branding.SidebarBackgroundCurrent : Branding.SidebarBackground);
-            visible: debug.enabled
-
-            MouseArea {
-                id: mouseAreaDebug
-                anchors.fill: parent;
-                cursorShape: Qt.PointingHandCursor
-                hoverEnabled: true
-                Text {
-                    anchors.centerIn: parent
-                    text: qsTr("Debug")
-                    color: Branding.styleString( mouseAreaDebug.containsMouse ? Branding.SidebarTextCurrent : Branding.SidebarBackground );
-                    font.pointSize : 8
-                }
-
-                onClicked: debug.toggle()
-            }
-        }
-
-        Rectangle {
-            id: aboutArea
-            Layout.fillWidth: true;
-            height: 35
-            Layout.alignment: Qt.AlignHCenter | Qt.AlignBottom
-            color: Branding.styleString( mouseAreaAbout.containsMouse ? Branding.SidebarBackgroundCurrent : Branding.SidebarBackground);
-            visible: true
-
-            MouseArea {
-                id: mouseAreaAbout
-                anchors.fill: parent;
-                cursorShape: Qt.PointingHandCursor
-                hoverEnabled: true
-                Text {
-                    anchors.centerIn: parent
-                    text: qsTr("About")
-                    ToolTip {
-                        visible: mouseAreaAbout.containsMouse
-                        delay: 1000
-                        text: qsTr("Info about Calamares")
-                    }
-                    color: Branding.styleString( mouseAreaAbout.containsMouse ? Branding.SidebarTextCurrent : Branding.SidebarBackgroundCurrent );
-                    font.pointSize : 8
-                }
-
-                property variant window;
-                onClicked: {
-                    var component = Qt.createComponent("about.qml");
-                    window = component.createObject();
-                    window.show();
-                }
-            }
-        }
-    }
-}
--- a/branding/kaos_branding/kaos.png
+++ b/branding/kaos_branding/kaos.png
--- a/branding/kaos_branding/lang/CMakeLists.txt
+++ b/branding/kaos_branding/lang/CMakeLists.txt
@@ -1,10 +0,0 @@
-#   SPDX-FileCopyrightText: no
-#   SPDX-License-Identifier: CC0-1.0
-#
-foreach( lang ast ca cs de en es es_AR fr hu id_ID nl_NL pl pt_BR pt_PT ro_RO ru sr_RS tr_TR zh_CN )
-   list( APPEND TS_FILES "${CMAKE_CURRENT_SOURCE_DIR}/calamares-${COMPONENT_NAME}_${lang}.ts" )
-endforeach()
-qt5_add_translation( QM_FILES ${TS_FILES} )
-
-add_custom_target( translations ALL DEPENDS ${QM_FILES} )
-install( FILES ${QM_FILES} DESTINATION share/calamares/branding/${COMPONENT_NAME}/lang )
--- a/branding/kaos_branding/lang/calamares-kaos_branding_ar.ts
+++ b/branding/kaos_branding/lang/calamares-kaos_branding_ar.ts
@@ -1,35 +0,0 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="ar" version="2.1">
-<context>
-    <name>show</name>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="47"/>
-        <source>Here the actual install of KaOS will start.&lt;br/&gt;Use the left &lt;b&gt;mouse button&lt;/b&gt; to go to the next slide, right for previous.&lt;br/&gt;After creating your chosen disk setup in the first 10 % &lt;br/&gt;the full copying of the ISO will take the longest of this install phase &lt;br/&gt;and will run until approximately 30%.&lt;br/&gt;</source>
-        <translation>هنا سيبدأ تثبيت KaOS الفعليّ.&lt;br/&gt;استخدم &lt;b&gt;زرّ الفأرة&lt;/b&gt; الأيسر للانتقال إلى الشّريحة التّالية، والأيمن للسّابقة.&lt;br/&gt;بعد إنشاء إعداد القرص الذي اخترته في أوّل 10% &lt;br/&gt;نسخ ISO كاملًا سيأخذ أطول فترة تثبيت &lt;br/&gt;وسيعمل حتّى حواليّ 30%.&lt;br/&gt;</translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="73"/>
-        <source>After the ISO is copied some 25 post-install modules will run.&lt;br/&gt;This includes setting user specific options, &lt;br/&gt;removing Live Session only packages&lt;br/&gt;and adjusting hardware setup.&lt;br/&gt;</source>
-        <translation>بعد أن يُنسخ ISO، ستعمل وحدات ما بعد التّثبيت ال‍ 25.&lt;br/&gt;هذا يشمل إعدادات الخيارات الخاصّة بالمستخدم، &lt;br/&gt;وإزالة حزم اللازمة للجلسة الحيّة فقط&lt;br/&gt;وضبط إعداد العتاد.&lt;br/&gt;</translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="98"/>
-        <source>The default Office Suite is Calligra.&lt;br/&gt;LibreOffice is available in the repositories. &lt;br/&gt;</source>
-        <translation>الحزمة المكتبيّة الافتراضيّة هي كاليجرا.&lt;br/&gt;ليبر أوفيس متوفّر في المستودعات.&lt;br/&gt;</translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="121"/>
-        <source>Qt/KDE specific internet applications include the Qupzilla web-browser &lt;br/&gt;and kde-telepathy for chat and Instant Messaging. &lt;br/&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="144"/>
-        <source>For package management Octopi is the GUI application.&lt;br/&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="166"/>
-        <source>May using KaOS be a pleasant experience for you.</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-</TS>
--- a/branding/kaos_branding/lang/calamares-kaos_branding_ast.ts
+++ b/branding/kaos_branding/lang/calamares-kaos_branding_ast.ts
@@ -1,35 +0,0 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="ast" version="2.1">
-<context>
-    <name>show</name>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="47"/>
-        <source>Here the actual install of KaOS will start.&lt;br/&gt;Use the left &lt;b&gt;mouse button&lt;/b&gt; to go to the next slide, right for previous.&lt;br/&gt;After creating your chosen disk setup in the first 10 % &lt;br/&gt;the full copying of the ISO will take the longest of this install phase &lt;br/&gt;and will run until approximately 30%.&lt;br/&gt;</source>
-        <translation>Equí ye u entamará la instalación actual de KaOS.&lt;br/&gt;Usa&apos;l &lt;b&gt;botón esquierdu del mur&lt;/b&gt; pa dir a la dispositiva siguiente,&lt;br/&gt;el drechu pa dir a la anterior.&lt;br/&gt;Dempués de crear la to configuración de discos escoyida nel primer 10%, &lt;br/&gt;la copia completa de la ISO ye lo que más tardará nesta fas d&apos;instalación &lt;br/&gt; y executaráse fasta aproximadaménte&apos;l 30%.&lt;br/&gt;</translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="73"/>
-        <source>After the ISO is copied some 25 post-install modules will run.&lt;br/&gt;This includes setting user specific options, &lt;br/&gt;removing Live Session only packages&lt;br/&gt;and adjusting hardware setup.&lt;br/&gt;</source>
-        <translation>Dempués de copiase la ISO executaránse 25 módulos de post-instalación.&lt;br/&gt; Esto inclúi la configuración d&apos;opciones específiques del usuariu, &lt;br/&gt;desaniciu de los paquetes de la sesión Live&lt;br/&gt;y l&apos;axuste de la configuración del hardware.&lt;br/&gt;</translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="98"/>
-        <source>The default Office Suite is Calligra.&lt;br/&gt;LibreOffice is available in the repositories. &lt;br/&gt;</source>
-        <translation>La suit por defeutu ye Calligra.&lt;br/&gt;LibreOffice ta disponible nos repositorios. &lt;br/&gt;</translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="121"/>
-        <source>Qt/KDE specific internet applications include the Qupzilla web-browser &lt;br/&gt;and kde-telepathy for chat and Instant Messaging. &lt;br/&gt;</source>
-        <translation>Les aplicaciones d&apos;internet específiques de QT/KDE inclúin el restolador &lt;br/&gt;web Qupzilla y kde-telepathy pa charres y mensaxería nel intre. &lt;br/&gt;</translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="144"/>
-        <source>For package management Octopi is the GUI application.&lt;br/&gt;</source>
-        <translation>L&apos;aplicación pa la xestión de paquetes ye Octopi.&lt;br/&gt;</translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="166"/>
-        <source>May using KaOS be a pleasant experience for you.</source>
-        <translation>Que l&apos;usu de KaOS sía una esperiencia prestosa pa tigo</translation>
-    </message>
-</context>
-</TS>
--- a/branding/kaos_branding/lang/calamares-kaos_branding_ca.ts
+++ b/branding/kaos_branding/lang/calamares-kaos_branding_ca.ts
@@ -1,35 +0,0 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="ca" version="2.1">
-<context>
-    <name>show</name>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="47"/>
-        <source>Here the actual install of KaOS will start.&lt;br/&gt;Use the left &lt;b&gt;mouse button&lt;/b&gt; to go to the next slide, right for previous.&lt;br/&gt;After creating your chosen disk setup in the first 10 % &lt;br/&gt;the full copying of the ISO will take the longest of this install phase &lt;br/&gt;and will run until approximately 30%.&lt;br/&gt;</source>
-        <translation>Aquí començarà realment la instal·lació del KaOS.&lt;br/&gt;Useu el botó de &lt;b&gt;l&apos;esquerra del ratolí&lt;/b&gt; per anar a la diapositiva següent i el de la dreta per a l&apos;anterior.&lt;br/&gt;Després de la creació de la configuració del disc que heu escollit durant el primer 10 %, &lt;br/&gt; la còpia sencera de la imatge ISO ocuparà la fase més llarga de la instal·lació &lt;br/&gt; i durarà aproximadament el 30%.&lt;br/&gt;</translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="73"/>
-        <source>After the ISO is copied some 25 post-install modules will run.&lt;br/&gt;This includes setting user specific options, &lt;br/&gt;removing Live Session only packages&lt;br/&gt;and adjusting hardware setup.&lt;br/&gt;</source>
-        <translation>Després que s&apos;hagi copiat la imatge ISO, s&apos;executaran 25 mòduls de postinstal·lació.&lt;br/&gt;Això inclou l&apos;establiment de les opcions específiques de l&apos;usuari &lt;br/&gt;removing Live Session only packages&lt;br/&gt;i la configuració del maquinari.&lt;br/&gt;</translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="98"/>
-        <source>The default Office Suite is Calligra.&lt;br/&gt;LibreOffice is available in the repositories. &lt;br/&gt;</source>
-        <translation>El conjunt d&apos;aplicacions d&apos;ofimàtica per defecte és el Calligra.&lt;br/&gt;El LibreOffice està disponible als repositoris. &lt;br/&gt;</translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="121"/>
-        <source>Qt/KDE specific internet applications include the Qupzilla web-browser &lt;br/&gt;and kde-telepathy for chat and Instant Messaging. &lt;br/&gt;</source>
-        <translation>Les aplicacions específiques d&apos;Internet de Qt/KDE inclouen el navegador web Qupzilla &lt;br/&gt;i el kde-telepathy per a xat i missatgeria instantània. &lt;br/&gt;</translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="144"/>
-        <source>For package management Octopi is the GUI application.&lt;br/&gt;</source>
-        <translation>Per a la gestió de paquets l&apos;aplicació gràfica és l&apos;Octopi.</translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="166"/>
-        <source>May using KaOS be a pleasant experience for you.</source>
-        <translation>Que usar el KaOS sigui una bona experiència!</translation>
-    </message>
-</context>
-</TS>
--- a/branding/kaos_branding/lang/calamares-kaos_branding_cs.ts
+++ b/branding/kaos_branding/lang/calamares-kaos_branding_cs.ts
@@ -1,35 +0,0 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="cs" version="2.1">
-<context>
-    <name>show</name>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="47"/>
-        <source>Here the actual install of KaOS will start.&lt;br/&gt;Use the left &lt;b&gt;mouse button&lt;/b&gt; to go to the next slide, right for previous.&lt;br/&gt;After creating your chosen disk setup in the first 10 % &lt;br/&gt;the full copying of the ISO will take the longest of this install phase &lt;br/&gt;and will run until approximately 30%.&lt;br/&gt;</source>
-        <translation>Zde začíná proces instalace KaOS.&lt;br/&gt;Použijte levé &lt;b&gt;tlačítko myši&lt;/b&gt; pro přechod na další snímek, pravé pro předchozí.&lt;br/&gt;Po vytvoření vámi vybraného disku v prvních 10 %&lt;br/&gt;zabere fáze kopírování celého ISO nejdelší dobu&lt;br/&gt; a potrvá přibližně do 30 %.</translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="73"/>
-        <source>After the ISO is copied some 25 post-install modules will run.&lt;br/&gt;This includes setting user specific options, &lt;br/&gt;removing Live Session only packages&lt;br/&gt;and adjusting hardware setup.&lt;br/&gt;</source>
-        <translation>Jakmile je ISO zkopírováno, spustí se na 25 po-instalačních modulů. Ty obsahují specifická uživatelská nastavení, &lt;br/&gt;odstraní balíčky živého sezení (Live)&lt;br/&gt; a přizpůsobí nastavení hardwaru.</translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="98"/>
-        <source>The default Office Suite is Calligra.&lt;br/&gt;LibreOffice is available in the repositories. &lt;br/&gt;</source>
-        <translation>Výchozí kancelářský balík je Calligra.&lt;br/&gt;LibreOffice je dostupný ve skladištích. &lt;br/&gt;</translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="121"/>
-        <source>Qt/KDE specific internet applications include the Qupzilla web-browser &lt;br/&gt;and kde-telepathy for chat and Instant Messaging. &lt;br/&gt;</source>
-        <translation>V Qt/KDE jsou obsaženy aplikace zaměřené na internet, jako webový prohlížeč Qupzilla a kde-telepathy pro vedení rozhovorů a okamžitou výměnu zpráv.</translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="144"/>
-        <source>For package management Octopi is the GUI application.&lt;br/&gt;</source>
-        <translation>Obrazovým rozhraním ku správě balíčků je Octopi.&lt;br/&gt;</translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="166"/>
-        <source>May using KaOS be a pleasant experience for you.</source>
-        <translation>Věříme, že práce s KaOS pro vás bude příjemnou zkušeností.</translation>
-    </message>
-</context>
-</TS>
--- a/branding/kaos_branding/lang/calamares-kaos_branding_de.ts
+++ b/branding/kaos_branding/lang/calamares-kaos_branding_de.ts
@@ -1,35 +0,0 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="de" version="2.1">
-<context>
-    <name>show</name>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="47"/>
-        <source>Here the actual install of KaOS will start.&lt;br/&gt;Use the left &lt;b&gt;mouse button&lt;/b&gt; to go to the next slide, right for previous.&lt;br/&gt;After creating your chosen disk setup in the first 10 % &lt;br/&gt;the full copying of the ISO will take the longest of this install phase &lt;br/&gt;and will run until approximately 30%.&lt;br/&gt;</source>
-        <translation>Die faktische Installation von KaOS beginnt nun. &lt;br/&gt;Verwende die linke &lt;b&gt; Maustaste, um auf die nächste Seite dieser Vorführung zu kommen, sowie die rechte, um einen Schritt zurückzugelangen. &lt;br/&gt; Nachdem die Partitionierung bei 10 % eingerichtet ist, &lt;br/&gt;wird der Kopiervorgang dieser ISO die längste Phase der Installation einnehmen, welcher bei rund 30% des Gesamtfortschritts fertig gestellt ist.</translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="73"/>
-        <source>After the ISO is copied some 25 post-install modules will run.&lt;br/&gt;This includes setting user specific options, &lt;br/&gt;removing Live Session only packages&lt;br/&gt;and adjusting hardware setup.&lt;br/&gt;</source>
-        <translation>Nachdem die ISO erfolgreich kopiert ist, werden rund 25 Module ausgeführt.&lt;br/&gt; Diese inkludieren, das setzen spezifischer Anwender Optionen, &lt;br/&gt; das entfernen der speziellen Live Programme und die Einrichtung deiner Hardware.</translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="98"/>
-        <source>The default Office Suite is Calligra.&lt;br/&gt;LibreOffice is available in the repositories. &lt;br/&gt;</source>
-        <translation>Das Standard-Office-Paket ist Calligra.&lt;br/&gt;LibreOffice ist in den Repositorien verfügbar. &lt;br/&gt;</translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="121"/>
-        <source>Qt/KDE specific internet applications include the Qupzilla web-browser &lt;br/&gt;and kde-telepathy for chat and Instant Messaging. &lt;br/&gt;</source>
-        <translation>Qt/KDE spezifische Anwendungen umfassen den Qupzilla Webbrowser &lt;br/&gt; sowie KDE Telepathy für Chat und Kurznachrichten.</translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="144"/>
-        <source>For package management Octopi is the GUI application.&lt;br/&gt;</source>
-        <translation>Octopi ist die grafische Lösung für deine Softwareverwaltung.</translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="166"/>
-        <source>May using KaOS be a pleasant experience for you.</source>
-        <translation>Möge die Verwendung von KaOS eine angenehme Erfahrung für dich sein.</translation>
-    </message>
-</context>
-</TS>
--- a/branding/kaos_branding/lang/calamares-kaos_branding_en.ts
+++ b/branding/kaos_branding/lang/calamares-kaos_branding_en.ts
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.1" language="en_US">
-<context>
-    <name>show</name>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="47"/>
-        <source>Here the actual install of KaOS will start.&lt;br/&gt;Use the left &lt;b&gt;mouse button&lt;/b&gt; to go to the next slide, right for previous.&lt;br/&gt;After creating your chosen disk setup in the first 10 % &lt;br/&gt;the full copying of the ISO will take the longest of this install phase &lt;br/&gt;and will run until approximately 30%.&lt;br/&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="73"/>
-        <source>After the ISO is copied some 25 post-install modules will run.&lt;br/&gt;This includes setting user specific options, &lt;br/&gt;removing Live Session only packages&lt;br/&gt;and adjusting hardware setup.&lt;br/&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="98"/>
-        <source>The default Office Suite is Calligra.&lt;br/&gt;LibreOffice is available in the repositories. &lt;br/&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="121"/>
-        <source>Qt/KDE specific internet applications include the Qupzilla web-browser &lt;br/&gt;and kde-telepathy for chat and Instant Messaging. &lt;br/&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="144"/>
-        <source>For package management Octopi is the GUI application.&lt;br/&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="166"/>
-        <source>May using KaOS be a pleasant experience for you.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
--- a/branding/kaos_branding/lang/calamares-kaos_branding_es.ts
+++ b/branding/kaos_branding/lang/calamares-kaos_branding_es.ts
@@ -1,35 +0,0 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="es" version="2.1">
-<context>
-    <name>show</name>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="47"/>
-        <source>Here the actual install of KaOS will start.&lt;br/&gt;Use the left &lt;b&gt;mouse button&lt;/b&gt; to go to the next slide, right for previous.&lt;br/&gt;After creating your chosen disk setup in the first 10 % &lt;br/&gt;the full copying of the ISO will take the longest of this install phase &lt;br/&gt;and will run until approximately 30%.&lt;br/&gt;</source>
-        <translation>Aquí comienza la instalación de KaOS actual.&lt;br/&gt;Use &lt;b&gt;el botón izquierdo del mouse&lt;/b&gt; para ir a la siguiente diapositiva, el derecho para la anterior.&lt;br/&gt;Luego de crearse la configuración de disco elegida durante el 10 % inicial,  &lt;br/&gt;la copia completa de la ISO será lo más largo de esta fase de la &lt;br/&gt;y se hará hasta aproximadamente el 30 %.&lt;br/&gt;</translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="73"/>
-        <source>After the ISO is copied some 25 post-install modules will run.&lt;br/&gt;This includes setting user specific options, &lt;br/&gt;removing Live Session only packages&lt;br/&gt;and adjusting hardware setup.&lt;br/&gt;</source>
-        <translation>Luego de copiarse la ISO se ejecutarán unos 25 módulos de post-instalacion.&lt;br/&gt;Esto incluye la configuración de las opciones específicas de usuario.&lt;br/&gt;removiendo sólo los paquetes de la Sesión Live&lt;br/&gt;y ajustando la configuración del hardware.&lt;br/&gt;</translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="98"/>
-        <source>The default Office Suite is Calligra.&lt;br/&gt;LibreOffice is available in the repositories. &lt;br/&gt;</source>
-        <translation>La Suite de Oficina por defecto es Calligra.&lt;br/&gt;LibreOffice se encuentra disponible en los repositorios.&lt;br/&gt;</translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="121"/>
-        <source>Qt/KDE specific internet applications include the Qupzilla web-browser &lt;br/&gt;and kde-telepathy for chat and Instant Messaging. &lt;br/&gt;</source>
-        <translation>Las aplicaciones Qt/KDE específicas para internet inclyen el navegador web Quzilla &lt;br/&gt;y kde-telepathy para chat y mensajería instantánea. &lt;br/&gt;</translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="144"/>
-        <source>For package management Octopi is the GUI application.&lt;br/&gt;</source>
-        <translation>Octopi es la aplicación GUI para la administración de paquetes.&lt;br/&gt;</translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="166"/>
-        <source>May using KaOS be a pleasant experience for you.</source>
-        <translation>Que el uso de KaOS sea una experiencia placentera para Ud.</translation>
-    </message>
-</context>
-</TS>
--- a/branding/kaos_branding/lang/calamares-kaos_branding_es_AR.ts
+++ b/branding/kaos_branding/lang/calamares-kaos_branding_es_AR.ts
@@ -1,35 +0,0 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="es_AR" version="2.1">
-<context>
-    <name>show</name>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="47"/>
-        <source>Here the actual install of KaOS will start.&lt;br/&gt;Use the left &lt;b&gt;mouse button&lt;/b&gt; to go to the next slide, right for previous.&lt;br/&gt;After creating your chosen disk setup in the first 10 % &lt;br/&gt;the full copying of the ISO will take the longest of this install phase &lt;br/&gt;and will run until approximately 30%.&lt;br/&gt;</source>
-        <translation>Aquí comienza la instalación de KaOS actual.&lt;br/&gt;Use &lt;b&gt;el botón izquierdo del mouse&lt;/b&gt; para ir a la siguiente diapositiva, el derecho para la anterior.&lt;br/&gt;Luego de crearse la configuración de disco elegida durante el 10 % inicial,  &lt;br/&gt;la copia completa de la ISO será lo más largo de esta fase de la &lt;br/&gt;y se hará hasta aproximadamente el 30 %.&lt;br/&gt;</translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="73"/>
-        <source>After the ISO is copied some 25 post-install modules will run.&lt;br/&gt;This includes setting user specific options, &lt;br/&gt;removing Live Session only packages&lt;br/&gt;and adjusting hardware setup.&lt;br/&gt;</source>
-        <translation>Luego de copiarse la ISO se ejecutarán unos 25 módulos de post-instalacion.&lt;br/&gt;Esto incluye la configuración de las opciones específicas de usuario.&lt;br/&gt;removiendo sólo los paquetes de la Sesión Live&lt;br/&gt;y ajustando la configuración del hardware.&lt;br/&gt;</translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="98"/>
-        <source>The default Office Suite is Calligra.&lt;br/&gt;LibreOffice is available in the repositories. &lt;br/&gt;</source>
-        <translation>La Suite de Oficina por defecto es Calligra.&lt;br/&gt;LibreOffice se encuentra disponible en los repositorios.&lt;br/&gt;</translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="121"/>
-        <source>Qt/KDE specific internet applications include the Qupzilla web-browser &lt;br/&gt;and kde-telepathy for chat and Instant Messaging. &lt;br/&gt;</source>
-        <translation>Las aplicaciones Qt/KDE específicas para internet inclyen el navegador web Quzilla &lt;br/&gt;y kde-telepathy para chat y mensajería instantánea. &lt;br/&gt;</translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="144"/>
-        <source>For package management Octopi is the GUI application.&lt;br/&gt;</source>
-        <translation>Octopi es la aplicación GUI para la administración de paquetes.&lt;br/&gt;</translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="166"/>
-        <source>May using KaOS be a pleasant experience for you.</source>
-        <translation>Que el uso de KaOS sea una experiencia placentera para Ud.</translation>
-    </message>
-</context>
-</TS>
--- a/branding/kaos_branding/lang/calamares-kaos_branding_fr.ts
+++ b/branding/kaos_branding/lang/calamares-kaos_branding_fr.ts
@@ -1,35 +0,0 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="fr" version="2.1">
-<context>
-    <name>show</name>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="47"/>
-        <source>Here the actual install of KaOS will start.&lt;br/&gt;Use the left &lt;b&gt;mouse button&lt;/b&gt; to go to the next slide, right for previous.&lt;br/&gt;After creating your chosen disk setup in the first 10 % &lt;br/&gt;the full copying of the ISO will take the longest of this install phase &lt;br/&gt;and will run until approximately 30%.&lt;br/&gt;</source>
-        <translation>L’installation de KaOS va commencer à partir d’ici.&lt;br/&gt;Veuillez utiliser le &lt;b&gt;bouton gauche de la souris&lt;/b&gt; pour passer à la diapositive suivante, bouton droit pour la précédente.&lt;br/&gt;Une fois les disques choisis créés dans les premier 10%,&lt;br/&gt; la copie de toute l’ISO sera la phase la plus longue de l’installation&lt;br/&gt; et durera jusqu’à environ 30%.&lt;br/&gt;</translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="73"/>
-        <source>After the ISO is copied some 25 post-install modules will run.&lt;br/&gt;This includes setting user specific options, &lt;br/&gt;removing Live Session only packages&lt;br/&gt;and adjusting hardware setup.&lt;br/&gt;</source>
-        <translation>Une fois l’ISO copiée, près de 25 modules post-installation seront exécutés.&lt;br/&gt;Cela comprend la configuration d’options utilisateur spécifiques,&lt;br/&gt;la suppression des paquets uniquement utilisés pour la session Live&lt;br/&gt;et la configuration des paramètres matériels.&lt;br/&gt;</translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="98"/>
-        <source>The default Office Suite is Calligra.&lt;br/&gt;LibreOffice is available in the repositories. &lt;br/&gt;</source>
-        <translation>La suite Office par défaut est Calligra.&lt;br/&gt;LibreOffice est disponible dans les dépôts.&lt;br/&gt;</translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="121"/>
-        <source>Qt/KDE specific internet applications include the Qupzilla web-browser &lt;br/&gt;and kde-telepathy for chat and Instant Messaging. &lt;br/&gt;</source>
-        <translation>Parmi les applications internet spécifiquement Qt/KDE, on peut noter le navigateur QupZilla &lt;br/&gt;et la messagerie instantanée et client chat kde-telepathy.&lt;br/&gt;</translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="144"/>
-        <source>For package management Octopi is the GUI application.&lt;br/&gt;</source>
-        <translation>Octopi est l’interface graphique pour la gestion de paquets.&lt;br/&gt;</translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="166"/>
-        <source>May using KaOS be a pleasant experience for you.</source>
-        <translation>En espérant que KaOS vous soit une expérience agréable.</translation>
-    </message>
-</context>
-</TS>
--- a/branding/kaos_branding/lang/calamares-kaos_branding_hu.ts
+++ b/branding/kaos_branding/lang/calamares-kaos_branding_hu.ts
@@ -1,35 +0,0 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="hu" version="2.1">
-<context>
-    <name>show</name>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="47"/>
-        <source>Here the actual install of KaOS will start.&lt;br/&gt;Use the left &lt;b&gt;mouse button&lt;/b&gt; to go to the next slide, right for previous.&lt;br/&gt;After creating your chosen disk setup in the first 10 % &lt;br/&gt;the full copying of the ISO will take the longest of this install phase &lt;br/&gt;and will run until approximately 30%.&lt;br/&gt;</source>
-        <translation>Elkezdődik a KaOS tényleges telepítése. A következő oldalra lépéshez &lt;br/&gt;használja a bal&lt;b&gt;egérgombot&lt;/b&gt;, a jobbat az előző oldalhoz. &lt;br/&gt;Miután kiválasztotta a megfelelő lemez beállítást az első 10 %-ban,&lt;br/&gt;elkezdődik a a leghosszabb folyamat a telepítés folyamán, az ISO átmásolása, ami nagyából 30%-ig tart.</translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="73"/>
-        <source>After the ISO is copied some 25 post-install modules will run.&lt;br/&gt;This includes setting user specific options, &lt;br/&gt;removing Live Session only packages&lt;br/&gt;and adjusting hardware setup.&lt;br/&gt;</source>
-        <translation>Az ISO másolása után lefut 25 telepítés utáni modul.&lt;br/&gt;Ide tartozik a felhasználó specifikus lehetőségek beállítása, &lt;br/&gt;a Live Session csomagok eltávolítása&lt;br/&gt; és a hardver telepítés kiigazítása.</translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="98"/>
-        <source>The default Office Suite is Calligra.&lt;br/&gt;LibreOffice is available in the repositories. &lt;br/&gt;</source>
-        <translation>Az alapértelmezett irodai programcsomag a Calligra viszont&lt;br/&gt;a LibreOffice is elérhető a tárolókban.&lt;br/&gt;</translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="121"/>
-        <source>Qt/KDE specific internet applications include the Qupzilla web-browser &lt;br/&gt;and kde-telepathy for chat and Instant Messaging. &lt;br/&gt;</source>
-        <translation>A Qt/KDE specifikus internetes alkalmazás a Qupzilla böngésző.&lt;br/&gt; A kde-telepathy alkalmazást használhatjuk chat és azonnali üzenetküldéshez.</translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="144"/>
-        <source>For package management Octopi is the GUI application.&lt;br/&gt;</source>
-        <translation>A csomagkezelő alkalmazás az Octopi amivel számos csomag közül lehet válogatni.&lt;br/&gt;</translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="166"/>
-        <source>May using KaOS be a pleasant experience for you.</source>
-        <translation>A KaOS használata kellemes élmény lesz a számodra.</translation>
-    </message>
-</context>
-</TS>
--- a/branding/kaos_branding/lang/calamares-kaos_branding_id_ID.ts
+++ b/branding/kaos_branding/lang/calamares-kaos_branding_id_ID.ts
@@ -1,35 +0,0 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="id_ID" version="2.1">
-<context>
-    <name>show</name>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="47"/>
-        <source>Here the actual install of KaOS will start.&lt;br/&gt;Use the left &lt;b&gt;mouse button&lt;/b&gt; to go to the next slide, right for previous.&lt;br/&gt;After creating your chosen disk setup in the first 10 % &lt;br/&gt;the full copying of the ISO will take the longest of this install phase &lt;br/&gt;and will run until approximately 30%.&lt;br/&gt;</source>
-        <translation>Di sini memasang KaOS yang sebenarnya akan mulai.&lt;br/&gt; Gunakan &lt;b&gt;tombol mouse&lt;/br&gt; kiri untuk pergi ke slide berikutnya, kanan untuk sebelumnya.&lt;br/&gt;Setelah membuat persiapan disk yang kamu pilih dalam 10% pertama &lt;br/&gt;penyalinan penuh ISO akan memakan waktu yang lama bagi fase pasang ini &lt;br/&gt;dan akan berlangsung sampai sekitar 30%.&lt;br/&gt;</translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="73"/>
-        <source>After the ISO is copied some 25 post-install modules will run.&lt;br/&gt;This includes setting user specific options, &lt;br/&gt;removing Live Session only packages&lt;br/&gt;and adjusting hardware setup.&lt;br/&gt;</source>
-        <translation>Setelah ISO tersebut disalin sekira 25 pasca pasang modul akan berjalan.&lt;br/&gt; Ini termasuk pilihan setelan spesifik pengguna,&lt;br/&gt; menghapus paket Sesi Live saja&lt;br/&gt; dan menyesuaikan persiapan perangkat keras.&lt;br/&gt;</translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="98"/>
-        <source>The default Office Suite is Calligra.&lt;br/&gt;LibreOffice is available in the repositories. &lt;br/&gt;</source>
-        <translation>Secara baku Rangkaian Perkantoran adalah Calligra.&lt;br/&gt;LibreOffice telah tersedia di repositori. &lt;br/&gt;</translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="121"/>
-        <source>Qt/KDE specific internet applications include the Qupzilla web-browser &lt;br/&gt;and kde-telepathy for chat and Instant Messaging. &lt;br/&gt;</source>
-        <translation>Aplikasi internet khusus Qt/KDE termasuk penjelajah web Qupzilla &lt;br/&gt;dan Instant Messaging dan kde-telepathy untuk chating. &lt;br/&gt;</translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="144"/>
-        <source>For package management Octopi is the GUI application.&lt;br/&gt;</source>
-        <translation>Untuk pengelolaan paket Octopi adalah aplikasi Antarmuka Pengguna Grafis.&lt;br/&gt;</translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="166"/>
-        <source>May using KaOS be a pleasant experience for you.</source>
-        <translation>Mungkin menggunakan KaOS menjadi pengalaman yang menyenangkan bagimu.</translation>
-    </message>
-</context>
-</TS>
--- a/branding/kaos_branding/lang/calamares-kaos_branding_nl_NL.ts
+++ b/branding/kaos_branding/lang/calamares-kaos_branding_nl_NL.ts
@@ -1,35 +0,0 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="nl_NL" version="2.1">
-<context>
-    <name>show</name>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="47"/>
-        <source>Here the actual install of KaOS will start.&lt;br/&gt;Use the left &lt;b&gt;mouse button&lt;/b&gt; to go to the next slide, right for previous.&lt;br/&gt;After creating your chosen disk setup in the first 10 % &lt;br/&gt;the full copying of the ISO will take the longest of this install phase &lt;br/&gt;and will run until approximately 30%.&lt;br/&gt;</source>
-        <translation>Hier begint de feitelijk installatie van KaOS.&lt;br&gt;Gebruik de linker &lt;b&gt;muis knop&lt;/b&gt; om naar de volgende slide te gaan, rechter om terug te gaan.&lt;br&gt;Na het maken van de door u gekozen schijf setup in de eerste 10%&lt;br&gt;het volledig copieren van de ISO neemt de langste tijd in beslag van deze installatie fase &lt;br&gt; en loopt tot ongeveer 30%.&lt;br&gt;</translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="73"/>
-        <source>After the ISO is copied some 25 post-install modules will run.&lt;br/&gt;This includes setting user specific options, &lt;br/&gt;removing Live Session only packages&lt;br/&gt;and adjusting hardware setup.&lt;br/&gt;</source>
-        <translation>Nadat de iso is gekopieerd ongeveer 25 post-installatie modules zullen worden uitgevoerd.&lt;br/&gt;Dit omvat instelling van gebruiker specifieke opties, &lt;br/&gt;verwijderen van Live Sessie exclusieve pakketten &lt;br/&gt; en het aanpassen van de hardware setup. &lt;br/&gt;</translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="98"/>
-        <source>The default Office Suite is Calligra.&lt;br/&gt;LibreOffice is available in the repositories. &lt;br/&gt;</source>
-        <translation>De standaard Office Suite is Calligra.&lt;br&gt;Libreoffice is beschikbaar in de repositories.&lt;br/&gt;</translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="121"/>
-        <source>Qt/KDE specific internet applications include the Qupzilla web-browser &lt;br/&gt;and kde-telepathy for chat and Instant Messaging. &lt;br/&gt;</source>
-        <translation>Qt / KDE specifieke internet toepassingen omvat de Qupzilla web-browser &lt;br/&gt; en kde-telepathie voor chat en Instant Messaging. &lt;br/&gt;</translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="144"/>
-        <source>For package management Octopi is the GUI application.&lt;br/&gt;</source>
-        <translation>Voor pakketbeheer Octopi is de GUI applicatie.&lt;br/&gt;</translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="166"/>
-        <source>May using KaOS be a pleasant experience for you.</source>
-        <translation>Mag het gebruiken van KaOS een aangename ervaring voor je zijn.</translation>
-    </message>
-</context>
-</TS>
--- a/branding/kaos_branding/lang/calamares-kaos_branding_pl.ts
+++ b/branding/kaos_branding/lang/calamares-kaos_branding_pl.ts
@@ -1,35 +0,0 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="pl" version="2.1">
-<context>
-    <name>show</name>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="47"/>
-        <source>Here the actual install of KaOS will start.&lt;br/&gt;Use the left &lt;b&gt;mouse button&lt;/b&gt; to go to the next slide, right for previous.&lt;br/&gt;After creating your chosen disk setup in the first 10 % &lt;br/&gt;the full copying of the ISO will take the longest of this install phase &lt;br/&gt;and will run until approximately 30%.&lt;br/&gt;</source>
-        <translation>Teraz nastąpi właściwa instalacja KaOS.&lt;br/&gt;Naciśnij lewy &lt;b&gt;przycisk myszki&lt;/b&gt; aby przejść do następnego slajdu, prawy zaś do poprzedniego.&lt;br/&gt;Po ustawieniu wybranej konfiguracji dysku podczas pierwszych 10 %, &lt;br/&gt;pełne kopiowanie ISO zajmie najdłuższą część instalacji&lt;br/&gt;i będzie trwało do około 30%.&lt;br/&gt;</translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="73"/>
-        <source>After the ISO is copied some 25 post-install modules will run.&lt;br/&gt;This includes setting user specific options, &lt;br/&gt;removing Live Session only packages&lt;br/&gt;and adjusting hardware setup.&lt;br/&gt;</source>
-        <translation>Po skopiowaniu obrazu ISO zostanie uruchomionych około 25 modułów postinstalacyjnych.&lt;br/&gt;Pozwolą one na wybór specyficznych dla użytkownika ustawień, &lt;br/&gt;usuną pakiety sesji Live&lt;br/&gt;i dostosują ustawienia sprzętowe.&lt;br/&gt;</translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="98"/>
-        <source>The default Office Suite is Calligra.&lt;br/&gt;LibreOffice is available in the repositories. &lt;br/&gt;</source>
-        <translation>Domyślnym Pakietem Biurowym jest Calligra.&lt;br/&gt;LibreOffice jest dostępny w repozytoriach. &lt;br/&gt;</translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="121"/>
-        <source>Qt/KDE specific internet applications include the Qupzilla web-browser &lt;br/&gt;and kde-telepathy for chat and Instant Messaging. &lt;br/&gt;</source>
-        <translation>Specjalistyczne aplikacje internetowe Qt/KDE, w tym przeglądarka internetowa Qupzilla &lt;br/&gt; i komunikator kde-telepathy</translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="144"/>
-        <source>For package management Octopi is the GUI application.&lt;br/&gt;</source>
-        <translation>Do zarządzania pakietami służy interfejs graficzny Octopi.&lt;br/&gt;</translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="166"/>
-        <source>May using KaOS be a pleasant experience for you.</source>
-        <translation>Życzymy, aby użytkowanie KaOS było dla Ciebie przyjemnym doświadczeniem.</translation>
-    </message>
-</context>
-</TS>
--- a/branding/kaos_branding/lang/calamares-kaos_branding_pt_BR.ts
+++ b/branding/kaos_branding/lang/calamares-kaos_branding_pt_BR.ts
@@ -1,35 +0,0 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="pt_BR" version="2.1">
-<context>
-    <name>show</name>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="47"/>
-        <source>Here the actual install of KaOS will start.&lt;br/&gt;Use the left &lt;b&gt;mouse button&lt;/b&gt; to go to the next slide, right for previous.&lt;br/&gt;After creating your chosen disk setup in the first 10 % &lt;br/&gt;the full copying of the ISO will take the longest of this install phase &lt;br/&gt;and will run until approximately 30%.&lt;br/&gt;</source>
-        <translation>Aqui ira começa a instalação do KaOS.&lt;br/&gt;Use o &lt;b&gt;botão esquerdo do mouse&lt;/b&gt; para navegar para o próximo slides, e o direito para o anterior.&lt;br/&gt; Após estará em 10% após criar as configurações do disco,&lt;br/&gt; a parte mais loga da instalação é a cópia da ISO &lt;br/&gt; está fase leva cerca de 30%&lt;br/&gt;</translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="73"/>
-        <source>After the ISO is copied some 25 post-install modules will run.&lt;br/&gt;This includes setting user specific options, &lt;br/&gt;removing Live Session only packages&lt;br/&gt;and adjusting hardware setup.&lt;br/&gt;</source>
-        <translation>Após a cópia da ISO serão executados 25 módulos pós instalação.&lt;br&gt;Isto inclue opções especificas de configuração de usuário, &lt;br&gt;remoção dos pacotes apenas da Sessão Live&lt;br&gt;e ajustes de configurações de hardware.</translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="98"/>
-        <source>The default Office Suite is Calligra.&lt;br/&gt;LibreOffice is available in the repositories. &lt;br/&gt;</source>
-        <translation>A Suite de escritório padrão é o Calligra.&lt;br/&gt;Porem o LibreOffice está disponível nos repositórios. &lt;br/&gt;</translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="121"/>
-        <source>Qt/KDE specific internet applications include the Qupzilla web-browser &lt;br/&gt;and kde-telepathy for chat and Instant Messaging. &lt;br/&gt;</source>
-        <translation>As aplicações de internet especificas do Qt/KDE incluem Qupzilla navegador web &lt;br&gt; e kde-telepathy para chat e mensagem instantânea. &lt;br/&gt;</translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="144"/>
-        <source>For package management Octopi is the GUI application.&lt;br/&gt;</source>
-        <translation>Para gestão de pacotes Octopi é a aplicação GUI. &lt;br/&gt;</translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="166"/>
-        <source>May using KaOS be a pleasant experience for you.</source>
-        <translation>Esperamos que você tenha uma experiencia agradável usando o KaOS.</translation>
-    </message>
-</context>
-</TS>
--- a/branding/kaos_branding/lang/calamares-kaos_branding_pt_PT.ts
+++ b/branding/kaos_branding/lang/calamares-kaos_branding_pt_PT.ts
@@ -1,35 +0,0 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="pt_PT" version="2.1">
-<context>
-    <name>show</name>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="47"/>
-        <source>Here the actual install of KaOS will start.&lt;br/&gt;Use the left &lt;b&gt;mouse button&lt;/b&gt; to go to the next slide, right for previous.&lt;br/&gt;After creating your chosen disk setup in the first 10 % &lt;br/&gt;the full copying of the ISO will take the longest of this install phase &lt;br/&gt;and will run until approximately 30%.&lt;br/&gt;</source>
-        <translation>Aqui a atual instalação do KaOS vai começar.&lt;br/&gt;Use o &lt;b&gt;botão esquerdo do rato&lt;/b&gt; para navegar para o próximo slide, e o direito para o anterior.&lt;br/&gt; Após estar em 10% após criar as configurações do disco,&lt;br/&gt; a parte mais longa da instalação é a cópia da ISO, &lt;br/&gt; esta fase leva cerca de 30%.&lt;br/&gt;</translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="73"/>
-        <source>After the ISO is copied some 25 post-install modules will run.&lt;br/&gt;This includes setting user specific options, &lt;br/&gt;removing Live Session only packages&lt;br/&gt;and adjusting hardware setup.&lt;br/&gt;</source>
-        <translation>Após a cópia da ISO serão executados 25 módulos pós instalação.&lt;br/&gt;Isto inclui opções especificas de configuração de utilizador, &lt;br/&gt;remoção dos pacotes apenas da Sessão Live&lt;br/&gt;e ajustes de configurações de hardware.&lt;br/&gt;</translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="98"/>
-        <source>The default Office Suite is Calligra.&lt;br/&gt;LibreOffice is available in the repositories. &lt;br/&gt;</source>
-        <translation>A suite de escritório padrão é o Calligra.&lt;br/&gt;Porém o LibreOffice está disponível nos repositórios. &lt;br/&gt;</translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="121"/>
-        <source>Qt/KDE specific internet applications include the Qupzilla web-browser &lt;br/&gt;and kde-telepathy for chat and Instant Messaging. &lt;br/&gt;</source>
-        <translation>As aplicações de internet especificas do Qt/KDE incluem o navegador web Qupzilla &lt;br/&gt;e o kde-telepathy para chat e mensagens instantâneas. &lt;br/&gt;</translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="144"/>
-        <source>For package management Octopi is the GUI application.&lt;br/&gt;</source>
-        <translation>Para gestão de pacotes o gestor GUI é o Octopi.</translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="166"/>
-        <source>May using KaOS be a pleasant experience for you.</source>
-        <translation>Esperamos que você tenha uma experiencia agradável usando o KaOS.</translation>
-    </message>
-</context>
-</TS>
--- a/branding/kaos_branding/lang/calamares-kaos_branding_ro_RO.ts
+++ b/branding/kaos_branding/lang/calamares-kaos_branding_ro_RO.ts
@@ -1,35 +0,0 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="ro_RO" version="2.1">
-<context>
-    <name>show</name>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="47"/>
-        <source>Here the actual install of KaOS will start.&lt;br/&gt;Use the left &lt;b&gt;mouse button&lt;/b&gt; to go to the next slide, right for previous.&lt;br/&gt;After creating your chosen disk setup in the first 10 % &lt;br/&gt;the full copying of the ISO will take the longest of this install phase &lt;br/&gt;and will run until approximately 30%.&lt;br/&gt;</source>
-        <translation>Aici va începe efectiv instalarea KaOS.&lt;br/&gt;Folosiți butonul &lt;b&gt;mouse stânga&lt;/b&gt; pentru a avansa la următorul diapozitiv, clic dreapta pentru cel anterior.&lt;br/&gt;După crearea configurației dorită de disc, primele 10% din instalare, adică copierea efectivă&lt;br/&gt;a ISO-ului va dura cel mai mult din faza de instalare &lt;br/&gt;și va dura aproximativ 30% din timp.&lt;br/&gt;</translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="73"/>
-        <source>After the ISO is copied some 25 post-install modules will run.&lt;br/&gt;This includes setting user specific options, &lt;br/&gt;removing Live Session only packages&lt;br/&gt;and adjusting hardware setup.&lt;br/&gt;</source>
-        <translation>După ce este copiat ISO-ul, vor rula aproximativ 25 de module post-instalare.&lt;br/&gt;Aceasta include setarea opțiunilor specifice pentru utilizator, &lt;br/&gt;ștergerea pachetelor valabile doar pentru sesiunea live&lt;br/&gt;și ajustarea configurației hardware.&lt;br/&gt;</translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="98"/>
-        <source>The default Office Suite is Calligra.&lt;br/&gt;LibreOffice is available in the repositories. &lt;br/&gt;</source>
-        <translation>Suita implicită de Office este Calligra.&lt;br/&gt;În depozite mai este disponibil și LibreOffice.&lt;br/&gt;</translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="121"/>
-        <source>Qt/KDE specific internet applications include the Qupzilla web-browser &lt;br/&gt;and kde-telepathy for chat and Instant Messaging. &lt;br/&gt;</source>
-        <translation>Aplicații specifice pentru internet Qt/KDE includ browserul Qupzilla &lt;br/&gt;și kde-telepathy pentru chat și mesagerie instant.&lt;br/&gt;</translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="144"/>
-        <source>For package management Octopi is the GUI application.&lt;br/&gt;</source>
-        <translation>Octopi este aplicația GUI pentru gestiunea pachetelor.&lt;br/&gt;</translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="166"/>
-        <source>May using KaOS be a pleasant experience for you.</source>
-        <translation>Fie ca spiritul KaOS-ului să vă aducă o experiență plăcută în utilizare.</translation>
-    </message>
-</context>
-</TS>
--- a/branding/kaos_branding/lang/calamares-kaos_branding_ru.ts
+++ b/branding/kaos_branding/lang/calamares-kaos_branding_ru.ts
@@ -1,36 +0,0 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="ru" version="2.1">
-<context>
-    <name>show</name>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="47"/>
-        <source>Here the actual install of KaOS will start.&lt;br/&gt;Use the left &lt;b&gt;mouse button&lt;/b&gt; to go to the next slide, right for previous.&lt;br/&gt;After creating your chosen disk setup in the first 10 % &lt;br/&gt;the full copying of the ISO will take the longest of this install phase &lt;br/&gt;and will run until approximately 30%.&lt;br/&gt;</source>
-        <translation>Здесь начнётся реальная установка KaOS.&lt;br/&gt;Используйте левую &lt;b&gt;кнопку мыши&lt;/b&gt; для следования дальше, правую для
-возвращения.&lt;br/&gt;После создания выбранного диска в первые 10 %, &lt;br/&gt;начнётся полное копирование ISO, это самая длинная фаза &lt;br/&gt;продлится примерно до 30%.&lt;br/&gt;</translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="73"/>
-        <source>After the ISO is copied some 25 post-install modules will run.&lt;br/&gt;This includes setting user specific options, &lt;br/&gt;removing Live Session only packages&lt;br/&gt;and adjusting hardware setup.&lt;br/&gt;</source>
-        <translation>После копирования ISO, будут запущены 25 после-установочных модулей.&lt;br/&gt;Это содержит настройку параметров пользователя, &lt;br/&gt;удаление пакетов live-сенаса&lt;br/&gt;и настройка установки оборудования.&lt;br/&gt;</translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="98"/>
-        <source>The default Office Suite is Calligra.&lt;br/&gt;LibreOffice is available in the repositories. &lt;br/&gt;</source>
-        <translation>Офисный пакет по умолчанию - Calligra.&lt;br/&gt;LibreOffice доступен в репозиториях. &lt;br/&gt;</translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="121"/>
-        <source>Qt/KDE specific internet applications include the Qupzilla web-browser &lt;br/&gt;and kde-telepathy for chat and Instant Messaging. &lt;br/&gt;</source>
-        <translation>Специфические для Qt/KDE интернет-приложения включают веб-браузер Qupzilla &lt;br/&gt;и kde-telepathy для чата и мгновенных сообщений. &lt;br/&gt;</translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="144"/>
-        <source>For package management Octopi is the GUI application.&lt;br/&gt;</source>
-        <translation>Для управления пакетами - Octopi, приложение с графическим интерфейсом.&lt;br/&gt;</translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="166"/>
-        <source>May using KaOS be a pleasant experience for you.</source>
-        <translation>Возможно использование KaOS, будет для Вас приятным опытом.</translation>
-    </message>
-</context>
-</TS>
--- a/branding/kaos_branding/lang/calamares-kaos_branding_sr_RS.ts
+++ b/branding/kaos_branding/lang/calamares-kaos_branding_sr_RS.ts
@@ -1,35 +0,0 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="sr_RS" version="2.1">
-<context>
-    <name>show</name>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="47"/>
-        <source>Here the actual install of KaOS will start.&lt;br/&gt;Use the left &lt;b&gt;mouse button&lt;/b&gt; to go to the next slide, right for previous.&lt;br/&gt;After creating your chosen disk setup in the first 10 % &lt;br/&gt;the full copying of the ISO will take the longest of this install phase &lt;br/&gt;and will run until approximately 30%.&lt;br/&gt;</source>
-        <translation>Сада ће почети инсталација за КаОС.&lt;br/&gt;Користите леви &lt;b&gt;тастер миша&lt;/b&gt; за следећи слајд, десни за претходни.&lt;br/&gt;Након креирања изабране поставе диска у првих 10 % &lt;br/&gt;, потпуно копирање система трајаће најдуже &lt;br/&gt;и трајаће до отприлике 30%.&lt;br/&gt;</translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="73"/>
-        <source>After the ISO is copied some 25 post-install modules will run.&lt;br/&gt;This includes setting user specific options, &lt;br/&gt;removing Live Session only packages&lt;br/&gt;and adjusting hardware setup.&lt;br/&gt;</source>
-        <translation>Након што се систем ископира, неких 25 пост-инсталационих модула биће покренуто.&lt;br/&gt;То укључује корисничке опције, &lt;br/&gt;уклањање пакета живе сесије&lt;br/&gt;и подешавања хардвера.&lt;br/&gt;</translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="98"/>
-        <source>The default Office Suite is Calligra.&lt;br/&gt;LibreOffice is available in the repositories. &lt;br/&gt;</source>
-        <translation>Подразумевани канцеларијски пакет је Калигра.&lt;br/&gt;Либре офис је доступан у ризницама. &lt;br/&gt;</translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="121"/>
-        <source>Qt/KDE specific internet applications include the Qupzilla web-browser &lt;br/&gt;and kde-telepathy for chat and Instant Messaging. &lt;br/&gt;</source>
-        <translation>КуТ/КДЕ интернет апликације укључују Капзилу, веб прегледач &lt;br/&gt;и кде-телепатију за ћаскање и тренутне поруке. &lt;br/&gt;</translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="144"/>
-        <source>For package management Octopi is the GUI application.&lt;br/&gt;</source>
-        <translation>За управљање пакетима, Октопи је права апликација.&lt;br/&gt;</translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="166"/>
-        <source>May using KaOS be a pleasant experience for you.</source>
-        <translation>Нека вам коришћење КаОС оперативног система буде лепо искуство.</translation>
-    </message>
-</context>
-</TS>
--- a/branding/kaos_branding/lang/calamares-kaos_branding_tr_TR.ts
+++ b/branding/kaos_branding/lang/calamares-kaos_branding_tr_TR.ts
@@ -1,35 +0,0 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="tr_TR" version="2.1">
-<context>
-    <name>show</name>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="47"/>
-        <source>Here the actual install of KaOS will start.&lt;br/&gt;Use the left &lt;b&gt;mouse button&lt;/b&gt; to go to the next slide, right for previous.&lt;br/&gt;After creating your chosen disk setup in the first 10 % &lt;br/&gt;the full copying of the ISO will take the longest of this install phase &lt;br/&gt;and will run until approximately 30%.&lt;br/&gt;</source>
-        <translation>KaOS şimdi kuruluma başlayacak.&lt;br/&gt;Farenin sol tıklama &lt;b&gt;butonunu kullan&lt;/b&gt; ve sonraki kurulum aşaması için ileri, önceki aşama için geri butonuna tıklayın.&lt;br/&gt;Önce 10%  seçtiğiniz bir disk kurulumu oluşturduktan sonra ISO kalıbı kopyalanacak &lt;br/&gt;ve aşama yaklaşık 30% kadar sürecek</translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="73"/>
-        <source>After the ISO is copied some 25 post-install modules will run.&lt;br/&gt;This includes setting user specific options, &lt;br/&gt;removing Live Session only packages&lt;br/&gt;and adjusting hardware setup.&lt;br/&gt;</source>
-        <translation>ISO kalıbı kopyalandıktan sonra bazı işlemler için 25 post-install modülü çalışacaktır.&lt;br/&gt;Bu ayarlar kullanıcı seçeneklerini ve yapılandırmalarını içerir,  &lt;br/&gt;live oturum paketleri kaldırılır &lt;br/&gt;ve bazı donanım sürücüleri kurulur.&lt;br/&gt;</translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="98"/>
-        <source>The default Office Suite is Calligra.&lt;br/&gt;LibreOffice is available in the repositories. &lt;br/&gt;</source>
-        <translation>Varsayılan Ofis Paketi Calligra&apos;dır.&lt;br/&gt;LibreOffice Repoda Mevcuttur.&lt;br/&gt;</translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="121"/>
-        <source>Qt/KDE specific internet applications include the Qupzilla web-browser &lt;br/&gt;and kde-telepathy for chat and Instant Messaging. &lt;br/&gt;</source>
-        <translation>Qt/KDE internet uygulamaları Qupzilla web tarayıcı &lt;br/&gt; ile sohbet ve mesajlaşma için kde-telepathy programını içerir. &lt;br/&gt;</translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="144"/>
-        <source>For package management Octopi is the GUI application.&lt;br/&gt;</source>
-        <translation>Octopi paket yönetimi için bir GUI grafik arayüz uygulamadır.&lt;br/&gt;</translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="166"/>
-        <source>May using KaOS be a pleasant experience for you.</source>
-        <translation>KaOS kullanmak sizin için hoş bir deneyim olabilir.</translation>
-    </message>
-</context>
-</TS>
--- a/branding/kaos_branding/lang/calamares-kaos_branding_zh_CN.ts
+++ b/branding/kaos_branding/lang/calamares-kaos_branding_zh_CN.ts
@@ -1,35 +0,0 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="zh_CN" version="2.1">
-<context>
-    <name>show</name>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="47"/>
-        <source>Here the actual install of KaOS will start.&lt;br/&gt;Use the left &lt;b&gt;mouse button&lt;/b&gt; to go to the next slide, right for previous.&lt;br/&gt;After creating your chosen disk setup in the first 10 % &lt;br/&gt;the full copying of the ISO will take the longest of this install phase &lt;br/&gt;and will run until approximately 30%.&lt;br/&gt;</source>
-        <translation>KaOS的安装即将开始。&lt;br/&gt;左击&lt;b&gt;鼠标&lt;/b&gt;来观看下一个幻灯片。&lt;br/&gt;在第一次创建磁盘设置后10%,&lt;br/&gt;将会开始进行镜像的复制&lt;br/&gt;并且运行至30%。&lt;br/&gt;</translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="73"/>
-        <source>After the ISO is copied some 25 post-install modules will run.&lt;br/&gt;This includes setting user specific options, &lt;br/&gt;removing Live Session only packages&lt;br/&gt;and adjusting hardware setup.&lt;br/&gt;</source>
-        <translation>之后，镜像文件将会复制25个安装模块并运行。&lt;br/&gt;这包括设置用户特定选项，&lt;br/&gt;删除Live会话和包&lt;br/&gt;并调整硬件设置。&lt;br/&gt;</translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="98"/>
-        <source>The default Office Suite is Calligra.&lt;br/&gt;LibreOffice is available in the repositories. &lt;br/&gt;</source>
-        <translation>默认的办公套件是Calligra。&lt;br/&gt;LibreOffice 在软件源中可用。&lt;br/&gt;</translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="121"/>
-        <source>Qt/KDE specific internet applications include the Qupzilla web-browser &lt;br/&gt;and kde-telepathy for chat and Instant Messaging. &lt;br/&gt;</source>
-        <translation>Qt/KDE的特色网络应用程序包含Qupzilla网络浏览器&lt;br/&gt;并且KDE-Telepathy可用于即时通讯。&lt;br/&gt;</translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="144"/>
-        <source>For package management Octopi is the GUI application.&lt;br/&gt;</source>
-        <translation>Octopi是默认的图形化包管理器。&lt;br/&gt;</translation>
-    </message>
-    <message>
-        <location filename="../kaos_branding/show.qml" line="166"/>
-        <source>May using KaOS be a pleasant experience for you.</source>
-        <translation>KaOS可以获得更好的体验。</translation>
-    </message>
-</context>
-</TS>
--- a/branding/kaos_branding/pan-end-symbolic.svg
+++ b/branding/kaos_branding/pan-end-symbolic.svg
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' standalone='no'?>
-<svg height="16" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" version="1.1" width="16" xmlns="http://www.w3.org/2000/svg" enable-background="new">
- <metadata id="metadata90"/>
- <defs id="defs7386">
-  <linearGradient id="linearGradient5606" osb:paint="solid">
-   <stop id="stop5608"/>
-  </linearGradient>
-  <filter inkscape:collect="always" color-interpolation-filters="sRGB" id="filter7554">
-   <feBlend inkscape:collect="always" id="feBlend7556" in2="BackgroundImage" mode="darken"/>
-  </filter>
- </defs>
- <g inkscape:groupmode="layer" id="layer12" inkscape:label="actions" transform="translate(-445.0002,-129)">
-  <path inkscape:connector-curvature="0" d="m 451.0002,142 5,-5 -5,-5 z" id="path6412" sodipodi:nodetypes="cccc" fill="#555555"/>
- </g>
-</svg>
--- a/branding/kaos_branding/pan-start-symbolic.svg
+++ b/branding/kaos_branding/pan-start-symbolic.svg
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' standalone='no'?>
-<svg height="16" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" version="1.1" width="16" xmlns="http://www.w3.org/2000/svg" enable-background="new">
- <metadata id="metadata90"/>
- <defs id="defs7386">
-  <linearGradient id="linearGradient5606" osb:paint="solid">
-   <stop id="stop5608"/>
-  </linearGradient>
-  <filter inkscape:collect="always" color-interpolation-filters="sRGB" id="filter7554">
-   <feBlend inkscape:collect="always" id="feBlend7556" in2="BackgroundImage" mode="darken"/>
-  </filter>
- </defs>
- <g inkscape:groupmode="layer" id="layer12" inkscape:label="actions" transform="translate(-425.0002,-129)">
-  <path inkscape:connector-curvature="0" d="m 435.0002,142 -5,-5 5,-5 z" id="path6400-8" sodipodi:nodetypes="cccc" fill="#555555"/>
- </g>
-</svg>
--- a/branding/kaos_branding/squid.png
+++ b/branding/kaos_branding/squid.png
--- a/branding/samegame/Block.qml
+++ b/branding/samegame/Block.qml
@@ -1,73 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-//![0]
-import QtQuick 2.0
-
-Item {
-    id: block
-
-    property int type: 0
-
-    Image {
-        id: img
-
-        anchors.fill: parent
-        source: {
-            if (type == 0)
-                return "img/redStone.png";
-            else if (type == 1)
-                return "img/blueStone.png";
-            else
-                return "img/greenStone.png";
-        }
-    }
-}
-//![0]
--- a/branding/samegame/Button.qml
+++ b/branding/samegame/Button.qml
@@ -1,91 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-Rectangle {
-    id: container
-
-    property string text: "Button"
-
-    signal clicked
-
-    width: buttonLabel.width + 20; height: buttonLabel.height + 5
-    border { width: 1; color: Qt.darker(activePalette.button) }
-    antialiasing: true
-    radius: 8
-
-    // color the button with a gradient
-    gradient: Gradient {
-        GradientStop {
-            position: 0.0
-            color: {
-                if (mouseArea.pressed)
-                    return activePalette.dark
-                else
-                    return activePalette.light
-            }
-        }
-        GradientStop { position: 1.0; color: activePalette.button }
-    }
-
-    MouseArea {
-        id: mouseArea
-        anchors.fill: parent
-        onClicked: container.clicked();
-    }
-
-    Text {
-        id: buttonLabel
-        anchors.centerIn: container
-        color: activePalette.buttonText
-        text: container.text
-    }
-}
--- a/branding/samegame/Dialog.qml
+++ b/branding/samegame/Dialog.qml
@@ -1,81 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-//![0]
-import QtQuick 2.0
-
-Rectangle {
-    id: container
-
-    function show(text) {
-        dialogText.text = text;
-        container.opacity = 1;
-    }
-
-    function hide() {
-        container.opacity = 0;
-    }
-
-    width: dialogText.width + 20
-    height: dialogText.height + 20
-    opacity: 0
-
-    Text {
-        id: dialogText
-        anchors.centerIn: parent
-        text: ""
-    }
-
-    MouseArea {
-        anchors.fill: parent
-        onClicked: hide();
-    }
-}
-//![0]
--- a/branding/samegame/background.jpg
+++ b/branding/samegame/background.jpg
--- a/branding/samegame/branding.desc
+++ b/branding/samegame/branding.desc
@@ -1,77 +0,0 @@
---
-componentName:  samegame
-
-# This selects between different welcome texts. When false, uses
-# the traditional "Welcome to the %1 installer.", and when true,
-# uses "Welcome to the Calamares installer for %1." This allows
-# to distinguish this installer from other installers for the
-# same distribution.
-welcomeStyleCalamares:   false
-
-# These are strings shown to the user in the user interface.
-# There is no provision for translating them -- since they
-# are names, the string is included as-is.
-#
-# The four Url strings are the Urls used by the buttons in
-# the welcome screen, and are not shown to the user. Clicking
-# on the "Support" button, for instance, opens the link supportUrl.
-# If a Url is empty, the corresponding button is not shown.
-#
-# bootloaderEntryName is how this installation / distro is named
-# in the boot loader (e.g. in the GRUB menu).
-strings:
-    productName:         Generic GNU/Linux
-    shortProductName:    Generic
-    version:             2018.1 LTS
-    shortVersion:        2018.1
-    versionedName:       Generic GNU/Linux 2018.1 LTS "Tasseled Tambourine"
-    shortVersionedName:  Generic 2018.1
-    bootloaderEntryName: Generic
-    productUrl:          https://calamares.io/
-    supportUrl:          https://github.com/calamares/calamares/issues
-    knownIssuesUrl:      https://calamares.io/about/
-    releaseNotesUrl:     https://calamares.io/about/
-
-# Should the welcome image (productWelcome, below) be scaled
-# up beyond its natural size? If false, the image does not grow
-# with the window but remains the same size throughout (this
-# may have surprising effects on HiDPI monitors).
-welcomeExpandingLogo:   true
-
-# These images are loaded from the branding module directory.
-#
-# productIcon is used as the window icon, and will (usually) be used
-#       by the window manager to represent the application. This image
-#       should be square, and may be displayed by the window manager
-#       as small as 16x16 (but possibly larger).
-# productLogo is used as the logo at the top of the left-hand column
-#       which shows the steps to be taken. The image should be square,
-#       and is displayed at 80x80 pixels (also on HiDPI).
-# productWelcome is shown on the welcome page of the application in
-#       the middle of the window, below the welcome text. It can be
-#       any size and proportion, and will be scaled to fit inside
-#       the window. Use `welcomeExpandingLogo` to make it non-scaled.
-#       Recommended size is 320x150.
-images:
-    productLogo:         "squidball.png"
-    productIcon:         "squidball.png"
-    productWelcome:      "languages.png"
-
-# The slideshow is displayed during execution steps (e.g. when the
-# installer is actually writing to disk and doing other slow things).
-slideshow:               "samegame.qml"
-slideshowAPI:            1
-
-# Colors for text and background components.
-#
-#  - sidebarBackground is the background of the sidebar
-#  - sidebarText is the (foreground) text color
-#  - sidebarTextHighlight sets the background of the selected (current) step.
-#    Optional, and defaults to the application palette.
-#  - sidebarSelect is the text color of the selected step.
-#
-style:
-   sidebarBackground:    "#292F34"
-   sidebarText:          "#FFFFFF"
-   sidebarTextSelect:    "#292F34"
-   sidebarTextHighlight: "#D35400"
--- a/branding/samegame/img/blueStar.png
+++ b/branding/samegame/img/blueStar.png
--- a/branding/samegame/img/blueStone.png
+++ b/branding/samegame/img/blueStone.png
--- a/branding/samegame/img/greenStar.png
+++ b/branding/samegame/img/greenStar.png
--- a/branding/samegame/img/greenStone.png
+++ b/branding/samegame/img/greenStone.png
--- a/branding/samegame/img/redStar.png
+++ b/branding/samegame/img/redStar.png
--- a/branding/samegame/img/redStone.png
+++ b/branding/samegame/img/redStone.png
--- a/branding/samegame/img/yellowStone.png
+++ b/branding/samegame/img/yellowStone.png
--- a/branding/samegame/languages.png
+++ b/branding/samegame/languages.png
--- a/branding/samegame/samegame.js
+++ b/branding/samegame/samegame.js
@@ -1,174 +0,0 @@
-/* This script file handles the game logic */
-var maxColumn = 10;
-var maxRow = 15;
-var maxIndex = maxColumn * maxRow;
-var board = new Array(maxIndex);
-var component;
-
-//Index function used instead of a 2D array
-function index(column, row) {
-    return column + (row * maxColumn);
-}
-
-function startNewGame() {
-    //Calculate board size
-    maxColumn = Math.floor(gameCanvas.width / gameCanvas.blockSize);
-    maxRow = Math.floor(gameCanvas.height / gameCanvas.blockSize);
-    maxIndex = maxRow * maxColumn;
-
-    //Close dialogs
-    dialog.hide();
-
-    //Initialize Board
-    board = new Array(maxIndex);
-    gameCanvas.score = 0;
-    for (var column = 0; column < maxColumn; column++) {
-        for (var row = 0; row < maxRow; row++) {
-            board[index(column, row)] = null;
-            createBlock(column, row);
-        }
-    }
-}
-
-function createBlock(column, row) {
-    if (component == null)
-        component = Qt.createComponent("Block.qml");
-
-    // Note that if Block.qml was not a local file, component.status would be
-    // Loading and we should wait for the component's statusChanged() signal to
-    // know when the file is downloaded and ready before calling createObject().
-    if (component.status == Component.Ready) {
-        var dynamicObject = component.createObject(gameCanvas);
-        if (dynamicObject == null) {
-            console.log("error creating block");
-            console.log(component.errorString());
-            return false;
-        }
-        dynamicObject.type = Math.floor(Math.random() * 3);
-        dynamicObject.x = column * gameCanvas.blockSize;
-        dynamicObject.y = row * gameCanvas.blockSize;
-        dynamicObject.width = gameCanvas.blockSize;
-        dynamicObject.height = gameCanvas.blockSize;
-        board[index(column, row)] = dynamicObject;
-    } else {
-        console.log("error loading block component");
-        console.log(component.errorString());
-        return false;
-    }
-    return true;
-}
-
-var fillFound; //Set after a floodFill call to the number of blocks found
-var floodBoard; //Set to 1 if the floodFill reaches off that node
-
-//![1]
-function handleClick(xPos, yPos) {
-    var column = Math.floor(xPos / gameCanvas.blockSize);
-    var row = Math.floor(yPos / gameCanvas.blockSize);
-    if (column >= maxColumn || column < 0 || row >= maxRow || row < 0)
-        return;
-    if (board[index(column, row)] == null)
-        return;
-    //If it's a valid block, remove it and all connected (does nothing if it's not connected)
-    floodFill(column, row, -1);
-    if (fillFound <= 0)
-        return;
-    gameCanvas.score += (fillFound - 1) * (fillFound - 1);
-    shuffleDown();
-    victoryCheck();
-}
-//![1]
-
-function floodFill(column, row, type) {
-    if (board[index(column, row)] == null)
-        return;
-    var first = false;
-    if (type == -1) {
-        first = true;
-        type = board[index(column, row)].type;
-
-        //Flood fill initialization
-        fillFound = 0;
-        floodBoard = new Array(maxIndex);
-    }
-    if (column >= maxColumn || column < 0 || row >= maxRow || row < 0)
-        return;
-    if (floodBoard[index(column, row)] == 1 || (!first && type != board[index(column, row)].type))
-        return;
-    floodBoard[index(column, row)] = 1;
-    floodFill(column + 1, row, type);
-    floodFill(column - 1, row, type);
-    floodFill(column, row + 1, type);
-    floodFill(column, row - 1, type);
-    if (first == true && fillFound == 0)
-        return;     //Can't remove single blocks
-    board[index(column, row)].opacity = 0;
-    board[index(column, row)] = null;
-    fillFound += 1;
-}
-
-function shuffleDown() {
-    //Fall down
-    for (var column = 0; column < maxColumn; column++) {
-        var fallDist = 0;
-        for (var row = maxRow - 1; row >= 0; row--) {
-            if (board[index(column, row)] == null) {
-                fallDist += 1;
-            } else {
-                if (fallDist > 0) {
-                    var obj = board[index(column, row)];
-                    obj.y += fallDist * gameCanvas.blockSize;
-                    board[index(column, row + fallDist)] = obj;
-                    board[index(column, row)] = null;
-                }
-            }
-        }
-    }
-    //Fall to the left
-    var fallDist = 0;
-    for (var column = 0; column < maxColumn; column++) {
-        if (board[index(column, maxRow - 1)] == null) {
-            fallDist += 1;
-        } else {
-            if (fallDist > 0) {
-                for (var row = 0; row < maxRow; row++) {
-                    var obj = board[index(column, row)];
-                    if (obj == null)
-                        continue;
-                    obj.x -= fallDist * gameCanvas.blockSize;
-                    board[index(column - fallDist, row)] = obj;
-                    board[index(column, row)] = null;
-                }
-            }
-        }
-    }
-}
-
-//![2]
-function victoryCheck() {
-    //Award bonus points if no blocks left
-    var deservesBonus = true;
-    for (var column = maxColumn - 1; column >= 0; column--)
-        if (board[index(column, maxRow - 1)] != null)
-        deservesBonus = false;
-    if (deservesBonus)
-        gameCanvas.score += 500;
-
-    //Check whether game has finished
-    if (deservesBonus || !(floodMoveCheck(0, maxRow - 1, -1)))
-        dialog.show("Game Over. Your score is " + gameCanvas.score);
-}
-//![2]
-
-//only floods up and right, to see if it can find adjacent same-typed blocks
-function floodMoveCheck(column, row, type) {
-    if (column >= maxColumn || column < 0 || row >= maxRow || row < 0)
-        return false;
-    if (board[index(column, row)] == null)
-        return false;
-    var myType = board[index(column, row)].type;
-    if (type == myType)
-        return true;
-    return floodMoveCheck(column + 1, row, myType) || floodMoveCheck(column, row - 1, board[index(column, row)].type);
-}
-
--- a/branding/samegame/samegame.qml
+++ b/branding/samegame/samegame.qml
@@ -1,113 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-//![0]
-import QtQuick 2.0
-import "samegame.js" as SameGame
-
-Rectangle {
-    id: screen
-
-    width: 490; height: 720
-
-    SystemPalette { id: activePalette }
-
-    Item {
-        width: parent.width
-        anchors { top: parent.top; bottom: toolBar.top }
-
-        Image {
-            id: background
-            anchors.fill: parent
-            source: "background.jpg"
-            fillMode: Image.PreserveAspectCrop
-        }
-
-//![1]
-        Item {
-            id: gameCanvas
-
-            property int score: 0
-            property int blockSize: 40
-
-            width: parent.width - (parent.width % blockSize)
-            height: parent.height - (parent.height % blockSize)
-            anchors.centerIn: parent
-
-            MouseArea {
-                anchors.fill: parent
-                onClicked: SameGame.handleClick(mouse.x, mouse.y)
-            }
-        }
-//![1]
-    }
-
-//![2]
-    Dialog {
-        id: dialog
-        anchors.centerIn: parent
-        z: 100
-    }
-//![2]
-
-    Rectangle {
-        id: toolBar
-        width: parent.width; height: 30
-        color: activePalette.window
-        anchors.bottom: screen.bottom
-
-        Button {
-            anchors { left: parent.left; verticalCenter: parent.verticalCenter }
-            text: "New Game"
-            onClicked: SameGame.startNewGame()
-        }
-    }
-}
-//![0]
--- a/branding/samegame/squidball.png
+++ b/branding/samegame/squidball.png
--- a/branding/samegame/star.png
+++ b/branding/samegame/star.png
--- a/modules/basestrap/basestrap.conf
+++ b/modules/basestrap/basestrap.conf
@@ -41,6 +41,8 @@ backend: dummy
 # when set to true.  If missing, false is assumed.
 # *handle_keyrings* is a boolean that includes initializing and populating keyrings
 # when set to true.  If missing, false is assumed.
+# *copy_pacconf* is a boolean that includes copying the host's pacman.conf
+# to the install root.  If missing, false is assumed.

 pacman:
    num_retries: 0
--- a/modules/packagechooser/CMakeLists.txt
+++ b/modules/packagechooser/CMakeLists.txt
@@ -7,12 +7,15 @@ find_package(${qtname} COMPONENTS Core Gui Widgets REQUIRED)
 set(_extra_libraries "")
 set(_extra_src "")

+set(_netinstall ${CMAKE_CURRENT_SOURCE_DIR}/../netinstall)
+include_directories(${_netinstall})
+
 ### OPTIONAL AppData XML support in PackageModel
 #
 #
-option(BUILD_APPDATA "Support appdata: items in PackageChooser (requires QtXml)" ON)
+option(BUILD_APPDATA "Support appdata: items in PackageChooser (requires QtXml)" OFF)
 if(BUILD_APPDATA)
-    find_package(${qtname} COMPONENTS Xml)
+    find_package(${qtname} REQUIRED COMPONENTS Xml)
    if(TARGET ${qtname}::Xml)
        add_definitions(-DHAVE_APPDATA)
        list(APPEND _extra_libraries ${qtname}::Xml)
@@ -23,23 +26,7 @@ endif()
 ### OPTIONAL AppStream support in PackageModel
 #
 #
-option(BUILD_APPSTREAM "Support appstream: items in PackageChooser (requires libappstream-qt)" ON)
-if(BUILD_APPSTREAM)
-    find_package(AppStreamQt)
-    set_package_properties(
-        AppStreamQt
-        PROPERTIES
-        DESCRIPTION "Support for AppStream (cache) data"
-        URL "https://github.com/ximion/appstream"
-        PURPOSE "AppStream provides package data"
-        TYPE OPTIONAL
-    )
-    if(AppStreamQt_FOUND)
-        add_definitions(-DHAVE_APPSTREAM_VERSION=${AppStreamQt_VERSION_MAJOR})
-        list(APPEND _extra_libraries AppStreamQt)
-        list(APPEND _extra_src ItemAppStream.cpp)
-    endif()
-endif()
+#include(AppStreamHelper)

 calamares_add_plugin(packagechooser
    TYPE viewmodule
@@ -48,7 +35,10 @@ calamares_add_plugin(packagechooser
        Config.cpp
        PackageChooserPage.cpp
        PackageChooserViewStep.cpp
-        PackageModel.cpp
+        PackageChooserModel.cpp
+        ${_netinstall}/LoaderQueue.cpp
+        ${_netinstall}/PackageModel.cpp
+        ${_netinstall}/PackageTreeItem.cpp
        ${_extra_src}
    RESOURCES
        packagechooser.qrc
@@ -59,7 +49,11 @@ calamares_add_plugin(packagechooser
    SHARED_LIB
 )

-# include(CalamaresAddTest)
+if(AppStreamQt_FOUND)
+    target_link_libraries(calamares_viewmodule_packagechooser PRIVATE calamares::appstreamqt)
+    target_sources(calamares_viewmodule_packagechooser PRIVATE ItemAppStream.cpp)
+endif()
+
 # calamares_add_test(
 #     packagechoosertest
 #     GUI
--- a/modules/packagechooser/Config.cpp
+++ b/modules/packagechooser/Config.cpp
@@ -10,13 +10,14 @@

 #include "Config.h"

+#include "LoaderQueue.h"
+
 #ifdef HAVE_APPDATA
 #include "ItemAppData.h"
 #endif

 #ifdef HAVE_APPSTREAM_VERSION
 #include "ItemAppStream.h"
-#include <AppStreamQt/pool.h>
 #include <memory>
 #endif

@@ -26,6 +27,9 @@
 #include "packages/Globals.h"
 #include "utils/Logger.h"
 #include "utils/Variant.h"
+#include "network/Manager.h"
+
+#include <QNetworkReply>

 /** @brief This removes any values from @p groups that match @p source
 *
@@ -87,12 +91,68 @@ PackageChooserMethodNames()
 Config::Config( QObject* parent )
    : Calamares::ModuleSystem::Config( parent )
    , m_model( new PackageListModel( this ) )
+    , m_netmodel( new PackageModel( this ) )
    , m_mode( PackageChooserMode::Required )
+
 {
 }

 Config::~Config() {}

+QString
+Config::status() const
+{
+    switch ( m_status )
+    {
+    case Status::Ok:
+        return QString();
+    case Status::FailedBadConfiguration:
+        return tr( "Network Installation. (Disabled: Incorrect configuration)" );
+    case Status::FailedBadData:
+        return tr( "Network Installation. (Disabled: Received invalid groups data)" );
+    case Status::FailedInternalError:
+        return tr( "Network Installation. (Disabled: Internal error)" );
+    case Status::FailedNetworkError:
+        return tr( "Network Installation. (Disabled: Unable to fetch package lists, check your network connection)" );
+    case Status::FailedNoData:
+        return tr( "Network Installation. (Disabled: No package list)" );
+    }
+    __builtin_unreachable();
+}
+
+void
+Config::setStatus( Status s )
+{
+    m_status = s;
+    emit statusChanged( status() );
+}
+
+void
+Config::loadGroupList( const QVariantList& groupData )
+{
+    m_netmodel->setupModelData( groupData );
+    if ( m_netmodel->rowCount() < 1 )
+    {
+        cWarning() << "NetInstall groups data was empty.";
+        setStatus( Status::FailedNoData );
+    }
+    else
+    {
+        setStatus( Status::Ok );
+    }
+}
+
+void
+Config::loadingDone()
+{
+    if ( m_queue )
+    {
+        m_queue->deleteLater();
+        m_queue = nullptr;
+    }
+    emit statusReady();
+}
+
 const PackageItem&
 Config::introductionPackage() const
 {
@@ -324,6 +384,29 @@ Config::setConfigurationMap( const QVariantMap& configurationMap )
    {
        fillModel( m_model, configurationMap.value( "items" ).toList() );

+        // Lastly, load the groups data
+//         const QString key = QStringLiteral( "groupsUrl" );
+//
+//
+//         const auto& groupsUrlVariant = configurationMap.value( key );
+//         m_queue = new LoaderQueue( this );
+//         if ( Calamares::typeOf( groupsUrlVariant ) == Calamares::StringVariantType )
+//         {
+//             m_queue->append( SourceItem::makeSourceItem( groupsUrlVariant.toString(), configurationMap ) );
+//         }
+//         else if ( Calamares::typeOf( groupsUrlVariant ) == Calamares::ListVariantType )
+//         {
+//             for ( const auto& s : groupsUrlVariant.toStringList() )
+//             {
+//                 m_queue->append( SourceItem::makeSourceItem( s, configurationMap ) );
+//             }
+//         }
+//
+//         setStatus( required() ? Status::FailedNoData : Status::Ok );
+//         cDebug() << "Loading netinstall from" << m_queue->count() << "alternate sources.";
+//         connect( m_queue, &LoaderQueue::done, this, &Config::loadingDone );
+//         m_queue->load();
+
        QString default_item_id = Calamares::getString( configurationMap, "default" );
        if ( !default_item_id.isEmpty() )
        {
--- a/modules/packagechooser/Config.h
+++ b/modules/packagechooser/Config.h
@@ -11,14 +11,22 @@
 #ifndef PACKAGECHOOSER_CONFIG_H
 #define PACKAGECHOOSER_CONFIG_H

+#include "PackageChooserModel.h"
 #include "PackageModel.h"

 #include "modulesystem/Config.h"
 #include "modulesystem/InstanceKey.h"

+#include <QObject>
+#include <QVariantMap>
+
 #include <memory>
 #include <optional>

+
+
+class LoaderQueue;
+
 enum class PackageChooserMode
 {
    Optional,  // zero or one
@@ -55,6 +63,9 @@ class Config : public Calamares::ModuleSystem::Config
    Q_PROPERTY( QString packageChoice READ packageChoice WRITE setPackageChoice NOTIFY packageChoiceChanged )
    Q_PROPERTY( QString prettyStatus READ prettyStatus NOTIFY prettyStatusChanged FINAL )

+    Q_PROPERTY( PackageModel* PackageModel MEMBER m_netmodel FINAL )
+    Q_PROPERTY( QString status READ status NOTIFY statusChanged FINAL )
+
 public:
    Config( QObject* parent = nullptr );
    ~Config() override;
@@ -73,6 +84,10 @@ public:
    PackageListModel* model() const { return m_model; }
    QModelIndex defaultSelectionIndex() const { return m_defaultModelIndex; }

+    PackageModel* netmodel() const { return m_netmodel; }
+    void loadGroupList( const QVariantList& groupData );
+
+
    /** @brief Returns an "introductory package" which describes packagechooser
     *
     * If the model contains a "none" package, returns that one on
@@ -101,14 +116,43 @@ public:
    QString prettyName() const;
    QString prettyStatus() const;

+    enum class Status
+    {
+        Ok,
+        FailedBadConfiguration,
+        FailedInternalError,
+        FailedNetworkError,
+        FailedBadData,
+        FailedNoData
+    };
+
+    /// Human-readable, translated representation of the status
+    QString status() const;
+    /// Internal code for the status
+    Status statusCode() const { return m_status; }
+    void setStatus( Status s );
+
 signals:
    void packageChoiceChanged( QString packageChoice );
    void prettyStatusChanged();

+Q_SIGNALS:
+    void statusChanged( QString status );  ///< Something changed
+    void sidebarLabelChanged( QString label );
+    void titleLabelChanged( QString label );
+    void statusReady();  ///< Loading groups is complete
+
+private Q_SLOTS:
+    void loadingDone();
+
 private:
    PackageListModel* m_model = nullptr;
    QModelIndex m_defaultModelIndex;

+    PackageModel* m_netmodel = nullptr;
+    LoaderQueue* m_queue = nullptr;
+    Status m_status = Status::Ok;
+
    /// Selection mode for this module
    PackageChooserMode m_mode = PackageChooserMode::Optional;
    /// How this module stores to GS
--- a/modules/packagechooser/ItemAppData.cpp
+++ b/modules/packagechooser/ItemAppData.cpp
@@ -11,7 +11,7 @@
 *
 * Only used if QtXML is found, implements PackageItem::fromAppData().
 */
-#include "PackageModel.h"
+#include "PackageChooserModel.h"

 #include "utils/Logger.h"
 #include "utils/Variant.h"
--- a/modules/packagechooser/ItemAppData.h
+++ b/modules/packagechooser/ItemAppData.h
@@ -10,7 +10,7 @@
 #ifndef ITEMAPPDATA_H
 #define ITEMAPPDATA_H

-#include "PackageModel.h"
+#include "PackageChooserModel.h"

 /** @brief Loads an AppData XML file and returns a PackageItem
 *
--- a/modules/packagechooser/ItemAppStream.cpp
+++ b/modules/packagechooser/ItemAppStream.cpp
@@ -7,20 +7,16 @@
 *
 */

-/** @brief Loading items from AppData XML files.
+/** @brief Loading items from AppStream database.
 *
- * Only used if QtXML is found, implements PackageItem::fromAppData().
+ * Only used if AppStreamQt is found, implements PackageItem::fromAppStream().
 */
-#include "PackageModel.h"
+#include "ItemAppStream.h"

 #include "locale/TranslationsModel.h"
 #include "utils/Logger.h"
 #include "utils/Variant.h"

-#include <AppStreamQt/image.h>
-#include <AppStreamQt/pool.h>
-#include <AppStreamQt/screenshot.h>
-
 /// @brief Return number of pixels in a size, for < ordering purposes
 static inline quint64
 sizeOrder( const QSize& size )
--- a/modules/packagechooser/ItemAppStream.h
+++ b/modules/packagechooser/ItemAppStream.h
@@ -10,12 +10,30 @@
 #ifndef ITEMAPPSTREAM_H
 #define ITEMAPPSTREAM_H

-#include "PackageModel.h"
+#include "PackageChooserModel.h"

-namespace AppStream
-{
-class Pool;
-}  // namespace AppStream
+/*
+ * This weird include mechanism is because an #include line is allowed
+ * to consist of preprocessor-tokens, which are expanded, and then
+ * the #include is *re*processed. But if it starts with < or ", then
+ * preprocessor tokens are not expanded. So we build up a #include <>
+ * style line with a suitable path -- if we are given a value for
+ * HAVE_APPSTREAM_HEADERS, that is the directory that the AppStreamQt
+ * headers live in.
+ */
+#define CALAMARES_LT <
+#define CALAMARES_GT >
+
+#ifndef HAVE_APPSTREAM_HEADERS
+#define HAVE_APPSTREAM_HEADERS AppStreamQt
+#endif
+
+#include CALAMARES_LT HAVE_APPSTREAM_HEADERS/pool.h CALAMARES_GT
+#include CALAMARES_LT HAVE_APPSTREAM_HEADERS/image.h CALAMARES_GT
+#include CALAMARES_LT HAVE_APPSTREAM_HEADERS/screenshot.h CALAMARES_GT
+
+#undef CALAMARES_LT
+#undef CALAMARES_GT

 /** @brief Loads an item from AppStream data.
 *
--- a/modules/packagechooser/PackageChooserModel.cpp
+++ b/modules/packagechooser/PackageChooserModel.cpp
@@ -7,12 +7,15 @@
 *
 */

-#include "PackageModel.h"
+#include "PackageChooserModel.h"

 #include "Branding.h"
 #include "utils/Logger.h"
 #include "utils/Variant.h"

+#include "compat/Variant.h"
+#include "utils/Yaml.h"
+
 #include <QFileInfo>

 /** @brief A wrapper for Calamares::getSubMap that excludes the success param
--- a/modules/packagechooser/PackageChooserModel.h
+++ b/modules/packagechooser/PackageChooserModel.h
@@ -7,12 +7,19 @@
 *
 */

-#ifndef PACKAGEMODEL_H
-#define PACKAGEMODEL_H
+#ifndef PACKAGECHOOSERMODEL_H
+#define PACKAGECHOOSERMODEL_H

 #include "locale/TranslatableConfiguration.h"
 #include "utils/NamedEnum.h"

+
+#include <QAbstractItemModel>
+#include <QString>
+
+
+#include "PackageTreeItem.h"
+
 #include <QAbstractListModel>
 #include <QObject>
 #include <QPixmap>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
artoo	d3a3c6bb04	packagechooser: rename PackageModel -> PackageChooiserModel to allow netinstall PackageModel inclusion	2024-01-06 01:43:52 +01:00
artoo	9729936e2f	clean up a little	2024-01-06 01:32:34 +01:00
artoo	5225dbff9a	fix	2024-01-06 00:06:37 +01:00
artoo	c831299490	merge the PackageNetModel	2024-01-06 00:04:46 +01:00
artoo	8b1ed58cf2	fix qrc	2024-01-05 23:43:40 +01:00
artoo	f700653eb9	initial ugly loaderqueue implement	2024-01-05 23:39:35 +01:00
artoo	2d200cd61e	wip	2024-01-05 15:35:10 +01:00
artoo	15a1600974	update conf documentation	2024-01-04 17:30:42 +01:00
artoo	417a5c23a0	artix-next: fix branding desc	2024-01-04 16:35:52 +01:00
artoo	0970ebea9d	add artix-next branding	2024-01-04 16:34:43 +01:00
artoo	7168e53bc7	rm unused images	2024-01-02 23:23:39 +01:00
artoo	1d11f43ea3	clean up	2024-01-02 22:39:29 +01:00