diff --git a/YACReader/viewer.cpp b/YACReader/viewer.cpp
index 015429db..c08eb7a3 100644
--- a/YACReader/viewer.cpp
+++ b/YACReader/viewer.cpp
@@ -65,16 +65,16 @@ shouldOpenPrevious(false)
 	
 	QSettings * settings = new QSettings(YACReader::getSettingsPath()+"/YACReader.ini",QSettings::IniFormat);
 
-	//CONFIG GOTO_FLOW--------------------------------------------------------
+    //CONFIG GOTO_FLOW--------------------------------------------------------
     if(QGLFormat::hasOpenGL() && !settings->contains(USE_OPEN_GL))
+    {
         settings->setValue(USE_OPEN_GL,2);
-    else
-        settings->setValue(USE_OPEN_GL,0);
+    }
 
-	if(QGLFormat::hasOpenGL() && (settings->value(USE_OPEN_GL).toBool() == true))
-		goToFlow = new GoToFlowGL(this,Configuration::getConfiguration().getFlowType());
-	else
-		goToFlow = new GoToFlow(this,Configuration::getConfiguration().getFlowType());
+    if(QGLFormat::hasOpenGL() && (settings->value(USE_OPEN_GL).toBool() == true))
+        goToFlow = new GoToFlowGL(this,Configuration::getConfiguration().getFlowType());
+    else
+        goToFlow = new GoToFlow(this,Configuration::getConfiguration().getFlowType());
 
 	goToFlow->setFocusPolicy(Qt::StrongFocus);
 	goToFlow->hide();
diff --git a/YACReaderLibrary/library_window.cpp b/YACReaderLibrary/library_window.cpp
index de30a3af..60094585 100644
--- a/YACReaderLibrary/library_window.cpp
+++ b/YACReaderLibrary/library_window.cpp
@@ -167,15 +167,7 @@ void LibraryWindow::doLayout()
     //---------------------------------------------------------------------------
     if(QGLFormat::hasOpenGL() && !settings->contains(USE_OPEN_GL))
     {
-        OnStartFlowSelectionDialog * flowSelDialog = new OnStartFlowSelectionDialog();
-
-        flowSelDialog->exec();
-        if(flowSelDialog->result() == QDialog::Accepted)
-            settings->setValue(USE_OPEN_GL,2);
-        else
-            settings->setValue(USE_OPEN_GL,0);
-
-        delete flowSelDialog;
+        settings->setValue(USE_OPEN_GL,2);
     }
 
     //FOLDERS FILTER-------------------------------------------------------------
diff --git a/shortcuts_management/shortcuts_manager.cpp b/shortcuts_management/shortcuts_manager.cpp
index df8d253d..64c07d4a 100644
--- a/shortcuts_management/shortcuts_manager.cpp
+++ b/shortcuts_management/shortcuts_manager.cpp
@@ -80,7 +80,12 @@ void ShortcutsManager::resetToDefaults()
 
 QString ShortcutsManager::getShortcut(const QString &name)
 {
-    QSettings s(YACReader::getSettingsPath()+"/YACReaderLibrary.ini",QSettings::IniFormat);
+#ifdef YACREADER
+    QString filePath = "/YACReader.ini";
+#else
+    QString filePath = "/YACReaderLibrary.ini";
+#endif
+    QSettings s(YACReader::getSettingsPath()+filePath,QSettings::IniFormat);
     s.beginGroup("shortcuts");
 
     return s.value(name,defaultShorcuts.value(name)).toString();
@@ -88,7 +93,12 @@ QString ShortcutsManager::getShortcut(const QString &name)
 
 void ShortcutsManager::saveShortcut(QAction *action)
 {
-    QSettings s(YACReader::getSettingsPath()+"/YACReaderLibrary.ini",QSettings::IniFormat);
+#ifdef YACREADER
+    QString filePath = "/YACReader.ini";
+#else
+    QString filePath = "/YACReaderLibrary.ini";
+#endif
+    QSettings s(YACReader::getSettingsPath()+filePath,QSettings::IniFormat);
     s.beginGroup("shortcuts");
 
     return s.setValue(action->data().toString() , action->shortcut().toString());