diff --git a/public/img/ios-icon/th_ohmicon_152x152.png b/public/img/ios-icon/th_ohmicon_152x152.png
deleted file mode 100644
index ea0f54f..0000000
Binary files a/public/img/ios-icon/th_ohmicon_152x152.png and /dev/null differ
diff --git a/public/img/ios-icon/th_ohmicon_167x167.png b/public/img/ios-icon/th_ohmicon_167x167.png
deleted file mode 100644
index afed731..0000000
Binary files a/public/img/ios-icon/th_ohmicon_167x167.png and /dev/null differ
diff --git a/public/img/ios-icon/th_ohmicon_180x180.png b/public/img/ios-icon/th_ohmicon_180x180.png
deleted file mode 100644
index 15c7530..0000000
Binary files a/public/img/ios-icon/th_ohmicon_180x180.png and /dev/null differ
diff --git a/public/img/ios-icon/th_ohmicon_192x192.png b/public/img/ios-icon/th_ohmicon_192x192.png
deleted file mode 100644
index 975869c..0000000
Binary files a/public/img/ios-icon/th_ohmicon_192x192.png and /dev/null differ
diff --git a/public/img/launcher/launcher_app_icon_152.png b/public/img/launcher/launcher_app_icon_152.png
new file mode 100644
index 0000000..6450d40
Binary files /dev/null and b/public/img/launcher/launcher_app_icon_152.png differ
diff --git a/public/img/launcher/launcher_app_icon_167.png b/public/img/launcher/launcher_app_icon_167.png
new file mode 100644
index 0000000..5beccd4
Binary files /dev/null and b/public/img/launcher/launcher_app_icon_167.png differ
diff --git a/public/img/launcher/launcher_app_icon_180.png b/public/img/launcher/launcher_app_icon_180.png
new file mode 100644
index 0000000..20e4ea6
Binary files /dev/null and b/public/img/launcher/launcher_app_icon_180.png differ
diff --git a/public/img/launcher/launcher_app_icon_192.png b/public/img/launcher/launcher_app_icon_192.png
new file mode 100644
index 0000000..360265d
Binary files /dev/null and b/public/img/launcher/launcher_app_icon_192.png differ
diff --git a/public/img/launcher/launcher_app_icon_512.png b/public/img/launcher/launcher_app_icon_512.png
new file mode 100644
index 0000000..b9aba43
Binary files /dev/null and b/public/img/launcher/launcher_app_icon_512.png differ
diff --git a/public/img/th_nbg_ohmicon_amp.png b/public/img/launcher_app_icon.png
similarity index 100%
rename from public/img/th_nbg_ohmicon_amp.png
rename to public/img/launcher_app_icon.png
diff --git a/public/img/profil_icon2.PNG b/public/img/profil_icon.png
similarity index 100%
rename from public/img/profil_icon2.PNG
rename to public/img/profil_icon.png
diff --git a/public/index.html b/public/index.html
index 85c57f4..634648e 100644
--- a/public/index.html
+++ b/public/index.html
@@ -10,48 +10,62 @@
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
 	<!-- <meta http-equiv="refresh" content="30"> -->
 
+	<!-- NOTE: Define Theme Color -->
+	<!-- Chrome, Firefox OS and Opera -->
+	<meta name="theme-color" content="#0046a0">
+
+	<!-- NOTE: Icon for tab recognition -->
+	<!-- highest resolution for Chrome & Opera -->
+	<link rel="icon" sizes="192x192" href="/public/img/app_icon.png">
+	<!-- icons for Safari -> iOS Icons -->
+	<!-- icons for IE & Windows phone -->
+	<meta name="msapplication-square70x70logo" content="icon_smalltile.png">
+	<meta name="msapplication-square150x150logo" content="icon_mediumtile.png">
+	<meta name="msapplication-square310x310logo" content="icon_largetile.png">
+	<meta name="msapplication-wide310x150logo" content="icon_widetile.png">
+
 	<!-- NOTE: iOS - Add to Homescreen -->
 	<!-- Icon: No transparency allowed -->
-	<link rel="apple-touch-icon" href="img/ios-icon/th_ohmicon_192x192.png"> <!-- iphone -->
-	<link rel="apple-touch-icon" sizes="152x152" href="img/ios-icon/th_ohmicon_152x152.png"><!-- ipad -->
-	<link rel="apple-touch-icon" sizes="180x180" href="img/ios-icon/th_ohmicon_180x180.png"><!-- iphone-retina -->
-	<link rel="apple-touch-icon" sizes="167x167" href="img/ios-icon/th_ohmicon_167x167.png"><!-- ipad-retina -->
+	<link rel="apple-touch-icon" href="img/launcher/launcher_app_icon_192.png"> <!-- iphone -->
+	<link rel="apple-touch-icon" sizes="152x152" href="img/launcher/launcher_app_icon_152.png"><!-- ipad -->
+	<link rel="apple-touch-icon" sizes="180x180" href="img/launcher/launcher_app_icon_180.png"><!-- iphone-retina -->
+	<link rel="apple-touch-icon" sizes="167x167" href="img/launcher/launcher_app_icon_167.png"><!-- ipad-retina -->
 	<!-- Splash screen: If not set, will be white screen -->
 	<meta name="apple-mobile-web-app-capable" content="yes" />
-	<link rel="apple-touch-startup-image" sizes="2048x2732" href="/ios-splash/apple_splash_2048.png" /><!-- Tablet -->
-	<link rel="apple-touch-startup-image" sizes="1668x2224"href="/ios-splash/apple_splash_1668.png" /><!-- Tablet -->
-	<link rel="apple-touch-startup-image" sizes="1536x2048" href="/ios-splash/apple_splash_1536.png" /><!-- Tablet -->
-	<link rel="apple-touch-startup-image" sizes="1125x2436" href="/ios-splash/apple_splash_1125.png" /><!-- Tablet ? Phone -->
-	<link rel="apple-touch-startup-image" sizes="1242x2208" href="/ios-splash/apple_splash_1242.png" /><!-- Tablet ? Phone -->
-	<link rel="apple-touch-startup-image" sizes="750x1334" href="/ios-splash/apple_splash_750.png" /><!-- Phone -->
-	<link rel="apple-touch-startup-image" sizes="640x1136" href="/ios-splash/apple_splash_640.png" /><!-- Phone -->
+	<link rel="apple-touch-startup-image" sizes="2048x2732" href="ios-splash/apple_splash_2048.png" /><!-- Tablet -->
+	<link rel="apple-touch-startup-image" sizes="1668x2224"href="ios-splash/apple_splash_1668.png" /><!-- Tablet -->
+	<link rel="apple-touch-startup-image" sizes="1536x2048" href="ios-splash/apple_splash_1536.png" /><!-- Tablet -->
+	<link rel="apple-touch-startup-image" sizes="1125x2436" href="ios-splash/apple_splash_1125.png" /><!-- Tablet ? Phone -->
+	<link rel="apple-touch-startup-image" sizes="1242x2208" href="ios-splash/apple_splash_1242.png" /><!-- Tablet ? Phone -->
+	<link rel="apple-touch-startup-image" sizes="750x1334" href="ios-splash/apple_splash_750.png" /><!-- Phone -->
+	<link rel="apple-touch-startup-image" sizes="640x1136" href="ios-splash/apple_splash_640.png" /><!-- Phone -->
 
 	<!-- NOTE: CSS -->
 	<!-- CSS_Material Design for Bootstrap fonts and icons -->
-	<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700|Material+Icons">
+	<link rel="stylesheet" href="lib/bootstrap-font-and-icons.css">
 	<!-- CSS_Material Design for Bootstrap minified CSS -->
-	<link rel="stylesheet" href="https://unpkg.com/bootstrap-material-design@4.1.1/dist/css/bootstrap-material-design.min.css" integrity="sha384-wXznGJNEXNG1NFsbm0ugrLFMQPWswR3lds2VeinahP8N0zJw9VWSopbjv2x7WCvX" crossorigin="anonymous">
+	<link rel="stylesheet" href="lib/bootstrap-material-design.min.css">
     <!-- CSS_Custom Design -->
 	<link rel="stylesheet" type="text/css" href="style/style.css">
 
     <!-- NOTE: Call manifest.json -->
 	<link rel="manifest" href="manifest.json">
 
-    <!-- NOTE: VUE.js und VueRouter -->
+    <!-- NOTE: Load JQuery, Vue.js, VueRouter -->
     <script src=lib/jquery-3.3.1.min.js></script>
     <script src=lib/vue.js></script>
     <script src=lib/vue-router.js></script>
 
 	<!-- NOTE: JavaScript Libs & Files -->
-    <script src="home.js"></script>
-    <script src="files.js"></script>
-    <script src="createMessage.js"></script>
-    <script src="bookmark.js"></script>
-    <script src="profil.js"></script>
-    <script src="msgCard.js"></script>
-    <script src="messageData.js"></script>
-	<script src="profilCard.js"></script>
-	<script src="profilData.js"></script>
+    <script src="routes/home.js"></script>
+    <script src="routes/files.js"></script>
+    <script src="routes/createMessage.js"></script>
+    <script src="routes/bookmark.js"></script>
+    <script src="routes/profil.js"></script>
+    <script src="routes/msgCard.js"></script>
+    <script src="routes/messageData.js"></script>
+	<script src="routes/profilCard.js"></script>
+	<script src="routes/profilData.js"></script>
 
 	<title>OMApp</title>
 </head>
@@ -108,10 +122,10 @@
 	<!-- <script src="https://cdn.jsdelivr.net/npm/vue@2.5.17/dist/vue.min.js"></script> -->
 	<!-- CDN_jQuery minified lib -->
 	<!--<script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous"></script>-->
-	<!-- CDN_Popper.js lib -->
-	<script src="https://unpkg.com/popper.js@1.12.6/dist/umd/popper.js" integrity="sha384-fA23ZRQ3G/J53mElWqVJEGJzU0sTs+SvzG8fXVWP+kJQ1lwFAOkcUOysnlKJC33U" crossorigin="anonymous"></script>
-	<!-- CDN_Bootstrap JS lib -->
-	<script src="https://unpkg.com/bootstrap-material-design@4.1.1/dist/js/bootstrap-material-design.js" integrity="sha384-CauSuKpEqAFajSpkdjv3z9t8E7RlpJ1UP0lKM/+NdtSarroVKu069AlsRPKkFBz9" crossorigin="anonymous"></script>
+	<!-- Load Popper.js -->
+	<script src="lib/popper-1.12.6.js"></script>
+	<!-- Load Bootstrap.js -->
+	<script src="lib/bootstrap-material-design.js"></script>
 	<!-- NOTE: Call main.js -->
 	<script src="main.js"></script>