@@ -0,0 +25,4 @@
+	public static void initializeEnvoyShortcuts() {
+		final var instance = GlobalKeyShortcuts.getInstance();
+
+		// Add the option to exit Linux-like with "Control" + "Q" or "Alt" + "F4"

@@ -0,0 +8,4 @@
+import envoy.client.ui.SceneContext.SceneInfo;
+
+/**
+ * Contains all KeyBoardshotcuts used throughout the application.

@@ -0,0 +21,4 @@
+	 * @author Leon Hofmeister
+	 * @since Envoy Client v0.3-beta
+	 */
+	public final class KeyCombinationAction implements Entry<KeyCombination, Runnable> {

@@ -0,0 +108,4 @@
+	}
+
+	/**
+	 * Returns all stored keyboard shortcuts for the given scene constant

@@ -0,0 +8,4 @@
+
+/**
+ * Provides methods to set the keyboard shortcuts for a specific scene.
+ * Should only be implemented by Controllers of Scenes so that these methods can

@@ -107,2 +107,3 @@
 
-			supplyKeyboardShortcuts(sceneInfo, scene);
+			// Supply the global custom keyboard shortcuts for that scene
+			for (final var shortcut : GlobalKeyShortcuts.getInstance().getKeyboardShortcuts(sceneInfo))

@@ -84,6 +85,9 @@ public final class Startup extends Application {
 		stage.setTitle("Envoy");
 		stage.getIcons().add(IconUtil.loadIcon("envoy_logo"));
 
+		// Configure global shortcuts used

@@ -41,0 +45,4 @@
+
+	@Override
+	public Map<KeyCombination, Runnable> getKeyboardShortcuts() {
+		final var map = new HashMap<KeyCombination, Runnable>();