diff --git a/src/blackgui/editors/aircrafticaoform.cpp b/src/blackgui/editors/aircrafticaoform.cpp
index cb439d1e9..b34c0621f 100644
--- a/src/blackgui/editors/aircrafticaoform.cpp
+++ b/src/blackgui/editors/aircrafticaoform.cpp
@@ -190,6 +190,8 @@ namespace BlackGui
             ui->cb_Rank->setEnabled(!readOnly);
             ui->drop_DropData->setVisible(!readOnly);
             ui->combined_TypeSelector->setReadOnly(readOnly);
+
+            this->forceStyleSheetUpdate();
         }
 
         void CAircraftIcaoForm::setSelectOnly()
diff --git a/src/blackgui/editors/aircraftmodelform.cpp b/src/blackgui/editors/aircraftmodelform.cpp
index e6a61d89e..4f3e9a734 100644
--- a/src/blackgui/editors/aircraftmodelform.cpp
+++ b/src/blackgui/editors/aircraftmodelform.cpp
@@ -32,6 +32,7 @@ namespace BlackGui
             ui->editor_AircraftIcao->setReadOnly(readOnly);
             ui->editor_Distributor->setReadOnly(readOnly);
             ui->editor_Livery->setReadOnly(readOnly);
+            this->forceStyleSheetUpdate();
         }
 
         void CAircraftModelForm::setSelectOnly()
diff --git a/src/blackgui/editors/aircraftpartsform.cpp b/src/blackgui/editors/aircraftpartsform.cpp
index c263fdf79..0c8bcba7e 100644
--- a/src/blackgui/editors/aircraftpartsform.cpp
+++ b/src/blackgui/editors/aircraftpartsform.cpp
@@ -19,7 +19,6 @@
 #include <QJsonDocument>
 #include <QJsonParseError>
 
-using namespace BlackGui;
 using namespace BlackMisc;
 using namespace BlackMisc::Aviation;
 
@@ -46,6 +45,7 @@ namespace BlackGui
         {
             CGuiUtility::childrenSetEnabled<QPushButton>(this, !readonly);
             CGuiUtility::checkBoxesReadOnly(this, readonly);
+            this->forceStyleSheetUpdate();
         }
 
         void CAircraftPartsForm::setSelectOnly()
diff --git a/src/blackgui/editors/airlineicaoform.cpp b/src/blackgui/editors/airlineicaoform.cpp
index bbbb1fae5..c3acad4c0 100644
--- a/src/blackgui/editors/airlineicaoform.cpp
+++ b/src/blackgui/editors/airlineicaoform.cpp
@@ -133,6 +133,8 @@ namespace BlackGui
 
             CGuiUtility::checkBoxReadOnly(ui->cb_Va, readOnly);
             CGuiUtility::checkBoxReadOnly(ui->cb_Military, readOnly);
+
+            this->forceStyleSheetUpdate();
         }
 
         void CAirlineIcaoForm::setSelectOnly()
diff --git a/src/blackgui/editors/cockpitcomform.cpp b/src/blackgui/editors/cockpitcomform.cpp
index 1d9c280a0..7ff8871b2 100644
--- a/src/blackgui/editors/cockpitcomform.cpp
+++ b/src/blackgui/editors/cockpitcomform.cpp
@@ -65,6 +65,7 @@ namespace BlackGui
             ui->cbp_ComPanelTransponderMode->setDisabled(!readonly);
             ui->tb_ComPanelCom1Toggle->setEnabled(!readonly);
             ui->tb_ComPanelCom2Toggle->setEnabled(!readonly);
+            this->forceStyleSheetUpdate();
         }
 
         void CCockpitComForm::setSelectOnly()
diff --git a/src/blackgui/editors/coordinateform.cpp b/src/blackgui/editors/coordinateform.cpp
index 2f35eba7c..9431808e6 100644
--- a/src/blackgui/editors/coordinateform.cpp
+++ b/src/blackgui/editors/coordinateform.cpp
@@ -135,7 +135,7 @@ namespace BlackGui
             ui->le_Location->setVisible(!readonly); // does not make sense to show it in ro, no reverse lookup
             ui->lbl_Location->setVisible(!readonly);
 
-            CGuiUtility::forceStyleSheetUpdate(this);
+            this->forceStyleSheetUpdate();
         }
 
         void CCoordinateForm::setSelectOnly()
diff --git a/src/blackgui/editors/distributorform.cpp b/src/blackgui/editors/distributorform.cpp
index c1979f6e0..c5417e98b 100644
--- a/src/blackgui/editors/distributorform.cpp
+++ b/src/blackgui/editors/distributorform.cpp
@@ -8,10 +8,10 @@
  */
 
 #include "blackgui/components/dbdistributorselectorcomponent.h"
-#include "blackgui/dropsite.h"
 #include "blackgui/editors/distributorform.h"
 #include "blackgui/editors/validationindicator.h"
 #include "blackgui/labelandicon.h"
+#include "blackgui/dropsite.h"
 #include "blackmisc/compare.h"
 #include "blackmisc/icons.h"
 #include "blackmisc/simulation/distributorlist.h"
@@ -107,6 +107,7 @@ namespace BlackGui
             ui->le_Description->setReadOnly(readOnly);
             ui->distributor_Selector->setReadOnly(readOnly);
             ui->drop_DropData->setVisible(!readOnly);
+            this->forceStyleSheetUpdate();
         }
 
         void CDistributorForm::setSelectOnly()
diff --git a/src/blackgui/editors/distributorform.h b/src/blackgui/editors/distributorform.h
index 171f70d35..515942fdb 100644
--- a/src/blackgui/editors/distributorform.h
+++ b/src/blackgui/editors/distributorform.h
@@ -23,7 +23,6 @@
 
 class QWidget;
 namespace Ui { class CDistributorForm; }
-
 namespace BlackGui
 {
     namespace Editors
diff --git a/src/blackgui/editors/form.cpp b/src/blackgui/editors/form.cpp
index a8c3271d2..34b6e4b99 100644
--- a/src/blackgui/editors/form.cpp
+++ b/src/blackgui/editors/form.cpp
@@ -8,6 +8,7 @@
  */
 
 #include "blackgui/editors/form.h"
+#include "blackgui/guiutility.h"
 #include <QApplication>
 #include <QClipboard>
 #include <QShortcut>
@@ -48,6 +49,11 @@ namespace BlackGui
             this->jsonPasted(data);
         }
 
+        void CForm::forceStyleSheetUpdate()
+        {
+            CGuiUtility::forceStyleSheetUpdate(this);
+        }
+
         CFormDbUser::CFormDbUser(QWidget *parent) : CForm(parent)
         { }
 
diff --git a/src/blackgui/editors/form.h b/src/blackgui/editors/form.h
index 1a8bf2fe9..f09bb8777 100644
--- a/src/blackgui/editors/form.h
+++ b/src/blackgui/editors/form.h
@@ -59,6 +59,9 @@ namespace BlackGui
             //! Pasted from clipboard
             void pasted();
 
+            //! \copydoc BlackGui::CGuiUtility::forceStyleSheetUpdate
+            void forceStyleSheetUpdate();
+
             bool m_readOnly = false; //!< read only
         };
 
diff --git a/src/blackgui/editors/fsdsetupform.cpp b/src/blackgui/editors/fsdsetupform.cpp
index 1af230cca..155accfa8 100644
--- a/src/blackgui/editors/fsdsetupform.cpp
+++ b/src/blackgui/editors/fsdsetupform.cpp
@@ -88,6 +88,7 @@ namespace BlackGui
             CGuiUtility::checkBoxReadOnly(ui->cb_AircraftPartsSend, readonly);
             CGuiUtility::checkBoxReadOnly(ui->cb_FastPositionReceive, readonly);
             CGuiUtility::checkBoxReadOnly(ui->cb_FastPositionSend, readonly);
+            this->forceStyleSheetUpdate();
         }
 
         CStatusMessageList CFsdSetupForm::validate(bool nested) const
diff --git a/src/blackgui/editors/liveryform.cpp b/src/blackgui/editors/liveryform.cpp
index 404f9390a..d3b539bab 100644
--- a/src/blackgui/editors/liveryform.cpp
+++ b/src/blackgui/editors/liveryform.cpp
@@ -184,6 +184,7 @@ namespace BlackGui
             ui->drop_DropData->setVisible(!readOnly);
             ui->tb_Paste->setVisible(!readOnly);
             CGuiUtility::checkBoxReadOnly(ui->cb_Military, readOnly);
+            this->forceStyleSheetUpdate();
         }
 
         void CLiveryForm::setSelectOnly()
diff --git a/src/blackgui/editors/modelmappingform.cpp b/src/blackgui/editors/modelmappingform.cpp
index b8bebea03..816e37f03 100644
--- a/src/blackgui/editors/modelmappingform.cpp
+++ b/src/blackgui/editors/modelmappingform.cpp
@@ -68,6 +68,7 @@ namespace BlackGui
             ui->le_Description->setReadOnly(readOnly);
             ui->le_ModelKey->setReadOnly(readOnly);
             ui->le_Name->setReadOnly(readOnly);
+            this->forceStyleSheetUpdate();
         }
 
         void CModelMappingForm::setSelectOnly()
diff --git a/src/blackgui/editors/modelmappingmodifyform.cpp b/src/blackgui/editors/modelmappingmodifyform.cpp
index e82febdd1..f7d831c4e 100644
--- a/src/blackgui/editors/modelmappingmodifyform.cpp
+++ b/src/blackgui/editors/modelmappingmodifyform.cpp
@@ -88,6 +88,7 @@ namespace BlackGui
         {
             // void
             Q_UNUSED(readOnly);
+            // this->forceStyleSheetUpdate();
         }
 
         void CModelMappingModifyForm::userChanged()
diff --git a/src/blackgui/editors/ownmodelsetform.cpp b/src/blackgui/editors/ownmodelsetform.cpp
index 0138d66a6..6d29e426e 100644
--- a/src/blackgui/editors/ownmodelsetform.cpp
+++ b/src/blackgui/editors/ownmodelsetform.cpp
@@ -36,11 +36,11 @@ namespace BlackGui
             ui->comp_SimulatorSelector->setMode(CSimulatorSelector::RadioButtons);
             ui->comp_SimulatorSelector->setLeftMargin(0);
 
-            connect(ui->comp_SimulatorSelector, &CSimulatorSelector::changed, this, &COwnModelSetForm::ps_simulatorChanged);
-            connect(ui->rb_DisplayAllDistributors, &QRadioButton::clicked, this, &COwnModelSetForm::ps_changeDistributorDisplay);
-            connect(ui->rb_DisplayPreferencesDistributors, &QRadioButton::clicked, this, &COwnModelSetForm::ps_changeDistributorDisplay);
+            connect(ui->comp_SimulatorSelector, &CSimulatorSelector::changed, this, &COwnModelSetForm::onSimulatorChanged);
+            connect(ui->rb_DisplayAllDistributors, &QRadioButton::clicked, this, &COwnModelSetForm::changeDistributorDisplay);
+            connect(ui->rb_DisplayPreferencesDistributors, &QRadioButton::clicked, this, &COwnModelSetForm::changeDistributorDisplay);
 
-            this->ps_simulatorChanged(ui->comp_SimulatorSelector->getValue());
+            this->onSimulatorChanged(ui->comp_SimulatorSelector->getValue());
         }
 
         COwnModelSetForm::~COwnModelSetForm()
@@ -88,19 +88,19 @@ namespace BlackGui
             return ui->cb_ConsolidateModelSet->isChecked();
         }
 
-        void COwnModelSetForm::ps_preferencesChanged()
+        void COwnModelSetForm::onPreferencesChanged()
         {
             // void
         }
 
-        void COwnModelSetForm::ps_simulatorChanged(const CSimulatorInfo &simulator)
+        void COwnModelSetForm::onSimulatorChanged(const CSimulatorInfo &simulator)
         {
             this->setSimulator(simulator);
             this->reloadData();
-            emit simulatorChanged(simulator);
+            emit this->simulatorChanged(simulator);
         }
 
-        void COwnModelSetForm::ps_changeDistributorDisplay()
+        void COwnModelSetForm::changeDistributorDisplay()
         {
             if (ui->rb_DisplayAllDistributors->isChecked())
             {
@@ -128,7 +128,7 @@ namespace BlackGui
             {
                 ui->rb_DisplayAllDistributors->setChecked(true);
             }
-            this->ps_changeDistributorDisplay();
+            this->changeDistributorDisplay();
         }
 
         void COwnModelSetForm::setDistributorView(bool hasPreferences)
diff --git a/src/blackgui/editors/ownmodelsetform.h b/src/blackgui/editors/ownmodelsetform.h
index 14aafae35..de6483aec 100644
--- a/src/blackgui/editors/ownmodelsetform.h
+++ b/src/blackgui/editors/ownmodelsetform.h
@@ -34,7 +34,7 @@ namespace BlackGui
             explicit COwnModelSetForm(QWidget *parent = nullptr);
 
             //! Destructor
-            ~COwnModelSetForm();
+            virtual ~COwnModelSetForm();
 
             //! Reload data
             void reloadData();
@@ -90,17 +90,16 @@ namespace BlackGui
             //! Simulator changed
             void simulatorChanged(const BlackMisc::Simulation::CSimulatorInfo &simulator);
 
-        private slots:
+        private:
             //! Changed preferences
-            void ps_preferencesChanged();
+            void onPreferencesChanged();
 
             //! Simulator changed
-            void ps_simulatorChanged(const BlackMisc::Simulation::CSimulatorInfo &simulator);
+            void onSimulatorChanged(const BlackMisc::Simulation::CSimulatorInfo &simulator);
 
             //! Display distributors based on checkboxes
-            void ps_changeDistributorDisplay();
+            void changeDistributorDisplay();
 
-        private:
             //! Init the options which distributors are displayed
             void initDistributorDisplay();
 
@@ -109,7 +108,7 @@ namespace BlackGui
 
             QScopedPointer<Ui::COwnModelSetForm>  ui;
             BlackMisc::Simulation::CSimulatorInfo m_simulator;
-            BlackMisc::CSetting<BlackMisc::Simulation::Settings::TDistributorListPreferences> m_distributorPreferences { this, &COwnModelSetForm::ps_preferencesChanged };
+            BlackMisc::CSetting<BlackMisc::Simulation::Settings::TDistributorListPreferences> m_distributorPreferences { this, &COwnModelSetForm::onPreferencesChanged };
         };
     } // ns
 } // ns
diff --git a/src/blackgui/editors/pilotform.cpp b/src/blackgui/editors/pilotform.cpp
index 05d07dda5..d202267dd 100644
--- a/src/blackgui/editors/pilotform.cpp
+++ b/src/blackgui/editors/pilotform.cpp
@@ -116,6 +116,7 @@ namespace BlackGui
             ui->lblp_HomeAirport->setVisible(!readonly);
             ui->lblp_Password->setVisible(!readonly);
             ui->lblp_RealName->setVisible(!readonly);
+            this->forceStyleSheetUpdate();
         }
 
         CStatusMessageList CPilotForm::validate(bool nested) const
diff --git a/src/blackgui/editors/serverform.cpp b/src/blackgui/editors/serverform.cpp
index 86433438b..5655b43a0 100644
--- a/src/blackgui/editors/serverform.cpp
+++ b/src/blackgui/editors/serverform.cpp
@@ -56,7 +56,7 @@ namespace BlackGui
             const CUser user(
                 ui->le_NetworkId->text().trimmed(),
                 ui->le_RealName->text().trimmed().simplified(),
-                "",
+                QStringLiteral(""),
                 ui->le_Password->text().trimmed()
             );
             const CFsdSetup setup(ui->form_ServerFsd->getValue());
@@ -90,6 +90,7 @@ namespace BlackGui
             ui->form_ServerFsd->setReadOnly(readOnly);
             ui->cb_ServerType->setEnabled(!readOnly);
             ui->cbp_Ecosystem->setEnabled(!readOnly);
+            this->forceStyleSheetUpdate();
         }
 
         void CServerForm::showPasswordField(bool show)
diff --git a/src/blackgui/editors/situationform.cpp b/src/blackgui/editors/situationform.cpp
index a880069be..a2e50da0f 100644
--- a/src/blackgui/editors/situationform.cpp
+++ b/src/blackgui/editors/situationform.cpp
@@ -113,6 +113,7 @@ namespace BlackGui
         void CSituationForm::setReadOnly(bool readonly)
         {
             ui->comp_Coordinate->setReadOnly(readonly);
+            this->forceStyleSheetUpdate();
         }
 
         void CSituationForm::setSelectOnly()