diff --git a/assets/security.css b/assets/security.css
index be7bfbb..5e213a9 100644
--- a/assets/security.css
+++ b/assets/security.css
@@ -3,13 +3,11 @@
     width: 85%;
     margin: auto;
     padding: 10px;
-    border-style: solid; border-color: #d0d0d0; border-radius: 10px; padding: 15px; border-width: 1px;
-    box-shadow: 2px 2px 5px #c0c0c0;
+
 }
 
 .bdp_security_inner {
-    border-style: solid; border-color: #d0d0d0; border-radius: 10px; padding: 15px; border-width: 1px;
-    box-shadow: 2px 2px 5px #c0c0c0;
+
     width: 80%;
     margin: 0 auto 40px;
 }
diff --git a/assets/wordpress-bdp.css b/assets/wordpress-bdp.css
index 1e137fe..cd7e056 100644
--- a/assets/wordpress-bdp.css
+++ b/assets/wordpress-bdp.css
@@ -1,87 +1,457 @@
-#adminmenu,
-#wpadminbar,
+body {
+    background: #fff;
+}
+
+/* Admin Menu */
+#adminmenuback,
 #adminmenuwrap,
-#adminmenuback {
-    background-color: #ffcb04 !important;
+#adminmenu {
+    margin-top: 12px;
+    background: #f0f0f0;
+    width: 300px;
 }
 
-#toplevel_page_limit-login-attempts,
-#wp-admin-bar-llar-root {
-    display: none;
+#adminmenu {
+    background-color: #ffffff;
+    border-radius: 10px;
+
 }
 
-.wp-submenu-wrap,
-.wp-submenu-head {
-    color: #FFFFFF !important;
-}
-
-.wp-has-submenu,
-.wp-not-current-submenu,
-.menu-top,
-
-#collapse-button,
-#wp-submenu ul,
-#wp-admin-bar-site-name,
-.ab-item
-{
-    color: #46484d !important;
+#adminmenu a {
+    color: #1d4899 !important;
     font-weight: bold !important;
+    margin-left: 30px !important;
 }
-.wp-menu-open ,
-.wp-has-current-submenu li,
-#adminmenu ul
+
+
+#wpbody {
+    background-color: #f0f0f0;
+    position: relative;
+    padding-left: 150px;
+
+    padding-top: 25px;
+}
+
+#wpfooter, #wpwrap
 {
-    background-color: #3163bd !important;
-    color: #FFFFFF !important;
+    background-color: #f0f0f0;
 }
 
-.wp-not-current-submenu:hover,
-#wpadminbar .ab-item:hover
-{
-    background-color: #3163bd !important;
-    color: #FFFFFF !important;
-
+#wpfooter {
+    padding-left: 150px;
+}
+#wpbody-content {
+    background-color: #ffffff;
+    width: 95%;
+    padding-left: 50px;
+    box-shadow: 10px 10px 10px #c0c0c0;
+    border-radius: 10px;
+    border-width: 1px;
+    border-style: solid;
+    border-color: #c0c0c0;
 }
 
-.ab-submenu {
-    background-color: #ffcb04 !important;
+
+
+#adminmenu div.wp-menu-image:before {
+    color: #f1f3f3;
 }
 
-#wp-admin-bar-updates,
-#wp-admin-bar-comments,
-#wp-admin-bar-new-content,
-#wp-admin-bar-wp-logo
-{
+#adminmenu a:hover,
+#adminmenu li.menu-top:hover,
+#adminmenu li.opensub > a.menu-top,
+#adminmenu li > a.menu-top:focus {
+    color: #1d4899;
+    font-weight: bold;
+    background: linear-gradient(to right, #efefef, rgba(255, 203, 4, 0.45));
+    border-radius: 10px;
+    border-width: 0 !important;
+}
+
+#adminmenu li.menu-top:hover div.wp-menu-image:before,
+#adminmenu li.opensub > a.menu-top div.wp-menu-image:before {
+    color: #1d4899;
+    font-weight: bold;
+    background: linear-gradient(to right, #efefef, rgba(255, 203, 4, 0.45));
+    border-radius: 10px;
+    border-width: 0;}
+
+/* Active tabs use a bottom border color that matches the page background color. */
+.about-wrap .nav-tab-active,
+.nav-tab-active,
+.nav-tab-active:hover {
+    background-color: #fff;
+    border-bottom-color: #fff;
+}
+
+/* Admin Menu: submenu */
+#adminmenu .wp-submenu,
+#adminmenu .wp-has-current-submenu .wp-submenu,
+#adminmenu .wp-has-current-submenu.opensub .wp-submenu,
+.folded #adminmenu .wp-has-current-submenu .wp-submenu,
+#adminmenu a.wp-has-current-submenu:focus + .wp-submenu {
+    background: #ffffff;
+    width: 300px;
+}
+
+#adminmenu li.wp-has-submenu.wp-not-current-submenu.opensub:hover:after {
     display: none;
 }
 
-.bdp_submit:hover {
-    color: #ffffff;
-    background-color: #3163bd;
-    cursor: pointer;
-    border-radius: 5px;
+#adminmenu .wp-submenu .wp-submenu-head {
+    color: #ccdbe0;
 }
 
-.bdp_submit {
-    background-color: #ffffff;
-    padding: 5px 25px;
-    border-style: solid;
-    border-width: 1px;
-    border-color: #769be7;
-    cursor: pointer;
-    border-radius: 5px;
-    box-shadow: 2px 2px 2px #d0d0d0;
+#adminmenu .wp-submenu a,
+#adminmenu .wp-has-current-submenu .wp-submenu a,
+.folded #adminmenu .wp-has-current-submenu .wp-submenu a,
+#adminmenu a.wp-has-current-submenu:focus + .wp-submenu a,
+#adminmenu .wp-has-current-submenu.opensub .wp-submenu a {
+    color: #ccdbe0;
 }
 
-#bdp_success {
-    background-color: #ffffff;
-    border-color: #c3c4c7;
-    border-left-color: #00a32a;
-    padding: 10px 12px;
-    margin: 5px 0 15px;
-    border-width: 1px;
-    border-style: solid;
-    border-left-width: 4px;
-    width: 97%;
+#adminmenu .wp-submenu a:focus, #adminmenu .wp-submenu a:hover,
+#adminmenu .wp-has-current-submenu .wp-submenu a:focus,
+#adminmenu .wp-has-current-submenu .wp-submenu a:hover,
+.folded #adminmenu .wp-has-current-submenu .wp-submenu a:focus,
+.folded #adminmenu .wp-has-current-submenu .wp-submenu a:hover,
+#adminmenu a.wp-has-current-submenu:focus + .wp-submenu a:focus,
+#adminmenu a.wp-has-current-submenu:focus + .wp-submenu a:hover,
+#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:focus,
+#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:hover {
+    color: #f0f0f0;
+}
 
-}
\ No newline at end of file
+/* Admin Menu: current */
+#adminmenu .wp-submenu li.current a,
+#adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a,
+#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a {
+    color: #f2fcff;
+}
+
+#adminmenu .wp-submenu li.current a:hover, #adminmenu .wp-submenu li.current a:focus,
+#adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:hover,
+#adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:focus,
+#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:hover,
+#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:focus {
+    color: #e0e0e0;
+}
+
+ul#adminmenu a.wp-has-current-submenu:after,
+ul#adminmenu > li.current > a.current:after {
+    border-right-color: #fff;
+    display: none;
+}
+
+#adminmenu li.current a.menu-top,
+#adminmenu li.wp-has-current-submenu a.wp-has-current-submenu,
+#adminmenu li.wp-has-current-submenu .wp-submenu .wp-submenu-head,
+.folded #adminmenu li.current.menu-top {
+    color: #000000;
+    background: linear-gradient(to right, #efefef, rgba(255, 203, 4, 0.45));
+    border-radius: 10px;
+}
+
+#adminmenu li.wp-has-current-submenu div.wp-menu-image:before,
+#adminmenu a.current:hover div.wp-menu-image:before,
+#adminmenu li.wp-has-current-submenu a:focus div.wp-menu-image:before,
+#adminmenu li.wp-has-current-submenu.opensub div.wp-menu-image:before,
+#adminmenu li:hover div.wp-menu-image:before,
+#adminmenu li a:focus div.wp-menu-image:before,
+#adminmenu li.opensub div.wp-menu-image:before,
+.ie8 #adminmenu li.opensub div.wp-menu-image:before {
+    color: #f2fcff;
+}
+
+.wp-menu-open .wp-submenu li {
+    padding-left: 30px !important;
+    color: #1d4899 !important;
+    font-weight: bold;
+}
+
+/* Admin Menu: bubble */
+#adminmenu .awaiting-mod,
+#adminmenu .update-plugins {
+    color: #f2fcff;
+    background: #aa9d88;
+}
+
+#adminmenu li.current a .awaiting-mod,
+#adminmenu li a.wp-has-current-submenu .update-plugins,
+#adminmenu li:hover a .awaiting-mod,
+#adminmenu li.menu-top:hover > a .update-plugins {
+    color: #f2fcff;
+    background: #627c83;
+}
+
+/* Admin Menu: collapse button */
+#collapse-button {
+    display: none;
+    color: #1d4899;
+    font-weight: bold;
+    border-radius: 10px;
+    border-width: 0;
+}
+
+#collapse-button:hover,
+#collapse-button:focus {
+    color: rgba(255, 203, 4, 0.45);
+}
+
+/* Admin Bar */
+#wpadminbar {
+    color: #f2fcff;
+    background: #738e96;
+}
+
+#wpadminbar .ab-item,
+#wpadminbar a.ab-item,
+#wpadminbar > #wp-toolbar span.ab-label,
+#wpadminbar > #wp-toolbar span.noticon {
+    color: #f2fcff;
+}
+
+#wpadminbar .ab-icon,
+#wpadminbar .ab-icon:before,
+#wpadminbar .ab-item:before,
+#wpadminbar .ab-item:after {
+    color: #f1f3f3;
+}
+
+#wpadminbar:not(.mobile) .ab-top-menu > li:hover > .ab-item,
+#wpadminbar:not(.mobile) .ab-top-menu > li > .ab-item:focus,
+#wpadminbar.nojq .quicklinks .ab-top-menu > li > .ab-item:focus,
+#wpadminbar.nojs .ab-top-menu > li.menupop:hover > .ab-item,
+#wpadminbar .ab-top-menu > li.menupop.hover > .ab-item {
+    color: #9ebaa0;
+    background: #627c83;
+}
+
+#wpadminbar:not(.mobile) > #wp-toolbar li:hover span.ab-label,
+#wpadminbar:not(.mobile) > #wp-toolbar li.hover span.ab-label,
+#wpadminbar:not(.mobile) > #wp-toolbar a:focus span.ab-label {
+    color: #9ebaa0;
+}
+
+#wpadminbar:not(.mobile) li:hover .ab-icon:before,
+#wpadminbar:not(.mobile) li:hover .ab-item:before,
+#wpadminbar:not(.mobile) li:hover .ab-item:after,
+#wpadminbar:not(.mobile) li:hover #adminbarsearch:before {
+    color: #f2fcff;
+}
+
+/* Admin Bar: submenu */
+#wpadminbar .menupop .ab-sub-wrapper {
+    background: #627c83;
+}
+
+#wpadminbar .quicklinks .menupop ul.ab-sub-secondary,
+#wpadminbar .quicklinks .menupop ul.ab-sub-secondary .ab-submenu {
+    background: #8f9a9e;
+}
+
+#wpadminbar .ab-submenu .ab-item,
+#wpadminbar .quicklinks .menupop ul li a,
+#wpadminbar .quicklinks .menupop.hover ul li a,
+#wpadminbar.nojs .quicklinks .menupop:hover ul li a {
+    color: #ccdbe0;
+}
+
+#wpadminbar .quicklinks li .blavatar,
+#wpadminbar .menupop .menupop > .ab-item:before {
+    color: #f1f3f3;
+}
+
+#wpadminbar .quicklinks .menupop ul li a:hover,
+#wpadminbar .quicklinks .menupop ul li a:focus,
+#wpadminbar .quicklinks .menupop ul li a:hover strong,
+#wpadminbar .quicklinks .menupop ul li a:focus strong,
+#wpadminbar .quicklinks .ab-sub-wrapper .menupop.hover > a,
+#wpadminbar .quicklinks .menupop.hover ul li a:hover,
+#wpadminbar .quicklinks .menupop.hover ul li a:focus,
+#wpadminbar.nojs .quicklinks .menupop:hover ul li a:hover,
+#wpadminbar.nojs .quicklinks .menupop:hover ul li a:focus,
+#wpadminbar li:hover .ab-icon:before,
+#wpadminbar li:hover .ab-item:before,
+#wpadminbar li a:focus .ab-icon:before,
+#wpadminbar li .ab-item:focus:before,
+#wpadminbar li .ab-item:focus .ab-icon:before,
+#wpadminbar li.hover .ab-icon:before,
+#wpadminbar li.hover .ab-item:before,
+#wpadminbar li:hover #adminbarsearch:before,
+#wpadminbar li #adminbarsearch.adminbar-focused:before {
+    color: #9ebaa0;
+}
+
+#wpadminbar .quicklinks li a:hover .blavatar,
+#wpadminbar .quicklinks li a:focus .blavatar,
+#wpadminbar .quicklinks .ab-sub-wrapper .menupop.hover > a .blavatar,
+#wpadminbar .menupop .menupop > .ab-item:hover:before,
+#wpadminbar.mobile .quicklinks .ab-icon:before,
+#wpadminbar.mobile .quicklinks .ab-item:before {
+    color: #9ebaa0;
+}
+
+#wpadminbar.mobile .quicklinks .hover .ab-icon:before,
+#wpadminbar.mobile .quicklinks .hover .ab-item:before {
+    color: #f1f3f3;
+}
+
+/* Admin Bar: search */
+#wpadminbar #adminbarsearch:before {
+    color: #f1f3f3;
+}
+
+#wpadminbar > #wp-toolbar > #wp-admin-bar-top-secondary > #wp-admin-bar-search #adminbarsearch input.adminbar-input:focus {
+    color: #f2fcff;
+    background: #879ea5;
+}
+
+/* Admin Bar: recovery mode */
+#wpadminbar #wp-admin-bar-recovery-mode {
+    color: #f2fcff;
+    background-color: #aa9d88;
+}
+
+#wpadminbar #wp-admin-bar-recovery-mode .ab-item,
+#wpadminbar #wp-admin-bar-recovery-mode a.ab-item {
+    color: #f2fcff;
+}
+
+#wpadminbar .ab-top-menu > #wp-admin-bar-recovery-mode.hover > .ab-item,
+#wpadminbar.nojq .quicklinks .ab-top-menu > #wp-admin-bar-recovery-mode > .ab-item:focus,
+#wpadminbar:not(.mobile) .ab-top-menu > #wp-admin-bar-recovery-mode:hover > .ab-item,
+#wpadminbar:not(.mobile) .ab-top-menu > #wp-admin-bar-recovery-mode > .ab-item:focus {
+    color: #f2fcff;
+    background-color: #998d7a;
+}
+
+/* Admin Bar: my account */
+#wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar > a img {
+    border-color: #879ea5;
+    background-color: #ff0000;
+    width: 250px;
+}
+
+#wpadminbar #wp-admin-bar-user-info .display-name {
+    color: #f2fcff;
+}
+
+#wpadminbar #wp-admin-bar-user-info a:hover .display-name {
+    color: #9ebaa0;
+}
+
+#wpadminbar #wp-admin-bar-user-info .username {
+    color: #ccdbe0;
+}
+
+/* Pointers */
+.wp-pointer .wp-pointer-content h3 {
+    background-color: #9ebaa0;
+    border-color: #8faf91;
+}
+
+.wp-pointer .wp-pointer-content h3:before {
+    color: #9ebaa0;
+}
+
+.wp-pointer.wp-pointer-top .wp-pointer-arrow,
+.wp-pointer.wp-pointer-top .wp-pointer-arrow-inner,
+.wp-pointer.wp-pointer-undefined .wp-pointer-arrow,
+.wp-pointer.wp-pointer-undefined .wp-pointer-arrow-inner {
+    border-bottom-color: #9ebaa0;
+}
+
+/* Media */
+.media-item .bar,
+.media-progress-bar div {
+    background-color: #9ebaa0;
+}
+
+.details.attachment {
+    box-shadow: inset 0 0 0 3px #fff, inset 0 0 0 7px #9ebaa0;
+}
+
+.attachment.details .check {
+    background-color: #9ebaa0;
+    box-shadow: 0 0 0 1px #fff, 0 0 0 2px #9ebaa0;
+}
+
+.media-selection .attachment.selection.details .thumbnail {
+    box-shadow: 0 0 0 1px #fff, 0 0 0 3px #9ebaa0;
+}
+
+/* Themes */
+.theme-browser .theme.active .theme-name,
+.theme-browser .theme.add-new-theme a:hover:after,
+.theme-browser .theme.add-new-theme a:focus:after {
+    background: #9ebaa0;
+}
+
+.theme-browser .theme.add-new-theme a:hover span:after,
+.theme-browser .theme.add-new-theme a:focus span:after {
+    color: #9ebaa0;
+}
+
+.theme-section.current,
+.theme-filter.current {
+    border-bottom-color: #738e96;
+}
+
+body.more-filters-opened .more-filters {
+    color: #f2fcff;
+    background-color: #738e96;
+}
+
+body.more-filters-opened .more-filters:before {
+    color: #f2fcff;
+}
+
+body.more-filters-opened .more-filters:hover,
+body.more-filters-opened .more-filters:focus {
+    background-color: #9ebaa0;
+    color: #f2fcff;
+}
+
+body.more-filters-opened .more-filters:hover:before,
+body.more-filters-opened .more-filters:focus:before {
+    color: #f2fcff;
+}
+
+/* Widgets */
+.widgets-chooser li.widgets-chooser-selected {
+    background-color: #9ebaa0;
+    color: #f2fcff;
+}
+
+.widgets-chooser li.widgets-chooser-selected:before,
+.widgets-chooser li.widgets-chooser-selected:focus:before {
+    color: #f2fcff;
+}
+
+/* Responsive Component */
+div#wp-responsive-toggle a:before {
+    color: #f1f3f3;
+}
+
+.wp-responsive-open div#wp-responsive-toggle a {
+    border-color: transparent;
+    background: #9ebaa0;
+}
+
+.wp-responsive-open #wpadminbar #wp-admin-bar-menu-toggle a {
+    background: #627c83;
+}
+
+.wp-responsive-open #wpadminbar #wp-admin-bar-menu-toggle .ab-icon:before {
+    color: #f1f3f3;
+}
+
+/* TinyMCE */
+.mce-container.mce-menu .mce-menu-item:hover,
+.mce-container.mce-menu .mce-menu-item.mce-selected,
+.mce-container.mce-menu .mce-menu-item:focus,
+.mce-container.mce-menu .mce-menu-item-normal.mce-active,
+.mce-container.mce-menu .mce-menu-item-preview.mce-active {
+    background: #9ebaa0;
+}
diff --git a/modules/about/internal/index.php b/modules/about/internal/index.php
index c85257a..e047cbd 100644
--- a/modules/about/internal/index.php
+++ b/modules/about/internal/index.php
@@ -1,4 +1,3 @@
-<div id="wpbody-content">
 <h1>Über dieses Plugin</h1>
 
 
diff --git a/modules/calendar/internal/index.php b/modules/calendar/internal/index.php
index 925fc09..1e77c22 100644
--- a/modules/calendar/internal/index.php
+++ b/modules/calendar/internal/index.php
@@ -1,5 +1,4 @@
 <?php
-echo '<div id="wpbody-content">';
 echo '<h1>Kalender-Einstellungen</h1>';
 if (isset($_POST['submit'])) {
     echo '<div id="bdp_success">Die Einstellungen wurden gespeichert.</div>';
@@ -22,7 +21,6 @@ if (null !== $categories) {
 }
 ?>
 <form method="post" action="admin.php?page=bdp-kompass%2Fmodules%2Findex.php&loadmodule=calendar">
-    <div class="bdp_cal_outer">
         <fieldset class="bdp_cal_inner">
             <legend>Datenabfrage</legend>
 
@@ -84,8 +82,5 @@ if (null !== $categories) {
                     <td class="bdp_cal_event_grey"></td>
                 </tr>
             </table>
-        </fieldset>
-    <input class="bdp_submit" type="submit" name="submit" value="Einstellungen speichern">
+    <input class="button" type="submit" name="submit" value="Einstellungen speichern">
 </form>
-</div>
-</div>
\ No newline at end of file
diff --git a/modules/firstusage/classes/Security.class.php b/modules/firstusage/classes/Security.class.php
index 8c252e6..9735d4b 100644
--- a/modules/firstusage/classes/Security.class.php
+++ b/modules/firstusage/classes/Security.class.php
@@ -10,12 +10,13 @@ class Security
 {
     public const required_security_plugins = [
         'wps_hide_login' => ['downloadUrl' => 'https://downloads.wordpress.org/plugin/wps-hide-login.1.9.10.zip'],
-        'limit-login-attempts-reloaded' => ['downloadUrl' => 'https://downloads.wordpress.org/plugin/limit-login-attempts-reloaded.2.25.27.zip']];
+    ];
 
 
     public const delete_plugins = [
         'akismet/akismet.php',
-        'hello.php'
+        'hello.php',
+	    'limit-login-attempts-reloaded'
     ];
 
     public static function setup()