diff --git a/README.md b/README.md
index b957bfc832e489d6affb132696bf20ddf2f5862d..00176faaf522992aede61581038d63065339b3f8 100644
--- a/README.md
+++ b/README.md
@@ -58,6 +58,7 @@
 4. Visual Studio erkennt automatisch das CMake-Projekt
 5. Build über "Build All" ausführen
 
+
 #### Falls Syntax errors
 
 1. Erstelle .vscode/c_cpp_properties.json Datei
diff --git a/src/game/entities/Building.cpp b/src/game/entities/Building.cpp
index bf7ff17eb36a84a99375207c83eef86412fe6548..73d607ba5c1f4d00a93238b720df70973e4764ee 100644
--- a/src/game/entities/Building.cpp
+++ b/src/game/entities/Building.cpp
@@ -2,6 +2,7 @@
  * Building.cpp
  *
  * @authors Max Körschen
+ * @author Nicolas Will
  * @author Frederik Keens
  */
 
diff --git a/src/game/entities/Building.hpp b/src/game/entities/Building.hpp
index 22b202c840e5e6e468d8082e8fabacf28c29e29b..07fd0f3d2cf9a31fab2123a28eab0fdc4a4c14c0 100644
--- a/src/game/entities/Building.hpp
+++ b/src/game/entities/Building.hpp
@@ -2,6 +2,7 @@
  * Building.hpp
  *
  * @authors Max Körschen
+ * @author Nicolas Will
  * @author Frederik Keens
  */
 
diff --git a/src/game/entities/Unit.cpp b/src/game/entities/Unit.cpp
index 77244f67300be4bf46354d62d4f063e2e6cd2d66..1f3cee0360c9022086c8eefb2705bd743129c46e 100644
--- a/src/game/entities/Unit.cpp
+++ b/src/game/entities/Unit.cpp
@@ -2,6 +2,7 @@
  * Unit.cpp
  *
  * @authors Max Körschen
+ * @author Nicolas Will
  * @author Frederik Keens
  */
 
diff --git a/src/game/entities/Unit.hpp b/src/game/entities/Unit.hpp
index 1c84e1e96a40b65082e49057cccbc4a594744163..2e24eb08c2b6083e1788b2efc1ed4abde7aa6d25 100644
--- a/src/game/entities/Unit.hpp
+++ b/src/game/entities/Unit.hpp
@@ -2,6 +2,7 @@
  * Unit.hpp
  *
  * @authors Max Körschen
+ * @author Nicolas Will
  * @author Frederik Keens
  */
 
diff --git a/src/game/level/Level.cpp b/src/game/level/Level.cpp
index bb80408f28c6fd2471f1e701706f70e307267d25..0a86abc9d1e12ddbea4a3a7e8645529384e8f3a3 100644
--- a/src/game/level/Level.cpp
+++ b/src/game/level/Level.cpp
@@ -2,6 +2,7 @@
  * Level.cpp
  *
  * @authors Max Körschen
+ * @author Nicolas Will
  * @author Frederik Keens
  * @author David Maul
  */
diff --git a/src/game/level/Level.hpp b/src/game/level/Level.hpp
index 9670567e6d85c1078036a8761aba8640e1838948..ba854679cd30912cb2fc2743c756dc47df8cef92 100644
--- a/src/game/level/Level.hpp
+++ b/src/game/level/Level.hpp
@@ -2,6 +2,7 @@
  * Level.hpp
  *
  * @authors Max Körschen
+ * @author Nicolas Will
  * @author Frederik Keens
  * @author David Maul
  */
diff --git a/src/game/ui/context/ContextMenu.cpp b/src/game/ui/context/ContextMenu.cpp
index f59241b4f100b2e7249390ca827d66ff7ea84187..1324409817654cb8f943b29593c309989c015e1b 100644
--- a/src/game/ui/context/ContextMenu.cpp
+++ b/src/game/ui/context/ContextMenu.cpp
@@ -1,5 +1,6 @@
 /**
  * @authors Max Körschen
+ * @author Nicolas Will
  */
 
 #include "ContextMenu.hpp"
diff --git a/src/game/ui/context/ContextMenu.hpp b/src/game/ui/context/ContextMenu.hpp
index 871147aec86d9e84f3d04caeb99f2232ca399ad7..082fd1461da2f4770e4a4e3d51eaab73b8d9dcec 100644
--- a/src/game/ui/context/ContextMenu.hpp
+++ b/src/game/ui/context/ContextMenu.hpp
@@ -1,5 +1,6 @@
 /**
  * @authors Max Körschen
+ * @author Nicolas Will
  */
 
 #pragma once
diff --git a/src/game/ui/context/RecruitingMenu.cpp b/src/game/ui/context/RecruitingMenu.cpp
index 1b334eb3064d62bb07b83433a1857dbbe8f1f0d7..a0bd4210bcd8dacd40008a0557db92912ac1a080 100644
--- a/src/game/ui/context/RecruitingMenu.cpp
+++ b/src/game/ui/context/RecruitingMenu.cpp
@@ -1,5 +1,6 @@
 /**
  * @authors Max Körschen
+ * @author Nicolas Will
  */
 
 #include "RecruitingMenu.hpp"
diff --git a/src/game/ui/context/RecruitingMenu.hpp b/src/game/ui/context/RecruitingMenu.hpp
index 8ff1321cfce83120b4c8156e22371f19abf90e8a..e5bcbba28a01489760bbd5bd3b2ed83632da2a43 100644
--- a/src/game/ui/context/RecruitingMenu.hpp
+++ b/src/game/ui/context/RecruitingMenu.hpp
@@ -1,5 +1,6 @@
 /**
  * @authors Max Körschen
+ * @author Nicolas Will
  */
 
 #pragma once
diff --git a/src/game/ui/menu/EndScreen.cpp b/src/game/ui/menu/EndScreen.cpp
index ad33b22394cbca09522aa69ff75c8114c2eb76eb..7044b68f2efddf71968aaa0b7b477665b7588d61 100644
--- a/src/game/ui/menu/EndScreen.cpp
+++ b/src/game/ui/menu/EndScreen.cpp
@@ -1,3 +1,7 @@
+/**
+ * @author Nicolas Will
+ */
+
 #include "EndScreen.hpp"
 
 #include <SDL_image.h>
diff --git a/src/game/ui/menu/EndScreen.hpp b/src/game/ui/menu/EndScreen.hpp
index 8fc428a4b8c0b33593ddf63c1338b734925530ae..865405471e52b7e0d324e9e3b0dbed70e974883d 100644
--- a/src/game/ui/menu/EndScreen.hpp
+++ b/src/game/ui/menu/EndScreen.hpp
@@ -1,3 +1,7 @@
+/**
+ * @author Nicolas Will
+ */
+
 #pragma once
 
 #include "../../core/Scene.hpp"
diff --git a/src/game/ui/menu/PauseMenu.cpp b/src/game/ui/menu/PauseMenu.cpp
index c2d152b33eb1cb60adee9784230938c66e7b62ce..31b2b17357ed459110c2c8eb8ac30a06b8289c0e 100644
--- a/src/game/ui/menu/PauseMenu.cpp
+++ b/src/game/ui/menu/PauseMenu.cpp
@@ -1,3 +1,7 @@
+/**
+ * @author Nicolas Will
+ */
+
 #include "PauseMenu.hpp"
 #include "../../core/Engine.hpp"
 
diff --git a/src/game/ui/menu/PauseMenu.hpp b/src/game/ui/menu/PauseMenu.hpp
index e97308b1eaf13c977c89f3357eae50686dc8bbab..fb93ac5464b007d638ecdbc64551a14d26871236 100644
--- a/src/game/ui/menu/PauseMenu.hpp
+++ b/src/game/ui/menu/PauseMenu.hpp
@@ -1,3 +1,7 @@
+/**
+ * @author Nicolas Will
+ */
+
 #pragma once
 
 #include "../../core/Scene.hpp"
diff --git a/src/game/ui/modals/HelpMenu.cpp b/src/game/ui/modals/HelpMenu.cpp
index cc424e729e398231dc479ab785a193d994bfd553..a9c72b490e779bee4fc77254841b7a177fdd6dd9 100644
--- a/src/game/ui/modals/HelpMenu.cpp
+++ b/src/game/ui/modals/HelpMenu.cpp
@@ -1,7 +1,9 @@
 /**
  * @authors Max Körschen
+ * @author Nicolas Will
  */
 
+
 #include "HelpMenu.hpp"
 
 #include <SDL_ttf.h>
diff --git a/src/game/ui/modals/HelpMenu.hpp b/src/game/ui/modals/HelpMenu.hpp
index c1e9aae192b807b07d812706be68c30560d304d7..97490391b286e1266544bacb40a08d5506e15672 100644
--- a/src/game/ui/modals/HelpMenu.hpp
+++ b/src/game/ui/modals/HelpMenu.hpp
@@ -1,5 +1,6 @@
 /**
  * @authors Max Körschen
+ * @author Nicolas Will
  */
 
 #pragma once
diff --git a/src/game/ui/modals/UnitInfoMenu.cpp b/src/game/ui/modals/UnitInfoMenu.cpp
index 50d2b7b472390017afab3ecf1b028dd853792660..c38f9ed4c6b4f17c290d7fee5365fd7ac1de40fa 100644
--- a/src/game/ui/modals/UnitInfoMenu.cpp
+++ b/src/game/ui/modals/UnitInfoMenu.cpp
@@ -1,5 +1,6 @@
 /**
  * @authors Max Körschen
+ * @author Nicolas Will
  */
 
 #include "UnitInfoMenu.hpp"
diff --git a/src/game/ui/modals/UnitInfoMenu.hpp b/src/game/ui/modals/UnitInfoMenu.hpp
index 6058ca15de0d02370afd6aa18697a4f72c5cb00f..d06f72608bb2460d4bdd9887d0769479107f2d5f 100644
--- a/src/game/ui/modals/UnitInfoMenu.hpp
+++ b/src/game/ui/modals/UnitInfoMenu.hpp
@@ -1,5 +1,6 @@
 /**
  * @authors Max Körschen
+ * @author Nicolas Will
  */
 
 #pragma once