diff --git a/src/modules/partition/CMakeLists.txt b/src/modules/partition/CMakeLists.txt
index 59b897092..156ff86f5 100644
--- a/src/modules/partition/CMakeLists.txt
+++ b/src/modules/partition/CMakeLists.txt
@@ -5,64 +5,72 @@ include(GenerateExportHeader)
 find_package( Qt5 REQUIRED DBus )
 find_package( KF5 REQUIRED Config CoreAddons I18n WidgetsAddons )
 
-find_package( KPMcore 3.3 REQUIRED )
-
-include_directories( ${KPMCORE_INCLUDE_DIR} )
-include_directories( ${PROJECT_BINARY_DIR}/src/libcalamaresui )
-
-add_subdirectory( tests )
-
-calamares_add_plugin( partition
-    TYPE viewmodule
-    EXPORT_MACRO PLUGINDLLEXPORT_PRO
-    SOURCES
-        core/BootLoaderModel.cpp
-        core/ColorUtils.cpp
-        core/DeviceList.cpp
-        core/DeviceModel.cpp
-        core/KPMHelpers.cpp
-        core/PartitionActions.cpp
-        core/PartitionCoreModule.cpp
-        core/PartitionInfo.cpp
-        core/PartitionIterator.cpp
-        core/PartitionModel.cpp
-        core/PartUtils.cpp
-        gui/BootInfoWidget.cpp
-        gui/ChoicePage.cpp
-        gui/CreatePartitionDialog.cpp
-        gui/DeviceInfoWidget.cpp
-        gui/EditExistingPartitionDialog.cpp
-        gui/EncryptWidget.cpp
-        gui/PartitionPage.cpp
-        gui/PartitionBarsView.cpp
-        gui/PartitionLabelsView.cpp
-        gui/PartitionSizeController.cpp
-        gui/PartitionSplitterWidget.cpp
-        gui/PartitionViewStep.cpp
-        gui/PrettyRadioButton.cpp
-        gui/ScanningDialog.cpp
-        gui/ReplaceWidget.cpp
-        jobs/ClearMountsJob.cpp
-        jobs/ClearTempMountsJob.cpp
-        jobs/CreatePartitionJob.cpp
-        jobs/CreatePartitionTableJob.cpp
-        jobs/DeletePartitionJob.cpp
-        jobs/FillGlobalStorageJob.cpp
-        jobs/FormatPartitionJob.cpp
-        jobs/PartitionJob.cpp
-        jobs/ResizePartitionJob.cpp
-        jobs/SetPartitionFlagsJob.cpp
-    UI
-        gui/ChoicePage.ui
-        gui/CreatePartitionDialog.ui
-        gui/CreatePartitionTableDialog.ui
-        gui/EditExistingPartitionDialog.ui
-        gui/EncryptWidget.ui
-        gui/PartitionPage.ui
-        gui/ReplaceWidget.ui
-    LINK_PRIVATE_LIBRARIES
-        kpmcore
-        calamaresui
-        KF5::CoreAddons
-    SHARED_LIB
+find_package( KPMcore 3.3 )
+set_package_properties(
+    KPMcore PROPERTIES
+    PURPOSE "For partitioning module"
 )
+
+if ( KPMcore_FOUND )
+    include_directories( ${KPMCORE_INCLUDE_DIR} )
+    include_directories( ${PROJECT_BINARY_DIR}/src/libcalamaresui )
+
+    add_subdirectory( tests )
+
+    calamares_add_plugin( partition
+        TYPE viewmodule
+        EXPORT_MACRO PLUGINDLLEXPORT_PRO
+        SOURCES
+            core/BootLoaderModel.cpp
+            core/ColorUtils.cpp
+            core/DeviceList.cpp
+            core/DeviceModel.cpp
+            core/KPMHelpers.cpp
+            core/PartitionActions.cpp
+            core/PartitionCoreModule.cpp
+            core/PartitionInfo.cpp
+            core/PartitionIterator.cpp
+            core/PartitionModel.cpp
+            core/PartUtils.cpp
+            gui/BootInfoWidget.cpp
+            gui/ChoicePage.cpp
+            gui/CreatePartitionDialog.cpp
+            gui/DeviceInfoWidget.cpp
+            gui/EditExistingPartitionDialog.cpp
+            gui/EncryptWidget.cpp
+            gui/PartitionPage.cpp
+            gui/PartitionBarsView.cpp
+            gui/PartitionLabelsView.cpp
+            gui/PartitionSizeController.cpp
+            gui/PartitionSplitterWidget.cpp
+            gui/PartitionViewStep.cpp
+            gui/PrettyRadioButton.cpp
+            gui/ScanningDialog.cpp
+            gui/ReplaceWidget.cpp
+            jobs/ClearMountsJob.cpp
+            jobs/ClearTempMountsJob.cpp
+            jobs/CreatePartitionJob.cpp
+            jobs/CreatePartitionTableJob.cpp
+            jobs/DeletePartitionJob.cpp
+            jobs/FillGlobalStorageJob.cpp
+            jobs/FormatPartitionJob.cpp
+            jobs/PartitionJob.cpp
+            jobs/ResizePartitionJob.cpp
+            jobs/SetPartitionFlagsJob.cpp
+        UI
+            gui/ChoicePage.ui
+            gui/CreatePartitionDialog.ui
+            gui/CreatePartitionTableDialog.ui
+            gui/EditExistingPartitionDialog.ui
+            gui/EncryptWidget.ui
+            gui/PartitionPage.ui
+            gui/ReplaceWidget.ui
+        LINK_PRIVATE_LIBRARIES
+            kpmcore
+            calamaresui
+            KF5::CoreAddons
+        SHARED_LIB
+    )
+else()
+    calamares_skip_module( "partition (missing suitable KPMcore)" )
+endif()
diff --git a/src/modules/partition/core/BootLoaderModel.cpp b/src/modules/partition/core/BootLoaderModel.cpp
index 9002b1f8d..e10a7c930 100644
--- a/src/modules/partition/core/BootLoaderModel.cpp
+++ b/src/modules/partition/core/BootLoaderModel.cpp
@@ -1,4 +1,4 @@
-/* === This file is part of Calamares - <http://github.com/calamares> ===
+/* === This file is part of Calamares - <https://github.com/calamares> ===
  *
  *   Copyright 2014, Aurélien Gâteau <agateau@kde.org>
  *   Copyright 2015, Teo Mrnjavac <teo@kde.org>
diff --git a/src/modules/partition/core/BootLoaderModel.h b/src/modules/partition/core/BootLoaderModel.h
index e911d9029..27be18687 100644
--- a/src/modules/partition/core/BootLoaderModel.h
+++ b/src/modules/partition/core/BootLoaderModel.h
@@ -1,4 +1,4 @@
-/* === This file is part of Calamares - <http://github.com/calamares> ===
+/* === This file is part of Calamares - <https://github.com/calamares> ===
  *
  *   Copyright 2014, Aurélien Gâteau <agateau@kde.org>
  *   Copyright 2015, Teo Mrnjavac <teo@kde.org>
diff --git a/src/modules/partition/core/ColorUtils.cpp b/src/modules/partition/core/ColorUtils.cpp
index 2f9710057..40f65d2ba 100644
--- a/src/modules/partition/core/ColorUtils.cpp
+++ b/src/modules/partition/core/ColorUtils.cpp
@@ -1,4 +1,4 @@
-/* === This file is part of Calamares - <http://github.com/calamares> ===
+/* === This file is part of Calamares - <https://github.com/calamares> ===
  *
  *   Copyright 2014, Aurélien Gâteau <agateau@kde.org>
  *   Copyright 2015-2016, Teo Mrnjavac <teo@kde.org>
diff --git a/src/modules/partition/core/ColorUtils.h b/src/modules/partition/core/ColorUtils.h
index 50f4fd785..33efc4b7e 100644
--- a/src/modules/partition/core/ColorUtils.h
+++ b/src/modules/partition/core/ColorUtils.h
@@ -1,4 +1,4 @@
-/* === This file is part of Calamares - <http://github.com/calamares> ===
+/* === This file is part of Calamares - <https://github.com/calamares> ===
  *
  *   Copyright 2014, Aurélien Gâteau <agateau@kde.org>
  *   Copyright 2016, Teo Mrnjavac <teo@kde.org>
diff --git a/src/modules/partition/core/DeviceList.cpp b/src/modules/partition/core/DeviceList.cpp
index 05616335b..d7e6bab29 100644
--- a/src/modules/partition/core/DeviceList.cpp
+++ b/src/modules/partition/core/DeviceList.cpp
@@ -1,4 +1,4 @@
-/* === This file is part of Calamares - <http://github.com/calamares> ===
+/* === This file is part of Calamares - <https://github.com/calamares> ===
  *
  *   Copyright 2015-2016, Teo Mrnjavac <teo@kde.org>
  *
diff --git a/src/modules/partition/core/DeviceList.h b/src/modules/partition/core/DeviceList.h
index 6da34c5d1..3754f58e6 100644
--- a/src/modules/partition/core/DeviceList.h
+++ b/src/modules/partition/core/DeviceList.h
@@ -1,4 +1,4 @@
-/* === This file is part of Calamares - <http://github.com/calamares> ===
+/* === This file is part of Calamares - <https://github.com/calamares> ===
  *
  *   Copyright 2014-2017, Teo Mrnjavac <teo@kde.org>
  *   Copyright 2017, Adriaan de Groot <groot@kde.org>
diff --git a/src/modules/partition/core/DeviceModel.cpp b/src/modules/partition/core/DeviceModel.cpp
index 0d6187c7a..00058bac4 100644
--- a/src/modules/partition/core/DeviceModel.cpp
+++ b/src/modules/partition/core/DeviceModel.cpp
@@ -1,4 +1,4 @@
-/* === This file is part of Calamares - <http://github.com/calamares> ===
+/* === This file is part of Calamares - <https://github.com/calamares> ===
  *
  *   Copyright 2014, Aurélien Gâteau <agateau@kde.org>
  *   Copyright 2014, Teo Mrnjavac <teo@kde.org>
diff --git a/src/modules/partition/core/DeviceModel.h b/src/modules/partition/core/DeviceModel.h
index 32c557d9e..ccca426bd 100644
--- a/src/modules/partition/core/DeviceModel.h
+++ b/src/modules/partition/core/DeviceModel.h
@@ -1,4 +1,4 @@
-/* === This file is part of Calamares - <http://github.com/calamares> ===
+/* === This file is part of Calamares - <https://github.com/calamares> ===
  *
  *   Copyright 2014, Aurélien Gâteau <agateau@kde.org>
  *   Copyright 2017, Adriaan de Groot <groot@kde.org>
diff --git a/src/modules/partition/core/KPMHelpers.cpp b/src/modules/partition/core/KPMHelpers.cpp
index 9f97d5e8c..cf97b4fc2 100644
--- a/src/modules/partition/core/KPMHelpers.cpp
+++ b/src/modules/partition/core/KPMHelpers.cpp
@@ -1,4 +1,4 @@
-/* === This file is part of Calamares - <http://github.com/calamares> ===
+/* === This file is part of Calamares - <https://github.com/calamares> ===
  *
  *   Copyright 2014,      Aurélien Gâteau <agateau@kde.org>
  *   Copyright 2015-2016, Teo Mrnjavac <teo@kde.org>
diff --git a/src/modules/partition/core/KPMHelpers.h b/src/modules/partition/core/KPMHelpers.h
index f6f5bb8c1..c9d9a30f9 100644
--- a/src/modules/partition/core/KPMHelpers.h
+++ b/src/modules/partition/core/KPMHelpers.h
@@ -1,4 +1,4 @@
-/* === This file is part of Calamares - <http://github.com/calamares> ===
+/* === This file is part of Calamares - <https://github.com/calamares> ===
  *
  *   Copyright 2014,      Aurélien Gâteau <agateau@kde.org>
  *   Copyright 2015-2016, Teo Mrnjavac <teo@kde.org>
diff --git a/src/modules/partition/core/OsproberEntry.h b/src/modules/partition/core/OsproberEntry.h
index e57ac986d..792f22b29 100644
--- a/src/modules/partition/core/OsproberEntry.h
+++ b/src/modules/partition/core/OsproberEntry.h
@@ -1,4 +1,4 @@
-/* === This file is part of Calamares - <http://github.com/calamares> ===
+/* === This file is part of Calamares - <https://github.com/calamares> ===
  *
  *   Copyright 2014-2016, Teo Mrnjavac <teo@kde.org>
  *
diff --git a/src/modules/partition/core/PartUtils.cpp b/src/modules/partition/core/PartUtils.cpp
index d2493239e..a8e004979 100644
--- a/src/modules/partition/core/PartUtils.cpp
+++ b/src/modules/partition/core/PartUtils.cpp
@@ -1,4 +1,4 @@
-/* === This file is part of Calamares - <http://github.com/calamares> ===
+/* === This file is part of Calamares - <https://github.com/calamares> ===
  *
  *   Copyright 2015-2016, Teo Mrnjavac <teo@kde.org>
  *
@@ -340,4 +340,26 @@ isEfiSystem()
     return QDir( "/sys/firmware/efi/efivars" ).exists();
 }
 
+bool
+isEfiBootable( const Partition* candidate )
+{
+    /* If bit 17 is set, old-style Esp flag, it's OK */
+    if ( candidate->activeFlags().testFlag( PartitionTable::FlagEsp ) )
+        return true;
+
+
+    /* Otherwise, if it's a GPT table, Boot (bit 0) is the same as Esp */
+    const PartitionNode* root = candidate;
+    while ( root && !root->isRoot() )
+        root = root->parent();
+
+    // Strange case: no root found, no partition table node?
+    if ( !root )
+        return false;
+
+    const PartitionTable* table = dynamic_cast<const PartitionTable*>( root );
+    return table && ( table->type() == PartitionTable::TableType::gpt ) &&
+        candidate->activeFlags().testFlag( PartitionTable::FlagBoot );
+}
+
 }  // nmamespace PartUtils
diff --git a/src/modules/partition/core/PartUtils.h b/src/modules/partition/core/PartUtils.h
index c8d0714f0..c81258712 100644
--- a/src/modules/partition/core/PartUtils.h
+++ b/src/modules/partition/core/PartUtils.h
@@ -1,4 +1,4 @@
-/* === This file is part of Calamares - <http://github.com/calamares> ===
+/* === This file is part of Calamares - <https://github.com/calamares> ===
  *
  *   Copyright 2015-2016, Teo Mrnjavac <teo@kde.org>
  *
@@ -67,6 +67,11 @@ OsproberEntryList runOsprober( PartitionCoreModule* core );
  */
 bool isEfiSystem();
 
+/**
+ * @brief Is the given @p partition bootable in EFI? Depending on
+ * the partition table layout, this may mean different flags.
+ */
+bool isEfiBootable( const Partition* candidate );
 }
 
 #endif // PARTUTILS_H
diff --git a/src/modules/partition/core/PartitionActions.cpp b/src/modules/partition/core/PartitionActions.cpp
index 1c2363845..1de84d83c 100644
--- a/src/modules/partition/core/PartitionActions.cpp
+++ b/src/modules/partition/core/PartitionActions.cpp
@@ -1,4 +1,4 @@
-/* === This file is part of Calamares - <http://github.com/calamares> ===
+/* === This file is part of Calamares - <https://github.com/calamares> ===
  *
  *   Copyright 2014-2017, Teo Mrnjavac <teo@kde.org>
  *   Copyright 2017, Adriaan de Groot <groot@kde.org>
diff --git a/src/modules/partition/core/PartitionActions.h b/src/modules/partition/core/PartitionActions.h
index 5bdf86c76..bb624552f 100644
--- a/src/modules/partition/core/PartitionActions.h
+++ b/src/modules/partition/core/PartitionActions.h
@@ -1,4 +1,4 @@
-/* === This file is part of Calamares - <http://github.com/calamares> ===
+/* === This file is part of Calamares - <https://github.com/calamares> ===
  *
  *   Copyright 2014-2016, Teo Mrnjavac <teo@kde.org>
  *
diff --git a/src/modules/partition/core/PartitionCoreModule.cpp b/src/modules/partition/core/PartitionCoreModule.cpp
index b46922b2f..178860e2e 100644
--- a/src/modules/partition/core/PartitionCoreModule.cpp
+++ b/src/modules/partition/core/PartitionCoreModule.cpp
@@ -1,4 +1,4 @@
-/* === This file is part of Calamares - <http://github.com/calamares> ===
+/* === This file is part of Calamares - <https://github.com/calamares> ===
  *
  *   Copyright 2014, Aurélien Gâteau <agateau@kde.org>
  *   Copyright 2014-2015, Teo Mrnjavac <teo@kde.org>
@@ -403,9 +403,8 @@ PartitionCoreModule::jobs() const
     foreach ( auto job, lst )
         jobsDebug.append( job->prettyName() );
 
-    cDebug() << "PartitionCodeModule has been asked for jobs. About to return:";
-    for ( const auto item: jobsDebug )
-        cDebug() << "  .." << item;
+    cDebug() << "PartitionCodeModule has been asked for jobs. About to return:"
+             << jobsDebug.join( "\n" );
 
     return lst;
 }
@@ -428,9 +427,9 @@ PartitionCoreModule::dumpQueue() const
     cDebug() << "# Queue:";
     for ( auto info : m_deviceInfos )
     {
-        cDebug() << "  .. Device:" << info->device->name();
+        cDebug() << "## Device:" << info->device->name();
         for ( auto job : info->jobs )
-            cDebug() << "  .." << job->prettyName();
+            cDebug() << "-" << job->prettyName();
     }
 }
 
@@ -505,16 +504,7 @@ PartitionCoreModule::scanForEfiSystemPartitions()
     }
 
     QList< Partition* > efiSystemPartitions =
-        KPMHelpers::findPartitions( devices,
-                                    []( Partition* partition ) -> bool
-    {
-        if ( partition->activeFlags().testFlag( PartitionTable::FlagEsp ) )
-        {
-            cDebug() << "Found EFI system partition at" << partition->partitionPath();
-            return true;
-        }
-        return false;
-    } );
+        KPMHelpers::findPartitions( devices, PartUtils::isEfiBootable );
 
     if ( efiSystemPartitions.isEmpty() )
         cDebug() << "WARNING: system is EFI but no EFI system partitions found.";
diff --git a/src/modules/partition/core/PartitionCoreModule.h b/src/modules/partition/core/PartitionCoreModule.h
index c035670f0..49564dad1 100644
--- a/src/modules/partition/core/PartitionCoreModule.h
+++ b/src/modules/partition/core/PartitionCoreModule.h
@@ -1,4 +1,4 @@
-/* === This file is part of Calamares - <http://github.com/calamares> ===
+/* === This file is part of Calamares - <https://github.com/calamares> ===
  *
  *   Copyright 2014, Aurélien Gâteau <agateau@kde.org>
  *   Copyright 2014-2016, Teo Mrnjavac <teo@kde.org>
diff --git a/src/modules/partition/core/PartitionInfo.cpp b/src/modules/partition/core/PartitionInfo.cpp
index 5f1d6d9f6..72cca8976 100644
--- a/src/modules/partition/core/PartitionInfo.cpp
+++ b/src/modules/partition/core/PartitionInfo.cpp
@@ -1,4 +1,4 @@
-/* === This file is part of Calamares - <http://github.com/calamares> ===
+/* === This file is part of Calamares - <https://github.com/calamares> ===
  *
  *   Copyright 2014, Aurélien Gâteau <agateau@kde.org>
  *
diff --git a/src/modules/partition/core/PartitionInfo.h b/src/modules/partition/core/PartitionInfo.h
index bdcd03610..2474a3a2d 100644
--- a/src/modules/partition/core/PartitionInfo.h
+++ b/src/modules/partition/core/PartitionInfo.h
@@ -1,4 +1,4 @@
-/* === This file is part of Calamares - <http://github.com/calamares> ===
+/* === This file is part of Calamares - <https://github.com/calamares> ===
  *
  *   Copyright 2014, Aurélien Gâteau <agateau@kde.org>
  *
diff --git a/src/modules/partition/core/PartitionIterator.cpp b/src/modules/partition/core/PartitionIterator.cpp
index 26fa1df8c..5ed48fd91 100644
--- a/src/modules/partition/core/PartitionIterator.cpp
+++ b/src/modules/partition/core/PartitionIterator.cpp
@@ -1,4 +1,4 @@
-/* === This file is part of Calamares - <http://github.com/calamares> ===
+/* === This file is part of Calamares - <https://github.com/calamares> ===
  *
  *   Copyright 2014, Aurélien Gâteau <agateau@kde.org>
  *   Copyright 2015, Teo Mrnjavac <teo@kde.org>
diff --git a/src/modules/partition/core/PartitionIterator.h b/src/modules/partition/core/PartitionIterator.h
index 225022273..b72c2de8a 100644
--- a/src/modules/partition/core/PartitionIterator.h
+++ b/src/modules/partition/core/PartitionIterator.h
@@ -1,4 +1,4 @@
-/* === This file is part of Calamares - <http://github.com/calamares> ===
+/* === This file is part of Calamares - <https://github.com/calamares> ===
  *
  *   Copyright 2014, Aurélien Gâteau <agateau@kde.org>
  *   Copyright 2015, Teo Mrnjavac <teo@kde.org>
diff --git a/src/modules/partition/core/PartitionModel.cpp b/src/modules/partition/core/PartitionModel.cpp
index 648c57932..bf61843d0 100644
--- a/src/modules/partition/core/PartitionModel.cpp
+++ b/src/modules/partition/core/PartitionModel.cpp
@@ -1,4 +1,4 @@
-/* === This file is part of Calamares - <http://github.com/calamares> ===
+/* === This file is part of Calamares - <https://github.com/calamares> ===
  *
  *   Copyright 2014, Aurélien Gâteau <agateau@kde.org>
  *
diff --git a/src/modules/partition/core/PartitionModel.h b/src/modules/partition/core/PartitionModel.h
index 71764d8e9..fa63103c9 100644
--- a/src/modules/partition/core/PartitionModel.h
+++ b/src/modules/partition/core/PartitionModel.h
@@ -1,4 +1,4 @@
-/* === This file is part of Calamares - <http://github.com/calamares> ===
+/* === This file is part of Calamares - <https://github.com/calamares> ===
  *
  *   Copyright 2014, Aurélien Gâteau <agateau@kde.org>
  *   Copyright 2017, Adriaan de Groot <groot@kde.org>
diff --git a/src/modules/partition/gui/BootInfoWidget.cpp b/src/modules/partition/gui/BootInfoWidget.cpp
index cb89432b0..6a985877f 100644
--- a/src/modules/partition/gui/BootInfoWidget.cpp
+++ b/src/modules/partition/gui/BootInfoWidget.cpp
@@ -1,4 +1,4 @@
-/* === This file is part of Calamares - <http://github.com/calamares> ===
+/* === This file is part of Calamares - <https://github.com/calamares> ===
  *
  *   Copyright 2015-2016, Teo Mrnjavac <teo@kde.org>
  *
diff --git a/src/modules/partition/gui/BootInfoWidget.h b/src/modules/partition/gui/BootInfoWidget.h
index ac70a7b9a..257b3904a 100644
--- a/src/modules/partition/gui/BootInfoWidget.h
+++ b/src/modules/partition/gui/BootInfoWidget.h
@@ -1,4 +1,4 @@
-/* === This file is part of Calamares - <http://github.com/calamares> ===
+/* === This file is part of Calamares - <https://github.com/calamares> ===
  *
  *   Copyright 2015-2016, Teo Mrnjavac <teo@kde.org>
  *
diff --git a/src/modules/partition/gui/ChoicePage.cpp b/src/modules/partition/gui/ChoicePage.cpp
index b4e9b0c9f..008a64d8d 100644
--- a/src/modules/partition/gui/ChoicePage.cpp
+++ b/src/modules/partition/gui/ChoicePage.cpp
@@ -1,4 +1,4 @@
-/* === This file is part of Calamares - <http://github.com/calamares> ===
+/* === This file is part of Calamares - <https://github.com/calamares> ===
  *
  *   Copyright 2014-2017, Teo Mrnjavac <teo@kde.org>
  *   Copyright 2017, Adriaan de Groot <groot@kde.org>
@@ -300,6 +300,16 @@ ChoicePage::selectedDevice()
 }
 
 
+void
+ChoicePage::hideButtons()
+{
+    m_eraseButton->hide();
+    m_replaceButton->hide();
+    m_alongsideButton->hide();
+    m_somethingElseButton->hide();
+}
+
+
 /**
  * @brief ChoicePage::applyDeviceChoice handler for the selected event of the device
  *      picker. Calls ChoicePage::selectedDevice() to get the current Device*, then
@@ -311,7 +321,10 @@ void
 ChoicePage::applyDeviceChoice()
 {
     if ( !selectedDevice() )
+    {
+        hideButtons();
         return;
+    }
 
     if ( m_core->isDirty() )
     {
@@ -342,11 +355,14 @@ ChoicePage::continueApplyDeviceChoice()
     // applyDeviceChoice() will be called again momentarily as soon as we handle the
     // PartitionCoreModule::reverted signal.
     if ( !currd )
+    {
+        hideButtons();
         return;
+    }
 
     updateDeviceStatePreview();
-    // Preview setup done. Now we show/hide choices as needed.
 
+    // Preview setup done. Now we show/hide choices as needed.
     setupActions();
 
     m_lastSelectedDeviceIndex = m_drivesCombo->currentIndex();
@@ -562,7 +578,11 @@ ChoicePage::onLeave()
         {
             if ( m_bootloaderComboBox.isNull() )
             {
-                m_core->setBootLoaderInstallPath( selectedDevice()->deviceNode() );
+                auto d_p = selectedDevice();
+                if ( d_p )
+                    m_core->setBootLoaderInstallPath( d_p->deviceNode() );
+                else
+                    cDebug() << "WARNING: No device selected for bootloader.";
             }
             else
             {
@@ -1156,6 +1176,9 @@ ChoicePage::setupActions()
     else
         m_deviceInfoWidget->setPartitionTableType( PartitionTable::unknownTableType );
 
+    // Manual partitioning is always a possibility
+    m_somethingElseButton->show();
+
     bool atLeastOneCanBeResized = false;
     bool atLeastOneCanBeReplaced = false;
     bool atLeastOneIsMounted = false;  // Suppress 'erase' if so
@@ -1332,18 +1355,16 @@ ChoicePage::updateNextEnabled()
 {
     bool enabled = false;
 
+    auto sm_p = m_beforePartitionBarsView ? m_beforePartitionBarsView->selectionModel() : nullptr;
+
     switch ( m_choice )
     {
     case NoChoice:
         enabled = false;
         break;
     case Replace:
-        enabled = m_beforePartitionBarsView->selectionModel()->
-                  currentIndex().isValid();
-        break;
     case Alongside:
-        enabled = m_beforePartitionBarsView->selectionModel()->
-                  currentIndex().isValid();
+        enabled = sm_p && sm_p->currentIndex().isValid();
         break;
     case Erase:
     case Manual:
diff --git a/src/modules/partition/gui/ChoicePage.h b/src/modules/partition/gui/ChoicePage.h
index f102cf419..91274d152 100644
--- a/src/modules/partition/gui/ChoicePage.h
+++ b/src/modules/partition/gui/ChoicePage.h
@@ -1,4 +1,4 @@
-/* === This file is part of Calamares - <http://github.com/calamares> ===
+/* === This file is part of Calamares - <https://github.com/calamares> ===
  *
  *   Copyright 2014-2016, Teo Mrnjavac <teo@kde.org>
  *
@@ -113,8 +113,12 @@ private:
     void setupChoices();
     QComboBox* createBootloaderComboBox( QWidget* parentButton );
     Device* selectedDevice();
-    void applyDeviceChoice();
-    void continueApplyDeviceChoice();
+
+    /* Change the UI depending on the device selected. */
+    void hideButtons();  // Hide everything when no device
+    void applyDeviceChoice();  // Start scanning new device
+    void continueApplyDeviceChoice();  // .. called after scan
+
     void updateDeviceStatePreview();
     void updateActionChoicePreview( ChoicePage::Choice choice );
     void setupActions();
diff --git a/src/modules/partition/gui/CreatePartitionDialog.cpp b/src/modules/partition/gui/CreatePartitionDialog.cpp
index 7d32b7d33..2dcc16bf0 100644
--- a/src/modules/partition/gui/CreatePartitionDialog.cpp
+++ b/src/modules/partition/gui/CreatePartitionDialog.cpp
@@ -1,4 +1,4 @@
-/* === This file is part of Calamares - <http://github.com/calamares> ===
+/* === This file is part of Calamares - <https://github.com/calamares> ===
  *
  *   Copyright 2014, Aurélien Gâteau <agateau@kde.org>
  *   Copyright 2016, Teo Mrnjavac <teo@kde.org>
diff --git a/src/modules/partition/gui/CreatePartitionDialog.h b/src/modules/partition/gui/CreatePartitionDialog.h
index 641616e3f..6e8e9b6fd 100644
--- a/src/modules/partition/gui/CreatePartitionDialog.h
+++ b/src/modules/partition/gui/CreatePartitionDialog.h
@@ -1,4 +1,4 @@
-/* === This file is part of Calamares - <http://github.com/calamares> ===
+/* === This file is part of Calamares - <https://github.com/calamares> ===
  *
  *   Copyright 2014, Aurélien Gâteau <agateau@kde.org>
  *   Copyright 2016, Teo Mrnjavac <teo@kde.org>
diff --git a/src/modules/partition/gui/DeviceInfoWidget.cpp b/src/modules/partition/gui/DeviceInfoWidget.cpp
index abe5c7a49..033db147f 100644
--- a/src/modules/partition/gui/DeviceInfoWidget.cpp
+++ b/src/modules/partition/gui/DeviceInfoWidget.cpp
@@ -1,4 +1,4 @@
-/* === This file is part of Calamares - <http://github.com/calamares> ===
+/* === This file is part of Calamares - <https://github.com/calamares> ===
  *
  *   Copyright 2015-2016, Teo Mrnjavac <teo@kde.org>
  *
diff --git a/src/modules/partition/gui/DeviceInfoWidget.h b/src/modules/partition/gui/DeviceInfoWidget.h
index f8bd07ca3..b1769c19d 100644
--- a/src/modules/partition/gui/DeviceInfoWidget.h
+++ b/src/modules/partition/gui/DeviceInfoWidget.h
@@ -1,4 +1,4 @@
-/* === This file is part of Calamares - <http://github.com/calamares> ===
+/* === This file is part of Calamares - <https://github.com/calamares> ===
  *
  *   Copyright 2015-2016, Teo Mrnjavac <teo@kde.org>
  *
diff --git a/src/modules/partition/gui/EditExistingPartitionDialog.cpp b/src/modules/partition/gui/EditExistingPartitionDialog.cpp
index e213b8731..2212c104c 100644
--- a/src/modules/partition/gui/EditExistingPartitionDialog.cpp
+++ b/src/modules/partition/gui/EditExistingPartitionDialog.cpp
@@ -1,4 +1,4 @@
-/* === This file is part of Calamares - <http://github.com/calamares> ===
+/* === This file is part of Calamares - <https://github.com/calamares> ===
  *
  *   Copyright 2014, Aurélien Gâteau <agateau@kde.org>
  *   Copyright 2016, Teo Mrnjavac <teo@kde.org>
diff --git a/src/modules/partition/gui/EditExistingPartitionDialog.h b/src/modules/partition/gui/EditExistingPartitionDialog.h
index 83552fe55..b933e90ce 100644
--- a/src/modules/partition/gui/EditExistingPartitionDialog.h
+++ b/src/modules/partition/gui/EditExistingPartitionDialog.h
@@ -1,4 +1,4 @@
-/* === This file is part of Calamares - <http://github.com/calamares> ===
+/* === This file is part of Calamares - <https://github.com/calamares> ===
  *
  *   Copyright 2014, Aurélien Gâteau <agateau@kde.org>
  *
diff --git a/src/modules/partition/gui/EncryptWidget.cpp b/src/modules/partition/gui/EncryptWidget.cpp
index 198f2ebe1..56938dec6 100644
--- a/src/modules/partition/gui/EncryptWidget.cpp
+++ b/src/modules/partition/gui/EncryptWidget.cpp
@@ -1,4 +1,4 @@
-/* === This file is part of Calamares - <http://github.com/calamares> ===
+/* === This file is part of Calamares - <https://github.com/calamares> ===
  *
  *   Copyright 2016, Teo Mrnjavac <teo@kde.org>
  *
diff --git a/src/modules/partition/gui/EncryptWidget.h b/src/modules/partition/gui/EncryptWidget.h
index 7e3d654da..3f3cb1681 100644
--- a/src/modules/partition/gui/EncryptWidget.h
+++ b/src/modules/partition/gui/EncryptWidget.h
@@ -1,4 +1,4 @@
-/* === This file is part of Calamares - <http://github.com/calamares> ===
+/* === This file is part of Calamares - <https://github.com/calamares> ===
  *
  *   Copyright 2016, Teo Mrnjavac <teo@kde.org>
  *
diff --git a/src/modules/partition/gui/PartitionBarsView.cpp b/src/modules/partition/gui/PartitionBarsView.cpp
index a66420e1b..3fa1bb272 100644
--- a/src/modules/partition/gui/PartitionBarsView.cpp
+++ b/src/modules/partition/gui/PartitionBarsView.cpp
@@ -1,4 +1,4 @@
-/* === This file is part of Calamares - <http://github.com/calamares> ===
+/* === This file is part of Calamares - <https://github.com/calamares> ===
  *
  *   Copyright 2014, Aurélien Gâteau <agateau@kde.org>
  *   Copyright 2015-2016, Teo Mrnjavac <teo@kde.org>
diff --git a/src/modules/partition/gui/PartitionBarsView.h b/src/modules/partition/gui/PartitionBarsView.h
index e384ed5db..0d5051b41 100644
--- a/src/modules/partition/gui/PartitionBarsView.h
+++ b/src/modules/partition/gui/PartitionBarsView.h
@@ -1,4 +1,4 @@
-/* === This file is part of Calamares - <http://github.com/calamares> ===
+/* === This file is part of Calamares - <https://github.com/calamares> ===
  *
  *   Copyright 2014, Aurélien Gâteau <agateau@kde.org>
  *   Copyright 2015-2016, Teo Mrnjavac <teo@kde.org>
diff --git a/src/modules/partition/gui/PartitionLabelsView.cpp b/src/modules/partition/gui/PartitionLabelsView.cpp
index c0b7fdd41..fbcc1de72 100644
--- a/src/modules/partition/gui/PartitionLabelsView.cpp
+++ b/src/modules/partition/gui/PartitionLabelsView.cpp
@@ -1,4 +1,4 @@
-/* === This file is part of Calamares - <http://github.com/calamares> ===
+/* === This file is part of Calamares - <https://github.com/calamares> ===
  *
  *   Copyright 2014, Aurélien Gâteau <agateau@kde.org>
  *   Copyright 2015-2016, Teo Mrnjavac <teo@kde.org>
diff --git a/src/modules/partition/gui/PartitionLabelsView.h b/src/modules/partition/gui/PartitionLabelsView.h
index d6c86a5dc..e461a8dd8 100644
--- a/src/modules/partition/gui/PartitionLabelsView.h
+++ b/src/modules/partition/gui/PartitionLabelsView.h
@@ -1,4 +1,4 @@
-/* === This file is part of Calamares - <http://github.com/calamares> ===
+/* === This file is part of Calamares - <https://github.com/calamares> ===
  *
  *   Copyright 2014, Aurélien Gâteau <agateau@kde.org>
  *   Copyright 2015-2016, Teo Mrnjavac <teo@kde.org>
diff --git a/src/modules/partition/gui/PartitionPage.cpp b/src/modules/partition/gui/PartitionPage.cpp
index 88b03ec72..33b9e6209 100644
--- a/src/modules/partition/gui/PartitionPage.cpp
+++ b/src/modules/partition/gui/PartitionPage.cpp
@@ -1,4 +1,4 @@
-/* === This file is part of Calamares - <http://github.com/calamares> ===
+/* === This file is part of Calamares - <https://github.com/calamares> ===
  *
  *   Copyright 2014, Aurélien Gâteau <agateau@kde.org>
  *   Copyright 2015-2016, Teo Mrnjavac <teo@kde.org>
diff --git a/src/modules/partition/gui/PartitionPage.h b/src/modules/partition/gui/PartitionPage.h
index f998fe2ae..24cf65675 100644
--- a/src/modules/partition/gui/PartitionPage.h
+++ b/src/modules/partition/gui/PartitionPage.h
@@ -1,4 +1,4 @@
-/* === This file is part of Calamares - <http://github.com/calamares> ===
+/* === This file is part of Calamares - <https://github.com/calamares> ===
  *
  *   Copyright 2014, Aurélien Gâteau <agateau@kde.org>
  *
diff --git a/src/modules/partition/gui/PartitionSizeController.cpp b/src/modules/partition/gui/PartitionSizeController.cpp
index 3bb9e758c..39879dab9 100644
--- a/src/modules/partition/gui/PartitionSizeController.cpp
+++ b/src/modules/partition/gui/PartitionSizeController.cpp
@@ -1,4 +1,4 @@
-/* === This file is part of Calamares - <http://github.com/calamares> ===
+/* === This file is part of Calamares - <https://github.com/calamares> ===
  *
  *   Copyright 2014, Aurélien Gâteau <agateau@kde.org>
  *   Copyright 2016, Teo Mrnjavac <teo@kde.org>
diff --git a/src/modules/partition/gui/PartitionSizeController.h b/src/modules/partition/gui/PartitionSizeController.h
index 64430b112..7337968f5 100644
--- a/src/modules/partition/gui/PartitionSizeController.h
+++ b/src/modules/partition/gui/PartitionSizeController.h
@@ -1,4 +1,4 @@
-/* === This file is part of Calamares - <http://github.com/calamares> ===
+/* === This file is part of Calamares - <https://github.com/calamares> ===
  *
  *   Copyright 2014, Aurélien Gâteau <agateau@kde.org>
  *   Copyright 2016, Teo Mrnjavac <teo@kde.org>
diff --git a/src/modules/partition/gui/PartitionSplitterWidget.cpp b/src/modules/partition/gui/PartitionSplitterWidget.cpp
index 4b0776344..ae73ecfcd 100644
--- a/src/modules/partition/gui/PartitionSplitterWidget.cpp
+++ b/src/modules/partition/gui/PartitionSplitterWidget.cpp
@@ -1,4 +1,4 @@
-/* === This file is part of Calamares - <http://github.com/calamares> ===
+/* === This file is part of Calamares - <https://github.com/calamares> ===
  *
  *   Copyright 2014-2016, Teo Mrnjavac <teo@kde.org>
  *
diff --git a/src/modules/partition/gui/PartitionSplitterWidget.h b/src/modules/partition/gui/PartitionSplitterWidget.h
index 0d2d0e233..ed4f0d112 100644
--- a/src/modules/partition/gui/PartitionSplitterWidget.h
+++ b/src/modules/partition/gui/PartitionSplitterWidget.h
@@ -1,4 +1,4 @@
-/* === This file is part of Calamares - <http://github.com/calamares> ===
+/* === This file is part of Calamares - <https://github.com/calamares> ===
  *
  *   Copyright 2014-2016, Teo Mrnjavac <teo@kde.org>
  *
diff --git a/src/modules/partition/gui/PartitionViewSelectionFilter.h b/src/modules/partition/gui/PartitionViewSelectionFilter.h
index 58f1a5f70..75572a5bb 100644
--- a/src/modules/partition/gui/PartitionViewSelectionFilter.h
+++ b/src/modules/partition/gui/PartitionViewSelectionFilter.h
@@ -1,4 +1,4 @@
-/* === This file is part of Calamares - <http://github.com/calamares> ===
+/* === This file is part of Calamares - <https://github.com/calamares> ===
  *
  *   Copyright 2016, Teo Mrnjavac <teo@kde.org>
  *
diff --git a/src/modules/partition/gui/PartitionViewStep.cpp b/src/modules/partition/gui/PartitionViewStep.cpp
index 7f113ce88..8e46da71a 100644
--- a/src/modules/partition/gui/PartitionViewStep.cpp
+++ b/src/modules/partition/gui/PartitionViewStep.cpp
@@ -1,4 +1,4 @@
-/* === This file is part of Calamares - <http://github.com/calamares> ===
+/* === This file is part of Calamares - <https://github.com/calamares> ===
  *
  *   Copyright 2014, Aurélien Gâteau <agateau@kde.org>
  *   Copyright 2014-2017, Teo Mrnjavac <teo@kde.org>
@@ -408,7 +408,7 @@ PartitionViewStep::onLeave()
                               .arg( *Calamares::Branding::ShortProductName )
                               .arg( espMountPoint );
             }
-            else if ( esp && !esp->activeFlags().testFlag( PartitionTable::FlagEsp ) )
+            else if ( esp && !PartUtils::isEfiBootable( esp ) )
             {
                 message = tr( "EFI system partition flag not set" );
                 description = tr( "An EFI system partition is necessary to start %1."
diff --git a/src/modules/partition/gui/PartitionViewStep.h b/src/modules/partition/gui/PartitionViewStep.h
index 1aa8190f9..dfd0310b3 100644
--- a/src/modules/partition/gui/PartitionViewStep.h
+++ b/src/modules/partition/gui/PartitionViewStep.h
@@ -1,4 +1,4 @@
-/* === This file is part of Calamares - <http://github.com/calamares> ===
+/* === This file is part of Calamares - <https://github.com/calamares> ===
  *
  *   Copyright 2014, Aurélien Gâteau <agateau@kde.org>
  *   Copyright 2014-2016, Teo Mrnjavac <teo@kde.org>
diff --git a/src/modules/partition/gui/PrettyRadioButton.cpp b/src/modules/partition/gui/PrettyRadioButton.cpp
index d5d25ef52..a697ed270 100644
--- a/src/modules/partition/gui/PrettyRadioButton.cpp
+++ b/src/modules/partition/gui/PrettyRadioButton.cpp
@@ -1,4 +1,4 @@
-/* === This file is part of Calamares - <http://github.com/calamares> ===
+/* === This file is part of Calamares - <https://github.com/calamares> ===
  *
  *   Copyright 2014, Teo Mrnjavac <teo@kde.org>
  *
diff --git a/src/modules/partition/gui/PrettyRadioButton.h b/src/modules/partition/gui/PrettyRadioButton.h
index ccedf25ed..f475ce528 100644
--- a/src/modules/partition/gui/PrettyRadioButton.h
+++ b/src/modules/partition/gui/PrettyRadioButton.h
@@ -1,4 +1,4 @@
-/* === This file is part of Calamares - <http://github.com/calamares> ===
+/* === This file is part of Calamares - <https://github.com/calamares> ===
  *
  *   Copyright 2014, Teo Mrnjavac <teo@kde.org>
  *
diff --git a/src/modules/partition/gui/ReplaceWidget.cpp b/src/modules/partition/gui/ReplaceWidget.cpp
index f5a492809..524932057 100644
--- a/src/modules/partition/gui/ReplaceWidget.cpp
+++ b/src/modules/partition/gui/ReplaceWidget.cpp
@@ -1,4 +1,4 @@
-/* === This file is part of Calamares - <http://github.com/calamares> ===
+/* === This file is part of Calamares - <https://github.com/calamares> ===
  *
  *   Copyright 2014-2015, Teo Mrnjavac <teo@kde.org>
  *   Copyright 2014, Aurélien Gâteau <agateau@kde.org>
diff --git a/src/modules/partition/gui/ReplaceWidget.h b/src/modules/partition/gui/ReplaceWidget.h
index 0f894a71d..467ad5f96 100644
--- a/src/modules/partition/gui/ReplaceWidget.h
+++ b/src/modules/partition/gui/ReplaceWidget.h
@@ -1,4 +1,4 @@
-/* === This file is part of Calamares - <http://github.com/calamares> ===
+/* === This file is part of Calamares - <https://github.com/calamares> ===
  *
  *   Copyright 2014-2015, Teo Mrnjavac <teo@kde.org>
  *   Copyright 2014, Aurélien Gâteau <agateau@kde.org>
diff --git a/src/modules/partition/gui/ScanningDialog.cpp b/src/modules/partition/gui/ScanningDialog.cpp
index 85c0cb734..9084be2cc 100644
--- a/src/modules/partition/gui/ScanningDialog.cpp
+++ b/src/modules/partition/gui/ScanningDialog.cpp
@@ -1,4 +1,4 @@
-/* === This file is part of Calamares - <http://github.com/calamares> ===
+/* === This file is part of Calamares - <https://github.com/calamares> ===
  *
  *   Copyright 2015, Teo Mrnjavac <teo@kde.org>
  *   Copyright 2017, Adriaan de Groot <groot@kde.org>
diff --git a/src/modules/partition/gui/ScanningDialog.h b/src/modules/partition/gui/ScanningDialog.h
index 6686e79e8..4f5254590 100644
--- a/src/modules/partition/gui/ScanningDialog.h
+++ b/src/modules/partition/gui/ScanningDialog.h
@@ -1,4 +1,4 @@
-/* === This file is part of Calamares - <http://github.com/calamares> ===
+/* === This file is part of Calamares - <https://github.com/calamares> ===
  *
  *   Copyright 2015, Teo Mrnjavac <teo@kde.org>
  *
diff --git a/src/modules/partition/jobs/ClearMountsJob.cpp b/src/modules/partition/jobs/ClearMountsJob.cpp
index bf07b909c..c5811cdd4 100644
--- a/src/modules/partition/jobs/ClearMountsJob.cpp
+++ b/src/modules/partition/jobs/ClearMountsJob.cpp
@@ -1,4 +1,4 @@
-/* === This file is part of Calamares - <http://github.com/calamares> ===
+/* === This file is part of Calamares - <https://github.com/calamares> ===
  *
  *   Copyright 2014-2015, Teo Mrnjavac <teo@kde.org>
  *
diff --git a/src/modules/partition/jobs/ClearMountsJob.h b/src/modules/partition/jobs/ClearMountsJob.h
index bc4df8fe7..26514913e 100644
--- a/src/modules/partition/jobs/ClearMountsJob.h
+++ b/src/modules/partition/jobs/ClearMountsJob.h
@@ -1,4 +1,4 @@
-/* === This file is part of Calamares - <http://github.com/calamares> ===
+/* === This file is part of Calamares - <https://github.com/calamares> ===
  *
  *   Copyright 2014-2015, Teo Mrnjavac <teo@kde.org>
  *
diff --git a/src/modules/partition/jobs/ClearTempMountsJob.cpp b/src/modules/partition/jobs/ClearTempMountsJob.cpp
index 3f82231d9..49e4e45dc 100644
--- a/src/modules/partition/jobs/ClearTempMountsJob.cpp
+++ b/src/modules/partition/jobs/ClearTempMountsJob.cpp
@@ -1,4 +1,4 @@
-/* === This file is part of Calamares - <http://github.com/calamares> ===
+/* === This file is part of Calamares - <https://github.com/calamares> ===
  *
  *   Copyright 2014-2015, Teo Mrnjavac <teo@kde.org>
  *
diff --git a/src/modules/partition/jobs/ClearTempMountsJob.h b/src/modules/partition/jobs/ClearTempMountsJob.h
index 1ce15a111..36adca91b 100644
--- a/src/modules/partition/jobs/ClearTempMountsJob.h
+++ b/src/modules/partition/jobs/ClearTempMountsJob.h
@@ -1,4 +1,4 @@
-/* === This file is part of Calamares - <http://github.com/calamares> ===
+/* === This file is part of Calamares - <https://github.com/calamares> ===
  *
  *   Copyright 2014-2015, Teo Mrnjavac <teo@kde.org>
  *
diff --git a/src/modules/partition/jobs/CreatePartitionJob.cpp b/src/modules/partition/jobs/CreatePartitionJob.cpp
index 4e91a00bf..119ecb12c 100644
--- a/src/modules/partition/jobs/CreatePartitionJob.cpp
+++ b/src/modules/partition/jobs/CreatePartitionJob.cpp
@@ -1,4 +1,4 @@
-/* === This file is part of Calamares - <http://github.com/calamares> ===
+/* === This file is part of Calamares - <https://github.com/calamares> ===
  *
  *   Copyright 2014, Aurélien Gâteau <agateau@kde.org>
  *   Copyright 2015, Teo Mrnjavac <teo@kde.org>
diff --git a/src/modules/partition/jobs/CreatePartitionJob.h b/src/modules/partition/jobs/CreatePartitionJob.h
index f3f708457..e25c74241 100644
--- a/src/modules/partition/jobs/CreatePartitionJob.h
+++ b/src/modules/partition/jobs/CreatePartitionJob.h
@@ -1,4 +1,4 @@
-/* === This file is part of Calamares - <http://github.com/calamares> ===
+/* === This file is part of Calamares - <https://github.com/calamares> ===
  *
  *   Copyright 2014, Aurélien Gâteau <agateau@kde.org>
  *   Copyright 2015, Teo Mrnjavac <teo@kde.org>
diff --git a/src/modules/partition/jobs/CreatePartitionTableJob.cpp b/src/modules/partition/jobs/CreatePartitionTableJob.cpp
index 4bd468ae3..2aec4a5fc 100644
--- a/src/modules/partition/jobs/CreatePartitionTableJob.cpp
+++ b/src/modules/partition/jobs/CreatePartitionTableJob.cpp
@@ -1,4 +1,4 @@
-/* === This file is part of Calamares - <http://github.com/calamares> ===
+/* === This file is part of Calamares - <https://github.com/calamares> ===
  *
  *   Copyright 2014, Aurélien Gâteau <agateau@kde.org>
  *   Copyright 2015, Teo Mrnjavac <teo@kde.org>
@@ -73,33 +73,21 @@ CreatePartitionTableJob::exec()
 
     PartitionTable* table = m_device->partitionTable();
     cDebug() << "Creating new partition table of type" << table->typeName()
-             << " - Uncommitted yet: " << table;
+             << ", uncommitted yet:\n" << table;
 
     QProcess lsblk;
     lsblk.setProgram( "lsblk" );
     lsblk.setProcessChannelMode( QProcess::MergedChannels );
     lsblk.start();
     lsblk.waitForFinished();
-
-    QByteArray byte = lsblk.readAllStandardOutput();
-    QStringList lines = QString(byte).split(("\n"),QString::SkipEmptyParts);
-    cDebug() << "CreatePartitionTableJob asked for lsblk output:";
-
-    for (const auto line: lines)
-        cDebug() << "  .." << line;
+    cDebug() << "lsblk:\n" << lsblk.readAllStandardOutput();
 
     QProcess mount;
     mount.setProgram( "mount" );
     mount.setProcessChannelMode( QProcess::MergedChannels );
     mount.start();
     mount.waitForFinished();
-
-    QByteArray mbyte = mount.readAllStandardOutput();
-    QStringList mlines = QString(mbyte).split(("\n"),QString::SkipEmptyParts);
-    cDebug() << "CreatePartitionTableJob asked for mount output:";
-
-    for (const auto mline: mlines)
-        cDebug() << "  .." << mline;
+    cDebug() << "mount:\n" << mount.readAllStandardOutput();
 
     CreatePartitionTableOperation op(*m_device, table);
     op.setStatus(Operation::StatusRunning);
diff --git a/src/modules/partition/jobs/CreatePartitionTableJob.h b/src/modules/partition/jobs/CreatePartitionTableJob.h
index 6f9544de3..38ef5365c 100644
--- a/src/modules/partition/jobs/CreatePartitionTableJob.h
+++ b/src/modules/partition/jobs/CreatePartitionTableJob.h
@@ -1,4 +1,4 @@
-/* === This file is part of Calamares - <http://github.com/calamares> ===
+/* === This file is part of Calamares - <https://github.com/calamares> ===
  *
  *   Copyright 2014, Aurélien Gâteau <agateau@kde.org>
  *   Copyright 2015, Teo Mrnjavac <teo@kde.org>
diff --git a/src/modules/partition/jobs/DeletePartitionJob.cpp b/src/modules/partition/jobs/DeletePartitionJob.cpp
index 61743ed74..5cd4a08ea 100644
--- a/src/modules/partition/jobs/DeletePartitionJob.cpp
+++ b/src/modules/partition/jobs/DeletePartitionJob.cpp
@@ -1,4 +1,4 @@
-/* === This file is part of Calamares - <http://github.com/calamares> ===
+/* === This file is part of Calamares - <https://github.com/calamares> ===
  *
  *   Copyright 2014, Aurélien Gâteau <agateau@kde.org>
  *   Copyright 2015, Teo Mrnjavac <teo@kde.org>
diff --git a/src/modules/partition/jobs/DeletePartitionJob.h b/src/modules/partition/jobs/DeletePartitionJob.h
index 7f85f4a65..805689cc0 100644
--- a/src/modules/partition/jobs/DeletePartitionJob.h
+++ b/src/modules/partition/jobs/DeletePartitionJob.h
@@ -1,4 +1,4 @@
-/* === This file is part of Calamares - <http://github.com/calamares> ===
+/* === This file is part of Calamares - <https://github.com/calamares> ===
  *
  *   Copyright 2014, Aurélien Gâteau <agateau@kde.org>
  *   Copyright 2015, Teo Mrnjavac <teo@kde.org>
diff --git a/src/modules/partition/jobs/FillGlobalStorageJob.cpp b/src/modules/partition/jobs/FillGlobalStorageJob.cpp
index a6c93a2c4..43a5f3904 100644
--- a/src/modules/partition/jobs/FillGlobalStorageJob.cpp
+++ b/src/modules/partition/jobs/FillGlobalStorageJob.cpp
@@ -1,4 +1,4 @@
-/* === This file is part of Calamares - <http://github.com/calamares> ===
+/* === This file is part of Calamares - <https://github.com/calamares> ===
  *
  *   Copyright 2014, Aurélien Gâteau <agateau@kde.org>
  *   Copyright 2015-2016, Teo Mrnjavac <teo@kde.org>
diff --git a/src/modules/partition/jobs/FillGlobalStorageJob.h b/src/modules/partition/jobs/FillGlobalStorageJob.h
index b3609ad3f..357d939a2 100644
--- a/src/modules/partition/jobs/FillGlobalStorageJob.h
+++ b/src/modules/partition/jobs/FillGlobalStorageJob.h
@@ -1,4 +1,4 @@
-/* === This file is part of Calamares - <http://github.com/calamares> ===
+/* === This file is part of Calamares - <https://github.com/calamares> ===
  *
  *   Copyright 2014, Aurélien Gâteau <agateau@kde.org>
  *   Copyright 2015, Teo Mrnjavac <teo@kde.org>
diff --git a/src/modules/partition/jobs/FormatPartitionJob.cpp b/src/modules/partition/jobs/FormatPartitionJob.cpp
index 5e68502bd..dcc1c7142 100644
--- a/src/modules/partition/jobs/FormatPartitionJob.cpp
+++ b/src/modules/partition/jobs/FormatPartitionJob.cpp
@@ -1,4 +1,4 @@
-/* === This file is part of Calamares - <http://github.com/calamares> ===
+/* === This file is part of Calamares - <https://github.com/calamares> ===
  *
  *   Copyright 2014, Aurélien Gâteau <agateau@kde.org>
  *   Copyright 2015-2016, Teo Mrnjavac <teo@kde.org>
diff --git a/src/modules/partition/jobs/FormatPartitionJob.h b/src/modules/partition/jobs/FormatPartitionJob.h
index a1ab853e0..683deb66e 100644
--- a/src/modules/partition/jobs/FormatPartitionJob.h
+++ b/src/modules/partition/jobs/FormatPartitionJob.h
@@ -1,4 +1,4 @@
-/* === This file is part of Calamares - <http://github.com/calamares> ===
+/* === This file is part of Calamares - <https://github.com/calamares> ===
  *
  *   Copyright 2014, Aurélien Gâteau <agateau@kde.org>
  *   Copyright 2015, Teo Mrnjavac <teo@kde.org>
diff --git a/src/modules/partition/jobs/PartitionJob.cpp b/src/modules/partition/jobs/PartitionJob.cpp
index 02aa1d6d6..1da8b0ba0 100644
--- a/src/modules/partition/jobs/PartitionJob.cpp
+++ b/src/modules/partition/jobs/PartitionJob.cpp
@@ -1,4 +1,4 @@
-/* === This file is part of Calamares - <http://github.com/calamares> ===
+/* === This file is part of Calamares - <https://github.com/calamares> ===
  *
  *   Copyright 2014, Aurélien Gâteau <agateau@kde.org>
  *
diff --git a/src/modules/partition/jobs/PartitionJob.h b/src/modules/partition/jobs/PartitionJob.h
index 8cbd8d0c4..61245203c 100644
--- a/src/modules/partition/jobs/PartitionJob.h
+++ b/src/modules/partition/jobs/PartitionJob.h
@@ -1,4 +1,4 @@
-/* === This file is part of Calamares - <http://github.com/calamares> ===
+/* === This file is part of Calamares - <https://github.com/calamares> ===
  *
  *   Copyright 2014, Aurélien Gâteau <agateau@kde.org>
  *
diff --git a/src/modules/partition/jobs/ResizePartitionJob.cpp b/src/modules/partition/jobs/ResizePartitionJob.cpp
index 3b7588ded..c0477cafe 100644
--- a/src/modules/partition/jobs/ResizePartitionJob.cpp
+++ b/src/modules/partition/jobs/ResizePartitionJob.cpp
@@ -1,4 +1,4 @@
-/* === This file is part of Calamares - <http://github.com/calamares> ===
+/* === This file is part of Calamares - <https://github.com/calamares> ===
  *
  *   Copyright 2014, Aurélien Gâteau <agateau@kde.org>
  *   Copyright 2015, Teo Mrnjavac <teo@kde.org>
diff --git a/src/modules/partition/jobs/ResizePartitionJob.h b/src/modules/partition/jobs/ResizePartitionJob.h
index 453461d8d..9e6d39943 100644
--- a/src/modules/partition/jobs/ResizePartitionJob.h
+++ b/src/modules/partition/jobs/ResizePartitionJob.h
@@ -1,4 +1,4 @@
-/* === This file is part of Calamares - <http://github.com/calamares> ===
+/* === This file is part of Calamares - <https://github.com/calamares> ===
  *
  *   Copyright 2014, Aurélien Gâteau <agateau@kde.org>
  *   Copyright 2015, Teo Mrnjavac <teo@kde.org>
diff --git a/src/modules/partition/jobs/SetPartitionFlagsJob.cpp b/src/modules/partition/jobs/SetPartitionFlagsJob.cpp
index bcf7c8692..7f6169bbe 100644
--- a/src/modules/partition/jobs/SetPartitionFlagsJob.cpp
+++ b/src/modules/partition/jobs/SetPartitionFlagsJob.cpp
@@ -1,4 +1,4 @@
-/* === This file is part of Calamares - <http://github.com/calamares> ===
+/* === This file is part of Calamares - <https://github.com/calamares> ===
  *
  *   Copyright 2016, Teo Mrnjavac <teo@kde.org>
  *
diff --git a/src/modules/partition/jobs/SetPartitionFlagsJob.h b/src/modules/partition/jobs/SetPartitionFlagsJob.h
index 0b1914f7f..464ad0c6b 100644
--- a/src/modules/partition/jobs/SetPartitionFlagsJob.h
+++ b/src/modules/partition/jobs/SetPartitionFlagsJob.h
@@ -1,4 +1,4 @@
-/* === This file is part of Calamares - <http://github.com/calamares> ===
+/* === This file is part of Calamares - <https://github.com/calamares> ===
  *
  *   Copyright 2016, Teo Mrnjavac <teo@kde.org>
  *
diff --git a/src/modules/partition/tests/PartitionJobTests.cpp b/src/modules/partition/tests/PartitionJobTests.cpp
index bd6962a85..de10631a0 100644
--- a/src/modules/partition/tests/PartitionJobTests.cpp
+++ b/src/modules/partition/tests/PartitionJobTests.cpp
@@ -1,4 +1,4 @@
-/* === This file is part of Calamares - <http://github.com/calamares> ===
+/* === This file is part of Calamares - <https://github.com/calamares> ===
  *
  *   Copyright 2014, Aurélien Gâteau <agateau@kde.org>
  *   Copyright 2017, Adriaan de Groot <groot@kde.org>
diff --git a/src/modules/partition/tests/PartitionJobTests.h b/src/modules/partition/tests/PartitionJobTests.h
index d86641580..0744cbdda 100644
--- a/src/modules/partition/tests/PartitionJobTests.h
+++ b/src/modules/partition/tests/PartitionJobTests.h
@@ -1,4 +1,4 @@
-/* === This file is part of Calamares - <http://github.com/calamares> ===
+/* === This file is part of Calamares - <https://github.com/calamares> ===
  *
  *   Copyright 2014, Aurélien Gâteau <agateau@kde.org>
  *