1 files changed, 10 insertions, 19 deletions

diff --git a/src/main.qml b/src/main.qml
index 2965fa1..db17cda 100644
--- a/src/main.qml
+++ b/src/main.qml
@@ -2,34 +2,32 @@ import QtQuick 2.0
 import QtQuick.Window 2.0
 import QtQuick.Controls 1.2
 import QtQuick.Layouts 1.1
-import Qt.labs.settings 1.0
 
 ApplicationWindow {
 	id: root
 
 	visible: true
-
-	property Settings settings : Settings {
-		category: "window"
-
-		property string background : "#161616"
-	}
-
-	color: settings.background
+	color: settings.window.background
 
 	Component.onCompleted: {
 		terminalList.createItem();
 		terminalList.focusCurrent();
 	}
 
+	SettingsHandler {
+		id: settings
+	}
+
+	StateHandler {
+		id: mode
+	}
+
 	ColumnLayout {
 		anchors.fill: parent
 
 		TerminalList {
 			id: terminalList
 
-			state: state
-
 			Layout.fillHeight: true
 			Layout.fillWidth:  true
 		}
@@ -39,14 +37,7 @@ ApplicationWindow {
 
 			Layout.fillWidth: true
 
-			onExecuted: state.enterNormalMode()
+			onExecuted: mode.enterNormalMode()
 		}
 	}
-
-	StateHandler {
-		id: state
-
-		terminalList: terminalList
-		commandInput: command
-	}
 }