diff --git a/App/main.cpp b/App/main.cpp
index b58aab127ca49d20100b2d7e128224d723c52b5f..c15ac83c3cd44d0d8662584312db061a7a52210f 100644
--- a/App/main.cpp
+++ b/App/main.cpp
@@ -60,14 +60,14 @@ int main(int argc, char* argv[])
 
         register1DDataLoaders();
 
-        auto style = baApp->settings().styleToUse();
-        baApp->loadStyle(style);
+        auto style = GSettings.settings().styleToUse();
+        GSettings.loadStyle(style);
 
         QString dir = SessionData::appDataFolder();
         if (!QDir().exists(dir))
             QDir().mkpath(dir);
 
-        gSessionData->instrumentLibrary.load();
+        GSession.instrumentLibrary.load();
 
         MainWindow win;
         if (options.find("geometry"))
@@ -77,7 +77,7 @@ int main(int argc, char* argv[])
 
         ret = QApplication::exec();
 
-        gSessionData->instrumentLibrary.saveIfModified();
+        GSession.instrumentLibrary.saveIfModified();
 #if !defined(BUILD_DEBUG)
     } catch (...) {
         QMessageBox box;