From 0c7459d7d7acab562fffaf4e2e9861a482c98ab2 Mon Sep 17 00:00:00 2001
From: qewer33 <qewer33@proton.me>
Date: Thu, 31 Aug 2023 17:39:34 +0300
Subject: [PATCH 1/8] StartPage CSS fixes

---
 src/Mod/Start/StartPage/StartPage.css | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/Mod/Start/StartPage/StartPage.css b/src/Mod/Start/StartPage/StartPage.css
index 60bb15dfc1..c842a88265 100644
--- a/src/Mod/Start/StartPage/StartPage.css
+++ b/src/Mod/Start/StartPage/StartPage.css
@@ -44,6 +44,10 @@ h2 {
     padding-top: 5px;
 }
 
+img, a {
+    -webkit-user-drag: none;
+}
+
 .hidden {
     display: none !important;
 }
@@ -113,7 +117,7 @@ ul.tabs {
     position: absolute;
     top: 2em;
     left: 50%;
-    transform: translateX(-50%);
+    transform: translateX(calc(-50% - 1em));
 }
 
 ul.tabs li {
@@ -130,7 +134,6 @@ ul.tabs li a {
     text-decoration: none;
     outline: 0;
     font-size: 1.3em;
-    transition: 100ms;
 }
 
 ul.tabs li a img {
@@ -186,12 +189,17 @@ ul.icons {
     width: 130px;
     height: THUMBCARDSIZE;
     background: BOXCOLOR;
+    border: solid 2px BOXCOLOR;
     border-radius: 8px;
     margin: 10px;
     word-wrap: break-word;
     text-align: center;
 }
 
+.file-card:hover {
+    border-color: LINKCOLOR;
+}
+
 .file-card h4 {
     margin: 5px 0;
 }
@@ -233,11 +241,16 @@ a .caption:visited {
     width: 18em;
     height: 5em;
     background: BOXCOLOR;
+    border: solid 2px BOXCOLOR;
     border-radius: 8px;
     margin: 10px;
     word-wrap: break-word;
 }
 
+.quickstart-button-card:hover {
+    border-color: LINKCOLOR;
+}
+
 .quickstart-button-card a {
     display: flex;
 }

From a1d20ec97d523bffc9953711a5c2c828b9ad5699 Mon Sep 17 00:00:00 2001
From: qewer33 <qewer33@proton.me>
Date: Thu, 31 Aug 2023 22:04:50 +0300
Subject: [PATCH 2/8] Turn StartPage "Import" quickstart button into "Open"

---
 src/Mod/Start/StartPage/CMakeLists.txt              |   2 +-
 src/Mod/Start/StartPage/LoadNew.py                  |  10 ++++++----
 src/Mod/Start/StartPage/StartPage.py                |   6 +++---
 src/Mod/Start/StartPage/TranslationTexts.py         |   4 ++--
 .../{new_import_file.png => new_open_file.png}      | Bin
 5 files changed, 12 insertions(+), 10 deletions(-)
 rename src/Mod/Start/StartPage/images/{new_import_file.png => new_open_file.png} (100%)

diff --git a/src/Mod/Start/StartPage/CMakeLists.txt b/src/Mod/Start/StartPage/CMakeLists.txt
index b09ccbea0e..0bbedbb8cc 100644
--- a/src/Mod/Start/StartPage/CMakeLists.txt
+++ b/src/Mod/Start/StartPage/CMakeLists.txt
@@ -27,7 +27,7 @@ SET(StartPage_ImageResources
     images/new_file_thumbnail.svg
     images/icon_settings.png
     images/new_empty_file.png
-    images/new_import_file.png
+    images/new_open_file.png
     images/new_parametric_part.png
     images/new_csg_part.png
     images/new_2d_draft.png
diff --git a/src/Mod/Start/StartPage/LoadNew.py b/src/Mod/Start/StartPage/LoadNew.py
index be697589ae..3668632f33 100644
--- a/src/Mod/Start/StartPage/LoadNew.py
+++ b/src/Mod/Start/StartPage/LoadNew.py
@@ -29,10 +29,12 @@ template_name = str(template)
 if template_name == "empty_file":
     FreeCADGui.runCommand('Std_New')
     StartPage.postStart()
-elif template_name == "import_file":
-    FreeCADGui.runCommand('Std_New')
-    StartPage.postStart()
-    FreeCADGui.runCommand("Std_Import")
+elif template_name == "open_file":
+    previous_doc = FreeCADGui.ActiveDocument
+    FreeCADGui.runCommand("Std_Open")
+    # workaround to not run postStart() if user cancels the Open dialog
+    if FreeCADGui.ActiveDocument != previous_doc:
+        StartPage.postStart()
 elif template_name == "parametric_part":
     FreeCADGui.runCommand('Std_New')
     FreeCADGui.activateWorkbench("PartDesignWorkbench")
diff --git a/src/Mod/Start/StartPage/StartPage.py b/src/Mod/Start/StartPage/StartPage.py
index 803044d944..f02928d392 100644
--- a/src/Mod/Start/StartPage/StartPage.py
+++ b/src/Mod/Start/StartPage/StartPage.py
@@ -258,7 +258,7 @@ def build_new_file_card(template):
 
     templates = {
         "empty_file": [TranslationTexts.T_TEMPLATE_EMPTYFILE_NAME, TranslationTexts.T_TEMPLATE_EMPTYFILE_DESC],
-        "import_file": [TranslationTexts.T_TEMPLATE_IMPORTFILE_NAME, TranslationTexts.T_TEMPLATE_IMPORTFILE_DESC],
+        "open_file": [TranslationTexts.T_TEMPLATE_OPENFILE_NAME, TranslationTexts.T_TEMPLATE_OPENFILE_DESC],
         "parametric_part": [TranslationTexts.T_TEMPLATE_PARAMETRICPART_NAME, TranslationTexts.T_TEMPLATE_PARAMETRICPART_DESC],
         # "csg_part": [TranslationTexts.T_TEMPLATE_CSGPART_NAME, TranslationTexts.T_TEMPLATE_CSGPART_DESC],
         "2d_draft": [TranslationTexts.T_TEMPLATE_2DDRAFT_NAME, TranslationTexts.T_TEMPLATE_2DDRAFT_DESC],
@@ -266,7 +266,7 @@ def build_new_file_card(template):
     }
 
     if template not in templates:
-        return
+        return ""
 
     image = 'file:///'+os.path.join(os.path.join(FreeCAD.getResourceDir(), "Mod", "Start", "StartPage"), 'images/new_'+template+".png").replace('\\','/')
 
@@ -439,7 +439,7 @@ def handle():
     SECTION_NEW_FILE = "<h2>"+TranslationTexts.T_NEWFILE+"</h2>"
     SECTION_NEW_FILE += "<ul>"
     SECTION_NEW_FILE += build_new_file_card("empty_file")
-    SECTION_NEW_FILE += build_new_file_card("import_file")
+    SECTION_NEW_FILE += build_new_file_card("open_file")
     SECTION_NEW_FILE += build_new_file_card("parametric_part")
     # SECTION_NEW_FILE += build_new_file_card("csg_part")
     SECTION_NEW_FILE += build_new_file_card("2d_draft")
diff --git a/src/Mod/Start/StartPage/TranslationTexts.py b/src/Mod/Start/StartPage/TranslationTexts.py
index 4e0ee061e1..4e95c7fbf4 100644
--- a/src/Mod/Start/StartPage/TranslationTexts.py
+++ b/src/Mod/Start/StartPage/TranslationTexts.py
@@ -44,8 +44,8 @@ T_BLOG_TOOLTIP = translate("StartPage", "Link to the FreeCAD blog")
 T_NEWFILE = translate("StartPage", "New file")
 T_TEMPLATE_EMPTYFILE_NAME = translate("StartPage", "Empty File")
 T_TEMPLATE_EMPTYFILE_DESC = translate("StartPage", "Create an empty FreeCAD file")
-T_TEMPLATE_IMPORTFILE_NAME = translate("StartPage", "Import File")
-T_TEMPLATE_IMPORTFILE_DESC = translate("StartPage", "Work on an existing CAD file or 3D model")
+T_TEMPLATE_OPENFILE_NAME = translate("StartPage", "Open File")
+T_TEMPLATE_OPENFILE_DESC = translate("StartPage", "Open an existing CAD file or 3D model")
 T_TEMPLATE_PARAMETRICPART_NAME = translate("StartPage", "Standard Part")
 T_TEMPLATE_PARAMETRICPART_DESC = translate("StartPage", "Create a part with the Part Design workbench")
 # T_TEMPLATE_CSGPART_NAME = translate("StartPage", "CSG Part")
diff --git a/src/Mod/Start/StartPage/images/new_import_file.png b/src/Mod/Start/StartPage/images/new_open_file.png
similarity index 100%
rename from src/Mod/Start/StartPage/images/new_import_file.png
rename to src/Mod/Start/StartPage/images/new_open_file.png

From 5be49a56f9fec457e6fc41e644eeb7d21f8a6fc4 Mon Sep 17 00:00:00 2001
From: qewer33 <qewer33@proton.me>
Date: Sun, 3 Sep 2023 16:21:49 +0300
Subject: [PATCH 3/8] StartPage implement custom CSS preference

---
 src/Mod/Start/Gui/AppStartGui.cpp             |  1 +
 src/Mod/Start/Gui/CMakeLists.txt              |  2 +
 src/Mod/Start/Gui/DlgStartPreferences.ui      | 24 +----
 .../Start/Gui/DlgStartPreferencesAdvanced.ui  | 87 +++++++++++++++++++
 src/Mod/Start/Gui/DlgStartPreferencesImp.cpp  | 75 ++++++++++++----
 src/Mod/Start/Gui/DlgStartPreferencesImp.h    | 53 +++++++----
 src/Mod/Start/StartPage/StartPage.html        |  3 +-
 src/Mod/Start/StartPage/StartPage.py          |  3 +-
 8 files changed, 191 insertions(+), 57 deletions(-)
 create mode 100644 src/Mod/Start/Gui/DlgStartPreferencesAdvanced.ui

diff --git a/src/Mod/Start/Gui/AppStartGui.cpp b/src/Mod/Start/Gui/AppStartGui.cpp
index 72a89dfcfd..b2cd79f1df 100644
--- a/src/Mod/Start/Gui/AppStartGui.cpp
+++ b/src/Mod/Start/Gui/AppStartGui.cpp
@@ -99,6 +99,7 @@ PyMOD_INIT_FUNC(StartGui)
 
     // register preferences pages
     new Gui::PrefPageProducer<StartGui::DlgStartPreferencesImp> (QT_TRANSLATE_NOOP("QObject", "Start"));
+    new Gui::PrefPageProducer<StartGui::DlgStartPreferencesAdvancedImp> (QT_TRANSLATE_NOOP("QObject", "Start"));
 
     // instantiating the commands
     CreateStartCommands();
diff --git a/src/Mod/Start/Gui/CMakeLists.txt b/src/Mod/Start/Gui/CMakeLists.txt
index fc1c86391b..7140934b15 100644
--- a/src/Mod/Start/Gui/CMakeLists.txt
+++ b/src/Mod/Start/Gui/CMakeLists.txt
@@ -14,6 +14,7 @@ set(StartGui_LIBS
 
 set(StartGui_UIC_SRCS
     DlgStartPreferences.ui
+    DlgStartPreferencesAdvanced.ui
 )
 
 set (Start_TR_QRC ${CMAKE_CURRENT_BINARY_DIR}/Resources/Start_translation.qrc)
@@ -26,6 +27,7 @@ SET(StartGui_SRCS
     ${Start_QRC_SRCS}
     ${StartGui_UIC_SRCS}
     DlgStartPreferences.ui
+    DlgStartPreferencesAdvanced.ui
     DlgStartPreferencesImp.cpp
     DlgStartPreferencesImp.h
     AppStartGui.cpp
diff --git a/src/Mod/Start/Gui/DlgStartPreferences.ui b/src/Mod/Start/Gui/DlgStartPreferences.ui
index a88215a6db..032a8fc33c 100644
--- a/src/Mod/Start/Gui/DlgStartPreferences.ui
+++ b/src/Mod/Start/Gui/DlgStartPreferences.ui
@@ -11,31 +11,9 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Start page options</string>
+   <string>General</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <widget class="QGroupBox" name="groupBox_2">
-     <property name="title">
-      <string>Start page template</string>
-     </property>
-     <layout class="QVBoxLayout" name="verticalLayout_2">
-      <item>
-       <widget class="Gui::PrefFileChooser" name="fileChooser_1" native="true">
-        <property name="toolTip">
-         <string>An optional HTML template that will be used instead of the default start page.</string>
-        </property>
-        <property name="prefEntry" stdset="0">
-         <cstring>Template</cstring>
-        </property>
-        <property name="prefPath" stdset="0">
-         <cstring>Mod/Start</cstring>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
    <item>
     <widget class="QGroupBox" name="groupBox_3">
      <property name="title">
diff --git a/src/Mod/Start/Gui/DlgStartPreferencesAdvanced.ui b/src/Mod/Start/Gui/DlgStartPreferencesAdvanced.ui
new file mode 100644
index 0000000000..eb373c18a2
--- /dev/null
+++ b/src/Mod/Start/Gui/DlgStartPreferencesAdvanced.ui
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>DlgStartPreferencesAdvanced</class>
+ <widget class="QWidget" name="DlgStartPreferencesAdvanced">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>548</width>
+    <height>896</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Advanced</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QGroupBox" name="groupBox_2">
+     <property name="title">
+      <string>Custom HTML Template</string>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout_2">
+      <item>
+       <widget class="Gui::PrefFileChooser" name="templateFileChooser" native="true">
+        <property name="toolTip">
+         <string>An optional HTML template that will be used instead of the default start page.</string>
+        </property>
+        <property name="prefEntry" stdset="0">
+         <cstring>Template</cstring>
+        </property>
+        <property name="prefPath" stdset="0">
+         <cstring>Mod/Start</cstring>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="groupBox">
+     <property name="title">
+      <string>Custom CSS</string>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout_2">
+      <item>
+       <widget class="QLabel" name="label">
+        <property name="text">
+         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;You can paste your custom CSS here and the Start Page will apply it for you. To learn more about how you can style the Start Page, take a look at the HTML and CSS sources:&lt;/p&gt;&lt;p&gt;&lt;a href=&quot;https://github.com/FreeCAD/FreeCAD/blob/master/src/Mod/Start/StartPage/StartPage.html&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#1d99f3;&quot;&gt;https://github.com/FreeCAD/FreeCAD/blob/master/src/Mod/Start/StartPage/StartPage.html&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;a href=&quot;https://github.com/FreeCAD/FreeCAD/blob/master/src/Mod/Start/StartPage/StartPage.css&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#1d99f3;&quot;&gt;https://github.com/FreeCAD/FreeCAD/blob/master/src/Mod/Start/StartPage/StartPage.css&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+        </property>
+        <property name="wordWrap">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="Gui::PrefTextEdit" name="customCSSTextEdit">
+        <property name="acceptRichText">
+         <bool>false</bool>
+        </property>
+        <property name="prefEntry" stdset="0">
+         <cstring>CustomCSS</cstring>
+        </property>
+        <property name="prefPath" stdset="0">
+         <cstring>Mod/Start</cstring>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>Gui::PrefFileChooser</class>
+   <extends>QWidget</extends>
+   <header>Gui/PrefWidgets.h</header>
+  </customwidget>
+  <customwidget>
+   <class>Gui::PrefTextEdit</class>
+   <extends>QWidget</extends>
+   <header>Gui/PrefWidgets.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/Mod/Start/Gui/DlgStartPreferencesImp.cpp b/src/Mod/Start/Gui/DlgStartPreferencesImp.cpp
index eab8120c2b..efe2bf6169 100644
--- a/src/Mod/Start/Gui/DlgStartPreferencesImp.cpp
+++ b/src/Mod/Start/Gui/DlgStartPreferencesImp.cpp
@@ -26,6 +26,7 @@
 
 #include "DlgStartPreferencesImp.h"
 #include "ui_DlgStartPreferences.h"
+#include "ui_DlgStartPreferencesAdvanced.h"
 
 
 using namespace StartGui;
@@ -33,9 +34,9 @@ using namespace StartGui;
 /**
  *  Constructs a DlgStartPreferencesImp which is a child of 'parent'
  */
-DlgStartPreferencesImp::DlgStartPreferencesImp( QWidget* parent )
-  : PreferencePage( parent )
-  , ui(new Ui_DlgStartPreferences)
+DlgStartPreferencesImp::DlgStartPreferencesImp(QWidget* parent)
+    : PreferencePage(parent)
+    , ui(new Ui_DlgStartPreferences)
 {
     ui->setupUi(this);
 
@@ -55,8 +56,10 @@ DlgStartPreferencesImp::DlgStartPreferencesImp( QWidget* parent )
         menuText[text] = it;
     }
 
-    {   // add special workbench to selection
-        QPixmap px = Gui::Application::Instance->workbenchIcon(QString::fromLatin1("NoneWorkbench"));
+    // add special workbench to selection
+    {
+        QPixmap px =
+            Gui::Application::Instance->workbenchIcon(QString::fromLatin1("NoneWorkbench"));
         QString key = QString::fromLatin1("<last>");
         QString value = QString::fromLatin1("$LastModule");
         if (px.isNull()) {
@@ -69,12 +72,13 @@ DlgStartPreferencesImp::DlgStartPreferencesImp( QWidget* parent )
 
     for (QMap<QString, QString>::Iterator it = menuText.begin(); it != menuText.end(); ++it) {
         QPixmap px = Gui::Application::Instance->workbenchIcon(it.value());
-        if (px.isNull())
+        if (px.isNull()) {
             ui->AutoloadModuleCombo->addItem(it.key(), QVariant(it.value()));
-        else
+        }
+        else {
             ui->AutoloadModuleCombo->addItem(px, it.key(), QVariant(it.value()));
+        }
     }
-
 }
 
 /**
@@ -87,8 +91,9 @@ void DlgStartPreferencesImp::saveSettings()
     int index = ui->AutoloadModuleCombo->currentIndex();
     QVariant data = ui->AutoloadModuleCombo->itemData(index);
     QString startWbName = data.toString();
-    App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/Mod/Start")->
-                          SetASCII("AutoloadModule", startWbName.toLatin1());
+    App::GetApplication()
+        .GetParameterGroupByPath("User parameter:BaseApp/Preferences/Mod/Start")
+        ->SetASCII("AutoloadModule", startWbName.toLatin1());
     ui->colorButton_1->onSave();
     ui->colorButton_2->onSave();
     ui->colorButton_3->onSave();
@@ -96,7 +101,6 @@ void DlgStartPreferencesImp::saveSettings()
     ui->colorButton_5->onSave();
     ui->colorButton_6->onSave();
     ui->colorButton_7->onSave();
-    ui->fileChooser_1->onSave();
     ui->fileChooser_2->onSave();
     ui->fileChooser_3->onSave();
     ui->radioButton_1->onSave();
@@ -118,8 +122,9 @@ void DlgStartPreferencesImp::saveSettings()
 void DlgStartPreferencesImp::loadSettings()
 {
     std::string start = App::Application::Config()["StartWorkbench"];
-    start = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/Mod/Start")->
-                                  GetASCII("AutoloadModule", start.c_str());
+    start = App::GetApplication()
+                .GetParameterGroupByPath("User parameter:BaseApp/Preferences/Mod/Start")
+                ->GetASCII("AutoloadModule", start.c_str());
     QString startWbName = QLatin1String(start.c_str());
     ui->AutoloadModuleCombo->setCurrentIndex(ui->AutoloadModuleCombo->findData(startWbName));
     ui->colorButton_1->onRestore();
@@ -129,7 +134,6 @@ void DlgStartPreferencesImp::loadSettings()
     ui->colorButton_5->onRestore();
     ui->colorButton_6->onRestore();
     ui->colorButton_7->onRestore();
-    ui->fileChooser_1->onRestore();
     ui->fileChooser_2->onRestore();
     ui->fileChooser_3->onRestore();
     ui->radioButton_1->onRestore();
@@ -151,7 +155,48 @@ void DlgStartPreferencesImp::loadSettings()
 /**
  * Sets the strings of the subwidgets using the current language.
  */
-void DlgStartPreferencesImp::changeEvent(QEvent *ev)
+void DlgStartPreferencesImp::changeEvent(QEvent* ev)
+{
+    if (ev->type() == QEvent::LanguageChange) {
+        ui->retranslateUi(this);
+    }
+    else {
+        Gui::Dialog::PreferencePage::changeEvent(ev);
+    }
+}
+
+
+/**
+ *  Constructs a DlgStartPreferencesAdvancedImp which is a child of 'parent'
+ */
+DlgStartPreferencesAdvancedImp::DlgStartPreferencesAdvancedImp(QWidget* parent)
+    : PreferencePage(parent)
+    , ui(new Ui_DlgStartPreferencesAdvanced)
+{
+    ui->setupUi(this);
+}
+
+/**
+ *  Destroys the object and frees any allocated resources
+ */
+DlgStartPreferencesAdvancedImp::~DlgStartPreferencesAdvancedImp() = default;
+
+void DlgStartPreferencesAdvancedImp::saveSettings()
+{
+    ui->templateFileChooser->onSave();
+    ui->customCSSTextEdit->onSave();
+}
+
+void DlgStartPreferencesAdvancedImp::loadSettings()
+{
+    ui->templateFileChooser->onRestore();
+    ui->customCSSTextEdit->onRestore();
+}
+
+/**
+ * Sets the strings of the subwidgets using the current language.
+ */
+void DlgStartPreferencesAdvancedImp::changeEvent(QEvent* ev)
 {
     if (ev->type() == QEvent::LanguageChange) {
         ui->retranslateUi(this);
diff --git a/src/Mod/Start/Gui/DlgStartPreferencesImp.h b/src/Mod/Start/Gui/DlgStartPreferencesImp.h
index 391e5c3bd9..83cfeade92 100644
--- a/src/Mod/Start/Gui/DlgStartPreferencesImp.h
+++ b/src/Mod/Start/Gui/DlgStartPreferencesImp.h
@@ -23,29 +23,48 @@
 #ifndef STARTGUI_DLGSTARTPREFERENCESIMP_H
 #define STARTGUI_DLGSTARTPREFERENCESIMP_H
 
-#include <memory>
 #include <Gui/PropertyPage.h>
+#include <memory>
 
 
 class Ui_DlgStartPreferences;
-namespace StartGui {
-    class DlgStartPreferencesImp : public Gui::Dialog::PreferencePage
-    {
-        Q_OBJECT
+class Ui_DlgStartPreferencesAdvanced;
+namespace StartGui
+{
+class DlgStartPreferencesImp: public Gui::Dialog::PreferencePage
+{
+    Q_OBJECT
 
-    public:
-        explicit DlgStartPreferencesImp( QWidget* parent = nullptr );
-        ~DlgStartPreferencesImp() override;
+public:
+    explicit DlgStartPreferencesImp(QWidget* parent = nullptr);
+    ~DlgStartPreferencesImp() override;
 
-    protected:
-        void saveSettings() override;
-        void loadSettings() override;
-        void changeEvent(QEvent *e) override;
+protected:
+    void saveSettings() override;
+    void loadSettings() override;
+    void changeEvent(QEvent* e) override;
 
-    private:
-        std::unique_ptr<Ui_DlgStartPreferences> ui;
-    };
+private:
+    std::unique_ptr<Ui_DlgStartPreferences> ui;
+};
 
-} // namespace StartGui
+class DlgStartPreferencesAdvancedImp: public Gui::Dialog::PreferencePage
+{
+    Q_OBJECT
 
-#endif // STARTGUI_DLGSTARTPREFERENCESIMP_H
+public:
+    explicit DlgStartPreferencesAdvancedImp(QWidget* parent = nullptr);
+    ~DlgStartPreferencesAdvancedImp() override;
+
+protected:
+    void saveSettings() override;
+    void loadSettings() override;
+    void changeEvent(QEvent* e) override;
+
+private:
+    std::unique_ptr<Ui_DlgStartPreferencesAdvanced> ui;
+};
+
+}// namespace StartGui
+
+#endif// STARTGUI_DLGSTARTPREFERENCESIMP_H
diff --git a/src/Mod/Start/StartPage/StartPage.html b/src/Mod/Start/StartPage/StartPage.html
index e852d2b616..943b4cbd0c 100644
--- a/src/Mod/Start/StartPage/StartPage.html
+++ b/src/Mod/Start/StartPage/StartPage.html
@@ -6,7 +6,8 @@
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <script>JS</script>
     <style>
-        CSS
+        DEFAULT_CSS
+        CUSTOM_CSS
     </style>
     <!--QSS-->
 </head>
diff --git a/src/Mod/Start/StartPage/StartPage.py b/src/Mod/Start/StartPage/StartPage.py
index f02928d392..11ba83e8d0 100644
--- a/src/Mod/Start/StartPage/StartPage.py
+++ b/src/Mod/Start/StartPage/StartPage.py
@@ -352,7 +352,8 @@ def handle():
     with open(css_filename, 'r') as f:
         CSS = f.read()
     HTML = HTML.replace("JS",JS)
-    HTML = HTML.replace("CSS",CSS)
+    HTML = HTML.replace("DEFAULT_CSS",CSS)
+    HTML = HTML.replace("CUSTOM_CSS",FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Start").GetString("CustomCSS","").replace("\n",""))
 
     # set the language
 

From 87d9fb576fbc808775a2d80b4951b3da8bceba7c Mon Sep 17 00:00:00 2001
From: qewer33 <qewer33@proton.me>
Date: Sun, 3 Sep 2023 16:33:50 +0300
Subject: [PATCH 4/8] Fix StartPage preference widget names

---
 src/Mod/Start/Gui/DlgStartPreferences.ui     | 686 +++++++++----------
 src/Mod/Start/Gui/DlgStartPreferencesImp.cpp |  72 +-
 2 files changed, 379 insertions(+), 379 deletions(-)

diff --git a/src/Mod/Start/Gui/DlgStartPreferences.ui b/src/Mod/Start/Gui/DlgStartPreferences.ui
index 032a8fc33c..d41d2b90ec 100644
--- a/src/Mod/Start/Gui/DlgStartPreferences.ui
+++ b/src/Mod/Start/Gui/DlgStartPreferences.ui
@@ -14,6 +14,81 @@
    <string>General</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QGroupBox" name="groupBox_4">
+     <property name="title">
+      <string>Options</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout_3">
+      <item row="0" column="0">
+       <widget class="QLabel" name="autoModuleLabel">
+        <property name="text">
+         <string>Switch workbench after loading</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="QComboBox" name="AutoloadModuleCombo">
+        <property name="toolTip">
+         <string>Choose which workbench to switch to after the program launches</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0">
+       <widget class="QLabel" name="label_11">
+        <property name="text">
+         <string>Close start page after loading</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="Gui::PrefCheckBox" name="closeStartCheckBox">
+        <property name="toolTip">
+         <string>If checked, will automatically close the Start page when FreeCAD launches</string>
+        </property>
+        <property name="layoutDirection">
+         <enum>Qt::RightToLeft</enum>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+        <property name="prefEntry" stdset="0">
+         <cstring>closeStart</cstring>
+        </property>
+        <property name="prefPath" stdset="0">
+         <cstring>Mod/Start</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0">
+       <widget class="QLabel" name="label_13">
+        <property name="text">
+         <string>Close and switch on opening file</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1">
+       <widget class="Gui::PrefCheckBox" name="closeAndSwitchCheckBox">
+        <property name="toolTip">
+         <string>If application is started by opening a file, apply the two settings above</string>
+        </property>
+        <property name="layoutDirection">
+         <enum>Qt::RightToLeft</enum>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+        <property name="prefEntry" stdset="0">
+         <cstring>DoNotShowOnOpen</cstring>
+        </property>
+        <property name="prefPath" stdset="0">
+         <cstring>Mod/Start</cstring>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
    <item>
     <widget class="QGroupBox" name="groupBox_3">
      <property name="title">
@@ -35,7 +110,7 @@
        </widget>
       </item>
       <item row="1" column="1">
-       <widget class="Gui::PrefCheckBox" name="checkBox_1">
+       <widget class="Gui::PrefCheckBox" name="showExamplesCheckBox">
         <property name="toolTip">
          <string>If you want the examples to show on the first page</string>
         </property>
@@ -57,7 +132,7 @@
        </widget>
       </item>
       <item row="3" column="1">
-       <widget class="Gui::PrefCheckBox" name="checkBox_4">
+       <widget class="Gui::PrefCheckBox" name="showForumCheckBox">
         <property name="toolTip">
          <string>If this is checked, the latest posts from the FreeCAD forum will be displayed on the Activity tab</string>
         </property>
@@ -95,7 +170,7 @@
        </widget>
       </item>
       <item row="0" column="1">
-       <widget class="Gui::PrefCheckBox" name="checkBox">
+       <widget class="Gui::PrefCheckBox" name="showNotepadCheckBox">
         <property name="toolTip">
          <string>Shows a notepad next to the file thumbnails, where you can keep notes across sessions</string>
         </property>
@@ -135,7 +210,7 @@
        </widget>
       </item>
       <item row="2" column="1">
-       <widget class="Gui::PrefFileChooser" name="fileChooser_3" native="true">
+       <widget class="Gui::PrefFileChooser" name="showAdditionalFolderFileChooser" native="true">
         <property name="toolTip">
          <string>An optional custom folder to be displayed at the bottom of the first page.
 By using &quot;;;&quot; to separate paths, you can add several folders here</string>
@@ -149,7 +224,7 @@ By using &quot;;;&quot; to separate paths, you can add several folders here</str
        </widget>
       </item>
       <item row="5" column="1">
-       <widget class="Gui::PrefCheckBox" name="checkBox_7">
+       <widget class="Gui::PrefCheckBox" name="showScrollbarsCheckBox">
         <property name="layoutDirection">
          <enum>Qt::RightToLeft</enum>
         </property>
@@ -182,7 +257,7 @@ By using &quot;;;&quot; to separate paths, you can add several folders here</str
        </widget>
       </item>
       <item row="4" column="1">
-       <widget class="Gui::PrefCheckBox" name="checkBox_6">
+       <widget class="Gui::PrefCheckBox" name="showTipsCheckBox">
         <property name="toolTip">
          <string>Displays help tips in the Start workbench Documents tab</string>
         </property>
@@ -246,7 +321,7 @@ By using &quot;;;&quot; to separate paths, you can add several folders here</str
            <enum>Qt::LeftToRight</enum>
           </property>
           <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
           </property>
           <property name="suffix">
            <string>px</string>
@@ -279,232 +354,8 @@ By using &quot;;;&quot; to separate paths, you can add several folders here</str
       <string>Fonts and colors</string>
      </property>
      <layout class="QGridLayout" name="gridLayout">
-      <item row="0" column="0">
-       <widget class="QLabel" name="label_15">
-        <property name="text">
-         <string>Use FreeCAD style sheet</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <widget class="Gui::PrefCheckBox" name="checkBox_5">
-        <property name="toolTip">
-         <string>If this is checked and a style sheet is specified in General preferences, it will be used and override the colors below</string>
-        </property>
-        <property name="layoutDirection">
-         <enum>Qt::RightToLeft</enum>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-        <property name="prefEntry" stdset="0">
-         <cstring>UseStyleSheet</cstring>
-        </property>
-        <property name="prefPath" stdset="0">
-         <cstring>Mod/Start</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="label">
-        <property name="text">
-         <string>Background color</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1" alignment="Qt::AlignRight">
-       <widget class="Gui::PrefColorButton" name="colorButton_1">
-        <property name="maximumSize">
-         <size>
-          <width>60</width>
-          <height>60</height>
-         </size>
-        </property>
-        <property name="toolTip">
-         <string>The background color behind the panels</string>
-        </property>
-        <property name="color" stdset="0">
-         <color>
-          <red>79</red>
-          <green>88</green>
-          <blue>116</blue>
-         </color>
-        </property>
-        <property name="prefEntry" stdset="0">
-         <cstring>BackgroundColor1</cstring>
-        </property>
-        <property name="prefPath" stdset="0">
-         <cstring>Mod/Start</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="0">
-       <widget class="QLabel" name="label_12">
-        <property name="enabled">
-         <bool>false</bool>
-        </property>
-        <property name="text">
-         <string>Background color down gradient</string>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="1" alignment="Qt::AlignRight">
-       <widget class="Gui::PrefColorButton" name="colorButton_7">
-        <property name="enabled">
-         <bool>false</bool>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>60</width>
-          <height>60</height>
-         </size>
-        </property>
-        <property name="toolTip">
-         <string>The down gradient for the background color (currently unsupported)</string>
-        </property>
-        <property name="color" stdset="0">
-         <color>
-          <red>127</red>
-          <green>158</green>
-          <blue>181</blue>
-         </color>
-        </property>
-        <property name="prefEntry" stdset="0">
-         <cstring>BackgroundColor2</cstring>
-        </property>
-        <property name="prefPath" stdset="0">
-         <cstring>Mod/Start</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="0">
-       <widget class="QLabel" name="label_2">
-        <property name="text">
-         <string>Background image</string>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="1">
-       <widget class="Gui::PrefFileChooser" name="fileChooser_2" native="true">
-        <property name="toolTip">
-         <string>An optional image to display as background</string>
-        </property>
-        <property name="prefEntry" stdset="0">
-         <cstring>BackgroundImage</cstring>
-        </property>
-        <property name="prefPath" stdset="0">
-         <cstring>Mod/Start</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="5" column="0">
-       <widget class="QLabel" name="label_3">
-        <property name="text">
-         <string>Background text color</string>
-        </property>
-       </widget>
-      </item>
-      <item row="5" column="1" alignment="Qt::AlignRight">
-       <widget class="Gui::PrefColorButton" name="colorButton_2">
-        <property name="maximumSize">
-         <size>
-          <width>60</width>
-          <height>60</height>
-         </size>
-        </property>
-        <property name="toolTip">
-         <string>The color of the version text</string>
-        </property>
-        <property name="color" stdset="0">
-         <color>
-          <red>95</red>
-          <green>95</green>
-          <blue>95</blue>
-         </color>
-        </property>
-        <property name="prefEntry" stdset="0">
-         <cstring>BackgroundTextColor</cstring>
-        </property>
-        <property name="prefPath" stdset="0">
-         <cstring>Mod/Start</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="6" column="0">
-       <widget class="QLabel" name="label_4">
-        <property name="text">
-         <string>Page background color</string>
-        </property>
-       </widget>
-      </item>
-      <item row="6" column="1" alignment="Qt::AlignRight">
-       <widget class="Gui::PrefColorButton" name="colorButton_3">
-        <property name="maximumSize">
-         <size>
-          <width>60</width>
-          <height>60</height>
-         </size>
-        </property>
-        <property name="toolTip">
-         <string>The background of the main start page area</string>
-        </property>
-        <property name="color" stdset="0">
-         <color>
-          <red>255</red>
-          <green>255</green>
-          <blue>255</blue>
-         </color>
-        </property>
-        <property name="prefEntry" stdset="0">
-         <cstring>PageColor</cstring>
-        </property>
-        <property name="prefPath" stdset="0">
-         <cstring>Mod/Start</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="7" column="0">
-       <widget class="QLabel" name="label_5">
-        <property name="text">
-         <string>Page text color</string>
-        </property>
-       </widget>
-      </item>
-      <item row="7" column="1" alignment="Qt::AlignRight">
-       <widget class="Gui::PrefColorButton" name="colorButton_4">
-        <property name="maximumSize">
-         <size>
-          <width>60</width>
-          <height>60</height>
-         </size>
-        </property>
-        <property name="toolTip">
-         <string>The color of the text on the main pages</string>
-        </property>
-        <property name="color" stdset="0">
-         <color>
-          <red>0</red>
-          <green>0</green>
-          <blue>0</blue>
-         </color>
-        </property>
-        <property name="prefEntry" stdset="0">
-         <cstring>PageTextColor</cstring>
-        </property>
-        <property name="prefPath" stdset="0">
-         <cstring>Mod/Start</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="8" column="0">
-       <widget class="QLabel" name="label_6">
-        <property name="text">
-         <string>Box background color</string>
-        </property>
-       </widget>
-      </item>
-      <item row="8" column="1" alignment="Qt::AlignRight">
-       <widget class="Gui::PrefColorButton" name="colorButton_5">
+      <item row="9" column="1" alignment="Qt::AlignRight">
+       <widget class="Gui::PrefColorButton" name="boxBackgroundColorButton">
         <property name="maximumSize">
          <size>
           <width>60</width>
@@ -529,15 +380,22 @@ By using &quot;;;&quot; to separate paths, you can add several folders here</str
         </property>
        </widget>
       </item>
-      <item row="9" column="0">
-       <widget class="QLabel" name="label_8">
+      <item row="8" column="0">
+       <widget class="QLabel" name="label_5">
         <property name="text">
-         <string>Link color</string>
+         <string>Page text color</string>
         </property>
        </widget>
       </item>
-      <item row="9" column="1" alignment="Qt::AlignRight">
-       <widget class="Gui::PrefColorButton" name="colorButton_6">
+      <item row="7" column="0">
+       <widget class="QLabel" name="label_4">
+        <property name="text">
+         <string>Page background color</string>
+        </property>
+       </widget>
+      </item>
+      <item row="7" column="1" alignment="Qt::AlignRight">
+       <widget class="Gui::PrefColorButton" name="pageBackgroundColorButton">
         <property name="maximumSize">
          <size>
           <width>60</width>
@@ -545,83 +403,24 @@ By using &quot;;;&quot; to separate paths, you can add several folders here</str
          </size>
         </property>
         <property name="toolTip">
-         <string>The color of the links</string>
+         <string>The background of the main start page area</string>
         </property>
         <property name="color" stdset="0">
          <color>
-          <red>0</red>
-          <green>0</green>
+          <red>255</red>
+          <green>255</green>
           <blue>255</blue>
          </color>
         </property>
         <property name="prefEntry" stdset="0">
-         <cstring>LinkColor</cstring>
+         <cstring>PageColor</cstring>
         </property>
         <property name="prefPath" stdset="0">
          <cstring>Mod/Start</cstring>
         </property>
        </widget>
       </item>
-      <item row="10" column="0">
-       <widget class="QLabel" name="label_16">
-        <property name="text">
-         <string>Font family</string>
-        </property>
-       </widget>
-      </item>
-      <item row="10" column="1">
-       <layout class="QHBoxLayout" name="horizontalLayout_2">
-        <item>
-         <widget class="Gui::PrefLineEdit" name="lineEdit">
-          <property name="toolTip">
-           <string>The font family to use on the start page. Can be a font name or a comma-separated series of fallback fonts</string>
-          </property>
-          <property name="text">
-           <string/>
-          </property>
-          <property name="placeholderText">
-           <string>Arial,Helvetica,sans</string>
-          </property>
-          <property name="prefEntry" stdset="0">
-           <cstring>FontFamily</cstring>
-          </property>
-          <property name="prefPath" stdset="0">
-           <cstring>Mod/Start</cstring>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="Gui::PrefSpinBox" name="spinBox">
-          <property name="toolTip">
-           <string>The base font size to use for all texts of the Start page</string>
-          </property>
-          <property name="suffix">
-           <string>px</string>
-          </property>
-          <property name="value">
-           <number>13</number>
-          </property>
-          <property name="prefEntry" stdset="0">
-           <cstring>FontSize</cstring>
-          </property>
-          <property name="prefPath" stdset="0">
-           <cstring>Mod/Start</cstring>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-      <item row="11" column="0">
-       <widget class="QLabel" name="label_7">
-        <property name="enabled">
-         <bool>false</bool>
-        </property>
-        <property name="text">
-         <string>Open links</string>
-        </property>
-       </widget>
-      </item>
-      <item row="11" column="1">
+      <item row="12" column="1">
        <layout class="QHBoxLayout" name="horizontalLayout">
         <item>
          <widget class="Gui::PrefRadioButton" name="radioButton_2">
@@ -660,66 +459,195 @@ By using &quot;;;&quot; to separate paths, you can add several folders here</str
         </item>
        </layout>
       </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <widget class="QGroupBox" name="groupBox_4">
-     <property name="title">
-      <string>Options</string>
-     </property>
-     <layout class="QGridLayout" name="gridLayout_3">
-      <item row="0" column="0">
-       <widget class="QLabel" name="autoModuleLabel">
+      <item row="11" column="0">
+       <widget class="QLabel" name="label_16">
         <property name="text">
-         <string>Switch workbench after loading</string>
+         <string>Font family</string>
         </property>
        </widget>
       </item>
-      <item row="0" column="1">
-       <widget class="QComboBox" name="AutoloadModuleCombo">
+      <item row="12" column="0">
+       <widget class="QLabel" name="label_7">
+        <property name="enabled">
+         <bool>false</bool>
+        </property>
+        <property name="text">
+         <string>Open links</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1" alignment="Qt::AlignRight">
+       <widget class="Gui::PrefColorButton" name="backgroundColorButton">
+        <property name="maximumSize">
+         <size>
+          <width>60</width>
+          <height>60</height>
+         </size>
+        </property>
         <property name="toolTip">
-         <string>Choose which workbench to switch to after the program launches</string>
+         <string>The background color behind the panels</string>
         </property>
-       </widget>
-      </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="label_11">
-        <property name="text">
-         <string>Close start page after loading</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1">
-       <widget class="Gui::PrefCheckBox" name="checkBox_2">
-        <property name="toolTip">
-         <string>If checked, will automatically close the Start page when FreeCAD launches</string>
-        </property>
-        <property name="layoutDirection">
-         <enum>Qt::RightToLeft</enum>
-        </property>
-        <property name="text">
-         <string/>
+        <property name="color" stdset="0">
+         <color>
+          <red>79</red>
+          <green>88</green>
+          <blue>116</blue>
+         </color>
         </property>
         <property name="prefEntry" stdset="0">
-         <cstring>closeStart</cstring>
+         <cstring>BackgroundColor1</cstring>
         </property>
         <property name="prefPath" stdset="0">
          <cstring>Mod/Start</cstring>
         </property>
        </widget>
       </item>
+      <item row="0" column="0">
+       <widget class="QLabel" name="label_15">
+        <property name="text">
+         <string>Use FreeCAD style sheet</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="0">
+       <widget class="QLabel" name="label_12">
+        <property name="enabled">
+         <bool>false</bool>
+        </property>
+        <property name="text">
+         <string>Background color down gradient</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="1" alignment="Qt::AlignRight">
+       <widget class="Gui::PrefColorButton" name="colorButton_7">
+        <property name="enabled">
+         <bool>false</bool>
+        </property>
+        <property name="maximumSize">
+         <size>
+          <width>60</width>
+          <height>60</height>
+         </size>
+        </property>
+        <property name="toolTip">
+         <string>The down gradient for the background color (currently unsupported)</string>
+        </property>
+        <property name="color" stdset="0">
+         <color>
+          <red>127</red>
+          <green>158</green>
+          <blue>181</blue>
+         </color>
+        </property>
+        <property name="prefEntry" stdset="0">
+         <cstring>BackgroundColor2</cstring>
+        </property>
+        <property name="prefPath" stdset="0">
+         <cstring>Mod/Start</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="9" column="0">
+       <widget class="QLabel" name="label_6">
+        <property name="text">
+         <string>Box background color</string>
+        </property>
+       </widget>
+      </item>
       <item row="2" column="0">
-       <widget class="QLabel" name="label_13">
+       <widget class="QLabel" name="label">
         <property name="text">
-         <string>Close and switch on opening file</string>
+         <string>Background color</string>
         </property>
        </widget>
       </item>
-      <item row="2" column="1">
-       <widget class="Gui::PrefCheckBox" name="checkBox_3">
+      <item row="6" column="0">
+       <widget class="QLabel" name="label_3">
+        <property name="text">
+         <string>Background text color</string>
+        </property>
+       </widget>
+      </item>
+      <item row="11" column="1">
+       <layout class="QHBoxLayout" name="horizontalLayout_2">
+        <item>
+         <widget class="Gui::PrefLineEdit" name="fontLineEdit">
+          <property name="toolTip">
+           <string>The font family to use on the start page. Can be a font name or a comma-separated series of fallback fonts</string>
+          </property>
+          <property name="text">
+           <string/>
+          </property>
+          <property name="placeholderText">
+           <string>Arial,Helvetica,sans</string>
+          </property>
+          <property name="prefEntry" stdset="0">
+           <cstring>FontFamily</cstring>
+          </property>
+          <property name="prefPath" stdset="0">
+           <cstring>Mod/Start</cstring>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="Gui::PrefSpinBox" name="fontSizeSpinBox">
+          <property name="toolTip">
+           <string>The base font size to use for all texts of the Start page</string>
+          </property>
+          <property name="suffix">
+           <string>px</string>
+          </property>
+          <property name="value">
+           <number>13</number>
+          </property>
+          <property name="prefEntry" stdset="0">
+           <cstring>FontSize</cstring>
+          </property>
+          <property name="prefPath" stdset="0">
+           <cstring>Mod/Start</cstring>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item row="10" column="1" alignment="Qt::AlignRight">
+       <widget class="Gui::PrefColorButton" name="linkColorButton">
+        <property name="maximumSize">
+         <size>
+          <width>60</width>
+          <height>60</height>
+         </size>
+        </property>
         <property name="toolTip">
-         <string>If application is started by opening a file, apply the two settings above</string>
+         <string>The color of the links</string>
+        </property>
+        <property name="color" stdset="0">
+         <color>
+          <red>0</red>
+          <green>0</green>
+          <blue>255</blue>
+         </color>
+        </property>
+        <property name="prefEntry" stdset="0">
+         <cstring>LinkColor</cstring>
+        </property>
+        <property name="prefPath" stdset="0">
+         <cstring>Mod/Start</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="10" column="0">
+       <widget class="QLabel" name="label_8">
+        <property name="text">
+         <string>Link color</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="Gui::PrefCheckBox" name="useStyleSheetCheckBox">
+        <property name="toolTip">
+         <string>If this is checked and a style sheet is specified in General preferences, it will be used and override the colors below</string>
         </property>
         <property name="layoutDirection">
          <enum>Qt::RightToLeft</enum>
@@ -728,13 +656,85 @@ By using &quot;;;&quot; to separate paths, you can add several folders here</str
          <string/>
         </property>
         <property name="prefEntry" stdset="0">
-         <cstring>DoNotShowOnOpen</cstring>
+         <cstring>UseStyleSheet</cstring>
         </property>
         <property name="prefPath" stdset="0">
          <cstring>Mod/Start</cstring>
         </property>
        </widget>
       </item>
+      <item row="6" column="1" alignment="Qt::AlignRight">
+       <widget class="Gui::PrefColorButton" name="backgroundTextColorButton">
+        <property name="maximumSize">
+         <size>
+          <width>60</width>
+          <height>60</height>
+         </size>
+        </property>
+        <property name="toolTip">
+         <string>The color of the version text</string>
+        </property>
+        <property name="color" stdset="0">
+         <color>
+          <red>95</red>
+          <green>95</green>
+          <blue>95</blue>
+         </color>
+        </property>
+        <property name="prefEntry" stdset="0">
+         <cstring>BackgroundTextColor</cstring>
+        </property>
+        <property name="prefPath" stdset="0">
+         <cstring>Mod/Start</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="8" column="1" alignment="Qt::AlignRight">
+       <widget class="Gui::PrefColorButton" name="pageTextColorButton">
+        <property name="maximumSize">
+         <size>
+          <width>60</width>
+          <height>60</height>
+         </size>
+        </property>
+        <property name="toolTip">
+         <string>The color of the text on the main pages</string>
+        </property>
+        <property name="color" stdset="0">
+         <color>
+          <red>0</red>
+          <green>0</green>
+          <blue>0</blue>
+         </color>
+        </property>
+        <property name="prefEntry" stdset="0">
+         <cstring>PageTextColor</cstring>
+        </property>
+        <property name="prefPath" stdset="0">
+         <cstring>Mod/Start</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="Gui::PrefFileChooser" name="backgroundImageFileChooser" native="true">
+        <property name="toolTip">
+         <string>An optional image to display as background</string>
+        </property>
+        <property name="prefEntry" stdset="0">
+         <cstring>BackgroundImage</cstring>
+        </property>
+        <property name="prefPath" stdset="0">
+         <cstring>Mod/Start</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0">
+       <widget class="QLabel" name="label_2">
+        <property name="text">
+         <string>Background image</string>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>
diff --git a/src/Mod/Start/Gui/DlgStartPreferencesImp.cpp b/src/Mod/Start/Gui/DlgStartPreferencesImp.cpp
index efe2bf6169..ac01f1c6d2 100644
--- a/src/Mod/Start/Gui/DlgStartPreferencesImp.cpp
+++ b/src/Mod/Start/Gui/DlgStartPreferencesImp.cpp
@@ -94,27 +94,27 @@ void DlgStartPreferencesImp::saveSettings()
     App::GetApplication()
         .GetParameterGroupByPath("User parameter:BaseApp/Preferences/Mod/Start")
         ->SetASCII("AutoloadModule", startWbName.toLatin1());
-    ui->colorButton_1->onSave();
-    ui->colorButton_2->onSave();
-    ui->colorButton_3->onSave();
-    ui->colorButton_4->onSave();
-    ui->colorButton_5->onSave();
-    ui->colorButton_6->onSave();
+    ui->backgroundColorButton->onSave();
+    ui->backgroundTextColorButton->onSave();
+    ui->pageBackgroundColorButton->onSave();
+    ui->pageTextColorButton->onSave();
+    ui->boxBackgroundColorButton->onSave();
+    ui->linkColorButton->onSave();
     ui->colorButton_7->onSave();
-    ui->fileChooser_2->onSave();
-    ui->fileChooser_3->onSave();
+    ui->backgroundImageFileChooser->onSave();
+    ui->showAdditionalFolderFileChooser->onSave();
     ui->radioButton_1->onSave();
     ui->radioButton_2->onSave();
-    ui->checkBox->onSave();
-    ui->checkBox_1->onSave();
-    ui->checkBox_2->onSave();
-    ui->checkBox_3->onSave();
-    ui->checkBox_4->onSave();
-    ui->checkBox_5->onSave();
-    ui->checkBox_6->onSave();
-    ui->checkBox_7->onSave();
-    ui->lineEdit->onSave();
-    ui->spinBox->onSave();
+    ui->showNotepadCheckBox->onSave();
+    ui->showExamplesCheckBox->onSave();
+    ui->closeStartCheckBox->onSave();
+    ui->closeAndSwitchCheckBox->onSave();
+    ui->showForumCheckBox->onSave();
+    ui->useStyleSheetCheckBox->onSave();
+    ui->showTipsCheckBox->onSave();
+    ui->showScrollbarsCheckBox->onSave();
+    ui->fontLineEdit->onSave();
+    ui->fontSizeSpinBox->onSave();
     ui->showFileThumbnailIconsCheckBox->onSave();
     ui->fileThumbnailIconSizeSpinBox->onSave();
 }
@@ -127,27 +127,27 @@ void DlgStartPreferencesImp::loadSettings()
                 ->GetASCII("AutoloadModule", start.c_str());
     QString startWbName = QLatin1String(start.c_str());
     ui->AutoloadModuleCombo->setCurrentIndex(ui->AutoloadModuleCombo->findData(startWbName));
-    ui->colorButton_1->onRestore();
-    ui->colorButton_2->onRestore();
-    ui->colorButton_3->onRestore();
-    ui->colorButton_4->onRestore();
-    ui->colorButton_5->onRestore();
-    ui->colorButton_6->onRestore();
+    ui->backgroundColorButton->onRestore();
+    ui->backgroundTextColorButton->onRestore();
+    ui->pageBackgroundColorButton->onRestore();
+    ui->pageTextColorButton->onRestore();
+    ui->boxBackgroundColorButton->onRestore();
+    ui->linkColorButton->onRestore();
     ui->colorButton_7->onRestore();
-    ui->fileChooser_2->onRestore();
-    ui->fileChooser_3->onRestore();
+    ui->backgroundImageFileChooser->onRestore();
+    ui->showAdditionalFolderFileChooser->onRestore();
     ui->radioButton_1->onRestore();
     ui->radioButton_2->onRestore();
-    ui->checkBox->onRestore();
-    ui->checkBox_1->onRestore();
-    ui->checkBox_2->onRestore();
-    ui->checkBox_3->onRestore();
-    ui->checkBox_4->onRestore();
-    ui->checkBox_5->onRestore();
-    ui->checkBox_6->onRestore();
-    ui->checkBox_7->onRestore();
-    ui->lineEdit->onRestore();
-    ui->spinBox->onRestore();
+    ui->showNotepadCheckBox->onRestore();
+    ui->showExamplesCheckBox->onRestore();
+    ui->closeStartCheckBox->onRestore();
+    ui->closeAndSwitchCheckBox->onRestore();
+    ui->showForumCheckBox->onRestore();
+    ui->useStyleSheetCheckBox->onRestore();
+    ui->showTipsCheckBox->onRestore();
+    ui->showScrollbarsCheckBox->onRestore();
+    ui->fontLineEdit->onRestore();
+    ui->fontSizeSpinBox->onRestore();
     ui->showFileThumbnailIconsCheckBox->onRestore();
     ui->fileThumbnailIconSizeSpinBox->onRestore();
 }

From 068e77c974d89aa0df6d52bb24e3f0d4f47e3970 Mon Sep 17 00:00:00 2001
From: qewer33 <qewer33@proton.me>
Date: Sun, 3 Sep 2023 19:23:13 +0300
Subject: [PATCH 5/8] StartPage fixes

---
 src/Mod/Start/Gui/DlgStartPreferencesAdvanced.ui |  7 +++++--
 src/Mod/Start/StartPage/StartPage.css            | 11 ++---------
 src/Mod/Start/StartPage/StartPage.html           |  2 +-
 src/Mod/Start/StartPage/TranslationTexts.py      |  2 +-
 4 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/src/Mod/Start/Gui/DlgStartPreferencesAdvanced.ui b/src/Mod/Start/Gui/DlgStartPreferencesAdvanced.ui
index eb373c18a2..d97177501e 100644
--- a/src/Mod/Start/Gui/DlgStartPreferencesAdvanced.ui
+++ b/src/Mod/Start/Gui/DlgStartPreferencesAdvanced.ui
@@ -50,11 +50,14 @@
         <property name="wordWrap">
          <bool>true</bool>
         </property>
+        <property name="openExternalLinks">
+         <bool>true</bool>
+        </property>
        </widget>
       </item>
       <item>
-       <widget class="Gui::PrefTextEdit" name="customCSSTextEdit">
-        <property name="acceptRichText">
+       <widget class="Gui::PrefTextEdit" name="customCSSTextEdit" native="true">
+        <property name="acceptRichText" stdset="0">
          <bool>false</bool>
         </property>
         <property name="prefEntry" stdset="0">
diff --git a/src/Mod/Start/StartPage/StartPage.css b/src/Mod/Start/StartPage/StartPage.css
index c842a88265..c16a912273 100644
--- a/src/Mod/Start/StartPage/StartPage.css
+++ b/src/Mod/Start/StartPage/StartPage.css
@@ -59,6 +59,7 @@ img, a {
     margin: 20px;
     background: BASECOLOR;
     border-radius: 15px;
+    overflow: overlay;
 }
 
 #title-bar {
@@ -77,7 +78,7 @@ img, a {
     display: flex;
     align-items: center;
     color: TEXTCOLOR;
-    font-size: 1.3em;
+    font-size: 1.4em;
     margin-left: 25px;
     font-weight: bold;
 }
@@ -196,10 +197,6 @@ ul.icons {
     text-align: center;
 }
 
-.file-card:hover {
-    border-color: LINKCOLOR;
-}
-
 .file-card h4 {
     margin: 5px 0;
 }
@@ -247,10 +244,6 @@ a .caption:visited {
     word-wrap: break-word;
 }
 
-.quickstart-button-card:hover {
-    border-color: LINKCOLOR;
-}
-
 .quickstart-button-card a {
     display: flex;
 }
diff --git a/src/Mod/Start/StartPage/StartPage.html b/src/Mod/Start/StartPage/StartPage.html
index 943b4cbd0c..f3bcbeabe6 100644
--- a/src/Mod/Start/StartPage/StartPage.html
+++ b/src/Mod/Start/StartPage/StartPage.html
@@ -35,7 +35,7 @@
                     </a>
                 </li>
                 <li>
-                    <a href="https://blog.freecad.org/" title="T_BLOG_TOOLTIP">
+                    <a href="https://blog.freecad.org/" title="T_TOOLTIP_BLOG">
                         <img src="IMAGE_SRC_ICON_BLOG" alt="blog">
                         T_BLOG
                     </a>
diff --git a/src/Mod/Start/StartPage/TranslationTexts.py b/src/Mod/Start/StartPage/TranslationTexts.py
index 4e95c7fbf4..97ac9ae162 100644
--- a/src/Mod/Start/StartPage/TranslationTexts.py
+++ b/src/Mod/Start/StartPage/TranslationTexts.py
@@ -40,7 +40,7 @@ T_DOCUMENTS = translate("StartPage", "Documents")
 T_HELP = translate("StartPage", "Help")
 T_ACTIVITY = translate("StartPage", "Activity")
 T_BLOG = translate("StartPage", "Blog")
-T_BLOG_TOOLTIP = translate("StartPage", "Link to the FreeCAD blog")
+T_TOOLTIP_BLOG = translate("StartPage", "Link to the FreeCAD blog")
 T_NEWFILE = translate("StartPage", "New file")
 T_TEMPLATE_EMPTYFILE_NAME = translate("StartPage", "Empty File")
 T_TEMPLATE_EMPTYFILE_DESC = translate("StartPage", "Create an empty FreeCAD file")

From 1ece491dfd27c76092117791a1121a8ddf130d95 Mon Sep 17 00:00:00 2001
From: qewer33 <qewer33@proton.me>
Date: Sun, 3 Sep 2023 19:30:57 +0300
Subject: [PATCH 6/8] StartPage remove hide scrollbars option

---
 src/Mod/Start/Gui/DlgStartPreferences.ui     | 366 +++++++++----------
 src/Mod/Start/Gui/DlgStartPreferencesImp.cpp |   2 -
 src/Mod/Start/StartPage/StartPage.css        |   1 -
 src/Mod/Start/StartPage/StartPage.py         |   2 -
 4 files changed, 170 insertions(+), 201 deletions(-)

diff --git a/src/Mod/Start/Gui/DlgStartPreferences.ui b/src/Mod/Start/Gui/DlgStartPreferences.ui
index d41d2b90ec..fbec5bc186 100644
--- a/src/Mod/Start/Gui/DlgStartPreferences.ui
+++ b/src/Mod/Start/Gui/DlgStartPreferences.ui
@@ -95,202 +95,6 @@
       <string>Contents</string>
      </property>
      <layout class="QGridLayout" name="gridLayout_2">
-      <item row="4" column="0">
-       <widget class="QLabel" name="label_19">
-        <property name="text">
-         <string>Show tips</string>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="0">
-       <widget class="QLabel" name="label_10">
-        <property name="text">
-         <string>Show additional folder</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1">
-       <widget class="Gui::PrefCheckBox" name="showExamplesCheckBox">
-        <property name="toolTip">
-         <string>If you want the examples to show on the first page</string>
-        </property>
-        <property name="layoutDirection">
-         <enum>Qt::RightToLeft</enum>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-        <property name="checked">
-         <bool>true</bool>
-        </property>
-        <property name="prefEntry" stdset="0">
-         <cstring>ShowExamples</cstring>
-        </property>
-        <property name="prefPath" stdset="0">
-         <cstring>Mod/Start</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="1">
-       <widget class="Gui::PrefCheckBox" name="showForumCheckBox">
-        <property name="toolTip">
-         <string>If this is checked, the latest posts from the FreeCAD forum will be displayed on the Activity tab</string>
-        </property>
-        <property name="layoutDirection">
-         <enum>Qt::RightToLeft</enum>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-        <property name="prefEntry" stdset="0">
-         <cstring>ShowForum</cstring>
-        </property>
-        <property name="prefPath" stdset="0">
-         <cstring>Mod/Start</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="6" column="1">
-       <widget class="Gui::PrefCheckBox" name="showFileThumbnailIconsCheckBox">
-        <property name="layoutDirection">
-         <enum>Qt::RightToLeft</enum>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-        <property name="checked">
-         <bool>true</bool>
-        </property>
-        <property name="prefEntry" stdset="0">
-         <cstring>ShowFileThumbnailIcons</cstring>
-        </property>
-        <property name="prefPath" stdset="0">
-         <cstring>Mod/Start</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <widget class="Gui::PrefCheckBox" name="showNotepadCheckBox">
-        <property name="toolTip">
-         <string>Shows a notepad next to the file thumbnails, where you can keep notes across sessions</string>
-        </property>
-        <property name="layoutDirection">
-         <enum>Qt::RightToLeft</enum>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-        <property name="prefEntry" stdset="0">
-         <cstring>ShowNotes</cstring>
-        </property>
-        <property name="prefPath" stdset="0">
-         <cstring>Mod/Start</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="5" column="0">
-       <widget class="QLabel" name="label_20">
-        <property name="text">
-         <string>Show scrollbars</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="0">
-       <widget class="QLabel" name="label_17">
-        <property name="text">
-         <string>Show notepad</string>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="0">
-       <widget class="QLabel" name="label_14">
-        <property name="text">
-         <string>Show forum</string>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="1">
-       <widget class="Gui::PrefFileChooser" name="showAdditionalFolderFileChooser" native="true">
-        <property name="toolTip">
-         <string>An optional custom folder to be displayed at the bottom of the first page.
-By using &quot;;;&quot; to separate paths, you can add several folders here</string>
-        </property>
-        <property name="prefEntry" stdset="0">
-         <cstring>ShowCustomFolder</cstring>
-        </property>
-        <property name="prefPath" stdset="0">
-         <cstring>Mod/Start</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="5" column="1">
-       <widget class="Gui::PrefCheckBox" name="showScrollbarsCheckBox">
-        <property name="layoutDirection">
-         <enum>Qt::RightToLeft</enum>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-        <property name="checked">
-         <bool>true</bool>
-        </property>
-        <property name="prefEntry" stdset="0">
-         <cstring>ShowScrollBars</cstring>
-        </property>
-        <property name="prefPath" stdset="0">
-         <cstring>Mod/Start</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="6" column="0">
-       <widget class="QLabel" name="label_18">
-        <property name="text">
-         <string>Show file thumbnails</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="label_9">
-        <property name="text">
-         <string>Show examples folder contents</string>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="1">
-       <widget class="Gui::PrefCheckBox" name="showTipsCheckBox">
-        <property name="toolTip">
-         <string>Displays help tips in the Start workbench Documents tab</string>
-        </property>
-        <property name="layoutDirection">
-         <enum>Qt::RightToLeft</enum>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-        <property name="checked">
-         <bool>true</bool>
-        </property>
-        <property name="prefEntry" stdset="0">
-         <cstring>ShowTips</cstring>
-        </property>
-        <property name="prefPath" stdset="0">
-         <cstring>Mod/Start</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="8" column="0">
-       <widget class="QLabel" name="label_21">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>File thumbnail size</string>
-        </property>
-       </widget>
-      </item>
       <item row="8" column="1">
        <layout class="QHBoxLayout" name="horizontalLayout_3">
         <item>
@@ -345,6 +149,176 @@ By using &quot;;;&quot; to separate paths, you can add several folders here</str
         </item>
        </layout>
       </item>
+      <item row="6" column="1">
+       <widget class="Gui::PrefCheckBox" name="showFileThumbnailIconsCheckBox">
+        <property name="layoutDirection">
+         <enum>Qt::RightToLeft</enum>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+        <property name="checked">
+         <bool>true</bool>
+        </property>
+        <property name="prefEntry" stdset="0">
+         <cstring>ShowFileThumbnailIcons</cstring>
+        </property>
+        <property name="prefPath" stdset="0">
+         <cstring>Mod/Start</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1">
+       <widget class="Gui::PrefCheckBox" name="showExamplesCheckBox">
+        <property name="toolTip">
+         <string>If you want the examples to show on the first page</string>
+        </property>
+        <property name="layoutDirection">
+         <enum>Qt::RightToLeft</enum>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+        <property name="checked">
+         <bool>true</bool>
+        </property>
+        <property name="prefEntry" stdset="0">
+         <cstring>ShowExamples</cstring>
+        </property>
+        <property name="prefPath" stdset="0">
+         <cstring>Mod/Start</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="1">
+       <widget class="Gui::PrefCheckBox" name="showTipsCheckBox">
+        <property name="toolTip">
+         <string>Displays help tips in the Start workbench Documents tab</string>
+        </property>
+        <property name="layoutDirection">
+         <enum>Qt::RightToLeft</enum>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+        <property name="checked">
+         <bool>true</bool>
+        </property>
+        <property name="prefEntry" stdset="0">
+         <cstring>ShowTips</cstring>
+        </property>
+        <property name="prefPath" stdset="0">
+         <cstring>Mod/Start</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="0">
+       <widget class="QLabel" name="label_19">
+        <property name="text">
+         <string>Show tips</string>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="0">
+       <widget class="QLabel" name="label_14">
+        <property name="text">
+         <string>Show forum</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0">
+       <widget class="QLabel" name="label_17">
+        <property name="text">
+         <string>Show notepad</string>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="1">
+       <widget class="Gui::PrefCheckBox" name="showForumCheckBox">
+        <property name="toolTip">
+         <string>If this is checked, the latest posts from the FreeCAD forum will be displayed on the Activity tab</string>
+        </property>
+        <property name="layoutDirection">
+         <enum>Qt::RightToLeft</enum>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+        <property name="prefEntry" stdset="0">
+         <cstring>ShowForum</cstring>
+        </property>
+        <property name="prefPath" stdset="0">
+         <cstring>Mod/Start</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="8" column="0">
+       <widget class="QLabel" name="label_21">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string>File thumbnail size</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0">
+       <widget class="QLabel" name="label_9">
+        <property name="text">
+         <string>Show examples folder contents</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="Gui::PrefCheckBox" name="showNotepadCheckBox">
+        <property name="toolTip">
+         <string>Shows a notepad next to the file thumbnails, where you can keep notes across sessions</string>
+        </property>
+        <property name="layoutDirection">
+         <enum>Qt::RightToLeft</enum>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+        <property name="prefEntry" stdset="0">
+         <cstring>ShowNotes</cstring>
+        </property>
+        <property name="prefPath" stdset="0">
+         <cstring>Mod/Start</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="6" column="0">
+       <widget class="QLabel" name="label_18">
+        <property name="text">
+         <string>Show file thumbnails</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="Gui::PrefFileChooser" name="showAdditionalFolderFileChooser" native="true">
+        <property name="toolTip">
+         <string>An optional custom folder to be displayed at the bottom of the first page.
+By using &quot;;;&quot; to separate paths, you can add several folders here</string>
+        </property>
+        <property name="prefEntry" stdset="0">
+         <cstring>ShowCustomFolder</cstring>
+        </property>
+        <property name="prefPath" stdset="0">
+         <cstring>Mod/Start</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0">
+       <widget class="QLabel" name="label_10">
+        <property name="text">
+         <string>Show additional folder</string>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>
diff --git a/src/Mod/Start/Gui/DlgStartPreferencesImp.cpp b/src/Mod/Start/Gui/DlgStartPreferencesImp.cpp
index ac01f1c6d2..ce400e0297 100644
--- a/src/Mod/Start/Gui/DlgStartPreferencesImp.cpp
+++ b/src/Mod/Start/Gui/DlgStartPreferencesImp.cpp
@@ -112,7 +112,6 @@ void DlgStartPreferencesImp::saveSettings()
     ui->showForumCheckBox->onSave();
     ui->useStyleSheetCheckBox->onSave();
     ui->showTipsCheckBox->onSave();
-    ui->showScrollbarsCheckBox->onSave();
     ui->fontLineEdit->onSave();
     ui->fontSizeSpinBox->onSave();
     ui->showFileThumbnailIconsCheckBox->onSave();
@@ -145,7 +144,6 @@ void DlgStartPreferencesImp::loadSettings()
     ui->showForumCheckBox->onRestore();
     ui->useStyleSheetCheckBox->onRestore();
     ui->showTipsCheckBox->onRestore();
-    ui->showScrollbarsCheckBox->onRestore();
     ui->fontLineEdit->onRestore();
     ui->fontSizeSpinBox->onRestore();
     ui->showFileThumbnailIconsCheckBox->onRestore();
diff --git a/src/Mod/Start/StartPage/StartPage.css b/src/Mod/Start/StartPage/StartPage.css
index c16a912273..4c4d4d9dfe 100644
--- a/src/Mod/Start/StartPage/StartPage.css
+++ b/src/Mod/Start/StartPage/StartPage.css
@@ -24,7 +24,6 @@ body {
     overflow: hidden;
 }
 
-OVERFLOW
 a,
 a:link,
 a:visited {
diff --git a/src/Mod/Start/StartPage/StartPage.py b/src/Mod/Start/StartPage/StartPage.py
index 11ba83e8d0..d2d6c6a839 100644
--- a/src/Mod/Start/StartPage/StartPage.py
+++ b/src/Mod/Start/StartPage/StartPage.py
@@ -614,7 +614,6 @@ def handle():
     BOXCOLOR  = gethexcolor(p.GetUnsigned("BoxColor",3722305023))
     TEXTCOLOR = gethexcolor(p.GetUnsigned("PageTextColor",255))
     BGTCOLOR = gethexcolor(p.GetUnsigned("BackgroundTextColor",1600086015))
-    OVERFLOW = "" if p.GetBool("ShowScrollBars",True) else "body::-webkit-scrollbar {display: none;}"
     SHADOW = "#888888"
     if QtGui.QColor(BASECOLOR).valueF() < 0.5: # dark page - we need to make darker shadows
         SHADOW = "#000000"
@@ -631,7 +630,6 @@ def handle():
     HTML = HTML.replace("SHADOW",SHADOW)
     HTML = HTML.replace("FONTFAMILY",FONTFAMILY)
     HTML = HTML.replace("FONTSIZE",str(FONTSIZE)+"px")
-    HTML = HTML.replace("OVERFLOW",OVERFLOW)
 
     # enable web access if permitted
 

From b6df38eb7f3970b4877d701e999a43eefcaa294a Mon Sep 17 00:00:00 2001
From: qewer33 <qewer33@proton.me>
Date: Sun, 3 Sep 2023 20:52:58 +0300
Subject: [PATCH 7/8] Fix CI tests failing

---
 src/Mod/Start/StartPage/StartPage.css | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Mod/Start/StartPage/StartPage.css b/src/Mod/Start/StartPage/StartPage.css
index 4c4d4d9dfe..116782e3ae 100644
--- a/src/Mod/Start/StartPage/StartPage.css
+++ b/src/Mod/Start/StartPage/StartPage.css
@@ -58,7 +58,6 @@ img, a {
     margin: 20px;
     background: BASECOLOR;
     border-radius: 15px;
-    overflow: overlay;
 }
 
 #title-bar {

From 221e337a0450eee2b12333f62686395f612f82c0 Mon Sep 17 00:00:00 2001
From: qewer33 <qewer33@proton.me>
Date: Sun, 3 Sep 2023 23:51:49 +0300
Subject: [PATCH 8/8] Apply pre-commit

---
 src/Mod/Start/StartPage/CMakeLists.txt |  1 -
 src/Mod/Start/StartPage/StartPage.css  |  2 +-
 src/Mod/Start/StartPage/StartPage.html |  2 +-
 src/Mod/Start/StartPage/StartPage.py   | 56 ++++++++++++++++----------
 src/Mod/Start/start.dox                |  1 -
 5 files changed, 37 insertions(+), 25 deletions(-)

diff --git a/src/Mod/Start/StartPage/CMakeLists.txt b/src/Mod/Start/StartPage/CMakeLists.txt
index 0bbedbb8cc..5d363bb972 100644
--- a/src/Mod/Start/StartPage/CMakeLists.txt
+++ b/src/Mod/Start/StartPage/CMakeLists.txt
@@ -68,4 +68,3 @@ INSTALL(FILES ${StartPage_PythonResources}
 INSTALL(FILES ${StartPage_ImageResources}
     DESTINATION ${CMAKE_INSTALL_DATADIR}/Mod/Start/StartPage/images
 )
-
diff --git a/src/Mod/Start/StartPage/StartPage.css b/src/Mod/Start/StartPage/StartPage.css
index 116782e3ae..6691267d30 100644
--- a/src/Mod/Start/StartPage/StartPage.css
+++ b/src/Mod/Start/StartPage/StartPage.css
@@ -386,4 +386,4 @@ ul.addonslist {
     background: TEXTCOLOR;
     background-clip: content-box;
     border: 6px solid transparent;
-}
\ No newline at end of file
+}
diff --git a/src/Mod/Start/StartPage/StartPage.html b/src/Mod/Start/StartPage/StartPage.html
index f3bcbeabe6..d48f062fa6 100644
--- a/src/Mod/Start/StartPage/StartPage.html
+++ b/src/Mod/Start/StartPage/StartPage.html
@@ -192,4 +192,4 @@
     </div>
 </body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/src/Mod/Start/StartPage/StartPage.py b/src/Mod/Start/StartPage/StartPage.py
index 5a619ffeeb..4951d960bf 100644
--- a/src/Mod/Start/StartPage/StartPage.py
+++ b/src/Mod/Start/StartPage/StartPage.py
@@ -262,9 +262,18 @@ def build_new_file_card(template):
     quick start button"""
 
     templates = {
-        "empty_file": [TranslationTexts.T_TEMPLATE_EMPTYFILE_NAME, TranslationTexts.T_TEMPLATE_EMPTYFILE_DESC],
-        "open_file": [TranslationTexts.T_TEMPLATE_OPENFILE_NAME, TranslationTexts.T_TEMPLATE_OPENFILE_DESC],
-        "parametric_part": [TranslationTexts.T_TEMPLATE_PARAMETRICPART_NAME, TranslationTexts.T_TEMPLATE_PARAMETRICPART_DESC],
+        "empty_file": [
+            TranslationTexts.T_TEMPLATE_EMPTYFILE_NAME,
+            TranslationTexts.T_TEMPLATE_EMPTYFILE_DESC,
+        ],
+        "open_file": [
+            TranslationTexts.T_TEMPLATE_OPENFILE_NAME,
+            TranslationTexts.T_TEMPLATE_OPENFILE_DESC,
+        ],
+        "parametric_part": [
+            TranslationTexts.T_TEMPLATE_PARAMETRICPART_NAME,
+            TranslationTexts.T_TEMPLATE_PARAMETRICPART_DESC,
+        ],
         # "csg_part": [TranslationTexts.T_TEMPLATE_CSGPART_NAME, TranslationTexts.T_TEMPLATE_CSGPART_DESC],
         "2d_draft": [
             TranslationTexts.T_TEMPLATE_2DDRAFT_NAME,
@@ -368,9 +377,14 @@ def handle():
         JS = f.read()
     with open(css_filename, "r") as f:
         CSS = f.read()
-    HTML = HTML.replace("JS",JS)
-    HTML = HTML.replace("DEFAULT_CSS",CSS)
-    HTML = HTML.replace("CUSTOM_CSS",FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Start").GetString("CustomCSS","").replace("\n",""))
+    HTML = HTML.replace("JS", JS)
+    HTML = HTML.replace("DEFAULT_CSS", CSS)
+    HTML = HTML.replace(
+        "CUSTOM_CSS",
+        FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Start")
+        .GetString("CustomCSS", "")
+        .replace("\n", ""),
+    )
 
     # set the language
 
@@ -718,27 +732,27 @@ def handle():
     else:
         BACKGROUND = gethexcolor(p.GetUnsigned("BackgroundColor1", 1331197183))
         # linear gradient not supported by QT "linear-gradient("+gethexcolor(p.GetUnsigned("BackgroundColor1",1331197183))+","+gethexcolor(p.GetUnsigned("BackgroundColor2",2141107711))+")"
-    LINKCOLOR = gethexcolor(p.GetUnsigned("LinkColor",65535))
-    BASECOLOR = gethexcolor(p.GetUnsigned("PageColor",4294967295))
-    BOXCOLOR  = gethexcolor(p.GetUnsigned("BoxColor",3722305023))
-    TEXTCOLOR = gethexcolor(p.GetUnsigned("PageTextColor",255))
-    BGTCOLOR = gethexcolor(p.GetUnsigned("BackgroundTextColor",1600086015))
+    LINKCOLOR = gethexcolor(p.GetUnsigned("LinkColor", 65535))
+    BASECOLOR = gethexcolor(p.GetUnsigned("PageColor", 4294967295))
+    BOXCOLOR = gethexcolor(p.GetUnsigned("BoxColor", 3722305023))
+    TEXTCOLOR = gethexcolor(p.GetUnsigned("PageTextColor", 255))
+    BGTCOLOR = gethexcolor(p.GetUnsigned("BackgroundTextColor", 1600086015))
     SHADOW = "#888888"
     if QtGui.QColor(BASECOLOR).valueF() < 0.5:  # dark page - we need to make darker shadows
         SHADOW = "#000000"
     FONTFAMILY = p.GetString("FontFamily", "Arial,Helvetica,sans")
     if not FONTFAMILY:
         FONTFAMILY = "Arial,Helvetica,sans"
-    FONTSIZE = p.GetInt("FontSize",13)
-    HTML = HTML.replace("BASECOLOR",BASECOLOR)
-    HTML = HTML.replace("BOXCOLOR",BOXCOLOR)
-    HTML = HTML.replace("LINKCOLOR",LINKCOLOR)
-    HTML = HTML.replace("TEXTCOLOR",TEXTCOLOR)
-    HTML = HTML.replace("BGTCOLOR",BGTCOLOR)
-    HTML = HTML.replace("BACKGROUND",BACKGROUND)
-    HTML = HTML.replace("SHADOW",SHADOW)
-    HTML = HTML.replace("FONTFAMILY",FONTFAMILY)
-    HTML = HTML.replace("FONTSIZE",str(FONTSIZE)+"px")
+    FONTSIZE = p.GetInt("FontSize", 13)
+    HTML = HTML.replace("BASECOLOR", BASECOLOR)
+    HTML = HTML.replace("BOXCOLOR", BOXCOLOR)
+    HTML = HTML.replace("LINKCOLOR", LINKCOLOR)
+    HTML = HTML.replace("TEXTCOLOR", TEXTCOLOR)
+    HTML = HTML.replace("BGTCOLOR", BGTCOLOR)
+    HTML = HTML.replace("BACKGROUND", BACKGROUND)
+    HTML = HTML.replace("SHADOW", SHADOW)
+    HTML = HTML.replace("FONTFAMILY", FONTFAMILY)
+    HTML = HTML.replace("FONTSIZE", str(FONTSIZE) + "px")
 
     # enable web access if permitted
 
diff --git a/src/Mod/Start/start.dox b/src/Mod/Start/start.dox
index 00d0df3869..0d1fe3c8c0 100644
--- a/src/Mod/Start/start.dox
+++ b/src/Mod/Start/start.dox
@@ -5,4 +5,3 @@
 See \ref src/Mod/Draft/draft.dox as an example of how to populate this page
 
 */
-