diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4bbc33e..335b07c 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,34 +4,8 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="58b952d2-2253-4e80-8b30-0eef029dc0b0" name="Changes" comment="Implemented basic app with Mantine SegmentedControl">
-      <change beforePath="$PROJECT_DIR$/.idea/vcs.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
+    <list default="true" id="58b952d2-2253-4e80-8b30-0eef029dc0b0" name="Changes" comment="Add &quot;not working&quot; day option with UI updates and logic adjustments for overtime calculations">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/README.md" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/backend/.gitignore" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/backend/package-lock.json" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/backend/package.json" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/backend/src/index.ts" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/backend/tsconfig.json" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/frontend/.gitignore" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/frontend/README.md" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/frontend/eslint.config.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/frontend/index.html" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/frontend/package-lock.json" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/frontend/package.json" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/frontend/postcss.config.cjs" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/frontend/public/favicon.svg" beforeDir="false" afterPath="$PROJECT_DIR$/public/favicon.svg" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/frontend/public/icons.svg" beforeDir="false" afterPath="$PROJECT_DIR$/public/icons.svg" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/frontend/src/App.tsx" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/frontend/src/assets/hero.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/frontend/src/assets/react.svg" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/frontend/src/assets/vite.svg" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/frontend/src/index.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/frontend/src/main.tsx" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/frontend/tsconfig.app.json" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/frontend/tsconfig.json" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/frontend/tsconfig.node.json" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/frontend/vite.config.ts" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/../zkpa4fs_qt/.gitignore" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/../zkpa4fs_qt/CMakeLists.txt" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/../zkpa4fs_qt/main.cpp" beforeDir="false" />
@@ -49,6 +23,8 @@
   </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+    <option name="ROOT_SYNC" value="DONT_SYNC" />
+    <option name="UPDATE_TYPE" value="REBASE" />
   </component>
   <component name="McpProjectServerCommands">
     <commands />
@@ -56,61 +32,61 @@
   </component>
   <component name="NextEditCompletionFeaturesState">
     <decayedCancelled>
-      <entry key="MS100" value="1.0000000000000009" />
-      <entry key="MS500" value="1.0009539537566359" />
-      <entry key="S2" value="1.2110570062864665" />
-      <entry key="S5" value="2.6514610749159675" />
-      <entry key="S10" value="6.607510158005727" />
-      <entry key="S30" value="15.513812640947325" />
-      <entry key="S60" value="19.628955963406014" />
-      <entry key="M2" value="22.13539263752126" />
-      <entry key="M5" value="23.807983810897454" />
-      <entry key="M10" value="24.396013473227395" />
-      <entry key="M15" value="24.595547743848567" />
-      <entry key="M30" value="24.796871127096388" />
-      <entry key="H1" value="24.898208847873168" />
-      <entry key="H2" value="24.949047615815104" />
-      <entry key="H4" value="24.974509589694275" />
-      <entry key="D1" value="24.995749622155472" />
-      <entry key="W1" value="24.999392754752186" />
+      <entry key="MS100" value="1.8713045682459133" />
+      <entry key="MS500" value="4.964967647318563" />
+      <entry key="S2" value="8.805592398314435" />
+      <entry key="S5" value="11.082456613391365" />
+      <entry key="S10" value="12.530544974000518" />
+      <entry key="S30" value="14.118828062383605" />
+      <entry key="S60" value="15.63646976095219" />
+      <entry key="M2" value="20.246618537135184" />
+      <entry key="M5" value="33.84735052751462" />
+      <entry key="M10" value="48.556239670135945" />
+      <entry key="M15" value="59.009452824465505" />
+      <entry key="M30" value="77.92148978783722" />
+      <entry key="H1" value="93.69131188798369" />
+      <entry key="H2" value="104.17280333673239" />
+      <entry key="H4" value="110.25778245209355" />
+      <entry key="D1" value="115.82727919175183" />
+      <entry key="W1" value="116.83122123494417" />
     </decayedCancelled>
     <decayedSelected>
       <entry key="MS100" value="0.0" />
-      <entry key="MS500" value="0.0" />
-      <entry key="S2" value="0.0" />
-      <entry key="S5" value="0.0" />
-      <entry key="S10" value="0.0" />
-      <entry key="S30" value="0.0" />
-      <entry key="S60" value="0.0" />
-      <entry key="M2" value="0.0" />
-      <entry key="M5" value="0.0" />
-      <entry key="M10" value="0.0" />
-      <entry key="M15" value="0.0" />
-      <entry key="M30" value="0.0" />
-      <entry key="H1" value="0.0" />
-      <entry key="H2" value="0.0" />
-      <entry key="H4" value="0.0" />
-      <entry key="D1" value="0.0" />
-      <entry key="W1" value="0.0" />
+      <entry key="MS500" value="8.773163218858977E-96" />
+      <entry key="S2" value="1.7210324234014676E-24" />
+      <entry key="S5" value="3.121157042292262E-10" />
+      <entry key="S10" value="1.766680585820295E-5" />
+      <entry key="S30" value="0.026254218199129004" />
+      <entry key="S60" value="0.17585861750115833" />
+      <entry key="M2" value="0.5220943281874633" />
+      <entry key="M5" value="1.1532805198395977" />
+      <entry key="M10" value="1.7339695029459006" />
+      <entry key="M15" value="2.134085130196612" />
+      <entry key="M30" value="2.803871142351243" />
+      <entry key="H1" value="3.3122258339662363" />
+      <entry key="H2" value="3.6297103499357672" />
+      <entry key="H4" value="3.807678764689653" />
+      <entry key="D1" value="3.9668966795193827" />
+      <entry key="W1" value="3.995244523264256" />
     </decayedSelected>
     <decayedShown>
-      <entry key="MS100" value="0.014179986801830679" />
-      <entry key="MS500" value="0.4274242839963846" />
-      <entry key="S2" value="0.9847597606956294" />
-      <entry key="S5" value="2.487771145762549" />
-      <entry key="S10" value="6.478774079481817" />
-      <entry key="S30" value="15.448545540503362" />
-      <entry key="S60" value="19.59208216216647" />
-      <entry key="M2" value="22.115739196316564" />
-      <entry key="M5" value="23.79980762074867" />
-      <entry key="M10" value="24.391870873465738" />
-      <entry key="M15" value="24.59277374272673" />
-      <entry key="M30" value="24.795477953117818" />
-      <entry key="H1" value="24.897510710086745" />
-      <entry key="H2" value="24.948698158288128" />
-      <entry key="H4" value="24.97433476365529" />
-      <entry key="D1" value="24.99572047096187" />
-      <entry key="W1" value="24.999388589964713" />
+      <entry key="MS100" value="1.8260807679260624" />
+      <entry key="MS500" value="4.9318949024448315" />
+      <entry key="S2" value="8.769221040722588" />
+      <entry key="S5" value="11.053500944573344" />
+      <entry key="S10" value="12.50969598045732" />
+      <entry key="S30" value="14.13444811981906" />
+      <entry key="S60" value="15.801193817213477" />
+      <entry key="M2" value="20.75131890622663" />
+      <entry key="M5" value="34.979814451664154" />
+      <entry key="M10" value="50.272658135844964" />
+      <entry key="M15" value="61.12871681391976" />
+      <entry key="M30" value="80.71538833020347" />
+      <entry key="H1" value="96.99757289149343" />
+      <entry key="H2" value="107.79922175194329" />
+      <entry key="H4" value="114.06372768959129" />
+      <entry key="D1" value="119.79387380644174" />
+      <entry key="W1" value="120.82642227050502" />
     </decayedShown>
   </component>
   <component name="ProjectColorInfo">{
@@ -122,29 +98,32 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "ModuleVcsDetector.initialDetectionPerformed": "true",
-    "RunOnceActivity.MCP Project settings loaded": "true",
-    "RunOnceActivity.ShowReadmeOnStart": "true",
-    "RunOnceActivity.git.unshallow": "true",
-    "RunOnceActivity.typescript.service.memoryLimit.init": "true",
-    "codeWithMe.voiceChat.enabledByDefault": "false",
-    "git-widget-placeholder": "main",
-    "javascript.preferred.runtime.type.id": "node",
-    "last_opened_file_path": "C:/Users/t.landgraf/GitProjects/work_tracker",
-    "node.js.detected.package.eslint": "true",
-    "node.js.detected.package.jshint": "true",
-    "node.js.detected.package.tslint": "true",
-    "node.js.selected.package.eslint": "(autodetect)",
-    "node.js.selected.package.jshint": "",
-    "node.js.selected.package.tslint": "(autodetect)",
-    "nodejs_package_manager_path": "npm",
-    "npm.dev.executor": "Run",
-    "settings.editor.selected.configurable": "preferences.keymap",
-    "ts.external.directory.path": "C:\\Users\\t.landgraf\\AppData\\Local\\Programs\\WebStorm\\plugins\\javascript-plugin\\jsLanguageServicesImpl\\external"
+  <component name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;ModuleVcsDetector.initialDetectionPerformed&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.MCP Project settings loaded&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.git.unshallow&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.typescript.service.memoryLimit.init&quot;: &quot;true&quot;,
+    &quot;codeWithMe.voiceChat.enabledByDefault&quot;: &quot;false&quot;,
+    &quot;com.intellij.ml.llm.matterhorn.ej.ui.settings.DefaultModelSelectionForGA.v1&quot;: &quot;true&quot;,
+    &quot;git-widget-placeholder&quot;: &quot;main&quot;,
+    &quot;javascript.preferred.runtime.type.id&quot;: &quot;node&quot;,
+    &quot;junie.onboarding.icon.badge.shown&quot;: &quot;true&quot;,
+    &quot;last_opened_file_path&quot;: &quot;C:/Users/t.landgraf/GitProjects/work_tracker&quot;,
+    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
+    &quot;node.js.detected.package.jshint&quot;: &quot;true&quot;,
+    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
+    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
+    &quot;node.js.selected.package.jshint&quot;: &quot;&quot;,
+    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
+    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
+    &quot;npm.dev.executor&quot;: &quot;Run&quot;,
+    &quot;settings.editor.selected.configurable&quot;: &quot;preferences.keymap&quot;,
+    &quot;to.speed.mode.migration.done&quot;: &quot;true&quot;,
+    &quot;ts.external.directory.path&quot;: &quot;C:\\Users\\t.landgraf\\AppData\\Local\\Programs\\WebStorm\\plugins\\javascript-plugin\\jsLanguageServicesImpl\\external&quot;
   }
-}]]></component>
+}</component>
   <component name="RecentsManager">
     <key name="MoveFile.RECENT_KEYS">
       <recent name="C:\Users\t.landgraf\GitProjects\work_tracker" />
@@ -193,7 +172,47 @@
       <option name="project" value="LOCAL" />
       <updated>1786644785673</updated>
     </task>
-    <option name="localTasksCounter" value="2" />
+    <task id="LOCAL-00002" summary="Remove all frontend and backend files from the repository and made frontend working">
+      <option name="closed" value="true" />
+      <created>1786687449139</created>
+      <option name="number" value="00002" />
+      <option name="presentableId" value="LOCAL-00002" />
+      <option name="project" value="LOCAL" />
+      <updated>1786687449139</updated>
+    </task>
+    <task id="LOCAL-00003" summary="Add overtime calculation and display to the App component">
+      <option name="closed" value="true" />
+      <created>1786688009978</created>
+      <option name="number" value="00003" />
+      <option name="presentableId" value="LOCAL-00003" />
+      <option name="project" value="LOCAL" />
+      <updated>1786688009978</updated>
+    </task>
+    <task id="LOCAL-00004" summary="Add persistent workday records with localStorage integration and reset functionality">
+      <option name="closed" value="true" />
+      <created>1786689731776</created>
+      <option name="number" value="00004" />
+      <option name="presentableId" value="LOCAL-00004" />
+      <option name="project" value="LOCAL" />
+      <updated>1786689731776</updated>
+    </task>
+    <task id="LOCAL-00005" summary="Add carryover management for overtime, update weekday naming to German, and enhance reset functionality.">
+      <option name="closed" value="true" />
+      <created>1786706765942</created>
+      <option name="number" value="00005" />
+      <option name="presentableId" value="LOCAL-00005" />
+      <option name="project" value="LOCAL" />
+      <updated>1786706765942</updated>
+    </task>
+    <task id="LOCAL-00006" summary="Add &quot;not working&quot; day option with UI updates and logic adjustments for overtime calculations">
+      <option name="closed" value="true" />
+      <created>1788174564242</created>
+      <option name="number" value="00006" />
+      <option name="presentableId" value="LOCAL-00006" />
+      <option name="project" value="LOCAL" />
+      <updated>1788174564242</updated>
+    </task>
+    <option name="localTasksCounter" value="7" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -201,6 +220,12 @@
   </component>
   <component name="VcsManagerConfiguration">
     <MESSAGE value="Implemented basic app with Mantine SegmentedControl" />
-    <option name="LAST_COMMIT_MESSAGE" value="Implemented basic app with Mantine SegmentedControl" />
+    <MESSAGE value="Remove all frontend and backend files from the repository and made frontend working" />
+    <MESSAGE value="Add overtime calculation and display to the App component" />
+    <MESSAGE value="Add persistent workday records with localStorage integration and reset functionality" />
+    <MESSAGE value="Add carryover overtime functionality with localStorage persistence and reset options" />
+    <MESSAGE value="Add carryover management for overtime, update weekday naming to German, and enhance reset functionality." />
+    <MESSAGE value="Add &quot;not working&quot; day option with UI updates and logic adjustments for overtime calculations" />
+    <option name="LAST_COMMIT_MESSAGE" value="Add &quot;not working&quot; day option with UI updates and logic adjustments for overtime calculations" />
   </component>
 </project>
\ No newline at end of file
diff --git a/src/App.tsx b/src/App.tsx
index d5e2cda..b8cb66f 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -53,7 +53,9 @@ const fromMinutes = (mins: number): string => {
 };
 
 function App() {
-    const [selectedDay, setSelectedDay] = React.useState<Workday>('Montag');
+    const todayIndex = new Date().getDay(); // 0=Sun,1=Mon,...,5=Fri
+    const defaultDay: Workday = todayIndex >= 1 && todayIndex <= 5 ? WEEKDAYS[todayIndex - 1] : 'Montag';
+    const [selectedDay, setSelectedDay] = React.useState<Workday>(defaultDay);
     const [records, setRecords] = React.useState<Records>(loadRecords);
     const [carryoverMinutes, setCarryoverMinutes] = React.useState<number>(loadCarryover);