3 files changed, 610 insertions, 129 deletions

diff --git a/src/i18n/locales/de.json b/src/i18n/locales/de.json
index 2560a5add..06a03db65 100644
--- a/src/i18n/locales/de.json
+++ b/src/i18n/locales/de.json
@@ -87,6 +87,9 @@
    "menu.window" : "Fenster",
    "menu.window.close" : "Schließen",
    "menu.window.minimize" : "Minimieren",
+   "menu.workspaces": "Workspaces",
+   "menu.workspaces.defaultWorkspace": "All services",
+   "menu.workspaces.addNewWorkspace": "Add New Workspace",
    "password.email.label" : "E-Mail Adresse",
    "password.headline" : "Passwort zurücksetzen",
    "password.link.login" : "An Deinem Konto anmelden",
@@ -169,6 +172,7 @@
    "settings.navigation.logout" : "Abmelden",
    "settings.navigation.settings" : "Einstellungen",
    "settings.navigation.yourServices" : "Deine Dienste",
+   "settings.navigation.yourWorkspaces": "Deine Workspaces",
    "settings.recipes.all" : "Alle Dienste",
    "settings.recipes.dev" : "Entwicklung",
    "settings.recipes.headline" : "Verfügbare Dienste",
@@ -226,6 +230,14 @@
    "settings.services.tooltip.isMuted" : "Alle Töne sind deaktiviert",
    "settings.services.tooltip.notificationsDisabled" : "Benachrichtigungen deaktiviert",
    "settings.services.updatedInfo" : "Deine Änderungen wurden gespeichert",
+   "settings.workspaces.headline": "Deine Workspaces",
+   "settings.workspace.add.form.submitButton": "Workspace erstellen",
+   "settings.workspace.add.form.name": "Name",
+   "settings.workspace.form.yourWorkspaces": "Deine Workspaces",
+   "settings.workspace.form.name": "Name",
+   "settings.workspace.form.buttonDelete": "Workspace löschen",
+   "settings.workspace.form.buttonSave": "Workspace speichern",
+   "settings.workspace.form.servicesInWorkspaceHeadline": "Services in diesem Workspace",
    "settings.user.form.accountType.company" : "Firma",
    "settings.user.form.accountType.individual" : "Einzelperson",
    "settings.user.form.accountType.label" : "Konto-Typ",
diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json
index 0641c510c..5e3988781 100644
--- a/src/i18n/locales/defaultMessages.json
+++ b/src/i18n/locales/defaultMessages.json
@@ -625,78 +625,78 @@
         "defaultMessage": "!!!Your services have been updated.",
         "end": {
           "column": 3,
-          "line": 25
+          "line": 28
         },
         "file": "src/components/layout/AppLayout.js",
         "id": "infobar.servicesUpdated",
         "start": {
           "column": 19,
-          "line": 22
+          "line": 25
         }
       },
       {
         "defaultMessage": "!!!A new update for Franz is available.",
         "end": {
           "column": 3,
-          "line": 29
+          "line": 32
         },
         "file": "src/components/layout/AppLayout.js",
         "id": "infobar.updateAvailable",
         "start": {
           "column": 19,
-          "line": 26
+          "line": 29
         }
       },
       {
         "defaultMessage": "!!!Reload services",
         "end": {
           "column": 3,
-          "line": 33
+          "line": 36
         },
         "file": "src/components/layout/AppLayout.js",
         "id": "infobar.buttonReloadServices",
         "start": {
           "column": 24,
-          "line": 30
+          "line": 33
         }
       },
       {
         "defaultMessage": "!!!Changelog",
         "end": {
           "column": 3,
-          "line": 37
+          "line": 40
         },
         "file": "src/components/layout/AppLayout.js",
         "id": "infobar.buttonChangelog",
         "start": {
           "column": 13,
-          "line": 34
+          "line": 37
         }
       },
       {
         "defaultMessage": "!!!Restart & install update",
         "end": {
           "column": 3,
-          "line": 41
+          "line": 44
         },
         "file": "src/components/layout/AppLayout.js",
         "id": "infobar.buttonInstallUpdate",
         "start": {
           "column": 23,
-          "line": 38
+          "line": 41
         }
       },
       {
         "defaultMessage": "!!!Could not load services and user information",
         "end": {
           "column": 3,
-          "line": 45
+          "line": 48
         },
         "file": "src/components/layout/AppLayout.js",
         "id": "infobar.requiredRequestsFailed",
         "start": {
           "column": 26,
-          "line": 42
+          "line": 45
         }
       }
     ],
@@ -708,52 +708,78 @@
         "defaultMessage": "!!!Settings",
         "end": {
           "column": 3,
-          "line": 14
+          "line": 16
         },
         "file": "src/components/layout/Sidebar.js",
         "id": "sidebar.settings",
         "start": {
           "column": 12,
-          "line": 11
+          "line": 13
         }
       },
       {
         "defaultMessage": "!!!Add new service",
         "end": {
           "column": 3,
-          "line": 18
+          "line": 20
         },
         "file": "src/components/layout/Sidebar.js",
         "id": "sidebar.addNewService",
         "start": {
           "column": 17,
-          "line": 15
+          "line": 17
         }
       },
       {
         "defaultMessage": "!!!Disable notifications & audio",
         "end": {
           "column": 3,
-          "line": 22
+          "line": 24
         },
         "file": "src/components/layout/Sidebar.js",
         "id": "sidebar.muteApp",
         "start": {
           "column": 8,
-          "line": 19
+          "line": 21
         }
       },
       {
         "defaultMessage": "!!!Enable notifications & audio",
         "end": {
           "column": 3,
-          "line": 26
+          "line": 28
         },
         "file": "src/components/layout/Sidebar.js",
         "id": "sidebar.unmuteApp",
         "start": {
           "column": 10,
-          "line": 23
+          "line": 25
+        }
+      },
+      {
+        "defaultMessage": "!!!Open workspace drawer",
+        "end": {
+          "column": 3,
+          "line": 32
+        },
+        "file": "src/components/layout/Sidebar.js",
+        "id": "sidebar.openWorkspaceDrawer",
+        "start": {
+          "column": 23,
+          "line": 29
+        }
+      },
+      {
+        "defaultMessage": "!!!Close workspace drawer",
+        "end": {
+          "column": 3,
+          "line": 36
+        },
+        "file": "src/components/layout/Sidebar.js",
+        "id": "sidebar.closeWorkspaceDrawer",
+        "start": {
+          "column": 24,
+          "line": 33
         }
       }
     ],
@@ -1276,78 +1302,91 @@
         "defaultMessage": "!!!Available services",
         "end": {
           "column": 3,
-          "line": 12
+          "line": 14
         },
         "file": "src/components/settings/navigation/SettingsNavigation.js",
         "id": "settings.navigation.availableServices",
         "start": {
           "column": 21,
-          "line": 9
+          "line": 11
         }
       },
       {
         "defaultMessage": "!!!Your services",
         "end": {
           "column": 3,
-          "line": 16
+          "line": 18
         },
         "file": "src/components/settings/navigation/SettingsNavigation.js",
         "id": "settings.navigation.yourServices",
         "start": {
           "column": 16,
-          "line": 13
+          "line": 15
+        }
+      },
+      {
+        "defaultMessage": "!!!Your workspaces",
+        "end": {
+          "column": 3,
+          "line": 22
+        },
+        "file": "src/components/settings/navigation/SettingsNavigation.js",
+        "id": "settings.navigation.yourWorkspaces",
+        "start": {
+          "column": 18,
+          "line": 19
         }
       },
       {
         "defaultMessage": "!!!Account",
         "end": {
           "column": 3,
-          "line": 20
+          "line": 26
         },
         "file": "src/components/settings/navigation/SettingsNavigation.js",
         "id": "settings.navigation.account",
         "start": {
           "column": 11,
-          "line": 17
+          "line": 23
         }
       },
       {
         "defaultMessage": "!!!Settings",
         "end": {
           "column": 3,
-          "line": 24
+          "line": 30
         },
         "file": "src/components/settings/navigation/SettingsNavigation.js",
         "id": "settings.navigation.settings",
         "start": {
           "column": 12,
-          "line": 21
+          "line": 27
         }
       },
       {
         "defaultMessage": "!!!Invite Friends",
         "end": {
           "column": 3,
-          "line": 28
+          "line": 34
         },
         "file": "src/components/settings/navigation/SettingsNavigation.js",
         "id": "settings.navigation.inviteFriends",
         "start": {
           "column": 17,
-          "line": 25
+          "line": 31
         }
       },
       {
         "defaultMessage": "!!!Logout",
         "end": {
           "column": 3,
-          "line": 32
+          "line": 38
         },
         "file": "src/components/settings/navigation/SettingsNavigation.js",
         "id": "settings.navigation.logout",
         "start": {
           "column": 10,
-          "line": 29
+          "line": 35
         }
       }
     ],
@@ -2496,13 +2535,13 @@
         "defaultMessage": "!!!Upgrade account",
         "end": {
           "column": 3,
-          "line": 17
+          "line": 18
         },
         "file": "src/components/ui/PremiumFeatureContainer/index.js",
         "id": "premiumFeature.button.upgradeAccount",
         "start": {
           "column": 10,
-          "line": 14
+          "line": 15
         }
       }
     ],
@@ -2511,6 +2550,24 @@
   {
     "descriptors": [
       {
+        "defaultMessage": "!!!Loading",
+        "end": {
+          "column": 3,
+          "line": 14
+        },
+        "file": "src/components/ui/WebviewLoader/index.js",
+        "id": "service.webviewLoader.loading",
+        "start": {
+          "column": 11,
+          "line": 11
+        }
+      }
+    ],
+    "path": "src/components/ui/WebviewLoader/index.json"
+  },
+  {
+    "descriptors": [
+      {
         "defaultMessage": "!!!Something went wrong.",
         "end": {
           "column": 3,
@@ -3165,6 +3222,322 @@
   {
     "descriptors": [
       {
+        "defaultMessage": "!!!Create workspace",
+        "end": {
+          "column": 3,
+          "line": 16
+        },
+        "file": "src/features/workspaces/components/CreateWorkspaceForm.js",
+        "id": "settings.workspace.add.form.submitButton",
+        "start": {
+          "column": 16,
+          "line": 13
+        }
+      },
+      {
+        "defaultMessage": "!!!Name",
+        "end": {
+          "column": 3,
+          "line": 20
+        },
+        "file": "src/features/workspaces/components/CreateWorkspaceForm.js",
+        "id": "settings.workspace.add.form.name",
+        "start": {
+          "column": 8,
+          "line": 17
+        }
+      }
+    ],
+    "path": "src/features/workspaces/components/CreateWorkspaceForm.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Delete workspace",
+        "end": {
+          "column": 3,
+          "line": 22
+        },
+        "file": "src/features/workspaces/components/EditWorkspaceForm.js",
+        "id": "settings.workspace.form.buttonDelete",
+        "start": {
+          "column": 16,
+          "line": 19
+        }
+      },
+      {
+        "defaultMessage": "!!!Save workspace",
+        "end": {
+          "column": 3,
+          "line": 26
+        },
+        "file": "src/features/workspaces/components/EditWorkspaceForm.js",
+        "id": "settings.workspace.form.buttonSave",
+        "start": {
+          "column": 14,
+          "line": 23
+        }
+      },
+      {
+        "defaultMessage": "!!!Name",
+        "end": {
+          "column": 3,
+          "line": 30
+        },
+        "file": "src/features/workspaces/components/EditWorkspaceForm.js",
+        "id": "settings.workspace.form.name",
+        "start": {
+          "column": 8,
+          "line": 27
+        }
+      },
+      {
+        "defaultMessage": "!!!Your workspaces",
+        "end": {
+          "column": 3,
+          "line": 34
+        },
+        "file": "src/features/workspaces/components/EditWorkspaceForm.js",
+        "id": "settings.workspace.form.yourWorkspaces",
+        "start": {
+          "column": 18,
+          "line": 31
+        }
+      },
+      {
+        "defaultMessage": "!!!Services in this Workspace",
+        "end": {
+          "column": 3,
+          "line": 38
+        },
+        "file": "src/features/workspaces/components/EditWorkspaceForm.js",
+        "id": "settings.workspace.form.servicesInWorkspaceHeadline",
+        "start": {
+          "column": 31,
+          "line": 35
+        }
+      }
+    ],
+    "path": "src/features/workspaces/components/EditWorkspaceForm.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Workspaces",
+        "end": {
+          "column": 3,
+          "line": 19
+        },
+        "file": "src/features/workspaces/components/WorkspaceDrawer.js",
+        "id": "workspaceDrawer.headline",
+        "start": {
+          "column": 12,
+          "line": 16
+        }
+      },
+      {
+        "defaultMessage": "!!!All services",
+        "end": {
+          "column": 3,
+          "line": 23
+        },
+        "file": "src/features/workspaces/components/WorkspaceDrawer.js",
+        "id": "workspaceDrawer.allServices",
+        "start": {
+          "column": 15,
+          "line": 20
+        }
+      },
+      {
+        "defaultMessage": "!!!Add workspace",
+        "end": {
+          "column": 3,
+          "line": 27
+        },
+        "file": "src/features/workspaces/components/WorkspaceDrawer.js",
+        "id": "workspaceDrawer.addWorkspaceTooltip",
+        "start": {
+          "column": 23,
+          "line": 24
+        }
+      },
+      {
+        "defaultMessage": "!!!Info about workspace feature",
+        "end": {
+          "column": 3,
+          "line": 31
+        },
+        "file": "src/features/workspaces/components/WorkspaceDrawer.js",
+        "id": "workspaceDrawer.workspaceFeatureInfo",
+        "start": {
+          "column": 24,
+          "line": 28
+        }
+      },
+      {
+        "defaultMessage": "!!!Create your first workspace",
+        "end": {
+          "column": 3,
+          "line": 35
+        },
+        "file": "src/features/workspaces/components/WorkspaceDrawer.js",
+        "id": "workspaceDrawer.premiumCtaButtonLabel",
+        "start": {
+          "column": 25,
+          "line": 32
+        }
+      }
+    ],
+    "path": "src/features/workspaces/components/WorkspaceDrawer.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!No services added yet",
+        "end": {
+          "column": 3,
+          "line": 12
+        },
+        "file": "src/features/workspaces/components/WorkspaceDrawerItem.js",
+        "id": "workspaceDrawer.item.noServicesAddedYet",
+        "start": {
+          "column": 22,
+          "line": 9
+        }
+      }
+    ],
+    "path": "src/features/workspaces/components/WorkspaceDrawerItem.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Your workspaces",
+        "end": {
+          "column": 3,
+          "line": 20
+        },
+        "file": "src/features/workspaces/components/WorkspacesDashboard.js",
+        "id": "settings.workspaces.headline",
+        "start": {
+          "column": 12,
+          "line": 17
+        }
+      },
+      {
+        "defaultMessage": "!!!You haven't added any workspaces yet.",
+        "end": {
+          "column": 3,
+          "line": 24
+        },
+        "file": "src/features/workspaces/components/WorkspacesDashboard.js",
+        "id": "settings.workspaces.noWorkspacesAdded",
+        "start": {
+          "column": 19,
+          "line": 21
+        }
+      },
+      {
+        "defaultMessage": "!!!Could not load your workspaces",
+        "end": {
+          "column": 3,
+          "line": 28
+        },
+        "file": "src/features/workspaces/components/WorkspacesDashboard.js",
+        "id": "settings.workspaces.workspacesRequestFailed",
+        "start": {
+          "column": 27,
+          "line": 25
+        }
+      },
+      {
+        "defaultMessage": "!!!Try again",
+        "end": {
+          "column": 3,
+          "line": 32
+        },
+        "file": "src/features/workspaces/components/WorkspacesDashboard.js",
+        "id": "settings.workspaces.tryReloadWorkspaces",
+        "start": {
+          "column": 23,
+          "line": 29
+        }
+      },
+      {
+        "defaultMessage": "!!!Your changes have been saved",
+        "end": {
+          "column": 3,
+          "line": 36
+        },
+        "file": "src/features/workspaces/components/WorkspacesDashboard.js",
+        "id": "settings.workspaces.updatedInfo",
+        "start": {
+          "column": 15,
+          "line": 33
+        }
+      },
+      {
+        "defaultMessage": "!!!Workspace has been deleted",
+        "end": {
+          "column": 3,
+          "line": 40
+        },
+        "file": "src/features/workspaces/components/WorkspacesDashboard.js",
+        "id": "settings.workspaces.deletedInfo",
+        "start": {
+          "column": 15,
+          "line": 37
+        }
+      },
+      {
+        "defaultMessage": "!!!Info about workspace feature",
+        "end": {
+          "column": 3,
+          "line": 44
+        },
+        "file": "src/features/workspaces/components/WorkspacesDashboard.js",
+        "id": "settings.workspaces.workspaceFeatureInfo",
+        "start": {
+          "column": 24,
+          "line": 41
+        }
+      },
+      {
+        "defaultMessage": "!!!Less is More: Introducing Franz Workspaces",
+        "end": {
+          "column": 3,
+          "line": 48
+        },
+        "file": "src/features/workspaces/components/WorkspacesDashboard.js",
+        "id": "settings.workspaces.workspaceFeatureHeadline",
+        "start": {
+          "column": 28,
+          "line": 45
+        }
+      }
+    ],
+    "path": "src/features/workspaces/components/WorkspacesDashboard.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Switching to",
+        "end": {
+          "column": 3,
+          "line": 15
+        },
+        "file": "src/features/workspaces/components/WorkspaceSwitchingIndicator.js",
+        "id": "workspaces.switchingIndicator.switchingTo",
+        "start": {
+          "column": 15,
+          "line": 12
+        }
+      }
+    ],
+    "path": "src/features/workspaces/components/WorkspaceSwitchingIndicator.json"
+  },
+  {
+    "descriptors": [
+      {
         "defaultMessage": "!!!Field is required",
         "end": {
           "column": 3,
@@ -3321,611 +3694,676 @@
         "defaultMessage": "!!!Edit",
         "end": {
           "column": 3,
-          "line": 13
+          "line": 16
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit",
         "start": {
           "column": 8,
-          "line": 10
+          "line": 13
         }
       },
       {
         "defaultMessage": "!!!Undo",
         "end": {
           "column": 3,
-          "line": 17
+          "line": 20
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.undo",
         "start": {
           "column": 8,
-          "line": 14
+          "line": 17
         }
       },
       {
         "defaultMessage": "!!!Redo",
         "end": {
           "column": 3,
-          "line": 21
+          "line": 24
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.redo",
         "start": {
           "column": 8,
-          "line": 18
+          "line": 21
         }
       },
       {
         "defaultMessage": "!!!Cut",
         "end": {
           "column": 3,
-          "line": 25
+          "line": 28
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.cut",
         "start": {
           "column": 7,
-          "line": 22
+          "line": 25
         }
       },
       {
         "defaultMessage": "!!!Copy",
         "end": {
           "column": 3,
-          "line": 29
+          "line": 32
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.copy",
         "start": {
           "column": 8,
-          "line": 26
+          "line": 29
         }
       },
       {
         "defaultMessage": "!!!Paste",
         "end": {
           "column": 3,
-          "line": 33
+          "line": 36
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.paste",
         "start": {
           "column": 9,
-          "line": 30
+          "line": 33
         }
       },
       {
         "defaultMessage": "!!!Paste And Match Style",
         "end": {
           "column": 3,
-          "line": 37
+          "line": 40
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.pasteAndMatchStyle",
         "start": {
           "column": 22,
-          "line": 34
+          "line": 37
         }
       },
       {
         "defaultMessage": "!!!Delete",
         "end": {
           "column": 3,
-          "line": 41
+          "line": 44
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.delete",
         "start": {
           "column": 10,
-          "line": 38
+          "line": 41
         }
       },
       {
         "defaultMessage": "!!!Select All",
         "end": {
           "column": 3,
-          "line": 45
+          "line": 48
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.selectAll",
         "start": {
           "column": 13,
-          "line": 42
+          "line": 45
         }
       },
       {
         "defaultMessage": "!!!Speech",
         "end": {
           "column": 3,
-          "line": 49
+          "line": 52
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.speech",
         "start": {
           "column": 10,
-          "line": 46
+          "line": 49
         }
       },
       {
         "defaultMessage": "!!!Start Speaking",
         "end": {
           "column": 3,
-          "line": 53
+          "line": 56
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.startSpeaking",
         "start": {
           "column": 17,
-          "line": 50
+          "line": 53
         }
       },
       {
         "defaultMessage": "!!!Stop Speaking",
         "end": {
           "column": 3,
-          "line": 57
+          "line": 60
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.stopSpeaking",
         "start": {
           "column": 16,
-          "line": 54
+          "line": 57
         }
       },
       {
         "defaultMessage": "!!!Start Dictation",
         "end": {
           "column": 3,
-          "line": 61
+          "line": 64
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.startDictation",
         "start": {
           "column": 18,
-          "line": 58
+          "line": 61
         }
       },
       {
         "defaultMessage": "!!!Emoji & Symbols",
         "end": {
           "column": 3,
-          "line": 65
+          "line": 68
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.emojiSymbols",
         "start": {
           "column": 16,
-          "line": 62
+          "line": 65
         }
       },
       {
         "defaultMessage": "!!!Actual Size",
         "end": {
           "column": 3,
-          "line": 69
+          "line": 72
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.resetZoom",
         "start": {
           "column": 13,
-          "line": 66
+          "line": 69
         }
       },
       {
         "defaultMessage": "!!!Zoom In",
         "end": {
           "column": 3,
-          "line": 73
+          "line": 76
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.zoomIn",
         "start": {
           "column": 10,
-          "line": 70
+          "line": 73
         }
       },
       {
         "defaultMessage": "!!!Zoom Out",
         "end": {
           "column": 3,
-          "line": 77
+          "line": 80
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.zoomOut",
         "start": {
           "column": 11,
-          "line": 74
+          "line": 77
         }
       },
       {
         "defaultMessage": "!!!Enter Full Screen",
         "end": {
           "column": 3,
-          "line": 81
+          "line": 84
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.enterFullScreen",
         "start": {
           "column": 19,
-          "line": 78
+          "line": 81
         }
       },
       {
         "defaultMessage": "!!!Exit Full Screen",
         "end": {
           "column": 3,
-          "line": 85
+          "line": 88
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.exitFullScreen",
         "start": {
           "column": 18,
-          "line": 82
+          "line": 85
         }
       },
       {
         "defaultMessage": "!!!Toggle Full Screen",
         "end": {
           "column": 3,
-          "line": 89
+          "line": 92
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.toggleFullScreen",
         "start": {
           "column": 20,
-          "line": 86
+          "line": 89
         }
       },
       {
         "defaultMessage": "!!!Toggle Developer Tools",
         "end": {
           "column": 3,
-          "line": 93
+          "line": 96
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.toggleDevTools",
         "start": {
           "column": 18,
-          "line": 90
+          "line": 93
         }
       },
       {
         "defaultMessage": "!!!Toggle Service Developer Tools",
         "end": {
           "column": 3,
-          "line": 97
+          "line": 100
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.toggleServiceDevTools",
         "start": {
           "column": 25,
-          "line": 94
+          "line": 97
         }
       },
       {
         "defaultMessage": "!!!Reload Service",
         "end": {
           "column": 3,
-          "line": 101
+          "line": 104
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.reloadService",
         "start": {
           "column": 17,
-          "line": 98
+          "line": 101
         }
       },
       {
         "defaultMessage": "!!!Reload Franz",
         "end": {
           "column": 3,
-          "line": 105
+          "line": 108
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.reloadFranz",
         "start": {
           "column": 15,
-          "line": 102
+          "line": 105
         }
       },
       {
         "defaultMessage": "!!!Minimize",
         "end": {
           "column": 3,
-          "line": 109
+          "line": 112
         },
         "file": "src/lib/Menu.js",
         "id": "menu.window.minimize",
         "start": {
           "column": 12,
-          "line": 106
+          "line": 109
         }
       },
       {
         "defaultMessage": "!!!Close",
         "end": {
           "column": 3,
-          "line": 113
+          "line": 116
         },
         "file": "src/lib/Menu.js",
         "id": "menu.window.close",
         "start": {
           "column": 9,
-          "line": 110
+          "line": 113
         }
       },
       {
         "defaultMessage": "!!!Learn More",
         "end": {
           "column": 3,
-          "line": 117
+          "line": 120
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help.learnMore",
         "start": {
           "column": 13,
-          "line": 114
+          "line": 117
         }
       },
       {
         "defaultMessage": "!!!Changelog",
         "end": {
           "column": 3,
-          "line": 121
+          "line": 124
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help.changelog",
         "start": {
           "column": 13,
-          "line": 118
+          "line": 121
         }
       },
       {
         "defaultMessage": "!!!Support",
         "end": {
           "column": 3,
-          "line": 125
+          "line": 128
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help.support",
         "start": {
           "column": 11,
-          "line": 122
+          "line": 125
         }
       },
       {
         "defaultMessage": "!!!Terms of Service",
         "end": {
           "column": 3,
-          "line": 129
+          "line": 132
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help.tos",
         "start": {
           "column": 7,
-          "line": 126
+          "line": 129
         }
       },
       {
         "defaultMessage": "!!!Privacy Statement",
         "end": {
           "column": 3,
-          "line": 133
+          "line": 136
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help.privacy",
         "start": {
           "column": 11,
-          "line": 130
+          "line": 133
         }
       },
       {
         "defaultMessage": "!!!File",
         "end": {
           "column": 3,
-          "line": 137
+          "line": 140
         },
         "file": "src/lib/Menu.js",
         "id": "menu.file",
         "start": {
           "column": 8,
-          "line": 134
+          "line": 137
         }
       },
       {
         "defaultMessage": "!!!View",
         "end": {
           "column": 3,
-          "line": 141
+          "line": 144
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view",
         "start": {
           "column": 8,
-          "line": 138
+          "line": 141
         }
       },
       {
         "defaultMessage": "!!!Services",
         "end": {
           "column": 3,
-          "line": 145
+          "line": 148
         },
         "file": "src/lib/Menu.js",
         "id": "menu.services",
         "start": {
           "column": 12,
-          "line": 142
+          "line": 145
         }
       },
       {
         "defaultMessage": "!!!Window",
         "end": {
           "column": 3,
-          "line": 149
+          "line": 152
         },
         "file": "src/lib/Menu.js",
         "id": "menu.window",
         "start": {
           "column": 10,
-          "line": 146
+          "line": 149
         }
       },
       {
         "defaultMessage": "!!!Help",
         "end": {
           "column": 3,
-          "line": 153
+          "line": 156
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help",
         "start": {
           "column": 8,
-          "line": 150
+          "line": 153
         }
       },
       {
         "defaultMessage": "!!!About Franz",
         "end": {
           "column": 3,
-          "line": 157
+          "line": 160
         },
         "file": "src/lib/Menu.js",
         "id": "menu.app.about",
         "start": {
           "column": 9,
-          "line": 154
+          "line": 157
         }
       },
       {
         "defaultMessage": "!!!Settings",
         "end": {
           "column": 3,
-          "line": 161
+          "line": 164
         },
         "file": "src/lib/Menu.js",
         "id": "menu.app.settings",
         "start": {
           "column": 12,
-          "line": 158
+          "line": 161
         }
       },
       {
         "defaultMessage": "!!!Hide",
         "end": {
           "column": 3,
-          "line": 165
+          "line": 168
         },
         "file": "src/lib/Menu.js",
         "id": "menu.app.hide",
         "start": {
           "column": 8,
-          "line": 162
+          "line": 165
         }
       },
       {
         "defaultMessage": "!!!Hide Others",
         "end": {
           "column": 3,
-          "line": 169
+          "line": 172
         },
         "file": "src/lib/Menu.js",
         "id": "menu.app.hideOthers",
         "start": {
           "column": 14,
-          "line": 166
+          "line": 169
         }
       },
       {
         "defaultMessage": "!!!Unhide",
         "end": {
           "column": 3,
-          "line": 173
+          "line": 176
         },
         "file": "src/lib/Menu.js",
         "id": "menu.app.unhide",
         "start": {
           "column": 10,
-          "line": 170
+          "line": 173
         }
       },
       {
         "defaultMessage": "!!!Quit",
         "end": {
           "column": 3,
-          "line": 177
+          "line": 180
         },
         "file": "src/lib/Menu.js",
         "id": "menu.app.quit",
         "start": {
           "column": 8,
-          "line": 174
+          "line": 177
         }
       },
       {
         "defaultMessage": "!!!Add New Service...",
         "end": {
           "column": 3,
-          "line": 181
+          "line": 184
         },
         "file": "src/lib/Menu.js",
         "id": "menu.services.addNewService",
         "start": {
           "column": 17,
-          "line": 178
+          "line": 181
         }
       },
       {
-        "defaultMessage": "!!!Activate next service...",
+        "defaultMessage": "!!!Add New Workspace...",
         "end": {
           "column": 3,
+          "line": 188
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.workspaces.addNewWorkspace",
+        "start": {
+          "column": 19,
           "line": 185
+        }
+      },
+      {
+        "defaultMessage": "!!!Open workspace drawer",
+        "end": {
+          "column": 3,
+          "line": 192
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.workspaces.openWorkspaceDrawer",
+        "start": {
+          "column": 23,
+          "line": 189
+        }
+      },
+      {
+        "defaultMessage": "!!!Close workspace drawer",
+        "end": {
+          "column": 3,
+          "line": 196
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.workspaces.closeWorkspaceDrawer",
+        "start": {
+          "column": 24,
+          "line": 193
+        }
+      },
+      {
+        "defaultMessage": "!!!Activate next service...",
+        "end": {
+          "column": 3,
+          "line": 200
         },
         "file": "src/lib/Menu.js",
         "id": "menu.services.setNextServiceActive",
         "start": {
           "column": 23,
-          "line": 182
+          "line": 197
         }
       },
       {
         "defaultMessage": "!!!Activate previous service...",
         "end": {
           "column": 3,
-          "line": 189
+          "line": 204
         },
         "file": "src/lib/Menu.js",
         "id": "menu.services.activatePreviousService",
         "start": {
           "column": 27,
-          "line": 186
+          "line": 201
         }
       },
       {
         "defaultMessage": "!!!Disable notifications & audio",
         "end": {
           "column": 3,
-          "line": 193
+          "line": 208
         },
         "file": "src/lib/Menu.js",
         "id": "sidebar.muteApp",
         "start": {
           "column": 11,
-          "line": 190
+          "line": 205
         }
       },
       {
         "defaultMessage": "!!!Enable notifications & audio",
         "end": {
           "column": 3,
-          "line": 197
+          "line": 212
         },
         "file": "src/lib/Menu.js",
         "id": "sidebar.unmuteApp",
         "start": {
           "column": 13,
-          "line": 194
+          "line": 209
+        }
+      },
+      {
+        "defaultMessage": "!!!Workspaces",
+        "end": {
+          "column": 3,
+          "line": 216
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.workspaces",
+        "start": {
+          "column": 14,
+          "line": 213
+        }
+      },
+      {
+        "defaultMessage": "!!!Default",
+        "end": {
+          "column": 3,
+          "line": 220
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.workspaces.defaultWorkspace",
+        "start": {
+          "column": 20,
+          "line": 217
         }
       }
     ],
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index 06cda4aca..c36801d4a 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -87,6 +87,11 @@
   "menu.window": "Window",
   "menu.window.close": "Close",
   "menu.window.minimize": "Minimize",
+  "menu.workspaces": "Workspaces",
+  "menu.workspaces.addNewWorkspace": "Add New Workspace...",
+  "menu.workspaces.closeWorkspaceDrawer": "Close workspace drawer",
+  "menu.workspaces.defaultWorkspace": "All services",
+  "menu.workspaces.openWorkspaceDrawer": "Open workspace drawer",
   "password.email.label": "Email address",
   "password.headline": "Reset password",
   "password.link.login": "Sign in to your account",
@@ -110,6 +115,7 @@
   "service.errorHandler.headline": "Oh no!",
   "service.errorHandler.message": "Error",
   "service.errorHandler.text": "{name} has failed to load.",
+  "service.webviewLoader.loading": "Loading",
   "services.getStarted": "Get started",
   "services.welcome": "Welcome to Franz",
   "settings.account.account.editButton": "Edit account",
@@ -169,6 +175,7 @@
   "settings.navigation.logout": "Logout",
   "settings.navigation.settings": "Settings",
   "settings.navigation.yourServices": "Your services",
+  "settings.navigation.yourWorkspaces": "Your workspaces",
   "settings.recipes.all": "All services",
   "settings.recipes.dev": "Development",
   "settings.recipes.headline": "Available services",
@@ -235,8 +242,25 @@
   "settings.user.form.firstname": "First Name",
   "settings.user.form.lastname": "Last Name",
   "settings.user.form.newPassword": "New password",
+  "settings.workspace.add.form.name": "Name",
+  "settings.workspace.add.form.submitButton": "Create workspace",
+  "settings.workspace.form.buttonDelete": "Delete workspace",
+  "settings.workspace.form.buttonSave": "Save workspace",
+  "settings.workspace.form.name": "Name",
+  "settings.workspace.form.servicesInWorkspaceHeadline": "Services in this Workspace",
+  "settings.workspace.form.yourWorkspaces": "Your workspaces",
+  "settings.workspaces.deletedInfo": "Workspace has been deleted",
+  "settings.workspaces.headline": "Your workspaces",
+  "settings.workspaces.noWorkspacesAdded": "You haven't added any workspaces yet.",
+  "settings.workspaces.tryReloadWorkspaces": "Try again",
+  "settings.workspaces.updatedInfo": "Your changes have been saved",
+  "settings.workspaces.workspaceFeatureHeadline": "Less is More: Introducing Franz Workspaces",
+  "settings.workspaces.workspaceFeatureInfo": "Franz Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time. You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.",
+  "settings.workspaces.workspacesRequestFailed": "Could not load your workspaces",
   "sidebar.addNewService": "Add new service",
+  "sidebar.closeWorkspaceDrawer": "Close workspace drawer",
   "sidebar.muteApp": "Disable notifications & audio",
+  "sidebar.openWorkspaceDrawer": "Open workspace drawer",
   "sidebar.settings": "Settings",
   "sidebar.unmuteApp": "Enable notifications & audio",
   "signup.company.label": "Company",
@@ -281,5 +305,12 @@
   "validation.required": "{field} is required",
   "validation.url": "{field} is not a valid URL",
   "welcome.loginButton": "Login to your account",
-  "welcome.signupButton": "Create a free account"
+  "welcome.signupButton": "Create a free account",
+  "workspaceDrawer.addWorkspaceTooltip": "Add workspace",
+  "workspaceDrawer.allServices": "All services",
+  "workspaceDrawer.headline": "Workspaces",
+  "workspaceDrawer.item.noServicesAddedYet": "No services added yet",
+  "workspaceDrawer.premiumCtaButtonLabel": "Create your first workspace",
+  "workspaceDrawer.workspaceFeatureInfo": "<p>Franz Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.</p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.</p>",
+  "workspaces.switchingIndicator.switchingTo": "Switching to"
 }