diff --git a/app/ColorButton.qml b/app/ColorButton.qml
index db44719..1b966df 100644
--- a/app/ColorButton.qml
+++ b/app/ColorButton.qml
@@ -18,7 +18,7 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *******************************************************************************/
 
-import QtQuick 2.1
+import QtQuick 2.2
 import QtQuick.Dialogs 1.1
 
 Item {
diff --git a/app/SettingComponent.qml b/app/SettingComponent.qml
index 7fc7cd0..abeb827 100644
--- a/app/SettingComponent.qml
+++ b/app/SettingComponent.qml
@@ -18,7 +18,7 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *******************************************************************************/
 
-import QtQuick 2.1
+import QtQuick 2.2
 import QtQuick.Controls 1.1
 import QtQuick.Layouts 1.1
 
diff --git a/app/SettingsWindow.qml b/app/SettingsWindow.qml
index 9f222d2..7b12502 100644
--- a/app/SettingsWindow.qml
+++ b/app/SettingsWindow.qml
@@ -18,13 +18,13 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *******************************************************************************/
 
-import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick 2.2
+import QtQuick.Controls 1.1
 import QtQuick.Window 2.1
-import QtQuick.Layouts 1.0
+import QtQuick.Layouts 1.1
 import QtQuick.Dialogs 1.1
 
-ApplicationWindow {
+Window {
     id: settings_window
     title: qsTr("Settings")
     width: 640
diff --git a/app/ShaderManager.qml b/app/ShaderManager.qml
index 7b87ebc..0a93ee4 100644
--- a/app/ShaderManager.qml
+++ b/app/ShaderManager.qml
@@ -18,7 +18,7 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *******************************************************************************/
 
-import QtQuick 2.0
+import QtQuick 2.2
 import QtGraphicalEffects 1.0
 
 ShaderEffect {
diff --git a/app/ShaderSettings.qml b/app/ShaderSettings.qml
index 938184b..e34155f 100644
--- a/app/ShaderSettings.qml
+++ b/app/ShaderSettings.qml
@@ -18,7 +18,7 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *******************************************************************************/
 
-import QtQuick 2.1
+import QtQuick 2.2
 
 Item{
     property bool fullscreen: false
diff --git a/app/SimpleSlider.qml b/app/SimpleSlider.qml
index e2c7d55..cabc9d8 100644
--- a/app/SimpleSlider.qml
+++ b/app/SimpleSlider.qml
@@ -18,7 +18,7 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *******************************************************************************/
 
-import QtQuick 2.1
+import QtQuick 2.2
 import QtQuick.Controls 1.1
 import QtQuick.Layouts 1.1
 
diff --git a/app/SizeOverlay.qml b/app/SizeOverlay.qml
index 3bcedc2..c6323ea 100644
--- a/app/SizeOverlay.qml
+++ b/app/SizeOverlay.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.0
+import QtQuick 2.2
 
 Rectangle{
     property size terminalSize
diff --git a/app/Storage.qml b/app/Storage.qml
index 8774813..92dadd7 100644
--- a/app/Storage.qml
+++ b/app/Storage.qml
@@ -18,7 +18,7 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *******************************************************************************/
 
-import QtQuick 2.1
+import QtQuick 2.2
 import QtQuick.LocalStorage 2.0
 
 Item {
diff --git a/app/Terminal.qml b/app/Terminal.qml
index 80af85e..08f5508 100644
--- a/app/Terminal.qml
+++ b/app/Terminal.qml
@@ -18,9 +18,9 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *******************************************************************************/
 
-import QtQuick 2.0
+import QtQuick 2.2
 import QtGraphicalEffects 1.0
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
 
 import org.kde.konsole 0.1
 
@@ -97,6 +97,8 @@ Item{
         id: contextmenu
         MenuItem{action: copyAction}
         MenuItem{action: pasteAction}
+        MenuSeparator{}
+        MenuItem{action: fullscreenAction}
     }
     MouseArea{
 
diff --git a/app/frames/BlackRoughFrame.qml b/app/frames/BlackRoughFrame.qml
index 44797dc..8c2fe6c 100644
--- a/app/frames/BlackRoughFrame.qml
+++ b/app/frames/BlackRoughFrame.qml
@@ -1,6 +1,5 @@
-import QtQuick 2.1
+import QtQuick 2.2
 import "utils"
-import QtGraphicalEffects 1.0
 
 TerminalFrame{
     id: frame
diff --git a/app/frames/NoFrame.qml b/app/frames/NoFrame.qml
index ab4c529..0b7f842 100644
--- a/app/frames/NoFrame.qml
+++ b/app/frames/NoFrame.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.0
+import QtQuick 2.2
 import "utils"
 
 TerminalFrame{
diff --git a/app/frames/WhiteSimpleFrame.qml b/app/frames/WhiteSimpleFrame.qml
index e69b077..9ff4fc3 100644
--- a/app/frames/WhiteSimpleFrame.qml
+++ b/app/frames/WhiteSimpleFrame.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.0
+import QtQuick 2.2
 import "utils"
 
 TerminalFrame{
diff --git a/app/frames/utils/FrameShader.qml b/app/frames/utils/FrameShader.qml
index de43fa7..ed990d9 100644
--- a/app/frames/utils/FrameShader.qml
+++ b/app/frames/utils/FrameShader.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.1
+import QtQuick 2.2
 
 ShaderEffect{
     property variant source: framesource
diff --git a/app/frames/utils/NoFrameShader.qml b/app/frames/utils/NoFrameShader.qml
index a59a874..2697554 100644
--- a/app/frames/utils/NoFrameShader.qml
+++ b/app/frames/utils/NoFrameShader.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.1
+import QtQuick 2.2
 
 ShaderEffect{
     property variant source: framesource
diff --git a/app/frames/utils/TerminalFrame.qml b/app/frames/utils/TerminalFrame.qml
index 56f4fa4..9f97585 100644
--- a/app/frames/utils/TerminalFrame.qml
+++ b/app/frames/utils/TerminalFrame.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.1
+import QtQuick 2.2
 
 Item{
     id: framecontainer
diff --git a/app/main.qml b/app/main.qml
index bc766aa..0ac5503 100644
--- a/app/main.qml
+++ b/app/main.qml
@@ -18,9 +18,9 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *******************************************************************************/
 
-import QtQuick 2.1
-import QtQuick.Window 2.0
-import QtQuick.Controls 1.0
+import QtQuick 2.2
+import QtQuick.Window 2.1
+import QtQuick.Controls 1.1
 import QtGraphicalEffects 1.0
 
 import org.kde.konsole 0.1
@@ -39,6 +39,8 @@ ApplicationWindow{
         text: qsTr("&Fullscreen")
         shortcut: "Alt+F11"
         onTriggered: shadersettings.fullscreen = !shadersettings.fullscreen;
+        checkable: true
+        checked: shadersettings.fullscreen
     }
     Action {
         id: quitAction
@@ -49,7 +51,7 @@ ApplicationWindow{
     Action{
         id: showsettingsAction
         text: qsTr("&Settings")
-        onTriggered: settingswindowloader.active = true;
+        onTriggered: settingswindow.show();
     }
     Action{
         id: copyAction
@@ -168,13 +170,8 @@ ApplicationWindow{
             terminal.loadKTerminal();
         }
     }
-    Loader{
-        id: settingswindowloader
-        active: false
-        sourceComponent: SettingsWindow{
-            id: settingswindow
-            visible: true
-            onClosing: settingswindowloader.active = false;
-        }
+    SettingsWindow{
+        id: settingswindow
+        visible: false
     }
 }