diff --git a/.gitignore b/.gitignore
index 2ba9c4f..278bf8a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 .idea/
 .vscode/
 .DS_Store
-
+workspace.xml
+**/.idea/
\ No newline at end of file
diff --git a/.idea/.gitignore b/.idea/.gitignore
deleted file mode 100644
index 9ed1b03..0000000
--- a/.idea/.gitignore
+++ /dev/null
@@ -1,9 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
-# Editor-based HTTP Client requests
-/httpRequests/
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml
-/jsLibraryMappings.xml
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
deleted file mode 100644
index f986f2f..0000000
--- a/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <HTMLCodeStyleSettings>
-      <option name="HTML_SPACE_INSIDE_EMPTY_TAG" value="true" />
-      <option name="HTML_ENFORCE_QUOTES" value="true" />
-    </HTMLCodeStyleSettings>
-    <JSCodeStyleSettings version="0">
-      <option name="FORCE_SEMICOLON_STYLE" value="true" />
-      <option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
-      <option name="FORCE_QUOTE_STYlE" value="true" />
-      <option name="ENFORCE_TRAILING_COMMA" value="Remove" />
-      <option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
-      <option name="SPACES_WITHIN_IMPORTS" value="true" />
-    </JSCodeStyleSettings>
-    <TypeScriptCodeStyleSettings version="0">
-      <option name="FORCE_SEMICOLON_STYLE" value="true" />
-      <option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
-      <option name="FORCE_QUOTE_STYlE" value="true" />
-      <option name="ENFORCE_TRAILING_COMMA" value="Remove" />
-      <option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
-      <option name="SPACES_WITHIN_IMPORTS" value="true" />
-    </TypeScriptCodeStyleSettings>
-    <VueCodeStyleSettings>
-      <option name="INTERPOLATION_NEW_LINE_AFTER_START_DELIMITER" value="false" />
-      <option name="INTERPOLATION_NEW_LINE_BEFORE_END_DELIMITER" value="false" />
-    </VueCodeStyleSettings>
-    <codeStyleSettings language="HTML">
-      <option name="SOFT_MARGINS" value="80" />
-      <indentOptions>
-        <option name="INDENT_SIZE" value="2" />
-        <option name="CONTINUATION_INDENT_SIZE" value="2" />
-        <option name="TAB_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
-    <codeStyleSettings language="JavaScript">
-      <option name="SOFT_MARGINS" value="80" />
-      <indentOptions>
-        <option name="INDENT_SIZE" value="2" />
-        <option name="CONTINUATION_INDENT_SIZE" value="2" />
-        <option name="TAB_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
-    <codeStyleSettings language="TypeScript">
-      <option name="SOFT_MARGINS" value="80" />
-      <indentOptions>
-        <option name="INDENT_SIZE" value="2" />
-        <option name="CONTINUATION_INDENT_SIZE" value="2" />
-        <option name="TAB_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
-    <codeStyleSettings language="Vue">
-      <option name="SOFT_MARGINS" value="80" />
-      <indentOptions>
-        <option name="CONTINUATION_INDENT_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
-  </code_scheme>
-</component>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
deleted file mode 100644
index 79ee123..0000000
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/htwk-planner.iml b/.idea/htwk-planner.iml
deleted file mode 100644
index 5e764c4..0000000
--- a/.idea/htwk-planner.iml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
-  <component name="Go" enabled="true" />
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/.idea/jsLibraryMappings.xml b/.idea/jsLibraryMappings.xml
deleted file mode 100644
index d23208f..0000000
--- a/.idea/jsLibraryMappings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="JavaScriptLibraryMappings">
-    <includedPredefinedLibrary name="Node.js Core" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index 99c7e98..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/backend/backend.iml" filepath="$PROJECT_DIR$/backend/backend.iml" />
-      <module fileurl="file://$PROJECT_DIR$/frontend/frontend.iml" filepath="$PROJECT_DIR$/frontend/frontend.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/prettier.xml b/.idea/prettier.xml
deleted file mode 100644
index b0c1c68..0000000
--- a/.idea/prettier.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="PrettierConfiguration">
-    <option name="myConfigurationMode" value="AUTOMATIC" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/swagger-settings.xml b/.idea/swagger-settings.xml
deleted file mode 100644
index 01d844c..0000000
--- a/.idea/swagger-settings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="SwaggerSettings">
-    <option name="defaultPreviewType" value="SWAGGER_UI" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 94a25f7..0000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
deleted file mode 100644
index 2b15ac5..0000000
--- a/.idea/workspace.xml
+++ /dev/null
@@ -1,224 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="AutoImportSettings">
-    <option name="autoReloadType" value="SELECTIVE" />
-  </component>
-  <component name="ChangeListManager">
-    <list default="true" id="81c34cb9-5538-45c5-b693-4f8a6bed15c4" name="Changes" comment="added missing idea files">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/frontend/.eslintrc.cjs" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/.eslintrc.cjs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/frontend/.prettierrc.json" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/.prettierrc.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/frontend/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/README.md" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/frontend/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/index.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/frontend/package-lock.json" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/package-lock.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/frontend/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/package.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/frontend/src/App.vue" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/src/App.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/frontend/src/api/createFeed.ts" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/src/api/createFeed.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/frontend/src/api/fetchCourse.ts" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/src/api/fetchCourse.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/frontend/src/api/fetchModule.ts" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/src/api/fetchModule.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/frontend/src/api/fetchRoom.ts" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/src/api/fetchRoom.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/frontend/src/api/loadCalendar.ts" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/src/api/loadCalendar.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/frontend/src/components/AdditionalModules.vue" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/src/components/AdditionalModules.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/frontend/src/components/CalendarLink.vue" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/src/components/CalendarLink.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/frontend/src/components/CourseSelection.vue" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/src/components/CourseSelection.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/frontend/src/components/FaqPage.vue" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/src/components/FaqPage.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/frontend/src/components/ImprintPage.vue" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/src/components/ImprintPage.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/frontend/src/components/MenuBar.vue" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/src/components/MenuBar.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/frontend/src/components/ModuleInformation.vue" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/src/components/ModuleInformation.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/frontend/src/components/ModuleSelection.vue" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/src/components/ModuleSelection.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/frontend/src/components/ModuleTemplateDialog.vue" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/src/components/ModuleTemplateDialog.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/frontend/src/components/PrivacyPolicy.vue" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/src/components/PrivacyPolicy.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/frontend/src/components/RenameModules.vue" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/src/components/RenameModules.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/frontend/src/components/RoomFinder.vue" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/src/components/RoomFinder.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/frontend/src/components/RoomOccupation.vue" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/src/components/RoomOccupation.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/frontend/src/components/editCalendar/EditAdditionalModules.vue" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/src/components/editCalendar/EditAdditionalModules.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/frontend/src/components/editCalendar/EditModules.vue" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/src/components/editCalendar/EditModules.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/frontend/src/main.ts" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/src/main.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/frontend/src/model/calendar.ts" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/src/model/calendar.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/frontend/src/model/event.ts" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/src/model/event.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/frontend/src/model/module.ts" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/src/model/module.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/frontend/src/router/index.ts" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/src/router/index.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/frontend/src/store/moduleStore.ts" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/src/store/moduleStore.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/frontend/src/store/tokenStore.ts" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/src/store/tokenStore.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/frontend/src/style.css" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/src/style.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/frontend/src/view/editCalendarView.vue" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/src/view/editCalendarView.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/frontend/src/vite-env.d.ts" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/src/vite-env.d.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/frontend/tsconfig.json" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/tsconfig.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/frontend/tsconfig.node.json" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/tsconfig.node.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/frontend/vite.config.ts" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/vite.config.ts" afterDir="false" />
-    </list>
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="FormatOnSaveOptions">
-    <option name="myRunOnSave" value="false" />
-    <option name="myAllFileTypesSelected" value="true" />
-    <option name="mySelectedFileTypes">
-      <set />
-    </option>
-  </component>
-  <component name="GOROOT" url="file://$USER_HOME$/go/go1.21.3" />
-  <component name="Git.Settings">
-    <option name="RECENT_BRANCH_BY_REPOSITORY">
-      <map>
-        <entry key="$PROJECT_DIR$" value="main" />
-      </map>
-    </option>
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="GithubProjectSettings">
-    <option name="branchProtectionPatterns">
-      <list>
-        <option value="main" />
-      </list>
-    </option>
-  </component>
-  <component name="GoLibraries">
-    <option name="indexEntireGoPath" value="true" />
-  </component>
-  <component name="MacroExpansionManager">
-    <option name="directoryName" value="ps5ys6pz" />
-  </component>
-  <component name="MarkdownSettingsMigration">
-    <option name="stateVersion" value="1" />
-  </component>
-  <component name="OptimizeOnSaveOptions">
-    <option name="myRunOnSave" value="false" />
-    <option name="myAllFileTypesSelected" value="true" />
-    <option name="mySelectedFileTypes">
-      <set />
-    </option>
-  </component>
-  <component name="ProjectColorInfo">{
-  &quot;associatedIndex&quot;: 2
-}</component>
-  <component name="ProjectId" id="2WqbaFt9UED5KZtHQV9GfCdMxMd" />
-  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
-  <component name="ProjectViewState">
-    <option name="hideEmptyMiddlePackages" value="true" />
-    <option name="showLibraryContents" value="true" />
-  </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "ASKED_SHARE_PROJECT_CONFIGURATION_FILES": "true",
-    "RunOnceActivity.OpenProjectViewOnStart": "true",
-    "RunOnceActivity.ShowReadmeOnStart": "true",
-    "RunOnceActivity.go.formatter.settings.were.checked": "true",
-    "RunOnceActivity.go.migrated.go.modules.settings": "true",
-    "RunOnceActivity.go.modules.automatic.dependencies.download": "true",
-    "WebServerToolWindowFactoryState": "false",
-    "git-widget-placeholder": "main",
-    "go.import.settings.migrated": "true",
-    "ignore.virus.scanning.warn.message": "true",
-    "jdk.selected.JAVA_MODULE": "20",
-    "last_opened_file_path": "C:/Users/masterelmar/project/htwkalender",
-    "node.js.detected.package.eslint": "true",
-    "node.js.detected.package.tslint": "true",
-    "node.js.selected.package.eslint": "(autodetect)",
-    "node.js.selected.package.tslint": "(autodetect)",
-    "nodejs_package_manager_path": "npm",
-    "prettierjs.PrettierConfiguration.Package": "C:\\Users\\masterelmar\\project\\htwkalender\\frontend\\node_modules\\prettier",
-    "project.structure.last.edited": "Modules",
-    "project.structure.proportion": "0.0",
-    "project.structure.side.proportion": "0.42068964",
-    "settings.editor.selected.configurable": "go.vgo",
-    "ts.external.directory.path": "C:\\Users\\masterelmar\\project\\htwkalender\\frontend\\node_modules\\typescript\\lib",
-    "vue.rearranger.settings.migration": "true"
-  }
-}]]></component>
-  <component name="RecentsManager">
-    <key name="CopyFile.RECENT_KEYS">
-      <recent name="$PROJECT_DIR$/frontend/src/components" />
-    </key>
-  </component>
-  <component name="RunManager">
-    <configuration default="true" type="GoApplicationRunConfiguration" factoryName="Go Application">
-      <module name="htwk-planner" />
-      <working_directory value="$PROJECT_DIR$" />
-      <go_parameters value="-i" />
-      <kind value="FILE" />
-      <directory value="$PROJECT_DIR$" />
-      <filePath value="$PROJECT_DIR$" />
-      <method v="2" />
-    </configuration>
-    <configuration name="go build htwkalender" type="GoApplicationRunConfiguration" factoryName="Go Application" nameIsGenerated="true">
-      <module name="htwk-planner" />
-      <working_directory value="$PROJECT_DIR$/backend" />
-      <go_parameters value="-i" />
-      <kind value="PACKAGE" />
-      <package value="htwkalender" />
-      <directory value="$PROJECT_DIR$" />
-      <filePath value="$PROJECT_DIR$" />
-      <method v="2" />
-    </configuration>
-    <configuration default="true" type="GoTestRunConfiguration" factoryName="Go Test">
-      <module name="htwk-planner" />
-      <working_directory value="$PROJECT_DIR$" />
-      <go_parameters value="-i" />
-      <kind value="DIRECTORY" />
-      <directory value="$PROJECT_DIR$" />
-      <filePath value="$PROJECT_DIR$" />
-      <framework value="gotest" />
-      <method v="2" />
-    </configuration>
-  </component>
-  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="81c34cb9-5538-45c5-b693-4f8a6bed15c4" name="Changes" comment="" />
-      <created>1697463118186</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1697463118186</updated>
-      <workItem from="1697463119285" duration="2319000" />
-      <workItem from="1697465553926" duration="3918000" />
-      <workItem from="1697823319671" duration="31000" />
-      <workItem from="1697823365338" duration="611000" />
-      <workItem from="1697823990507" duration="315000" />
-      <workItem from="1698862050509" duration="64000" />
-      <workItem from="1698873056958" duration="5000" />
-      <workItem from="1698873376316" duration="726000" />
-    </task>
-    <servers />
-  </component>
-  <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="3" />
-  </component>
-  <component name="Vcs.Log.Tabs.Properties">
-    <option name="TAB_STATES">
-      <map>
-        <entry key="MAIN">
-          <value>
-            <State>
-              <option name="FILTERS">
-                <map>
-                  <entry key="branch">
-                    <value>
-                      <list>
-                        <option value="main" />
-                      </list>
-                    </value>
-                  </entry>
-                </map>
-              </option>
-            </State>
-          </value>
-        </entry>
-      </map>
-    </option>
-  </component>
-  <component name="VcsManagerConfiguration">
-    <MESSAGE value="restored idea git detection" />
-    <MESSAGE value="added missing idea files" />
-    <option name="LAST_COMMIT_MESSAGE" value="added missing idea files" />
-  </component>
-  <component name="VgoProject">
-    <settings-migrated>true</settings-migrated>
-  </component>
-  <component name="XSLT-Support.FileAssociations.UIState">
-    <expand />
-    <select />
-  </component>
-</project>
\ No newline at end of file
diff --git a/backend/.idea/dataSources.xml b/backend/.idea/dataSources.xml
deleted file mode 100644
index be7ca6d..0000000
--- a/backend/.idea/dataSources.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="DataSourceManagerImpl" format="xml" multifile-model="true">
-    <data-source source="LOCAL" name="data" uuid="0cac75ec-a154-4b0c-a84d-58425c2050de">
-      <driver-ref>sqlite.xerial</driver-ref>
-      <synchronize>true</synchronize>
-      <jdbc-driver>org.sqlite.JDBC</jdbc-driver>
-      <jdbc-url>jdbc:sqlite:$PROJECT_DIR$/pb_data/data.db</jdbc-url>
-      <working-dir>$ProjectFileDir$</working-dir>
-    </data-source>
-  </component>
-</project>
\ No newline at end of file
diff --git a/backend/.idea/jpa-buddy.xml b/backend/.idea/jpa-buddy.xml
deleted file mode 100644
index 966d5f5..0000000
--- a/backend/.idea/jpa-buddy.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="JpaBuddyIdeaProjectConfig">
-    <option name="renamerInitialized" value="true" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/backend/.idea/misc.xml b/backend/.idea/misc.xml
deleted file mode 100644
index d79bd4e..0000000
--- a/backend/.idea/misc.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectRootManager">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-  <component name="ProjectType">
-    <option name="id" value="jpab" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/backend/.idea/modules.xml b/backend/.idea/modules.xml
deleted file mode 100644
index 0dc77c9..0000000
--- a/backend/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/backend.iml" filepath="$PROJECT_DIR$/backend.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff --git a/backend/.idea/vcs.xml b/backend/.idea/vcs.xml
deleted file mode 100644
index 6c0b863..0000000
--- a/backend/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/backend/openapi.yml b/backend/openapi.yml
index d1aee05..7f51ae3 100644
--- a/backend/openapi.yml
+++ b/backend/openapi.yml
@@ -3,7 +3,7 @@ info:
   title: HTWKalendar API
   version: 1.0.1
 servers:
-  - url: https://cal.ekresse.de
+  - url: https://htwkalendar.de
     description: Production server
   - url: http://localhost:8090
     description: Local server
diff --git a/frontend/index.html b/frontend/index.html
index a4c3e3f..4aad534 100644
--- a/frontend/index.html
+++ b/frontend/index.html
@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
-    <!-- <link rel="icon" type="image/svg+xml" href="/vite.svg" /> -->
+    <link rel="icon" type="image/svg+xml" href="/htwk.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>HTWKalender</title>
   </head>
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 1434fd0..6c1bdde 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -13,11 +13,13 @@
         "@fullcalendar/interaction": "^6.1.9",
         "@fullcalendar/timegrid": "^6.1.9",
         "@fullcalendar/vue3": "^6.1.9",
+        "@vueuse/core": "^10.6.1",
         "pinia": "^2.1.6",
         "primeflex": "^3.3.1",
         "primeicons": "^6.0.1",
         "primevue": "^3.32.2",
         "vue": "^3.3.4",
+        "vue-i18n": "^9.4.1",
         "vue-router": "^4.2.4"
       },
       "devDependencies": {
@@ -584,6 +586,47 @@
       "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
       "dev": true
     },
+    "node_modules/@intlify/core-base": {
+      "version": "9.4.1",
+      "resolved": "https://registry.npmjs.org/@intlify/core-base/-/core-base-9.4.1.tgz",
+      "integrity": "sha512-WIwx+elsZbxSMxRG5+LC+utRohFvmZMoDevfKOfnYMLbpCjCSavqTfHJAtfsY6ruowzqXeKkeLhRHbYbjoJx5g==",
+      "dependencies": {
+        "@intlify/message-compiler": "9.4.1",
+        "@intlify/shared": "9.4.1"
+      },
+      "engines": {
+        "node": ">= 16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/kazupon"
+      }
+    },
+    "node_modules/@intlify/message-compiler": {
+      "version": "9.4.1",
+      "resolved": "https://registry.npmjs.org/@intlify/message-compiler/-/message-compiler-9.4.1.tgz",
+      "integrity": "sha512-aN2N+dUx320108QhH51Ycd2LEpZ+NKbzyQ2kjjhqMcxhHdxtOnkgdx+MDBhOy/CObwBmhC3Nygzc6hNlfKvPNw==",
+      "dependencies": {
+        "@intlify/shared": "9.4.1",
+        "source-map-js": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/kazupon"
+      }
+    },
+    "node_modules/@intlify/shared": {
+      "version": "9.4.1",
+      "resolved": "https://registry.npmjs.org/@intlify/shared/-/shared-9.4.1.tgz",
+      "integrity": "sha512-A51elBmZWf1FS80inf/32diO9DeXoqg9GR9aUDHFcfHoNDuT46Q+fpPOdj8jiJnSHSBh8E1E+6qWRhAZXdK3Ng==",
+      "engines": {
+        "node": ">= 16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/kazupon"
+      }
+    },
     "node_modules/@jridgewell/gen-mapping": {
       "version": "0.3.3",
       "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz",
@@ -728,6 +771,11 @@
       "integrity": "sha512-7aqorHYgdNO4DM36stTiGO3DvKoex9TQRwsJU6vMaFGyqpBA1MNZkz+PG3gaNUPpTAOYhT1WR7M1JyA3fbS9Cw==",
       "dev": true
     },
+    "node_modules/@types/web-bluetooth": {
+      "version": "0.0.20",
+      "resolved": "https://registry.npmjs.org/@types/web-bluetooth/-/web-bluetooth-0.0.20.tgz",
+      "integrity": "sha512-g9gZnnXVq7gM7v3tJCWV/qw7w+KeOlSHAhgF9RytFyifW6AF61hdT2ucrYhPq9hLs5JIryeupHV3qGk95dH9ow=="
+    },
     "node_modules/@typescript-eslint/eslint-plugin": {
       "version": "6.7.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.7.0.tgz",
@@ -1122,6 +1170,89 @@
         "@vue/language-core": "1.8.8"
       }
     },
+    "node_modules/@vueuse/core": {
+      "version": "10.6.1",
+      "resolved": "https://registry.npmjs.org/@vueuse/core/-/core-10.6.1.tgz",
+      "integrity": "sha512-Pc26IJbqgC9VG1u6VY/xrXXfxD33hnvxBnKrLlA2LJlyHII+BSrRoTPJgGYq7qZOu61itITFUnm6QbacwZ4H8Q==",
+      "dependencies": {
+        "@types/web-bluetooth": "^0.0.20",
+        "@vueuse/metadata": "10.6.1",
+        "@vueuse/shared": "10.6.1",
+        "vue-demi": ">=0.14.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      }
+    },
+    "node_modules/@vueuse/core/node_modules/vue-demi": {
+      "version": "0.14.6",
+      "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.6.tgz",
+      "integrity": "sha512-8QA7wrYSHKaYgUxDA5ZC24w+eHm3sYCbp0EzcDwKqN3p6HqtTCGR/GVsPyZW92unff4UlcSh++lmqDWN3ZIq4w==",
+      "hasInstallScript": true,
+      "bin": {
+        "vue-demi-fix": "bin/vue-demi-fix.js",
+        "vue-demi-switch": "bin/vue-demi-switch.js"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      },
+      "peerDependencies": {
+        "@vue/composition-api": "^1.0.0-rc.1",
+        "vue": "^3.0.0-0 || ^2.6.0"
+      },
+      "peerDependenciesMeta": {
+        "@vue/composition-api": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@vueuse/metadata": {
+      "version": "10.6.1",
+      "resolved": "https://registry.npmjs.org/@vueuse/metadata/-/metadata-10.6.1.tgz",
+      "integrity": "sha512-qhdwPI65Bgcj23e5lpGfQsxcy0bMjCAsUGoXkJ7DsoeDUdasbZ2DBa4dinFCOER3lF4gwUv+UD2AlA11zdzMFw==",
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      }
+    },
+    "node_modules/@vueuse/shared": {
+      "version": "10.6.1",
+      "resolved": "https://registry.npmjs.org/@vueuse/shared/-/shared-10.6.1.tgz",
+      "integrity": "sha512-TECVDTIedFlL0NUfHWncf3zF9Gc4VfdxfQc8JFwoVZQmxpONhLxFrlm0eHQeidHj4rdTPL3KXJa0TZCk1wnc5Q==",
+      "dependencies": {
+        "vue-demi": ">=0.14.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      }
+    },
+    "node_modules/@vueuse/shared/node_modules/vue-demi": {
+      "version": "0.14.6",
+      "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.6.tgz",
+      "integrity": "sha512-8QA7wrYSHKaYgUxDA5ZC24w+eHm3sYCbp0EzcDwKqN3p6HqtTCGR/GVsPyZW92unff4UlcSh++lmqDWN3ZIq4w==",
+      "hasInstallScript": true,
+      "bin": {
+        "vue-demi-fix": "bin/vue-demi-fix.js",
+        "vue-demi-switch": "bin/vue-demi-switch.js"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      },
+      "peerDependencies": {
+        "@vue/composition-api": "^1.0.0-rc.1",
+        "vue": "^3.0.0-0 || ^2.6.0"
+      },
+      "peerDependenciesMeta": {
+        "@vue/composition-api": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@webassemblyjs/ast": {
       "version": "1.11.6",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.6.tgz",
@@ -3525,6 +3656,25 @@
         "eslint": ">=6.0.0"
       }
     },
+    "node_modules/vue-i18n": {
+      "version": "9.4.1",
+      "resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-9.4.1.tgz",
+      "integrity": "sha512-vnQyYE9LBuNOqPpETIcCaGnAyLEqfeIvDcyZ9T+WBCWFTqWw1J8FuF1jfeDwpHBi5JKgAwgXyq1mt8jp/x/GPA==",
+      "dependencies": {
+        "@intlify/core-base": "9.4.1",
+        "@intlify/shared": "9.4.1",
+        "@vue/devtools-api": "^6.5.0"
+      },
+      "engines": {
+        "node": ">= 16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/kazupon"
+      },
+      "peerDependencies": {
+        "vue": "^3.0.0"
+      }
+    },
     "node_modules/vue-router": {
       "version": "4.2.4",
       "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.2.4.tgz",
diff --git a/frontend/package.json b/frontend/package.json
index 12358ed..e6cd731 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -16,11 +16,13 @@
     "@fullcalendar/interaction": "^6.1.9",
     "@fullcalendar/timegrid": "^6.1.9",
     "@fullcalendar/vue3": "^6.1.9",
+    "@vueuse/core": "^10.6.1",
     "pinia": "^2.1.6",
     "primeflex": "^3.3.1",
     "primeicons": "^6.0.1",
     "primevue": "^3.32.2",
     "vue": "^3.3.4",
+    "vue-i18n": "^9.4.1",
     "vue-router": "^4.2.4"
   },
   "devDependencies": {
diff --git a/frontend/public/htwk.svg b/frontend/public/htwk.svg
new file mode 100644
index 0000000..cef9566
--- /dev/null
+++ b/frontend/public/htwk.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with PhotoLine 24.00 (www.pl32.de) -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="627" height="666" viewBox="0 0 627 666" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+  <rect id="Quadrat/Rechteck" transform="matrix(0.82674 -0.3298 1.134154 2.843093 -772.813049 -1590.353027)" fill="#ffff33" fill-rule="evenodd" x="36.99" y="627.42" width="192.87" height="192.87"/>
+  <rect id="Quadrat/Rechteck" transform="matrix(0.832138 -0.331953 1.134154 2.843093 -414.361572 -1608.206054)" fill="#ffff33" fill-rule="evenodd" x="36.99" y="627.42" width="192.87" height="192.87"/>
+</svg>
diff --git a/frontend/public/htwkalender.svg b/frontend/public/htwkalender.svg
new file mode 100644
index 0000000..e0c98e5
--- /dev/null
+++ b/frontend/public/htwkalender.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with PhotoLine 24.00 (www.pl32.de) -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="627" height="666" viewBox="0 0 627 666" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+  <rect id="Quadrat/Rechteck" transform="matrix(0.82674 -0.3298 1.134154 2.843093 -772.813049 -1540.146606)" fill="#ffff33" fill-rule="evenodd" x="36.99" y="627.42" width="192.87" height="192.87"/>
+  <rect id="Quadrat/Rechteck" transform="matrix(0.832138 -0.331953 1.134154 2.843093 -414.361572 -1557.999633)" fill="#ffff33" fill-rule="evenodd" x="36.99" y="627.42" width="192.87" height="192.87"/>
+  <g transform="matrix(0.769891 0 0 0.796361 -74.37635 -60.710224)">
+    <g id="Quadrat/Rechteck" transform="matrix(0.846958 0 0 0.693289 108.563324 93.212982)">
+      <rect transform="matrix(1.180696 0 0 1.442401 -128.180328 -134.450469)" stroke-width="28.4" stroke-miterlimit="10" fill="none" stroke="#000000" x="211.8" y="293.02" width="583.17" height="7.42"/>
+    </g>
+    <g id="Quadrat/Rechteck" transform="matrix(0.670841 0 0 0.793259 190.662277 204.505432)">
+      <rect transform="matrix(1.490665 0 0 1.260623 -284.213623 -257.804199)" stroke-width="28.4" stroke-miterlimit="10" fill="none" stroke="#000000" x="272.43" y="433.13" width="461.91" height="8.5"/>
+    </g>
+    <g id="Quadrat/Rechteck" transform="matrix(0.670841 0 0 0.793259 190.662277 300.184906)">
+      <rect transform="matrix(1.490665 0 0 1.260623 -284.213623 -378.419952)" stroke-width="28.4" stroke-miterlimit="10" fill="none" stroke="#000000" x="272.43" y="528.81" width="461.91" height="8.5"/>
+    </g>
+    <g id="Quadrat/Rechteck" transform="matrix(0.670841 0 0 0.793259 190.662277 395.864471)">
+      <rect transform="matrix(1.490665 0 0 1.260623 -284.213623 -499.035797)" stroke-width="28.4" stroke-miterlimit="10" fill="none" stroke="#000000" x="272.43" y="624.49" width="461.91" height="8.5"/>
+    </g>
+    <g id="Quadrat/Rechteck" transform="matrix(0.670841 0 0 0.793259 190.662277 491.543914)">
+      <rect transform="matrix(1.490665 0 0 1.260623 -284.213623 -619.651489)" stroke-width="28.4" stroke-miterlimit="10" fill="none" stroke="#000000" x="272.43" y="720.17" width="461.91" height="8.5"/>
+    </g>
+    <g id="abgerundetes Quadrat/Rechteck" transform="matrix(1.077601 0 0 1.050273 104.781829 -69.038833)">
+      <path transform="matrix(0.927987 0 0 0.952133 -97.236175 65.734169)" stroke-width="27.4" stroke-miterlimit="10" fill="none" stroke="#000000" d="M246.55 215.13 L762.01 215.13 C788.73 215.13 810.44 236.84 810.44 263.56 L810.44 772.09 C810.44 798.82 788.73 820.52 762.01 820.52 L246.55 820.52 C219.82 820.52 198.11 798.82 198.11 772.09 L198.11 263.56 C198.11 236.84 219.82 215.13 246.55 215.13 Z"/>
+    </g>
+    <path id="abgerundetes Quadrat/Rechteck 2" transform="matrix(1.713032 0 0 1.426116 -265.726959 -85.444915)" fill-rule="evenodd" d="M333.56 164.1 L333.56 164.1 C341.55 164.1 348.05 171.91 348.05 181.51 L348.05 225.45 C348.05 235.05 341.55 242.85 333.56 242.85 L333.56 242.85 C325.56 242.85 319.07 235.05 319.07 225.45 L319.07 181.51 C319.07 171.91 325.56 164.1 333.56 164.1 Z"/>
+    <path id="abgerundetes Quadrat/Rechteck 2" transform="matrix(1.713032 0 0 1.426116 138.124114 -85.444915)" fill-rule="evenodd" d="M333.56 164.1 L333.56 164.1 C341.55 164.1 348.05 171.91 348.05 181.51 L348.05 225.45 C348.05 235.05 341.55 242.85 333.56 242.85 L333.56 242.85 C325.56 242.85 319.07 235.05 319.07 225.45 L319.07 181.51 C319.07 171.91 325.56 164.1 333.56 164.1 Z"/>
+    <path id="abgerundetes Quadrat/Rechteck 2" transform="matrix(1.713032 0 0 1.426116 -265.726959 -85.444915)" fill-rule="evenodd" d="M333.56 164.1 L333.56 164.1 C341.55 164.1 348.05 171.91 348.05 181.51 L348.05 225.45 C348.05 235.05 341.55 242.85 333.56 242.85 L333.56 242.85 C325.56 242.85 319.07 235.05 319.07 225.45 L319.07 181.51 C319.07 171.91 325.56 164.1 333.56 164.1 Z"/>
+  </g>
+</svg>
diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index 1b80337..918cd48 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -1,10 +1,12 @@
 <script lang="ts" setup>
 import MenuBar from "./components/MenuBar.vue";
+import { RouterView } from "vue-router";
 </script>
 
 <template>
-  <MenuBar />
-  <router-view></router-view>
+<MenuBar />
+<RouterView />
+
 </template>
 
 <style scoped></style>
diff --git a/frontend/src/api/fetchCourse.ts b/frontend/src/api/fetchCourse.ts
index 00974e4..b1e164b 100644
--- a/frontend/src/api/fetchCourse.ts
+++ b/frontend/src/api/fetchCourse.ts
@@ -6,7 +6,13 @@ export async function fetchCourse(): Promise<string[]> {
   const courses: string[] = [];
   await fetch("/api/courses")
     .then((response) => {
-      return response.json();
+      //check if response type is json
+      const contentType = response.headers.get("content-type");
+      if (contentType && contentType.indexOf("application/json") !== -1) {
+        return response.json();
+      } else {
+        return [];
+      }
     })
     .then((coursesResponse) => {
       coursesResponse.forEach((course: string) => courses.push(course));
diff --git a/frontend/src/components/CalendarLink.vue b/frontend/src/components/CalendarLink.vue
index bff49e1..a8a7a40 100644
--- a/frontend/src/components/CalendarLink.vue
+++ b/frontend/src/components/CalendarLink.vue
@@ -3,6 +3,9 @@ import tokenStore from "../store/tokenStore.ts";
 import { useToast } from "primevue/usetoast";
 import { onMounted } from "vue";
 import router from "../router";
+import { useI18n } from "vue-i18n";
+const { t } = useI18n({ useScope: 'global' })
+
 const toast = useToast();
 
 const domain = window.location.hostname;
@@ -12,8 +15,8 @@ const getLink = () => "https://" + domain + "/api/feed?token=" + tokenStore().to
 const show = () => {
   toast.add({
     severity: "info",
-    summary: "Info",
-    detail: "Link copied to clipboard",
+    summary: t('calendarLink.copyToastSummary'),
+    detail: t('calendarLink.copyToastNotification'),
     life: 3000,
   });
 };
@@ -36,8 +39,8 @@ function copyToClipboard() {
       console.error("Could not copy text: ", err);
       toast.add({
         severity: "error",
-        summary: "Error",
-        detail: "Could not copy text",
+        summary: t('calendarLink.copyToastError'),
+        detail: t('calendarLink.copyToastErrorDetail'),
         life: 3000,
       });
     },
@@ -54,17 +57,17 @@ const forwardToMicrosoft = () => {
 
 const actions = [
   {
-    label: "Copy to Clipboard",
+    label: t('calendarLink.copyToClipboard'),
     icon: "pi pi-copy",
     command: copyToClipboard,
   },
   {
-    label: "To Google Calendar",
+    label: t('calendarLink.toGoogleCalendar'),
     icon: "pi pi-google",
     command: forwardToGoogle,
   },
   {
-    label: "To Microsoft Calendar",
+    label: t('calendarLink.toMicrosoftCalendar'),
     icon: "pi pi-microsoft",
     command: forwardToMicrosoft,
   },
diff --git a/frontend/src/components/CourseSelection.vue b/frontend/src/components/CourseSelection.vue
index d2c1b15..b90e702 100644
--- a/frontend/src/components/CourseSelection.vue
+++ b/frontend/src/components/CourseSelection.vue
@@ -1,11 +1,13 @@
 <script lang="ts" setup>
-import { Ref, ref } from "vue";
+import { computed, ComputedRef, Ref, ref, watch } from "vue";
 import {
   fetchCourse,
   fetchModulesByCourseAndSemester,
 } from "../api/fetchCourse";
 import ModuleSelection from "./ModuleSelection.vue";
 import { Module } from "../model/module.ts";
+import { useI18n } from "vue-i18n";
+const { t } = useI18n({ useScope: "global" });
 
 const courses = async () => {
   return await fetchCourse();
@@ -13,15 +15,22 @@ const courses = async () => {
 
 const selectedCourse: Ref<{ name: string }> = ref({ name: "" });
 const countries: Ref<{ name: string }[]> = ref([]);
-const semesters: Ref<{ name: string; value: string }[]> = ref([
-  { name: "Wintersemester", value: "ws" },
-  { name: "Sommersemester", value: "ss" },
-]);
+const semesters: ComputedRef<{ name: string; value: string }[]> = computed(
+  () => [
+    { name: t("courseSelection.winterSemester"), value: "ws" },
+    { name: t("courseSelection.summerSemester"), value: "ss" },
+  ],
+);
 
 const selectedSemester: Ref<{ name: string; value: string }> = ref(
   semesters.value[0],
 );
 
+//if semesters get changed, refresh the selected semester ref with a watcher
+watch(semesters,(newValue: { name: string; value: string }[]) =>
+    (selectedSemester.value = newValue[selectedSemester.value.value === "ws" ? 0 : 1]),
+);
+
 courses().then(
   (data) =>
     (countries.value = data.map((course) => {
@@ -43,7 +52,7 @@ async function getModules() {
   <div class="flex flex-column">
     <div class="flex align-items-center justify-content-center h-4rem m-2">
       <h3 class="text-4xl">
-        Welcome to HTWKalender
+        {{$t("courseSelection.headline")}}
         <i
           class="pi pi-calendar vertical-align-baseline"
           style="font-size: 2rem"
@@ -53,7 +62,7 @@ async function getModules() {
     <div
       class="flex align-items-center justify-content-center h-4rem border-round m-2"
     >
-      <h5 class="text-2xl">Please select a course</h5>
+      <h5 class="text-2xl">{{ $t("courseSelection.subTitle") }}</h5>
     </div>
     <div
       class="flex align-items-center justify-content-center border-round m-2"
@@ -64,7 +73,8 @@ async function getModules() {
         class="w-full md:w-25rem mx-2"
         filter
         option-label="name"
-        placeholder="Select a Course"
+        :placeholder="$t('courseSelection.courseDropDown')"
+        :empty-message="$t('courseSelection.noCoursesAvailable')"
         @change="getModules()"
         :autoFilterFocus="true"
       ></Dropdown>
@@ -73,7 +83,7 @@ async function getModules() {
         :options="semesters"
         class="w-full md:w-25rem mx-2"
         option-label="name"
-        placeholder="Select a Semester"
+        :placeholder="$t('courseSelection.semesterDropDown')"
         @change="getModules()"
       ></Dropdown>
     </div>
@@ -88,4 +98,4 @@ async function getModules() {
       </div>
     </div>
   </div>
-</template>
+</template>
\ No newline at end of file
diff --git a/frontend/src/components/LocaleSwitcher.vue b/frontend/src/components/LocaleSwitcher.vue
new file mode 100644
index 0000000..ccc6a62
--- /dev/null
+++ b/frontend/src/components/LocaleSwitcher.vue
@@ -0,0 +1,49 @@
+<script lang="ts" setup>
+import { computed } from "vue";
+import localeStore from "../store/localeStore.ts";
+import { useI18n } from "vue-i18n";
+const { t } = useI18n({ useScope: 'global' })
+
+const countries = computed(() => [
+  { name: t('english'), code: "en", icon: "🇬🇧" },
+  { name: t('german'), code: "de", icon: "🇩🇪" },
+]);
+
+function displayIcon(code: string) {
+  return countries.value.find((country) => country.code === code)?.icon;
+}
+
+function displayCountry(code: string) {
+  return countries.value.find((country) => country.code === code)?.name;
+}
+
+function updateLocale(locale: string) {
+  localeStore().setLocale(locale);
+}
+</script>
+<template>
+  <Dropdown
+    :options="$i18n.availableLocales"
+    v-model="$i18n.locale"
+    @change="updateLocale($event.data)"
+    option-label="name"
+    placeholder="Select a Language"
+    class="w-full md:w-14rem"
+  >
+    <template #value="slotProps">
+      <div v-if="slotProps.value" class="flex align-items-center">
+        <div class="mr-2 flag">{{ displayIcon(slotProps.value) }}</div>
+        <div>{{ displayCountry(slotProps.value) }}</div>
+      </div>
+      <span v-else>
+        {{ slotProps.placeholder }}
+      </span>
+    </template>
+    <template #option="slotProps">
+      <div class="flex align-items-center">
+        <div class="mr-2 flag">{{ displayIcon(slotProps.option) }}</div>
+        <div>{{ displayCountry(slotProps.option) }}</div>
+      </div>
+    </template>
+  </Dropdown>
+</template>
diff --git a/frontend/src/components/MenuBar.vue b/frontend/src/components/MenuBar.vue
index a3b0ec7..c2a4827 100644
--- a/frontend/src/components/MenuBar.vue
+++ b/frontend/src/components/MenuBar.vue
@@ -1,43 +1,63 @@
 <script lang="ts" setup>
-import { ref } from "vue";
+import { computed } from "vue";
+import { useI18n } from "vue-i18n";
+import LocaleSwitcher from "./LocaleSwitcher.vue";
+const { t } = useI18n({ useScope: 'global' })
 
-const items = ref([
+const items = computed(() => [
   {
-    label: "Create Calendar",
+    label: t("createCalendar"),
     icon: "pi pi-fw pi-plus",
-    url: "/",
+    route: "/",
   },
   {
-    label: "Edit Calendar",
+    label: t("editCalendar"),
     icon: "pi pi-fw pi-pencil",
-    url: "/edit",
+    route: "/edit",
   },
   {
-    label: "Check Room Availability",
+    label: t("roomFinder"),
     icon: "pi pi-fw pi-calendar",
-    url: "/rooms",
+    route: `rooms`,
   },
   {
-    label: "FAQ",
+    label: t("faq"),
     icon: "pi pi-fw pi-book",
-    url: "/faq",
+    route: `faq`,
   },
   {
-    label: "Imprint",
+    label: t("imprint"),
     icon: "pi pi-fw pi-id-card",
-    url: "/imprint",
+    route: `imprint`,
   },
   {
-    label: "Privacy",
-    url: "/privacy-policy",
+    label: t("privacy"),
     icon: "pi pi-fw pi-exclamation-triangle",
+    route: `privacy-policy`,
   },
 ]);
+
 </script>
 
 <template>
-  <Menubar :model="items" class="menubar justify-content-center">
-    <template #start></template>
+  <Menubar :model="items" class="menubar justify-content-between">
+    <template #start class="mr-2">
+        <img
+          width="35" height="40"
+          src="../../public/htwk.svg"
+          alt="Logo"
+          class="h-10 w-10 mr-6"
+          style="margin-left: 1rem"
+        />
+    </template>
+    <template #item="{ item }">
+      <router-link v-slot="{ navigate }" :to="item.route" custom>
+        <Button :label='String(item.label)' :icon="item.icon" severity="secondary" @click="navigate" text />
+      </router-link>
+    </template>
+    <template #end>
+      <LocaleSwitcher></LocaleSwitcher>
+    </template>
   </Menubar>
 </template>
 
@@ -46,4 +66,4 @@ const items = ref([
   background-color: transparent;
   border: none;
 }
-</style>
+</style>
\ No newline at end of file
diff --git a/frontend/src/components/ModuleInformation.vue b/frontend/src/components/ModuleInformation.vue
index e5789c4..a9daf7a 100644
--- a/frontend/src/components/ModuleInformation.vue
+++ b/frontend/src/components/ModuleInformation.vue
@@ -12,13 +12,13 @@ const module = dialogRef.value.data.module as Module;
     <h2>{{ module.name }}</h2>
     <table>
       <tr>
-        <td>Course: {{ module.course }}</td>
+        <td>{{$t('moduleInformation.course')}}: {{ module.course }}</td>
       </tr>
       <tr>
-        <td>Person: {{ module.prof }}</td>
+        <td>{{$t('moduleInformation.person')}}: {{ module.prof }}</td>
       </tr>
       <tr>
-        <td>Semester: {{ module.semester }}</td>
+        <td>{{$t('moduleInformation.semester')}}: {{ module.semester }}</td>
       </tr>
       <tr>
         <td>
diff --git a/frontend/src/components/ModuleSelection.vue b/frontend/src/components/ModuleSelection.vue
index b7981b5..1a510a1 100644
--- a/frontend/src/components/ModuleSelection.vue
+++ b/frontend/src/components/ModuleSelection.vue
@@ -64,7 +64,7 @@ function nextStep() {
         :disabled="selectedModules.length < 1"
         class="col-4 justify-content-center"
         @click="nextStep()"
-        >Next Step
+        >{{ $t("moduleSelection.nextStep") }}
       </Button>
     </div>
     <div class="flex align-items-center justify-content-center">
@@ -72,16 +72,16 @@ function nextStep() {
         <template #header>
           <div class="flex justify-content-between flex-wrap">
             <div class="flex align-items-center justify-content-center">
-              <h3>Modules - {{ selectedModules.length }}</h3>
+              <h3>{{$t('moduleSelection.modules')}} - {{ selectedModules.length }}</h3>
             </div>
             <div class="flex align-items-center justify-content-center">
               <ToggleButton
                 v-model="allSelected"
                 class="w-12rem"
                 off-icon="pi pi-times"
-                off-label="Unselect All"
+                :off-label="$t('moduleSelection.deselectAll')"
                 on-icon="pi pi-check"
-                on-label="Select All"
+                :on-label="$t('moduleSelection.selectAll')"
                 @click="selectAllModules(!allSelected)"
               />
             </div>
@@ -89,7 +89,7 @@ function nextStep() {
         </template>
         <template #empty>
           <p class="p-4 text-2xl font-bold text-900 empty-message">
-            No Modules found for this course
+            {{$t("moduleSelection.noModulesAvailable")}}
           </p>
         </template>
         <template #list="slotProps">
@@ -112,9 +112,9 @@ function nextStep() {
                     v-model="modulesWithSelection[slotProps.index].selected"
                     class="w-9rem"
                     off-icon="pi pi-times"
-                    off-label="Unselected"
+                    :off-label="$t('moduleSelection.unselected')"
                     on-icon="pi pi-check"
-                    on-label="Selected"
+                    :on-label="$t('moduleSelection.selected')"
                   />
                 </div>
               </div>
@@ -132,4 +132,4 @@ function nextStep() {
     width: 50rem;
   }
 }
-</style>
+</style>
\ No newline at end of file
diff --git a/frontend/src/components/ModuleTemplateDialog.vue b/frontend/src/components/ModuleTemplateDialog.vue
index e583492..b03e7da 100644
--- a/frontend/src/components/ModuleTemplateDialog.vue
+++ b/frontend/src/components/ModuleTemplateDialog.vue
@@ -1,18 +1,22 @@
 <script setup lang="ts">
-import { Ref, ref } from "vue";
+import { computed, Ref, ref } from "vue";
+import { useI18n } from "vue-i18n";
+const { t } = useI18n({ useScope: 'global' })
 
 const helpVisible: Ref<boolean> = ref(false);
 
-const placeholders = ref([
+const placeholders = computed(() => [
   {
     placeholder: "%t",
-    description: "Event Type",
-    examples: "V = Vorlesung, S = Seminar, P = Praktikum/Prüfung",
+    description: t('moduleTemplateDialog.eventTyp'),
+    examples: "V = "+t('moduleTemplateDialog.lecture')+
+      ", S = "+t('moduleTemplateDialog.seminar')+
+      ", P = "+t('moduleTemplateDialog.exam'),
   },
   {
     placeholder: "%p",
-    description: "Mandatory",
-    examples: "w = optional, p = mandatory",
+    description: t('moduleTemplateDialog.mandatory'),
+    examples: "w = "+t('moduleTemplateDialog.optional')+", p = "+t('moduleTemplateDialog.mandatory'),
   },
 ]);
 </script>
@@ -28,20 +32,18 @@ const placeholders = ref([
     aria-label="Help"
     @click="helpVisible = true"
   />
-  <Dialog v-model:visible="helpVisible" header="Module configuration">
+  <Dialog v-model:visible="helpVisible" :header="$t('moduleTemplateDialog.moduleConfiguration')">
     <p>
-      Here you can rename your modules to your liking. This will be the name of
-      the event in your calendar.
+      {{ t('moduleTemplateDialog.explanationOne')}}
     </p>
-    <p>You can use the following placeholders in your module names:</p>
+    <p>{{ t('moduleTemplateDialog.tableDescription')}}</p>
     <DataTable :value="placeholders">
-      <Column field="placeholder" header="Placeholder"></Column>
-      <Column field="description" header="Description"></Column>
-      <Column field="examples" header="Examples"></Column>
+      <Column field="placeholder" :header="$t('moduleTemplateDialog.placeholder')"></Column>
+      <Column field="description" :header="$t('moduleTemplateDialog.description')"></Column>
+      <Column field="examples" :header="$t('moduleTemplateDialog.examples')"></Column>
     </DataTable>
     <p>
-      Additionally, you can toggle notifications for each module. If you do so,
-      you will be notified 15 minutes before the event starts.
+      {{ t('moduleTemplateDialog.explanationTwo')}}
     </p>
   </Dialog>
 </template>
diff --git a/frontend/src/components/RenameModules.vue b/frontend/src/components/RenameModules.vue
index 8a6e620..6f7d7a1 100644
--- a/frontend/src/components/RenameModules.vue
+++ b/frontend/src/components/RenameModules.vue
@@ -3,9 +3,12 @@ import moduleStore from "../store/moduleStore.ts";
 import { createIndividualFeed } from "../api/createFeed.ts";
 import router from "../router";
 import tokenStore from "../store/tokenStore.ts";
-import { ref } from "vue";
+import { computed, ref } from "vue";
 import ModuleTemplateDialog from "./ModuleTemplateDialog.vue";
 import { onlyWhitespace } from "../helpers/strings.ts";
+import { useI18n } from "vue-i18n";
+const { t } = useI18n({ useScope: 'global' })
+
 
 const tableData = ref(
   moduleStore().modules.map((module) => {
@@ -16,10 +19,10 @@ const tableData = ref(
   }),
 );
 
-const columns = ref([
-  { field: "Course", header: "Course" },
-  { field: "Module", header: "Module" },
-  { field: "Reminder", header: "Reminder" },
+const columns = computed(() => [
+  { field: "Course", header: t('moduleInformation.course') },
+  { field: "Module", header: t('moduleInformation.module') },
+  { field: "Reminder", header: t('renameModules.reminder') },
 ]);
 
 async function finalStep() {
@@ -32,7 +35,7 @@ async function finalStep() {
 <template>
   <div class="flex flex-column">
     <div class="flex align-items-center justify-content-center h-4rem m-2">
-      <h3>Configure your selected Modules to your liking.</h3>
+      <h3>{{$t('renameModules.subTitle')}}</h3>
       <ModuleTemplateDialog />
     </div>
     <div class="card flex align-items-center justify-content-center m-2">
@@ -44,7 +47,7 @@ async function finalStep() {
       >
         <template #header>
           <div class="flex align-items-center justify-content-end">
-            Enable all notifications:
+            {{$t('renameModules.enableAllNotifications')}}
             <InputSwitch
               class="mx-4"
               :model-value="
@@ -99,10 +102,6 @@ async function finalStep() {
               />
             </template>
             <template v-else-if="field === 'Reminder'">
-              <!--<InputSwitch 
-                v-model="data.Module.reminder" 
-                class="align-self-center"
-              />-->
               <Button
                 :icon="data.Module.reminder ? 'pi pi-bell' : 'pi pi-times'"
                 :severity="data.Module.reminder ? 'warning' : 'secondary'"
@@ -121,7 +120,7 @@ async function finalStep() {
     </div>
 
     <div class="flex align-items-center justify-content-center h-4rem m-2">
-      <Button @click="finalStep()">Next Step</Button>
+      <Button @click="finalStep()">{{$t('renameModules.nextStep')}}</Button>
     </div>
   </div>
 </template>
diff --git a/frontend/src/components/RoomOccupation.vue b/frontend/src/components/RoomOccupation.vue
index 883233a..c88b0dd 100644
--- a/frontend/src/components/RoomOccupation.vue
+++ b/frontend/src/components/RoomOccupation.vue
@@ -3,9 +3,11 @@ import FullCalendar from "@fullcalendar/vue3";
 import dayGridPlugin from "@fullcalendar/daygrid";
 import interactionPlugin from "@fullcalendar/interaction";
 import timeGridPlugin from "@fullcalendar/timegrid";
-import { computed, ref, Ref, watch } from "vue";
+import { computed, ComputedRef, ref, Ref, watch } from "vue";
 import { CalendarOptions, EventInput } from "@fullcalendar/core";
 import { fetchEventsByRoomAndDuration } from "../api/fetchRoom.ts";
+import { useI18n } from "vue-i18n";
+const { t } = useI18n({ useScope: 'global' })
 
 const props = defineProps({
   room: {
@@ -53,7 +55,14 @@ async function getOccupation() {
   calendar?.refetchEvents();
 }
 
-const calendarOptions: CalendarOptions = {
+import allLocales from "@fullcalendar/core/locales-all";
+
+
+const calendarOptions: ComputedRef<CalendarOptions> = computed(() =>
+  {
+    return {
+  locales: allLocales,
+  locale: t('languageCode'),
   plugins: [dayGridPlugin, interactionPlugin, timeGridPlugin],
   initialView: "week",
   dayHeaderFormat: { weekday: "short", omitCommas: true },
@@ -65,6 +74,7 @@ const calendarOptions: CalendarOptions = {
   },
   views: {
     week: {
+      description: "Wochenansicht",
       type: "timeGrid",
       slotLabelFormat: {
         hour: "numeric",
@@ -77,7 +87,6 @@ const calendarOptions: CalendarOptions = {
       titleFormat: { month: "short", day: "numeric" },
       slotMinTime: "06:00:00",
       slotMaxTime: "22:00:00",
-
       duration: { days: 7 },
       firstDay: 1,
       allDaySlot: false,
@@ -106,7 +115,7 @@ const calendarOptions: CalendarOptions = {
     start: "week,Day",
   },
 
-  datesSet: function (dateInfo) {
+  datesSet: function (dateInfo: any) {
     const view = dateInfo.view;
     const offset = new Date().getTimezoneOffset();
     const startDate = new Date(view.activeStart.getTime() - offset * 60 * 1000);
@@ -115,7 +124,7 @@ const calendarOptions: CalendarOptions = {
     currentDateTo.value = endDate.toISOString().split("T")[0];
     getOccupation();
   },
-  events: function (_info, successCallback, failureCallback) {
+  events: function (_info: any, successCallback: any, failureCallback: any) {
     if (occupations.value.length === 0) {
       failureCallback(new Error("no events"));
     } else {
@@ -130,8 +139,8 @@ const calendarOptions: CalendarOptions = {
       );
     }
   },
-};
+}})
 </script>
 <template>
-  <FullCalendar ref="fullCalendar" :options="calendarOptions" />
+  <FullCalendar ref="fullCalendar" :options="calendarOptions"/>
 </template>
diff --git a/frontend/src/i18n/index.ts b/frontend/src/i18n/index.ts
new file mode 100644
index 0000000..747e9f4
--- /dev/null
+++ b/frontend/src/i18n/index.ts
@@ -0,0 +1,46 @@
+import { createI18n } from "vue-i18n";
+import en from './translations/en.json'
+import de from './translations/de.json'
+import localeStore from "../store/localeStore.ts";
+
+export const supportedLocales= {
+  'en': { name: 'English'},
+  'de': { name: 'Deutsch'},
+}
+// Private instance of VueI18n object
+let _i18n: any
+// Initializer
+function setup() {
+  _i18n = createI18n({
+    legacy: false,
+    locale: localeStore().locale,
+    fallbackLocale: "en",
+    messages: {
+      en,
+      de
+    },
+  })
+  return _i18n
+}
+
+// Sets the active locale.
+function setLocale(newLocale : any) {
+  _i18n.global.locale = newLocale
+  setDocumentAttributesFor(newLocale)
+}
+
+function setDocumentAttributesFor(locale: any) {
+  const htmlElement = document.querySelector('html')
+
+  htmlElement?.setAttribute('lang', locale)
+}
+
+// Public interface
+export default {
+  // Expose the VueI18n instance via a getter
+  get vueI18n() {
+    return _i18n
+  },
+  setup,
+  setLocale,
+}
\ No newline at end of file
diff --git a/frontend/src/i18n/messages.ts b/frontend/src/i18n/messages.ts
new file mode 100644
index 0000000..2f07201
--- /dev/null
+++ b/frontend/src/i18n/messages.ts
@@ -0,0 +1,18 @@
+export default {
+  en : {
+    createCalendar: "Create Calendar",
+    editCalendar: "Edit Calendar",
+    roomFinder: "Room Finder",
+    faq: "FAQ",
+    imprint: "Imprint",
+    privacy: "Privacy Policy",
+  },
+  de : {
+    createCalendar: "Kalender erstellen",
+    editCalendar: "Kalender bearbeiten",
+    roomFinder: "Raumfinder",
+    faq: "FAQ",
+    imprint: "Impressum",
+    privacy: "Datenschutz"
+  }
+}
\ No newline at end of file
diff --git a/frontend/src/i18n/translations/de.json b/frontend/src/i18n/translations/de.json
new file mode 100644
index 0000000..1915cd4
--- /dev/null
+++ b/frontend/src/i18n/translations/de.json
@@ -0,0 +1,84 @@
+{
+  "languageCode": "de",
+  "createCalendar": "Kalender erstellen",
+  "editCalendar": "Kalender bearbeiten",
+  "roomFinder": "Raumfinder",
+  "faq": "FAQ",
+  "imprint": "Impressum",
+  "privacy": "Datenschutz",
+  "english": "Englisch",
+  "german": "Deutsch",
+  "courseSelection": {
+    "headline": "Willkommen beim HTWKalender",
+    "winterSemester": "Wintersemester",
+    "summerSemester": "Sommersemester",
+    "subTitle": "Bitte wähle eine Gruppe und das Semester aus.",
+    "courseDropDown": "Gruppe",
+    "noCoursesAvailable": "Keine Gruppen verfügbar",
+    "semesterDropDown": "Semester"
+  },
+  "roomFinderPage": {
+    "headline": "Raumfinder",
+    "detail": "Bitte wähle einen Raum aus, um die Belegung einzusehen",
+    "dropDownSelect": "Bitte wähle einen Raum aus",
+    "noRoomsAvailable": "Keine Räume verfügbar"
+  },
+  "moduleSelection":{
+    "nextStep": "Weiter",
+    "selectAll": "Alle anwählen",
+    "deselectAll": "Alle abwählen",
+    "selected": "angewählt",
+    "unselected": "abgewählt",
+    "noModulesAvailable": "Keine Module verfügbar",
+    "modules": "Module"
+  },
+  "moduleInformation": {
+    "course": "Kurs",
+    "person": "Dozent",
+    "semester": "Semester",
+    "module": "Modul"
+  },
+  "editCalendarView": {
+    "error": "Fehler",
+    "invalidToken": "Ungültiger Token",
+    "headline": "Bearbeite deinen HTWKalender",
+    "subTitle": "Füge deinen Link oder Token ein um den Kalender zu bearbeiten"
+  },
+  "additionalModules": {
+    "subTitle": "Füge weitere Module hinzu die nicht in deinem Studiengang enthalten sind.",
+    "dropDown": "Wähle weitere Module aus",
+    "dropDownFooterItem": "Module",
+    "dropDownFooterSelected": "ausgewählt",
+    "nextStep": "Weiter"
+  },
+  "renameModules": {
+    "reminder": "Erinnerung",
+    "enableAllNotifications": "Alle Benachrichtigungen aktivieren",
+    "subTitle": "Konfigurieren Sie die ausgewählten Module nach Ihren Wünschen.",
+    "nextStep": "Weiter"
+  },
+  "moduleTemplateDialog":{
+    "explanationOne": "Hier können Module nach Wunsch umbenannt werden. Welche dann als Anzeigename im Kalender dargestellt werden.",
+    "explanationTwo": "Zusätzlich können Sie Benachrichtigungen für jedes Modul einschalten, damit für jeden Termin 15 Minuten vor Beginn einen Erinnerung geschalten wird.",
+    "tableDescription": "Sie können die folgenden Platzhalter in Ihren Modulnamen verwenden:",
+    "placeholder": "Platzhalter",
+    "description": "Beschreibung",
+    "examples": "Beispiele",
+    "moduleConfiguration": "Modulkonfiguration",
+    "mandatory": "Verpflichtend",
+    "optional": "Optional",
+    "lecture": "Vorlesung",
+    "seminar": "Seminar",
+    "exam": "Prüfung/Praktikum",
+    "eventTyp": "Ereignistyp"
+  },
+  "calendarLink": {
+    "copyToastNotification": "Link in Zwischenablage kopiert",
+    "copyToastSummary": "Information",
+    "copyToastError": "Fehler",
+    "copyToastErrorDetail": "Link konnte nicht in Zwischenablage kopiert werden",
+    "copyToClipboard": "Link kopieren",
+    "toGoogleCalendar": "Google Kalender",
+    "toMicrosoftCalendar": "Microsoft Kalender"
+  }
+}
\ No newline at end of file
diff --git a/frontend/src/i18n/translations/en.json b/frontend/src/i18n/translations/en.json
new file mode 100644
index 0000000..5fdd32f
--- /dev/null
+++ b/frontend/src/i18n/translations/en.json
@@ -0,0 +1,84 @@
+{
+  "languageCode": "en",
+  "createCalendar": "create calendar",
+  "editCalendar": "edit calendar",
+  "roomFinder": "room finder",
+  "faq": "faq",
+  "imprint": "imprint",
+  "privacy": "privacy",
+  "english": "English",
+  "german": "German",
+  "courseSelection": {
+    "headline": "Welcome to HTWKalender",
+    "winterSemester": "winter semester",
+    "summerSemester": "summer semester",
+    "subTitle": "Please select a course and semester",
+    "courseDropDown": "Please select a course",
+    "noCoursesAvailable": "No courses listed",
+    "semesterDropDown": "Please select a semester"
+  },
+  "roomFinderPage": {
+    "headline": "room finder",
+    "detail": "Please select a room to view the occupancy",
+    "dropDownSelect": "Please select a room",
+    "noRoomsAvailable": "No rooms listed"
+  },
+  "moduleSelection":{
+    "nextStep": "next step",
+    "selectAll": "select all",
+    "deselectAll": "deselect all",
+    "selected": "selected",
+    "unselected": "unselected",
+    "noModulesAvailable": "no modules available",
+    "modules": "modules"
+  },
+  "moduleInformation": {
+    "course": "course",
+    "person": "lecturer",
+    "semester": "semester",
+    "module": "module"
+  },
+  "editCalendarView": {
+    "error": "error",
+    "invalidToken": "invalid token",
+    "headline": "edit your HTWKalender",
+    "subTitle": "please enter your link or calendar token"
+  },
+  "additionalModules": {
+    "subTitle": "Select additional Modules that are not listed in the regular semester for your Course",
+    "dropDown": "Select additional modules",
+    "dropDownFooterItem": "modules",
+    "dropDownFooterSelected": "selected",
+    "nextStep": "next step"
+  },
+  "renameModules": {
+    "reminder": "reminder",
+    "enableAllNotifications": "enable all notifications",
+    "subTitle": "Configure your selected Modules to your liking.",
+    "nextStep": "next step"
+  },
+  "moduleTemplateDialog":{
+    "explanationOne": "Here you can rename your modules to your liking. This will be the name of the event in your calendar.",
+    "explanationTwo": "Additionally, you can toggle notifications for each module. If you do so, you will be notified 15 minutes before the event starts.",
+    "tableDescription": "You can use the following placeholders in your module names:",
+    "placeholder": "placeholder",
+    "description": "description",
+    "examples": "examples",
+    "moduleConfiguration": "module configuration",
+    "mandatory": "mandatory",
+    "optional": "optional",
+    "lecture": "lecture",
+    "seminar": "seminar",
+    "exam": "exam/internship project",
+    "eventTyp": "event type"
+  },
+  "calendarLink": {
+    "copyToastNotification": "Link copied to clipboard",
+    "copyToastSummary": "information",
+    "copyToastError": "error",
+    "copyToastErrorDetail": "could not copy link to clipboard",
+    "copyToClipboard": "copy to clipboard",
+    "toGoogleCalendar": "to Google Calendar",
+    "toMicrosoftCalendar": "to Microsoft Calendar"
+  }
+}
\ No newline at end of file
diff --git a/frontend/src/main.ts b/frontend/src/main.ts
index 1633c97..3c4bc9b 100644
--- a/frontend/src/main.ts
+++ b/frontend/src/main.ts
@@ -30,6 +30,7 @@ import Column from "primevue/column";
 import DynamicDialog from "primevue/dynamicdialog";
 import DialogService from "primevue/dialogservice";
 import ProgressSpinner from "primevue/progressspinner";
+import i18n from "./i18n";
 
 const app = createApp(App);
 const pinia = createPinia();
@@ -39,6 +40,8 @@ app.use(router);
 app.use(ToastService);
 app.use(pinia);
 app.use(DialogService);
+i18n.setup();
+app.use(i18n.vueI18n);
 app.component("Button", Button);
 app.component("Menu", Menu);
 app.component("Menubar", Menubar);
diff --git a/frontend/src/router/index.ts b/frontend/src/router/index.ts
index 95c4864..4b303cc 100644
--- a/frontend/src/router/index.ts
+++ b/frontend/src/router/index.ts
@@ -1,79 +1,86 @@
 import { createRouter, createWebHistory } from "vue-router";
 import Faq from "../components/FaqPage.vue";
-import CourseSelection from "../components/CourseSelection.vue";
-import AdditionalModules from "../components/AdditionalModules.vue";
+import AdditionalModules from "../view/AdditionalModules.vue";
 import CalendarLink from "../components/CalendarLink.vue";
-import Imprint from "../components/ImprintPage.vue";
-import PrivacyPolicy from "../components/PrivacyPolicy.vue";
+import Imprint from "../view/ImprintPage.vue";
+import PrivacyPolicy from "../view/PrivacyPolicy.vue";
 import RenameModules from "../components/RenameModules.vue";
-import RoomFinder from "../components/RoomFinder.vue";
-import EditCalendarView from "../view/editCalendarView.vue";
+import RoomFinder from "../view/RoomFinder.vue";
+import EditCalendarView from "../view/EditCalendarView.vue";
 import EditAdditionalModules from "../components/editCalendar/EditAdditionalModules.vue";
 import EditModules from "../components/editCalendar/EditModules.vue";
+import CourseSelection from "../components/CourseSelection.vue";
+import i18n from "../i18n";
 
 const router = createRouter({
   history: createWebHistory(import.meta.env.BASE_URL),
   routes: [
-    {
-      path: "/",
-      name: "course-selection",
-      component: CourseSelection,
-    },
-    {
-      path: "/rooms",
-      name: "room-finder",
-      component: RoomFinder,
-    },
-    {
-      path: "/faq",
-      name: "faq",
-      component: Faq,
-    },
-    {
-      path: "/additional-modules",
-      name: "additional-modules",
-      component: AdditionalModules,
-    },
-    {
-      path: "/edit-additional-modules",
-      name: "edit-additional-modules",
-      component: EditAdditionalModules,
-    },
-    {
-      path: "/edit-calendar",
-      name: "edit-calendar",
-      component: EditModules,
-    },
-    {
-      path: "/calendar-link",
-      name: "calendar-link",
-      component: CalendarLink,
-    },
-    {
-      path: "/edit",
-      name: "edit",
-      component: EditCalendarView,
-    },
-    {
-      path: "/privacy-policy",
-      name: "privacy-policy",
-      component: PrivacyPolicy,
-    },
-    {
-      path: "/imprint",
-      name: "imprint",
-      component: Imprint,
-    },
-    {
-      path: "/rename-modules",
-      name: "rename-modules",
-      component: RenameModules,
-    },
-    {
-      path: "/:catchAll(.*)",
-      redirect: "/",
-    },
+        {
+          path: "/",
+          name: "course-selection",
+          component: CourseSelection,
+        },
+        {
+          path: "/rooms",
+          name: "room-finder",
+          component: RoomFinder,
+        },
+        {
+          path: "/faq",
+          name: "faq",
+          component: Faq,
+        },
+        {
+          path: "/additional-modules",
+          name: "additional-modules",
+          component: AdditionalModules,
+        },
+        {
+          path: "/edit-additional-modules",
+          name: "edit-additional-modules",
+          component: EditAdditionalModules,
+        },
+        {
+          path: "/edit-calendar",
+          name: "edit-calendar",
+          component: EditModules,
+        },
+        {
+          path: "/calendar-link",
+          name: "calendar-link",
+          component: CalendarLink,
+        },
+        {
+          path: "/edit",
+          name: "edit",
+          component: EditCalendarView,
+        },
+        {
+          path: "/privacy-policy",
+          name: "privacy-policy",
+          component: PrivacyPolicy,
+        },
+        {
+          path: "/imprint",
+          name: "imprint",
+          component: Imprint,
+        },
+        {
+          path: "/rename-modules",
+          name: "rename-modules",
+          component: RenameModules,
+        }
   ],
 });
 
+router.beforeEach(async (to, from) => {
+  const newLocale = to.params.locale
+  const prevLocale = from.params.locale
+  // If the locale hasn't changed, do nothing
+  if (newLocale === prevLocale) {
+    return
+  }
+  i18n.setLocale(newLocale)
+})
+
 export default router;
diff --git a/frontend/src/store/localeStore.ts b/frontend/src/store/localeStore.ts
new file mode 100644
index 0000000..c67cb4f
--- /dev/null
+++ b/frontend/src/store/localeStore.ts
@@ -0,0 +1,17 @@
+import { defineStore } from "pinia";
+import { useLocalStorage } from "@vueuse/core"
+
+const localeStore = defineStore("localeStore", {
+  state: () => {
+    return {
+      locale: useLocalStorage('locale', "en"), //useLocalStorage takes in a key of 'count' and default value of 0
+    };
+  },
+  actions: {
+    setLocale(locale: string) {
+      this.locale = locale;
+    },
+  },
+});
+
+export default localeStore;
diff --git a/frontend/src/components/AdditionalModules.vue b/frontend/src/view/AdditionalModules.vue
similarity index 88%
rename from frontend/src/components/AdditionalModules.vue
rename to frontend/src/view/AdditionalModules.vue
index e3d8cb6..d45f4f3 100644
--- a/frontend/src/components/AdditionalModules.vue
+++ b/frontend/src/view/AdditionalModules.vue
@@ -4,12 +4,10 @@ import { Module } from "../model/module.ts";
 import { fetchAllModules } from "../api/fetchCourse.ts";
 import moduleStore from "../store/moduleStore.ts";
 import { MultiSelectAllChangeEvent } from "primevue/multiselect";
-
-import { useDialog } from "primevue/usedialog";
-const dialog = useDialog();
-
 import router from "../router";
 import { fetchModule } from "../api/fetchModule.ts";
+import { useDialog } from "primevue/usedialog";
+const dialog = useDialog();
 
 const fetchedModules = async () => {
   return await fetchAllModules();
@@ -35,7 +33,7 @@ async function nextStep() {
 }
 
 const ModuleInformation = defineAsyncComponent(
-  () => import("./ModuleInformation.vue"),
+  () => import("../components/ModuleInformation.vue"),
 );
 
 async function showInfo(module: Module) {
@@ -79,8 +77,7 @@ function selectChange() {
   <div class="flex flex-column">
     <div class="flex align-items-center justify-content-center h-4rem m-2">
       <h3>
-        Select additional Modules that are not listed in the regular semester
-        for your Course
+        {{ $t("additionalModules.subTitle") }}
       </h3>
     </div>
     <div class="card flex align-items-center justify-content-center m-2">
@@ -93,10 +90,11 @@ function selectChange() {
         :virtual-scroller-options="{ itemSize: 70 }"
         class="custom-multiselect"
         filter
-        placeholder="Select additional modules"
+        :placeholder="$t('additionalModules.dropDown')"
         @change="selectChange()"
         @selectall-change="onSelectAllChange($event)"
         :autoFilterFocus="true"
+        :showToggleAll="false"
       >
         <template #option="slotProps">
           <div class="flex justify-content-between w-full">
@@ -121,16 +119,15 @@ function selectChange() {
         <template #footer>
           <div class="py-2 px-3">
             <b>{{ selectedModules ? selectedModules.length : 0 }}</b>
-            item{{
-              (selectedModules ? selectedModules.length : 0) > 1 ? "s" : ""
-            }}
-            selected.
+            {{$t("additionalModules.dropDownFooterItem")}}
+            {{ (selectedModules ? selectedModules.length : 0) > 1 ? "s" : "" }}
+            {{$t("additionalModules.dropDownFooterSelected")}}
           </div>
         </template>
       </MultiSelect>
     </div>
     <div class="flex align-items-center justify-content-center h-4rem m-2">
-      <Button @click="nextStep()">Next Step</Button>
+      <Button @click="nextStep()">{{$t("additionalModules.nextStep")}}</Button>
     </div>
   </div>
 </template>
@@ -143,4 +140,4 @@ function selectChange() {
 :deep(.custom-multiselect li) {
   height: unset;
 }
-</style>
+</style>
\ No newline at end of file
diff --git a/frontend/src/view/editCalendarView.vue b/frontend/src/view/EditCalendarView.vue
similarity index 81%
rename from frontend/src/view/editCalendarView.vue
rename to frontend/src/view/EditCalendarView.vue
index 18dc925..d84ed7b 100644
--- a/frontend/src/view/editCalendarView.vue
+++ b/frontend/src/view/EditCalendarView.vue
@@ -6,6 +6,9 @@ import { getCalender } from "../api/loadCalendar";
 import router from "../router";
 import tokenStore from "../store/tokenStore";
 import { useToast } from "primevue/usetoast";
+import { useI18n } from "vue-i18n";
+const { t } = useI18n({ useScope: 'global' })
+
 const toast = useToast();
 
 const token: Ref<string> = ref("");
@@ -13,7 +16,7 @@ const modules: Ref<Module[]> = ref(moduleStore().modules);
 
 function extractToken(token: string): string {
   const tokenRegex = /^[a-z0-9]{15}$/;
-  const tokenUriRegex = /(?:\?|&)token=([a-z0-9]{15})(?:&|$)/;
+  const tokenUriRegex = /[?&]token=([a-z0-9]{15})(?:&|$)/;
 
   if (tokenRegex.test(token)) {
     return token;
@@ -33,8 +36,8 @@ function loadCalendar(): void {
   } catch (e) {
     toast.add({
       severity: "error",
-      summary: "Error",
-      detail: "Invalid token",
+      summary: t("editCalendarView.error"),
+      detail: t("editCalendarView.invalidToken"),
       life: 3000,
     });
     return;
@@ -58,10 +61,10 @@ function loadCalendar(): void {
   <Toast />
   <div class="flex flex-column">
     <div class="flex align-items-center justify-content-center h-4rem mt-2">
-      <h3 class="text-2xl">
-        Edit your HTWKalender
+      <h3 class="text-4xl">
+        {{$t("editCalendarView.headline")}}
         <i
-          class="pi pi-calendar vertical-align-baseline"
+          class="pi pi-pencil vertical-align-baseline ml-2"
           style="font-size: 2rem"
         ></i>
       </h3>
@@ -69,7 +72,7 @@ function loadCalendar(): void {
     <div
       class="flex align-items-center justify-content-center h-4rem border-round"
     >
-      <p class="text-2xl">Please enter your existing calendar token</p>
+      <p class="text-2xl">{{$t("editCalendarView.subTitle")}}</p>
     </div>
     <div
       class="flex align-items-center justify-content-center border-round m-2"
diff --git a/frontend/src/components/ImprintPage.vue b/frontend/src/view/ImprintPage.vue
similarity index 97%
rename from frontend/src/components/ImprintPage.vue
rename to frontend/src/view/ImprintPage.vue
index d8ff591..9d1e734 100644
--- a/frontend/src/components/ImprintPage.vue
+++ b/frontend/src/view/ImprintPage.vue
@@ -10,7 +10,7 @@
 
       <h2>Kontakt</h2>
       <p>
-        Per Email: <a href="mailto:support@ekresse.de">support@ekresse.de</a>
+        Per Email: <a href="mailto:support@htwkalender.de">support@htwkalender.de</a>
       </p>
 
       <h2>Adresse</h2>
diff --git a/frontend/src/components/PrivacyPolicy.vue b/frontend/src/view/PrivacyPolicy.vue
similarity index 99%
rename from frontend/src/components/PrivacyPolicy.vue
rename to frontend/src/view/PrivacyPolicy.vue
index 3c9b4f6..849d18f 100644
--- a/frontend/src/components/PrivacyPolicy.vue
+++ b/frontend/src/view/PrivacyPolicy.vue
@@ -55,7 +55,7 @@
         Deutschland
       </p>
       E-Mail-Adresse:
-      <p><a href="mailto:support@ekresse.de">support@ekresse.de</a></p>
+      <p><a href="mailto:support@htwkalender.de">support@htwkalender.de</a></p>
 
       <h2 id="mOverview">Übersicht der Verarbeitungen</h2>
       <p>
diff --git a/frontend/src/components/RoomFinder.vue b/frontend/src/view/RoomFinder.vue
similarity index 68%
rename from frontend/src/components/RoomFinder.vue
rename to frontend/src/view/RoomFinder.vue
index 2c718f4..daef29c 100644
--- a/frontend/src/components/RoomFinder.vue
+++ b/frontend/src/view/RoomFinder.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import { Ref, ref } from "vue";
-import { fetchRoom } from "../api/fetchRoom.ts";
-import RoomOccupation from "./RoomOccupation.vue";
+import { fetchRoom } from "@/api/fetchRoom.ts";
+import RoomOccupation from "@/components/RoomOccupation.vue";
 
 const rooms = async () => {
   return await fetchRoom();
@@ -21,12 +21,16 @@ rooms().then(
 <template>
   <div class="flex flex-column">
     <div class="flex align-items-center justify-content-center h-4rem m-2">
-      <h3 class="text-4xl">Raumfinder</h3>
+      <h3 class="text-4xl">{{$t('roomFinderPage.headline')}}</h3>
+      <i
+        class="pi pi-search vertical-align-baseline ml-3"
+        style="font-size: 2rem"
+      ></i>
     </div>
     <div
       class="flex align-items-center justify-content-center h-4rem border-round m-2"
     >
-      <h5 class="text-2xl">Please select a room</h5>
+      <h5 class="text-2xl">{{$t('roomFinderPage.detail')}}</h5>
     </div>
     <div
       class="flex align-items-center justify-content-center border-round m-2"
@@ -37,7 +41,8 @@ rooms().then(
         class="w-full md:w-25rem mx-2"
         filter
         option-label="name"
-        placeholder="Select a Room"
+        :placeholder="$t('roomFinderPage.dropDownSelect')"
+        :empty-message="$t('roomFinderPage.noRoomsAvailable')"
         :autoFilterFocus="true"
       />
     </div>
diff --git a/frontend/vite.config.ts b/frontend/vite.config.ts
index 3353390..59a9a80 100644
--- a/frontend/vite.config.ts
+++ b/frontend/vite.config.ts
@@ -1,9 +1,15 @@
 import { defineConfig } from "vite";
 import vue from "@vitejs/plugin-vue";
+import { fileURLToPath } from "node:url";
 
 // https://vitejs.dev/config/
 export default defineConfig({
   plugins: [vue()],
+  resolve: {
+    alias: {
+      '@': fileURLToPath(new URL('./src', import.meta.url))
+    }
+  },
   server: {
     host: true,
     port: 8000,