diff --git a/customize.dist/src/less2/include/admin.less b/customize.dist/src/less2/include/admin.less
index 98b110d3e..d13dea481 100644
--- a/customize.dist/src/less2/include/admin.less
+++ b/customize.dist/src/less2/include/admin.less
@@ -6,6 +6,7 @@
 
 @import (reference) "./colortheme-all.less";
 @import (reference) "./forms.less";
+@import (reference) './icon-colors.less';
 
 .admin_main() {
     --LessLoader_require: LessLoader_currentFile();
@@ -36,4 +37,20 @@
         .instance-colors(@palette-colors; length(@palette-colors));
     }
 
+    div.cp-admin-customize-apps-grid {
+        .cp-appblock {
+            .iconColors_main();
+        }
+        .cp-inactive-app {
+            .cp-on-enabled {
+                visibility: hidden;
+            }
+        }
+        .cp-active-app {
+            .cp-on-enabled {
+                visibility: visible;
+            }
+        }
+
+    }
 }
diff --git a/www/admin/inner.js b/www/admin/inner.js
index 4ff24497d..d8f032be5 100644
--- a/www/admin/inner.js
+++ b/www/admin/inner.js
@@ -638,36 +638,39 @@ define([
 
         sidebar.addItem('apps', function (cb) {
             const grid = blocks.block([], 'cp-admin-customize-apps-grid');
+            const $grid = $(grid);
             const allApps = PadTypes.appsToSelect;
-			const appsToDisable = ApiConfig.appsToDisable || [];
-            
-            function select(app, appBlock) {
+            const appsToDisable = ApiConfig.appsToDisable || [];
+
+            let select = function (app, $app) {
                 if (appsToDisable.indexOf(app) === -1) {
                     appsToDisable.push(app);
-                    var checkMark = h('div.cp-onboardscreen-checkmark');
-                    $(checkMark).addClass('fa.fa-check');
-                    appBlock.append(checkMark);
-                    $(`#${app}-block`).addClass('cp-active-app');
-                    $(`#${app}-block`).removeClass('cp-inactive-app');
+                    $app.toggleClass('cp-inactive-app', true);
+                    $app.toggleClass('cp-active-app', false);
                 } else {
                     appsToDisable.splice(appsToDisable.indexOf(app), 1);
-                    $(`#${app}-block`).addClass('cp-inactive-app'); 
-                    $(`#${app}-block`).removeClass('cp-active-app');
-                    appBlock.find('.cp-onboardscreen-checkmark').remove();
-                } 
-            }
-
-            allApps.forEach(app => { 
-                
-                let appBlock = h('div.cp-appblock', {id: `${app.toString()}-block`}, app.charAt(0).toUpperCase() + app.slice(1));
-                if (appsToDisable.indexOf(app) === -1) {
-                    $(appBlock).addClass('cp-inactive-app');
-                } else {
-                    $(appBlock).addClass('cp-active-app');
+                    $app.toggleClass('cp-inactive-app', false);
+                    $app.toggleClass('cp-active-app', true);
                 }
-                $(grid).append(appBlock);
-                $(appBlock).on('click', () => select(app, $(appBlock)));
-            }); 
+            };
+
+            allApps.forEach(app => {
+                let name = Messages.type[app] || app;
+                let icon = UI.getNewIcon(app);
+                let appBlock = h('div.cp-appblock', [
+                    icon,
+                    h('span', name),
+                    h('i.fa.fa-check.cp-on-enabled')
+                ]);
+                let $app = $(appBlock).appendTo($grid);
+                if (appsToDisable.includes(app)) {
+                    $app.addClass('cp-inactive-app');
+                } else {
+                    $app.addClass('cp-active-app');
+                }
+                $app.on('click', () => select(app, $app));
+            });
+
 
             var save = blocks.activeButton('primary', '', Messages.settings_save, function (done) {
                 sFrameChan.query('Q_ADMIN_RPC', {
diff --git a/www/install/onboarding.less b/www/install/onboarding.less
index 71da6d9b6..aaa7a6e01 100644
--- a/www/install/onboarding.less
+++ b/www/install/onboarding.less
@@ -45,18 +45,27 @@
         .cp-appblock {
             .iconColors_main();
         }
+        .cp-inactive-app {
+            .cp-on-enabled {
+                visibility: hidden;
+            }
+        }
+        .cp-active-app {
+            .cp-on-enabled {
+                visibility: visible;
+            }
+        }
     }
 }
 
-@cp_palette:
-    #FFD4D4,
-    #FFDECA,
-    #FFE69C,
-    #DBFFB7,
-    #AFFDC2,
-    #C9FFFE,
-    #C8D6FF,
-    #E4CAFF;
+.configscreen {
+    //width: 70%;
+    //height: 75%;
+    background-color: @cp_loading-progress-bg;
+    border-radius: @variables_radius_L;
+    box-shadow: 0px 0px 10px 0px @cp_shadow-color;
+    padding: 30px 110px 20px 110px;
+}
 
 // .cp-onboardscreen-form {
 //     // padding:10px;
@@ -153,22 +162,6 @@ nav.cp-onboardscreen-nav {
 // }
 
 
-.cp_palette(@cp_palette; @index) when (@index > 0){
-        // loop through the @colors
-        .cp_palette(@cp_palette; (@index - 1));
-        @color: extract(@cp_palette, @index);
-        // make a numbered class selector for each color
-        .cp-kanban-palette-color@{index}{
-            background-color: @color !important;
-            &.cp-kanban-palette-board {
-                background-color: @color !important;
-            }
-            &.kanban-board-inner {
-                background-color: fade(@color, 50%) !important;
-            }
-        }
-    }
-
 // .kanban-colors(@kanban-colors; @index) when (@index > 0){
 //         // loop through the @colors
 //         .kanban-colors(@kanban-colors; (@index - 1));
@@ -239,18 +232,6 @@ nav.cp-onboardscreen-nav {
 //     padding: 10px;
 // }
 
-.cp-inactive-app {
-    .cp-on-enabled {
-        visibility: hidden;
-    }
-}
-.cp-active-app {
-    background-color: #212121!important;
-    max-width:30%;
-    .cp-on-enabled {
-        visibility: visible;
-    }
-}
 
 // .cp-admin-customize-options-grid {
 //     height:40%;
diff --git a/www/install/onboardscreen.js b/www/install/onboardscreen.js
index 24c445f6b..d191cd51c 100644
--- a/www/install/onboardscreen.js
+++ b/www/install/onboardscreen.js
@@ -225,8 +225,6 @@ define([
         const allApps = PadTypes.appsToSelect;
         const appsToDisable = selections.appsToDisable;
 
-        let apps = {};
-
         let select = function (app, $app) {
             if (appsToDisable.indexOf(app) === -1) {
                 console.error('SET ACTIVE', app);
@@ -239,12 +237,12 @@ define([
                 $app.toggleClass('cp-inactive-app', false);
                 $app.toggleClass('cp-active-app', true);
             }
-        }
+        };
 
         allApps.forEach(app => {
             let name = Messages.type[app] || app;
             let icon = UI.getNewIcon(app);
-            let appBlock = apps[app] = h('div.cp-appblock', [
+            let appBlock = h('div.cp-appblock', [
                 icon,
                 h('span', name),
                 h('i.fa.fa-check.cp-on-enabled')