diff --git a/apps/Core/Components/Apps/AppsComponent.php b/apps/Core/Components/Apps/AppsComponent.php
index 06d87f498..70378c4dc 100644
--- a/apps/Core/Components/Apps/AppsComponent.php
+++ b/apps/Core/Components/Apps/AppsComponent.php
@@ -14,7 +14,7 @@ class AppsComponent extends BaseComponent
      */
     public function viewAction()
     {
-        $typesArr = $this->apps->types->types;
+        $typesArr = $this->apps->types->getInstalledAppTypes();
 
         $this->view->types = $typesArr;
 
@@ -189,7 +189,7 @@ public function viewAction()
                 }
 
                 //Views
-                $viewsArr = $this->modules->views->getViewsForAppType($app['app_type']);
+                $viewsArr = $this->modules->views->getViewsForAppType($app['app_type'], false);
                 if (count($viewsArr) === 1) {
                     array_push($mandatoryViews, $this->helper->first($viewsArr)['name']);
 
@@ -259,6 +259,8 @@ public function viewAction()
                     return;
                 }
                 $this->view->acceptableUsernames = $this->apps->getAcceptableUsernamesForAppId();
+
+                $this->view->dashboards = $this->basepackages->dashboards->init()->getDashboardsByAppType($app['app_type']);
             } else {
                 $this->view->app = null;
                 $domains = $this->domains->domains;
@@ -286,9 +288,10 @@ public function viewAction()
                 $this->view->publicStorages = $publicStorages;
 
                 $this->view->privateStorages = $privateStorages;
+
+                $this->view->dashboards = [];
             }
 
-            $this->view->dashboards = $this->basepackages->dashboards->init()->dashboards;
             $this->view->roles = $this->basepackages->roles->init()->roles;
             $this->view->pick('apps/view');
 
@@ -343,7 +346,7 @@ public function addAction()
     {
         $this->requestIsPost();
 
-        $viewsArr = $this->modules->views->getViewsForAppType($this->postData()['app_type']);
+        $viewsArr = $this->modules->views->getViewsForAppType($this->postData()['app_type'], false);
 
         if (count($viewsArr) === 0) {
             $this->addResponse('No Views Available for app type ' . $this->postData()['app_type'] . ' cannot proceed!', 1);
@@ -378,7 +381,7 @@ public function updateAction()
             $this->apps->packagesData->responseCode
         );
 
-        $this->addToNotification('update', 'Updated app ' . $this->postData()['name'], null, $this->apps->packagesData->last);
+        $this->addToNotification('update', 'Updated app', null, $this->apps->packagesData->last ?? []);
     }
 
     /**
@@ -517,7 +520,7 @@ public function getViewsForAppTypeAction()
     {
         $this->requestIsPost();
 
-        $viewsArr = $this->modules->views->getViewsForAppType($this->postData()['app_type']);
+        $viewsArr = $this->modules->views->getViewsForAppType($this->postData()['app_type'], false);
 
         if ($viewsArr && count($viewsArr) > 0) {
             $views = [];
diff --git a/apps/Core/Components/Auth/AuthComponent.php b/apps/Core/Components/Auth/AuthComponent.php
index aa45b934d..6becdbf5e 100644
--- a/apps/Core/Components/Auth/AuthComponent.php
+++ b/apps/Core/Components/Auth/AuthComponent.php
@@ -172,11 +172,7 @@ public function sendTwoFaEmailAction()
     {
         $this->requestIsPost();
 
-        try {
-            $this->access->auth->twoFa->sendTwoFaEmail($this->postData());
-        } catch (\Exception $e) {
-            var_dump($e);die();
-        }
+        $this->access->auth->twoFa->sendTwoFaEmail($this->postData());
 
         $this->addResponse(
             $this->access->auth->twoFa->packagesData->responseMessage,
diff --git a/apps/Core/Components/Dashboards/DashboardsComponent.php b/apps/Core/Components/Dashboards/DashboardsComponent.php
index db53ef1a3..aa405d32b 100644
--- a/apps/Core/Components/Dashboards/DashboardsComponent.php
+++ b/apps/Core/Components/Dashboards/DashboardsComponent.php
@@ -35,14 +35,11 @@ public function viewAction()
                     $dashboardId = $this->getData()['id'];
 
                     $dashboard = $this->basepackages->dashboards->getDashboardById($dashboardId, true, false);
-                    $dashboard['is_app_default'] = false;
 
                     if (isset($this->app['settings']['defaultDashboard'])) {
                         if ($this->app['settings']['defaultDashboard'] == $dashboard['id']) {
-                            $dashboard['is_app_default'] = true;
+                            $dashboard['app_default'] = true;
                         }
-
-                        $this->view->isAppDefault = true;
                     }
 
                     if (isset($dashboard['shared']) && is_string($dashboard['shared'])) {
@@ -66,19 +63,31 @@ public function viewAction()
                         $dashboard['shared'] = [];
                     }
 
+                    //Default
+                    if ($dashboard['user_default']) {
+                        if (is_string($dashboard['user_default'])) {
+                            $dashboard['user_default'] = $this->helper->decode($dashboard['user_default'], true);
+                        }
+
+                        if (in_array($this->access->auth->account()['id'], $dashboard['user_default'])) {
+                            $dashboard['user_default'] = true;
+                        }
+                    }
+
                     $this->view->dashboard = $dashboard;
                 }
 
                 $this->view->pick('dashboards/dashboards/dashboard');
 
                 return;
-            } else {
+            } else {//List of all dashboards
+                $dashboardId = 0;
+
                 if (isset($this->app['settings']['defaultDashboard'])) {
                     $dashboardId = $this->app['settings']['defaultDashboard'];
                 }
 
-                $dashboards = $this->basepackages->dashboards->dashboards;
-                $dashboards = msort($dashboards, 'is_default');
+                $dashboards = $this->basepackages->dashboards->getDashboardsByAppType($this->app['app_type']);
 
                 if ($this->access->auth->account()) {
                     foreach ($dashboards as $dashboardKey => &$dashboard) {
@@ -110,18 +119,23 @@ public function viewAction()
                         }
 
                         //Default
-                        if ($dashboard['is_default'] && !$isShared) {
-                            $dashboardId = $dashboard['id'];
+                        if ($dashboard['user_default']) {
+                            if (is_string($dashboard['user_default'])) {
+                                $dashboard['user_default'] = $this->helper->decode($dashboard['user_default'], true);
+                            }
 
-                            $dashboard['name'] = $dashboard['name'] . ' (User Default)';
+                            if (in_array($this->access->auth->account()['id'], $dashboard['user_default'])) {
+                                $dashboard['name'] = $dashboard['name'] . ' (User Default)';
+                                $dashboardId = $dashboard['id'];
+                            }
                         }
                     }
                 }
 
-                $this->view->dashboard = $this->basepackages->dashboards->getDashboardById($dashboardId, true, false);
-
                 $this->view->dashboards = $dashboards;
 
+                $this->view->dashboard = $this->basepackages->dashboards->getDashboardById($dashboardId, true, false);
+
                 $this->view->widgetsTree = $this->basepackages->widgets->getWidgetsTree();
             }
         }
@@ -222,6 +236,19 @@ public function getDashboardWidgetsAction()
         );
     }
 
+    public function getDashboardsByAppTypeAction()
+    {
+        $this->requestIsPost();
+
+        $this->basepackages->dashboards->getDashboardsByAppType($this->postData()['app_type']);
+
+        $this->addResponse(
+            $this->basepackages->dashboards->packagesData->responseMessage,
+            $this->basepackages->dashboards->packagesData->responseCode,
+            $this->basepackages->dashboards->packagesData->responseData
+        );
+    }
+
     public function searchAccountAction()
     {
         $this->requestIsPost();
diff --git a/apps/Core/Components/Devtools/Modules/ModulesComponent.php b/apps/Core/Components/Devtools/Modules/ModulesComponent.php
index d8ad40585..338779a8f 100644
--- a/apps/Core/Components/Devtools/Modules/ModulesComponent.php
+++ b/apps/Core/Components/Devtools/Modules/ModulesComponent.php
@@ -99,7 +99,6 @@ public function viewAction()
 				$modulesArr = $this->processModulesArr(msort($this->modules->{$modulesType}->{$modulesType}, 'name'));
 				${$modulesType . 'CategoryArr'} = $modulesArr['categoryArr'];
 			}
-
 			if ($modulesArr['modules'] && count($modulesArr['modules']) > 0) {
 				$modules[$modulesType]['value'] = ucfirst($modulesType);
 				$modules[$modulesType]['childs'] = $modulesArr['modules'];
@@ -193,7 +192,7 @@ public function viewAction()
 									 $module['module_details']['category'] === 'providers')
 								) {
 									if ($module['module_details']['category'] === 'basepackagesApis') {
-										$moduleLocation = 'system/Base/Installer/Packages/Setup/Register/Modules/Packages/Basepackages/ApiClientServices/Apis/';
+										$moduleLocation = 'system/Base/Installer/Packages/Setup/Register/Modules/Packages/Basepackages/Api/Apis/';
 									} else if (str_starts_with($module['module_details']['category'], 'basepackages')) {
 										$moduleLocation = 'system/Base/Installer/Packages/Setup/Register/Modules/Packages/Basepackages/';
 									} else if ($module['module_details']['category'] === 'providers') {
@@ -236,8 +235,12 @@ public function viewAction()
 
 									$routePath = implode('/', $pathArr) . '/Install/';
 								} else if ($module['module_details']['module_type'] === 'views') {
-									if (isset($module['module_details']['base_view_module_id']) && $module['module_details']['base_view_module_id'] != 0) {
-										$baseView = $this->modules->views->getViewById($module['module_details']['base_view_module_id']);
+									if ($module['module_details']['is_subview'] == true) {
+										if ($module['module_details']['base_view_module_id'] != 0) {
+											$baseView = $this->modules->views->getViewById($module['module_details']['base_view_module_id']);
+										} else {
+											$baseView['name'] = 'Default';
+										}
 
 										$pathArr = preg_split('/(?=[A-Z])/', ucfirst($module['module_details']['name']), -1, PREG_SPLIT_NO_EMPTY);
 
diff --git a/apps/Core/Components/Devtools/Test/TestComponent.php b/apps/Core/Components/Devtools/Test/TestComponent.php
index d638054b0..4a34c9334 100644
--- a/apps/Core/Components/Devtools/Test/TestComponent.php
+++ b/apps/Core/Components/Devtools/Test/TestComponent.php
@@ -7,20 +7,33 @@
 
 class TestComponent extends BaseComponent
 {
-    protected $sourceDir = 'system/Base/Providers/BasepackagesServiceProvider/Packages/Geo/Data/';
-
     /**
      * @acl(name=view)
      */
     public function viewAction()
     {
-        // var_dump($this->opCache->setCache('guru', ['guru'=>123], 'guru'));
-        // var_dump($this->opCache->getCache('guru', 'guru'));
-        // var_dump($this->opCache->removeCache());
+        // $install = new \Apps\Fintech\Components\Dashboards\Install\Install;
+
+        // $install->init()->install();
+        // $adminComponents = $this->basepackages->utils->scanDir('apps/Core/Components/', true);
 
-        // $dicData = new DevtoolsDicExtractData;
+        // foreach ($adminComponents['files'] as $adminComponentKey => $adminComponent) {
+        //     if (strpos($adminComponent, 'component.json')) {
+        //         try {
+        //             $jsonFile =
+        //                 $this->helper->decode(
+        //                     $this->localContent->read($adminComponent),
+        //                     true
+        //                 );
+        //         } catch (\throwable $e) {
+        //             throw new \Exception($e->getMessage() . '. Problem reading component.json at location ' . $adminComponent);
+        //         }
 
-        // $dicData->processDicData();
+        //         if ($jsonFile['menu'] && $jsonFile['menu'] !== 'false') {
+        //             $this->basepackages->menus->addMenu($jsonFile);
+        //         }
+        //     }
+        // }
     }
 
     /**
@@ -28,9 +41,6 @@ public function viewAction()
      */
     public function apiViewAction()
     {
-        // usleep(50000);
-        // sleep(10);
-        // var_dump($_SESSION);
         $this->addResponse('Test', 0, ['connection' => $this->connection->getId(), 'session' => $this->session->getId()]);
     }
 
diff --git a/apps/Core/Components/Home/HomeComponent.php b/apps/Core/Components/Home/HomeComponent.php
index fb81ce37d..3d28243eb 100644
--- a/apps/Core/Components/Home/HomeComponent.php
+++ b/apps/Core/Components/Home/HomeComponent.php
@@ -2,7 +2,6 @@
 
 namespace Apps\Core\Components\Home;
 
-use Phalcon\Helper\Arr;
 use System\Base\BaseComponent;
 
 class HomeComponent extends BaseComponent
diff --git a/apps/Core/Components/System/Api/Client/Services/ServicesComponent.php b/apps/Core/Components/System/Api/Client/Services/ServicesComponent.php
index 21f1a7497..89ef066d3 100644
--- a/apps/Core/Components/System/Api/Client/Services/ServicesComponent.php
+++ b/apps/Core/Components/System/Api/Client/Services/ServicesComponent.php
@@ -119,10 +119,10 @@ function ($dataArr) {
     protected function replaceColumns($dataArr)
     {
         foreach ($dataArr as $dataKey => &$data) {
-            if (isset($data['in_use']) && $data['in_use'] == '0') {
-                $data['in_use'] = '<span class="badge badge-secondary text-uppercase">No</span>';
-            } else if (isset($data['in_use']) && $data['in_use'] == '1') {
+            if (isset($data['in_use']) && $data['in_use'] == '1') {
                 $data['in_use'] = '<span class="badge badge-success text-uppercase">Yes</span>';
+            } else {
+                $data['in_use'] = '<span class="badge badge-secondary text-uppercase">No</span>';
             }
 
             $data['category'] = ucfirst($data['category']);
diff --git a/apps/Core/Components/System/Menus/Install/component.json b/apps/Core/Components/System/Menus/Install/component.json
new file mode 100644
index 000000000..5e19fbd99
--- /dev/null
+++ b/apps/Core/Components/System/Menus/Install/component.json
@@ -0,0 +1,42 @@
+{
+    "route"         : "system/menus",
+    "name"          : "Menus",
+    "description"   : "Manage menus via this component",
+    "module_type"   : "components",
+    "app_type"      : "core",
+    "category"      : "admin",
+    "version"       : "0.0.0",
+    "repo"          : "https://.../",
+    "class"         : "Apps\\Core\\Components\\System\\Menus\\MenusComponent",
+    "dependencies"  : {
+        "core"          : {
+            "name"      : "Core",
+            "version"   : "0.0.0",
+            "repo"      : "https://.../"
+        },
+        "components"    : [],
+        "packages"      : [],
+        "middlewares"   : [],
+        "views"         : [],
+        "external"      : []
+    },
+    "menu"              : {
+        "seq"           : 7,
+        "system"      : {
+            "icon"      : "cogs",
+            "title"     : "system",
+            "childs"    : {
+                "menus" : {
+                    "title"     : "menus",
+                    "icon"      : "bars",
+                    "link"      : "system/menus"
+                }
+            }
+        }
+    },
+    "settings"          : {
+        "mandatory"     : {
+            "core"      : true
+        }
+    }
+}
\ No newline at end of file
diff --git a/apps/Core/Components/System/Menus/MenusComponent.php b/apps/Core/Components/System/Menus/MenusComponent.php
new file mode 100644
index 000000000..d98120d79
--- /dev/null
+++ b/apps/Core/Components/System/Menus/MenusComponent.php
@@ -0,0 +1,89 @@
+<?php
+
+namespace Apps\Core\Components\System\Menus;
+
+use Apps\Core\Packages\Adminltetags\Traits\DynamicTable;
+use System\Base\BaseComponent;
+
+class MenusComponent extends BaseComponent
+{
+    use DynamicTable;
+
+    protected $menus;
+
+    public function initialize()
+    {
+        $this->menus = $this->basepackages->menus;
+    }
+
+    /**
+     * @acl(name=view)
+     */
+    public function viewAction()
+    {
+        $this->view->appTypes = $this->apps->types->getInstalledAppTypes();
+
+        if (isset($this->getData()['id'])) {
+            if ($this->getData()['id'] != 0) {
+                $menu = $this->menus->getById($this->getData()['id']);
+
+                if (!$menu) {
+                    return $this->throwIdNotFound();
+                }
+
+                $this->view->menu = $menu;
+            }
+
+            $this->view->pick('menus/view');
+
+            return;
+        }
+
+        $controlActions =
+            [
+                'actionsToEnable'       =>
+                [
+                    'view'              => 'system/menus',
+                ]
+            ];
+
+        $this->generateDTContent(
+            $this->menus,
+            'system/menus/view',
+            null,
+            ['route', 'app_type'],
+            true,
+            ['route', 'app_type'],
+            $controlActions,
+            null,
+            null,
+            'id'
+        );
+
+        $this->view->pick('menus/list');
+    }
+
+    /**
+     * @acl(name=add)
+     */
+    public function addAction()
+    {
+        //
+    }
+
+    /**
+     * @acl(name=update)
+     */
+    public function updateAction()
+    {
+        //
+    }
+
+    /**
+     * @acl(name=remove)
+     */
+    public function removeAction()
+    {
+        //
+    }
+}
\ No newline at end of file
diff --git a/apps/Core/Components/System/Tools/Backuprestore/BackuprestoreComponent.php b/apps/Core/Components/System/Tools/Backuprestore/BackuprestoreComponent.php
index aced6f136..6f350f8fe 100644
--- a/apps/Core/Components/System/Tools/Backuprestore/BackuprestoreComponent.php
+++ b/apps/Core/Components/System/Tools/Backuprestore/BackuprestoreComponent.php
@@ -19,7 +19,7 @@ public function viewAction()
         $this->getNewToken();
 
         if (isset($this->getData()['analyse']) && $this->getData()['analyse'] == 'info') {
-            $backupInfoFile = $this->basepackages->backuprestore->init('analyse')->analyseBackinfoFile($this->getData()['id']);
+            $backupInfoFile = $this->basepackages->backuprestore->init()->analyseBackinfoFile($this->getData()['id']);
 
             if ($backupInfoFile) {
                 return $this->view->getPartial('backuprestore/analyse/analysis', ['backupInfoFile' => $backupInfoFile]);
@@ -72,7 +72,7 @@ public function backupAction()
     {
         $this->requestIsPost();
 
-        if ($this->basepackages->backuprestore->init()->backup($this->postData())) {
+        if ($this->basepackages->backuprestore->init('backup')->backup($this->postData())) {
             $this->addResponse(
                 $this->basepackages->backuprestore->packagesData->responseMessage,
                 $this->basepackages->backuprestore->packagesData->responseCode,
diff --git a/apps/Core/Install/type.json b/apps/Core/Install/type.json
index 87f596ffa..1e2eb3d7a 100644
--- a/apps/Core/Install/type.json
+++ b/apps/Core/Install/type.json
@@ -1,7 +1,8 @@
 {
-    "name": "Core",
-    "app_type": "core",
-    "description": "Core apps type for core modules.",
-    "repo": "https://.../",
-    "version": "0.0.0"
+	"app_type" : "core",
+	"dashboards" : true,
+	"name" : "Core",
+	"description" : "Core apps type for core modules.",
+	"version" : "0.0.0",
+	"repo" : "https://.../"
 }
\ No newline at end of file
diff --git a/apps/Core/Middlewares/IpFilter/IpFilter.php b/apps/Core/Middlewares/IpFilter/IpFilter.php
index 1acd3252d..c3a7adc55 100644
--- a/apps/Core/Middlewares/IpFilter/IpFilter.php
+++ b/apps/Core/Middlewares/IpFilter/IpFilter.php
@@ -2,7 +2,6 @@
 
 namespace Apps\Core\Middlewares\IpFilter;
 
-use Phalcon\Mvc\View;
 use System\Base\BaseMiddleware;
 
 class IpFilter extends BaseMiddleware
diff --git a/apps/Core/Packages/Adminltetags/Tags/Buttons/ApplicationButton.php b/apps/Core/Packages/Adminltetags/Tags/Buttons/ApplicationButton.php
new file mode 100644
index 000000000..4ba5498dd
--- /dev/null
+++ b/apps/Core/Packages/Adminltetags/Tags/Buttons/ApplicationButton.php
@@ -0,0 +1,183 @@
+<?php
+
+namespace Apps\Core\Packages\Adminltetags\Tags\Buttons;
+
+use Apps\Core\Packages\Adminltetags\Adminltetags;
+
+class ApplicationButton
+{
+    protected $view;
+
+    protected $tag;
+
+    protected $links;
+
+    protected $escaper;
+
+    protected $adminLTETags;
+
+    protected $content;
+
+    protected $params;
+
+    protected $buttonParams = [];
+
+    public function __construct($view, $tag, $links, $escaper, $params, $buttonParams)
+    {
+        $this->view = $view;
+
+        $this->tag = $tag;
+
+        $this->links = $links;
+
+        $this->escaper = $escaper;
+
+        $this->adminLTETags = new Adminltetags();
+
+        $this->params = $params;
+
+        $this->buttonParams = $buttonParams;
+
+        $this->buildButtonParamsArr();
+    }
+
+    public function getContent()
+    {
+        return $this->content;
+    }
+
+    protected function buildButtonParamsArr()
+    {
+        if (isset($this->params['buttons'])) {
+            $buttons = $this->params['buttons'];
+        } else {
+            $this->content .= 'Error: buttons (array) missing';
+
+            return;
+        }
+
+        if (!isset($this->params['buttonId'])) {
+            $this->content .= 'Error: buttonId missing';
+
+            return;
+        }
+
+        foreach ($this->params['buttons'] as $buttonKey => $button) {
+            if (isset($button['title'])) {
+                if ($button['title'] === false) {
+                    $this->buttonParams['title'] = '';
+                } else {
+                    $this->buttonParams['title'] = '<span class="text-xs">' . $button['title'] . '</span>';
+                }
+            } else {
+                $this->buttonParams['title'] = 'Missing Button Title';
+            }
+
+            $this->buttonParams['position'] =
+                isset($button['position']) ?
+                'float-' . $button['position'] :
+                '';
+
+            $this->buttonParams['flat'] =
+                isset($button['flat']) && $button['flat'] === true ?
+                'btn-flat' :
+                '';
+
+            $this->buttonParams['type'] =
+                isset($button['type']) ?
+                'bg-' . $button['type'] :
+                'bg-primary';
+
+            if (isset($button['buttonId'])) {
+                $this->buttonParams['id'] = $button['buttonId'];
+            } else if (isset($this->params['componentId']) && isset($this->params['sectionId'])) {
+                $this->buttonParams['id'] =
+                    $this->params['componentId'] . '-' . $this->params['sectionId'] . '-' . $buttonKey;
+            } else {
+                $this->buttonParams['id'] = $buttonKey;
+            }
+
+            $this->buttonParams['url'] =
+                isset($button['url']) ?
+                $button['url'] :
+                '';
+
+            $this->buttonParams['hidden'] =
+                isset($button['hidden']) && $button['hidden'] === true ?
+                'hidden' :
+                '';
+
+            if ($this->buttonParams['url'] === '') {
+                $this->buttonParams['disabled'] =
+                    isset($button['disabled']) && $button['disabled'] === true ?
+                    'disabled' :
+                    '';
+            } else {
+                $this->buttonParams['disabled'] = '';
+                if (isset($button['disabled']) && $button['disabled'] === true) {
+                    if (isset($button['buttonAdditionalClass'])) {
+                        $button['buttonAdditionalClass'] = $button['buttonAdditionalClass'] . ' disabled';
+                    } else {
+                        $button['buttonAdditionalClass'] = 'disabled';
+                    }
+                }
+            }
+
+            if (isset($button['icon'])) {
+                if (isset($button['iconHidden']) && $button['iconHidden'] === true) {
+                    $iconHidden = 'hidden';
+                } else {
+                    $iconHidden = '';
+                }
+                $this->buttonParams['icon'] = '<i class="fas fa-' . $button['icon'] . '" ' . $iconHidden . '></i>';
+            } else {
+                $this->buttonParams['icon'] = '';
+            }
+
+            $this->buttonParams['additionalClass'] =
+                isset($button['buttonAdditionalClass']) ?
+                $button['buttonAdditionalClass'] :
+                '';
+
+            $this->buttonParams['tooltipPosition'] =
+                isset($button['tooltipPosition']) ?
+                $button['tooltipPosition'] :
+                'auto';
+
+            $this->buttonParams['tooltipTitle'] =
+                isset($button['tooltipTitle']) ?
+                $button['tooltipTitle'] :
+                '';
+
+            $this->buttonParams['badge'] = '';
+            if (isset($button['badge'])) {
+                $this->buttonParams['badge'] = '<span class="badge bg-' . $button['badge'] . '">';
+                if (isset($button['badgeContent'])) {
+                    $this->buttonParams['badge'] .= $button['badgeContent'];
+                }
+                $this->buttonParams['badge'] .= '</span>';
+            }
+
+            $this->buildButton();
+        }
+    }
+
+    protected function buildButton()
+    {
+        $this->content .=
+        '<a href="' . $this->buttonParams['url'] . '" class="btn btn-app ' .
+                $this->buttonParams['flat'] . ' ' .
+                $this->buttonParams['type'] . ' ' .
+                $this->buttonParams['position'] . ' ' .
+                $this->buttonParams['additionalClass'] . ' ' .
+            '" id="' . $this->buttonParams['id'] . '" data-toggle="tooltip" data-html="true" data-placement="' .
+                $this->buttonParams['tooltipPosition']. '" title="' .
+                $this->buttonParams['tooltipTitle'] . '" ' .
+            $this->buttonParams['disabled'] . ' ' .
+            $this->buttonParams['hidden'] . '>' .
+            $this->buttonParams['badge'] .
+            $this->buttonParams['icon'] .
+            $this->buttonParams['title'] .
+        '</a>';
+    }
+}
\ No newline at end of file
diff --git a/apps/Core/Packages/Adminltetags/Tags/Buttons/Button.php b/apps/Core/Packages/Adminltetags/Tags/Buttons/Button.php
index dc347cb12..d11fbdc08 100644
--- a/apps/Core/Packages/Adminltetags/Tags/Buttons/Button.php
+++ b/apps/Core/Packages/Adminltetags/Tags/Buttons/Button.php
@@ -62,7 +62,6 @@ protected function buildButtonParamsArr()
         // }
 
         foreach ($buttons as $buttonKey => $button) {
-
             if (isset($button['title'])) {
                 if ($button['title'] === false) {
                     $this->buttonParams['title'] = '';
diff --git a/apps/Core/Packages/Adminltetags/Tags/Buttons/ButtonGroup.php b/apps/Core/Packages/Adminltetags/Tags/Buttons/ButtonGroup.php
index 016c6296a..33a63ad07 100644
--- a/apps/Core/Packages/Adminltetags/Tags/Buttons/ButtonGroup.php
+++ b/apps/Core/Packages/Adminltetags/Tags/Buttons/ButtonGroup.php
@@ -37,6 +37,8 @@ public function __construct($view, $tag, $links, $escaper, $params, $buttonParam
         $this->params = $params;
 
         $this->buttonParams = $buttonParams;
+
+        $this->buildButtonParamsArr();
     }
 
     public function getContent()
@@ -44,114 +46,336 @@ public function getContent()
         return $this->content;
     }
 
-// {# Radio Button Group #}
-// {% elseif buttonType == 'button-radio-group' %}
-//     {% if buttonLabel %}
-//         <label style="display:block;">{{buttonLabel|upper}}</label>
-//     {% endif %}
-//     {% if buttons %}
-//         {% if buttonBlock == true %}
-//             {% set hasButtonBlock = 'btn-block' %}
-//         {% endif %}
-//         {% if buttonPosition %}
-//             {% set hasButtonPosition = 'float-' ~ buttonPosition %}
-//         {% else %}
-//             {% set hasButtonPosition = '' %}
-//         {% endif %}
-//         <div class="btn-group btn-group-toggle btn-group-{{buttonGroupSize|default('sm')}} {{hasButtonBlock}} {{hasButtonPosition}}" data-toggle="buttons">
-//         {% for buttonKey, button in buttons %}
-//             {% if not button.title == false %}
-//                 {% if button.title %}
-//                     {% set hasButtonTitle = button.title %}
-//                 {% else %}
-//                     {% set hasButtonTitle = ' missing_button_title' %}
-//                 {% endif %}
-//             {% elseif button.title == false %}
-//                     {% set hasButtonTitle = '' %}
-//             {% endif %}
-//             {% if button.size %}
-//                 {% set hasButtonSize = 'btn-' ~ button.size %}
-//             {% else %}
-//                 {% set hasButtonSize = 'btn-sm' %}
-//             {% endif %}
-//             {% if button.flat == true %}
-//                 {% set hasButtonFlat = 'btn-flat' %}
-//             {% endif %}
-//             {% if button.type %}
-//                 {% set hasButtonType = 'btn-' ~ button.type %}
-//             {% else %}
-//                 {% set hasButtonType = 'btn-primary' %}
-//             {% endif %}
-//             {% if button.style == 'outline' %}
-//                 {% set hasButtonType = 'btn-outline-' ~ button.type %}
-//             {% elseif button.style == 'gradient' %}
-//                 {% set hasButtonType = 'bg-gradient-' ~ button.type %}
-//             {% endif %}
-//             {% if button.icon %}
-//                 {% if button.title %}
-//                     {% if button.iconPosition == 'after' %}
-//                         {% set hasButtonIcon = '<i class="fas fa-fw fa-' ~ button.icon ~ ' ml-1"></i>' %}
-//                     {% else %}
-//                         {% set hasButtonIcon = '<i class="fas fa-fw fa-' ~ button.icon ~ ' mr-1"></i>' %}
-//                     {% endif %}
-//                 {% else %}
-//                     {% set hasButtonIcon = '<i class="fas fa-fw fa-' ~ button.icon ~ '"></i>' %}
-//                 {% endif %}
-//             {% else %}
-//                 {% set hasButtonIcon = '' %}
-//             {% endif %}
-//             {% if fieldRadioButtonGroupButtonChecked %}
-//                 {% if fieldRadioButtonGroupButtonChecked == button.dataValue %}
-//                     {% set hasButtonChecked = 'checked' %}
-//                     {% set hasButtonCheckedClasses = 'active focus' %}
-//                     {% set hasButtonCheckedBgClass = 'bg-' ~ button.type %}
-//                 {% else %}
-//                     {% set hasButtonChecked = '' %}
-//                     {% set hasButtonCheckedClasses = '' %}
-//                     {% set hasButtonCheckedBgClass = '' %}
-//                 {% endif %}
-//             {% else %}
-//                 {% if button.checked %}
-//                     {% set hasButtonChecked = 'checked' %}
-//                     {% set hasButtonCheckedClasses = 'active focus' %}
-//                 {% else %}
-//                     {% set hasButtonChecked = '' %}
-//                     {% set hasButtonCheckedClasses = '' %}
-//                 {% endif %}
-//             {% endif %}
-//             {% if button.hidden == true %}
-//                 {% set hasButtonHidden = 'hidden' %}
-//             {% else %}
-//                 {% set hasButtonHidden = '' %}
-//             {% endif %}
-//             {% if button.disabled == true %}
-//                 {% set hasButtonDisabled = 'disabled' %}
-//                 {% set hasButtonCursor = 'style=cursor:default;' %}
-//             {% else %}
-//                 {% set hasButtonDisabled = '' %}
-//                 {% set hasButtonCursor = 'style=cursor:pointer;' %}
-//             {% endif %}
-//             {% if componentId and sectionId %}
-//                 {% set hasButtonId = componentId ~ '-' ~ sectionId ~ '-' ~ buttonKey %}
-//             {% else %}
-//                 {% set hasButtonId = buttonKey %}
-//             {% endif %}
-//             <label class="btn {{hasButtonSize}} {{hasButtonFlat}} {{hasButtonType}} {{hasButtonCheckedClasses}} {{hasButtonDisabled}} {{button.buttonAdditionalClass}} {{hasButtonCheckedBgClass}}" {{hasButtonCursor}} {{hasButtonHidden}}>
-//                 <input type="radio" name="options" id="{{hasButtonId}}" autocomplete="off" data-value="{{button.dataValue}}" {{hasButtonChecked}}>
-//                 {% if button.iconPosition %}
-//                     {% if button.iconPosition == 'after' %}
-//                         {{buttonIdMissing|upper}}{{hasButtonTitle|upper}} {{hasButtonIcon|raw}}
-//                     {% else %}
-//                         {{hasButtonIcon|raw}} {{buttonIdMissing|upper}}{{hasButtonTitle|upper}}
-//                     {% endif %}
-//                 {% else %}
-//                     {{hasButtonIcon|raw}} {{buttonIdMissing|upper}}{{hasButtonTitle|upper}}
-//                 {% endif %}
-//             </label>
-//         {% endfor %}
-//         </div>
-//     {% else %}
-//         <span class="text-uppercase text-danger">{{('TEMPLATE ERROR: buttons (ARRAY) MISSING')}}</span>
-//     {% endif %}
-// {# button-group #}
+    protected function buildButtonParamsArr()
+    {
+        if (isset($this->params['buttons'])) {
+            $buttons = $this->params['buttons'];
+        } else {
+            $this->content .= 'Error: buttons (array) missing';
+
+            return;
+        }
+
+        if (!isset($this->params['buttonId'])) {
+            $this->content .= 'Error: buttonId missing';
+
+            return;
+        }
+
+        // groupButtonType : horizontal, vertical, radio
+        $this->buttonParams['groupButtonType'] = 'btn-group';
+        if (isset($this->params['groupButtonType'])) {
+            if ($this->params['groupButtonType'] === 'vertical') {
+                $this->buttonParams['groupButtonType'] = 'btn-group-vertical';
+            }
+        }
+
+        $this->buttonParams['groupButtonSize'] =
+            isset($this->params['groupButtonSize']) ?
+            $this->params['groupButtonSize'] :
+            'md';
+
+        $this->buttonParams['groupButtonFlat'] =
+            isset($this->params['groupButtonFlat']) && $this->params['groupButtonFlat'] === true ?
+            'btn-flat' :
+            '';
+
+        $this->buttonParams['groupButtonBlock'] =
+            isset($this->params['groupButtonBlock']) && $this->params['groupButtonBlock'] === true ?
+            'btn-block' :
+            '';
+
+        $this->buttonParams['groupButtonPosition'] =
+            isset($this->params['groupButtonPosition']) ?
+            'float-' . $this->params['groupButtonPosition'] :
+            '';
+
+        $this->buildButton();
+    }
+
+    protected function buildButton()
+    {
+        if ($this->params['groupButtonType'] === 'radio') {
+            $this->buttonParams['groupButtonType'] = 'btn-group btn-group-toggle';
+
+            $this->content .= '<div class="'. $this->buttonParams['groupButtonType'] . ' ' . $this->buttonParams['groupButtonFlat'] . ' ' . $this->buttonParams['groupButtonBlock'] . ' btn-group-' . $this->buttonParams['groupButtonSize'] . ' ' . $this->buttonParams['groupButtonPosition'] . '" data-toggle="buttons">';
+            foreach ($this->params['buttons'] as $buttonKey => $button) {
+
+                $this->params['groupRadioButtonType'] = 'primary';
+                if (isset($button['type'])) {
+                    $this->params['groupRadioButtonType'] = $button['type'];
+                }
+                $this->buttonParams['groupRadioButtonType'] = 'bg-' . $this->params['groupRadioButtonType'];
+
+                if (isset($this->params['groupRadioButtonStyle'])) {
+                    if ($this->params['groupRadioButtonStyle'] === 'outline') {
+                        $this->buttonParams['groupRadioButtonType'] = 'btn-outline-' . $this->params['groupRadioButtonType'];
+                    } else if ($this->params['groupRadioButtonStyle'] === 'gradient') {
+                        $this->buttonParams['groupRadioButtonType'] = 'bg-gradient-' . $this->params['groupRadioButtonType'];
+                    }
+                }
+
+                if (array_key_exists('title', $button) && $button['title'] !== false) {
+                    $hasButtonTitle = $button['title'];
+
+                    if ($button['title'] === false) {
+                        $hasButtonTitle = '';
+                    }
+                } else {
+                    $hasButtonTitle = 'missing_button_title';
+                }
+
+                if (isset($button['icon'])) {
+                    if (isset($button['title'])) {
+                        if (isset($button['iconPosition']) && $button['iconPosition'] === 'after') {
+                            $hasButtonIcon = '<i class="fas fa-fw fa-' . $button['icon'] . ' ml-1"></i>';
+                        } else {
+                            $hasButtonIcon = '<i class="fas fa-fw fa-' . $button['icon'] . ' mr-1"></i>';
+                        }
+                    } else {
+                        $hasButtonIcon = '<i class="fas fa-fw fa-' . $button['icon'] . '"></i>';
+                    }
+                } else {
+                    $hasButtonIcon = '';
+                }
+
+                if (isset($this->params['groupRadioButtonChecked'])) {
+                    if ($this->params['groupRadioButtonChecked'] === $button['value']) {
+                        $hasButtonChecked = 'checked';
+                        $hasButtonCheckedClasses = 'active focus';
+                        if ($this->params['groupRadioButtonStyle'] === 'outline') {
+                            $hasButtonCheckedBgClass = '';
+                        } else {
+                            $hasButtonCheckedBgClass = 'bg-' . $button['type'];
+                        }
+                    } else {
+                        $hasButtonChecked = '';
+                        $hasButtonCheckedClasses = '';
+                        $hasButtonCheckedBgClass = '';
+                    }
+                } else {
+                    if (isset($button['checked']) && $button['checked'] === true) {
+                        $hasButtonChecked = 'checked';
+                        $hasButtonCheckedClasses = 'active focus';
+                        if ($this->params['groupRadioButtonStyle'] === 'outline') {
+                            $hasButtonCheckedBgClass = '';
+                        } else {
+                            $hasButtonCheckedBgClass = 'bg-' . $button['type'];
+                        }
+                    } else {
+                        $hasButtonChecked = '';
+                        $hasButtonCheckedClasses = '';
+                        $hasButtonCheckedBgClass = '';
+                    }
+                }
+
+                if (isset($buton['disabled']) && $buton['disabled'] === true) {
+                    $hasButtonDisabled = 'disabled';
+                    $hasButtonCursor = 'style=cursor:default;';
+                } else {
+                    $hasButtonDisabled = '';
+                    $hasButtonCursor = 'style=cursor:pointer;';
+                }
+
+                $hasButtonValue = $buttonKey;
+                $hasButtonId = $buttonKey;
+                if (isset($button['value'])) {
+                    $hasButtonValue = $button['value'];
+                    $hasButtonId = $button['value'];
+                }
+
+                $hasButtonAdditionalClass = '';
+                if (isset($button['buttonAdditionalClass'])) {
+                    $hasButtonAdditionalClass = $button['buttonAdditionalClass'];
+                }
+
+                if (isset($this->params['buttonId'])) {
+                    $hasButtonName = $this->params['buttonId'];
+                } else if (isset($this->params['componentId']) && isset($this->params['sectionId'])) {
+                    $hasButtonName =
+                        $this->params['componentId'] . '-' . $this->params['sectionId'] . '-' . $buttonKey;
+                } else {
+                    $hasButtonName = $buttonKey;
+                }
+
+                $this->content .=
+                    '<label class="btn ' . $this->buttonParams['groupButtonFlat'] . ' ' . $this->buttonParams['groupRadioButtonType'] . ' ' . $hasButtonCheckedClasses . ' ' . $hasButtonDisabled . ' ' . $hasButtonAdditionalClass . ' '  . $hasButtonCheckedBgClass . '" ' . $hasButtonCursor . '>
+                        <input type="radio" name="' . $hasButtonName . '" id="' . $hasButtonId . '" autocomplete="off" data-value="' . $hasButtonValue . '" ' . $hasButtonChecked . '>';
+
+                        if (isset($button['iconPosition'])) {
+                            if ($button['iconPosition'] === 'after') {
+                                $this->content .= $hasButtonTitle . $hasButtonIcon;
+                            } else {
+                                $this->content .= $hasButtonIcon . $hasButtonTitle;
+                            }
+                        } else {
+                            $this->content .= $hasButtonIcon . $hasButtonTitle;
+                        }
+                $this->content .= '</label>';
+            }
+        } else {
+            $this->content .= '<div class="'. $this->buttonParams['groupButtonType'] . ' btn-group-' . $this->buttonParams['groupButtonSize'] . ' ' . $this->buttonParams['groupButtonPosition'] . '">';
+
+            foreach ($this->params['buttons'] as $buttonKey => $button) {
+                if (isset($button['dropdowns'])) {
+                    if (isset($button['dropdownHover']) && $button['dropdownHover'] === true) {
+                        $button['dropdownHover'] = 'dropdown-hover';
+                    } else {
+                        $button['dropdownHover'] = '';
+                    }
+
+                    $button['dropdownDirection'] =
+                        isset($button['dropdownDirection']) ?
+                        $button['dropdownDirection'] :
+                        '';//either dropup or ''
+
+                    $button['dropdownButtonType'] =
+                        isset($button['dropdownButtonType']) ?
+                        $button['dropdownButtonType'] :
+                        'primary';
+
+                    $this->content .= '<div class="btn-group">';
+                    $this->content .= '<button class="btn btn-' . $button['dropdownButtonType'] . ' dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"></button>';
+
+                    $params = $this->params;
+                    $params['buttonType'] = 'Dropdown';
+                    $params['dropdowns'] = $button['dropdowns'];
+
+                    $this->content .= $this->adminLTETags->useTag('buttons', $params);
+
+                    $this->content .= '</div>';
+                } else {
+                    if (isset($button['title'])) {
+                        if ($button['title'] === false) {
+                            $this->buttonParams['title'] = '';
+                        } else {
+                            $this->buttonParams['title'] = $button['title'];
+                        }
+                    } else {
+                        $this->buttonParams['title'] = 'Missing Button Title';
+                    }
+
+                    if (isset($button['icon']) && isset($button['title'])) {
+                        if (isset($button['iconHidden']) && $button['iconHidden'] === true) {
+                            $iconHidden = 'hidden';
+                        } else {
+                            $iconHidden = '';
+                        }
+                        if (isset($button['iconPosition']) && $button['iconPosition'] === 'after') {
+                            $this->buttonParams['icon'] =
+                                '<i class="fas fa-fw fa-' . $button['icon'] . '" ' . $iconHidden . '></i>';
+                            $this->buttonParams['iconPosition'] = 'after';
+                        } else {
+                            $this->buttonParams['icon'] =
+                                '<i class="fas fa-fw fa-' . $button['icon'] . '" ' . $iconHidden . '></i>';
+                            $this->buttonParams['iconPosition'] = '';
+                        }
+                    } else {
+                        $this->buttonParams['icon'] = '';
+                        $this->buttonParams['iconPosition'] = '';
+                    }
+
+                    if (isset($button['buttonId'])) {
+                        $this->buttonParams['id'] = $button['buttonId'];
+                    } else if (isset($this->params['componentId']) && isset($this->params['sectionId'])) {
+                        $this->buttonParams['id'] =
+                            $this->params['componentId'] . '-' . $this->params['sectionId'] . '-' . $buttonKey;
+                    } else {
+                        $this->buttonParams['id'] = $buttonKey;
+                    }
+
+                    $this->buttonParams['url'] =
+                        isset($button['url']) ?
+                        $button['url'] :
+                        '';
+
+                    $this->buttonParams['hidden'] =
+                        isset($button['hidden']) && $button['hidden'] === true ?
+                        'hidden' :
+                        '';
+
+                    if ($this->buttonParams['url'] === '') {
+                        $this->buttonParams['disabled'] =
+                            isset($button['disabled']) && $button['disabled'] === true ?
+                            'disabled' :
+                            '';
+                    } else {
+                        $this->buttonParams['disabled'] = '';
+                        if (isset($button['disabled']) && $button['disabled'] === true) {
+                            if (isset($button['buttonAdditionalClass'])) {
+                                $button['buttonAdditionalClass'] = $button['buttonAdditionalClass'] . ' disabled';
+                            } else {
+                                $button['buttonAdditionalClass'] = 'disabled';
+                            }
+                        }
+                    }
+
+                    $this->buttonParams['additionalClass'] =
+                        isset($button['buttonAdditionalClass']) ?
+                        $button['buttonAdditionalClass'] :
+                        '';
+
+                    $this->buttonParams['tooltipPosition'] =
+                        isset($button['tooltipPosition']) ?
+                        $button['tooltipPosition'] :
+                        'auto';
+
+                    $this->buttonParams['tooltipTitle'] =
+                        isset($button['tooltipTitle']) ?
+                        $button['tooltipTitle'] :
+                        '';
+
+                    if ($this->buttonParams['url'] !== '') {
+                        $this->content .=
+                            '<a href="' . $this->buttonParams['url'] . '" ';
+                    } else {
+                        $this->content .=
+                            '<button ';
+                    }
+
+                    $this->buttonParams['type'] =
+                        isset($button['type']) ?
+                        'btn-' . $button['type'] :
+                        'btn-primary';
+
+                    $this->content .=
+                        'class="btn btn-' .
+                            $this->buttonParams['groupButtonSize'] . ' ' .
+                            $this->buttonParams['groupButtonFlat'] . ' ' .
+                            $this->buttonParams['type'] . ' ' .
+                            $this->buttonParams['additionalClass'] . ' ' .
+                        '" id="' . $this->buttonParams['id'] . '" ' .
+                        'data-toggle="tooltip" data-html="true" data-placement="' .
+                            $this->buttonParams['tooltipPosition']. '" title="' .
+                            $this->buttonParams['tooltipTitle'] . '" ' .
+                        $this->buttonParams['disabled'] . ' ' .
+                        $this->buttonParams['hidden'] . ' ' .
+                        ' role="button">';
+
+                        if ($this->buttonParams['icon'] !== '') {
+                            if ($this->buttonParams['iconPosition'] === 'after') {
+                                $this->content .=
+                                    strtoupper($this->buttonParams['title']) . ' ' . $this->buttonParams['icon'];
+                            } else {
+                                $this->content .=
+                                    $this->buttonParams['icon'] . ' ' . strtoupper($this->buttonParams['title']);
+                            }
+                        } else {
+                            $this->content .=
+                                strtoupper($this->buttonParams['title']);
+                        }
+
+                    if ($this->buttonParams['url'] !== '') {
+                        $this->content .=
+                            '</a>';
+                    } else {
+                        $this->content .=
+                            '</button>';
+                    }
+                }
+            }
+        }
+
+        $this->content .= '</div>';
+    }
 }
\ No newline at end of file
diff --git a/apps/Core/Packages/Adminltetags/Tags/Buttons/Dropdown.php b/apps/Core/Packages/Adminltetags/Tags/Buttons/Dropdown.php
new file mode 100644
index 000000000..062b22638
--- /dev/null
+++ b/apps/Core/Packages/Adminltetags/Tags/Buttons/Dropdown.php
@@ -0,0 +1,115 @@
+<?php
+
+namespace Apps\Core\Packages\Adminltetags\Tags\Buttons;
+
+use Apps\Core\Packages\Adminltetags\Adminltetags;
+
+class Dropdown
+{
+    protected $view;
+
+    protected $tag;
+
+    protected $links;
+
+    protected $escaper;
+
+    protected $adminLTETags;
+
+    protected $content;
+
+    protected $params;
+
+    protected $buttonParams = [];
+
+    public function __construct($view, $tag, $links, $escaper, $params, $buttonParams)
+    {
+        $this->view = $view;
+
+        $this->tag = $tag;
+
+        $this->links = $links;
+
+        $this->escaper = $escaper;
+
+        $this->adminLTETags = new Adminltetags();
+
+        $this->params = $params;
+
+        $this->buttonParams = $buttonParams;
+
+        $this->buildDropdownParamsArr();
+    }
+
+    public function getContent()
+    {
+        return $this->content;
+    }
+
+    protected function buildDropdownParamsArr()
+    {
+        if (!isset($this->params['dropdowns'])) {
+            $this->content .= 'Error: dropdowns (array) missing';
+
+            return;
+        }
+
+        $this->buttonParams['dropdownAlign'] =
+            isset($this->params['dropdownAlign']) && $this->params['dropdownAlign'] === 'right' ?
+            'dropdown-menu-right' :
+            '';
+
+        $this->buildDropdown();
+    }
+
+    protected function buildDropdown()
+    {
+        $this->content .=
+            '<div class="dropdown-menu ' . $this->buttonParams['dropdownAlign'] . ' ">';
+            foreach ($this->params['dropdowns'] as $index => $links) {
+                if ($index === 'divider') {
+                    $this->content .= '<div class="dropdown-divider"></div>';
+                } else {
+                    if (isset($links['icon']) && isset($links['title'])) {
+                        if (isset($links['iconPosition']) && $links['iconPosition'] === 'after') {
+                            $icon['linkIcon'] =
+                                '<i class="fas fa-fw fa-' . $links['icon'] . '"></i>';
+                            $icon['linkIconPosition'] = 'after';
+                        } else {
+                            $icon['linkIcon'] =
+                                '<i class="fas fa-fw fa-' . $links['icon'] . '"></i>';
+                            $icon['linkIconPosition'] = '';
+                        }
+                    } else {
+                        $icon['linkIcon'] = '';
+                        $icon['linkIconPosition'] = '';
+                    }
+
+                    $linkId = $this->params['componentId'] . '-' . $this->params['sectionId'] . '-' . $index;
+                    $linkDisabled = isset($links['disabled']) && $links['disabled'] === true ? 'disabled' : '';
+                    $linkAdditionalClass = isset($links['additionalClass']) ? $links['additionalClass'] : '';
+                    $linkUrl = isset($links['url']) ? $links['url'] : '#';
+                    $link = isset($links['title']) ? $links['title'] : 'missing_button_title';
+
+                    $this->content .=
+                        '<a id="' . $linkId .'" class="dropdown-item ' . $linkDisabled . ' ' . $linkAdditionalClass . ' " href="'. $linkUrl . '">';
+
+                    if ($icon['linkIcon'] !== '') {
+                        if ($icon['linkIconPosition'] === 'after') {
+                            $this->content .=
+                                strtoupper($link) . ' ' . $icon['linkIcon'];
+                        } else {
+                            $this->content .=
+                                $icon['linkIcon'] . ' ' . strtoupper($link);
+                        }
+                    } else {
+                        $this->content .=
+                            strtoupper($link);
+                    }
+
+                    $this->content .= '</a>';
+                }
+            }
+        $this->content .= '</div>';
+    }
+}
\ No newline at end of file
diff --git a/apps/Core/Packages/Adminltetags/Tags/Buttons/DropdownSplitButtons.php b/apps/Core/Packages/Adminltetags/Tags/Buttons/DropdownSplitButtons.php
index 8f78fc87c..8b9e09a2a 100644
--- a/apps/Core/Packages/Adminltetags/Tags/Buttons/DropdownSplitButtons.php
+++ b/apps/Core/Packages/Adminltetags/Tags/Buttons/DropdownSplitButtons.php
@@ -39,8 +39,6 @@ public function __construct($view, $tag, $links, $escaper, $params, $buttonParam
         $this->buttonParams = $buttonParams;
 
         $this->buildButtonParamsArr();
-
-        $this->buildButton();
     }
 
     public function getContent()
@@ -50,10 +48,9 @@ public function getContent()
 
     protected function buildButtonParamsArr()
     {
-        if (isset($this->params['buttons'])) {
-            $buttons = $this->params['buttons'];
-        } else {
-            $this->content .= 'Error: buttons (array) missing';
+        if (!isset($this->params['dropdowns'])) {
+            $this->content .= 'Error: dropdowns (array) missing';
+
             return;
         }
 
@@ -78,17 +75,17 @@ protected function buildButtonParamsArr()
 
         //Whole Dropdown
         $this->buttonParams['dropdownHover'] =
-            isset($this->params['dropdownHover']) ?
+            (isset($this->params['dropdownHover']) && $this->params['dropdownHover'] === true) ?
             'dropdown-hover' :
             '';
 
         $this->buttonParams['dropdownDirection'] =
             isset($this->params['dropdownDirection']) ?
-            'dropup' :
-            '';
+            $this->params['dropdownDirection'] :
+            '';//either '' or 'dropup'
 
         $this->buttonParams['dropdownAlign'] =
-            isset($this->params['dropdownAlign']) && $this->params['dropdownAlign'] === 'right' ?
+            (isset($this->params['dropdownAlign']) && $this->params['dropdownAlign'] === 'right') ?
             'dropdown-menu-right' :
             '';
 
@@ -98,6 +95,8 @@ protected function buildButtonParamsArr()
         } else {
             $this->buildButtonParamsArrSplit();
         }
+
+        $this->buildButton();
     }
 
     protected function buildButtonParamsArrNoSplit()
@@ -255,7 +254,7 @@ protected function buildButtonParamsArrSplit()
     protected function buildButton()
     {
         $this->content .=
-            '<div class="btn-group ' . $this->buttonParams['dropdownDirection'] . ' ' . $this->buttonParams['buttonPosition'] . '">';
+            '<div class="btn-group ' . $this->buttonParams['dropdownDirection'] . ' ' . $this->buttonParams['dropdownHover'] . ' ' . $this->buttonParams['buttonPosition'] . '">';
 
         if (!$this->buttonParams['dropdownSplitButtonsSplit']) {
             $this->content .=
@@ -325,53 +324,10 @@ protected function buildButton()
                 '><span class="sr-only">Toggle Dropdown</span></button>';
         }
 
-        $this->content .=
-            '<div class="dropdown-menu ' . $this->buttonParams['dropdownAlign'] . ' ">';
-            foreach ($this->params['buttons'] as $index => $links) {
-                if ($index === 'divider') {
-
-                    $this->content .= '<div class="dropdown-divider"></div>';
-                } else {
-                    if (isset($links['icon']) && isset($links['title'])) {
-                        if (isset($links['iconPosition']) && $links['iconPosition'] === 'after') {
-                            $icon['linkIcon'] =
-                                '<i class="fas fa-fw fa-' . $links['icon'] . '"></i>';
-                            $icon['linkIconPosition'] = 'after';
-                        } else {
-                            $icon['linkIcon'] =
-                                '<i class="fas fa-fw fa-' . $links['icon'] . '"></i>';
-                            $icon['linkIconPosition'] = '';
-                        }
-                    } else {
-                        $icon['linkIcon'] = '';
-                        $icon['linkIconPosition'] = '';
-                    }
+        $params = $this->params;
+        $params['buttonType'] = 'Dropdown';
+        $this->content .= $this->adminLTETags->useTag('buttons', $params);
 
-                    $linkId = $this->params['componentId'] . '-' . $this->params['sectionId'] . '-' . $index;
-                    $linkDisabled = isset($links['disabled']) && $links['disabled'] === true ? 'disabled' : '';
-                    $linkAdditionalClass = isset($links['additionalClass']) ? $links['additionalClass'] : '';
-                    $linkUrl = isset($links['url']) ? $links['url'] : '#';
-                    $link = isset($links['title']) ? $links['title'] : 'missing_button_title';
-
-                    $this->content .=
-                        '<a id="' . $linkId .'" class="dropdown-item ' . $linkDisabled . ' ' . $linkAdditionalClass . ' " href="'. $linkUrl . '">';
-
-                    if ($icon['linkIcon'] !== '') {
-                        if ($icon['linkIconPosition'] === 'after') {
-                            $this->content .=
-                                strtoupper($link) . ' ' . $icon['linkIcon'];
-                        } else {
-                            $this->content .=
-                                $icon['linkIcon'] . ' ' . strtoupper($link);
-                        }
-                    } else {
-                        $this->content .=
-                            strtoupper($link);
-                    }
-
-                    $this->content .= '</a>';
-                }
-            }
-        $this->content .= '</div></div>';
+        $this->content .= '</div>';
     }
 }
\ No newline at end of file
diff --git a/apps/Core/Packages/Adminltetags/Tags/Fields/Files/Croppie.php b/apps/Core/Packages/Adminltetags/Tags/Fields/Files/Croppie.php
index a45243f39..f8edb40e5 100644
--- a/apps/Core/Packages/Adminltetags/Tags/Fields/Files/Croppie.php
+++ b/apps/Core/Packages/Adminltetags/Tags/Fields/Files/Croppie.php
@@ -752,6 +752,7 @@ function uploadAvatar(avatarName) {
                                 formData.append("setOrphan", "' . $this->params['setOrphan'] . '");
                                 formData.append("fileName", avatarName);
                                 formData.append("storagetype", "' . $this->params['storageType'] . '");
+                                formData.append($("#security-token").attr("name"), $("#security-token").val());
 
                                 performUpload(formData);
                             }
@@ -892,7 +893,7 @@ function updateProfileThumbnail(remove = false) {
                                     } else {
                                         $("#profile-portrait").children("i").attr("hidden", true);
                                         $("#profile-portrait").children("img").attr("src", window.dataCollection.env.rootPath + window.dataCollection.env.appRoute +
-                                            "/system/storages/q/uuid/" + uploadUUIDs[0] + "/w/30");
+                                            "/system/storages/q/uuid/" + uploadUUIDs[uploadUUIDs.length - 1] + "/w/30");
                                         $("#profile-portrait").children("img").attr("hidden", false);
                                         window.dataCollection.env.profile.portrait =
                                             window.dataCollection.env.rootPath + window.dataCollection.env.appRoute + "/system/storages/q/uuid/" + uploadUUIDs[0] + "/w/80";
diff --git a/apps/Core/Packages/Devtools/Modules/DevtoolsModules.php b/apps/Core/Packages/Devtools/Modules/DevtoolsModules.php
index 52bc27ffc..d466964e6 100644
--- a/apps/Core/Packages/Devtools/Modules/DevtoolsModules.php
+++ b/apps/Core/Packages/Devtools/Modules/DevtoolsModules.php
@@ -13,6 +13,7 @@
 use Seld\JsonLint\JsonParser;
 use Seld\JsonLint\ParsingException;
 use System\Base\BasePackage;
+use System\Base\Providers\CoreServiceProvider\Install\Install as CoreInstall;
 use z4kn4fein\SemVer\Version;
 
 class DevtoolsModules extends BasePackage
@@ -141,12 +142,16 @@ public function addModule($data)
                 if ($data['createrepo'] == true) {
                     if ($data['module_type'] === 'views' && $data['base_view_module_id'] == 0) {//Create public repository as well
                         if (!$this->checkRepo($data)) {
-                            $newRepo['base'] = $this->createRepo($data);
+                            if (strtolower($data['app_type']) !== 'core') {
+                                $newRepo['base'] = $this->createRepo($data);
+                            }
                         }
 
                         $data['repo'] = $data['repo'] . '-public';
                         if (!$this->checkRepo($data)) {
-                            $newRepo['public'] = $this->createRepo($data);
+                            if (strtolower($data['app_type']) !== 'core') {
+                                $newRepo['public'] = $this->createRepo($data);
+                            }
                         }
 
                         $this->addResponse('Module added & created new repo.',
@@ -161,7 +166,9 @@ public function addModule($data)
                         return;
                     } else {
                         if (!$this->checkRepo($data)) {
-                            $newRepo = $this->createRepo($data);
+                            if (strtolower($data['app_type']) !== 'core') {
+                                $newRepo = $this->createRepo($data);
+                            }
 
                             $this->addResponse('Module added & created new repo.',
                                                0,
@@ -233,7 +240,9 @@ public function updateModule($data)
             if ($this->modules->{$data['module_type']}->update($data)) {
                 if ($data['createrepo'] == true) {
                     if (!$this->checkRepo($data)) {
-                        $newRepo = $this->createRepo($data);
+                        if (strtolower($data['app_type']) !== 'core') {
+                            $newRepo = $this->createRepo($data);
+                        }
 
                         $this->addResponse('Bundle updated & created new repo.',
                                            0,
@@ -294,12 +303,16 @@ public function updateModule($data)
                     if ($data['createrepo'] == true && strtolower($data['name']) !== 'core') {
                         if ($data['module_type'] === 'views' && $data['base_view_module_id'] == 0) {//Create public repository as well
                             if (!$this->checkRepo($data)) {
-                                $newRepo['base'] = $this->createRepo($data);
+                                if (strtolower($data['app_type']) !== 'core') {
+                                    $newRepo['base'] = $this->createRepo($data);
+                                }
                             }
 
                             $data['repo'] = $data['repo'] . '-public';
                             if (!$this->checkRepo($data)) {
-                                $newRepo['public'] = $this->createRepo($data);
+                                if (strtolower($data['app_type']) !== 'core') {
+                                    $newRepo['public'] = $this->createRepo($data);
+                                }
                             }
 
                             $this->addResponse('Module updated & created new repo.',
@@ -314,7 +327,9 @@ public function updateModule($data)
                             return;
                         } else {
                             if (!$this->checkRepo($data)) {
-                                $newRepo = $this->createRepo($data);
+                                if (strtolower($data['app_type']) !== 'core') {
+                                    $newRepo = $this->createRepo($data);
+                                }
 
                                 $this->addResponse('Module updated & created new repo.',
                                                    0,
@@ -340,6 +355,12 @@ public function updateModule($data)
                         $this->core->update($core);
                     }
 
+                    if ((isset($data['reinstall_table']) && $data['reinstall_table'] == true) ||
+                        (isset($data['truncate_table']) && $data['truncate_table'] == true)
+                    ) {
+                        $this->reinstallTruncateTable($data);
+                    }
+
                     $this->addResponse('Module updated');
 
                     return;
@@ -378,6 +399,64 @@ public function removeModule($data)
         }
     }
 
+    protected function reinstallTruncateTable($data)
+    {
+        $moduleToReinstall = $this->modules->manager->getModuleInfo(
+            [
+                'module_type'   => $data['module_type'],
+                'module_id'     => $data['id']
+            ]
+        );
+
+        $class = $moduleToReinstall['class'];
+
+        if ($moduleToReinstall['app_type'] !== 'core') {
+            $classArr = explode('\\', $moduleToReinstall['class']);
+            $classArr = array_slice($classArr, 0, -1);
+            $class = implode('\\', $classArr) . '\\Install\\Install';
+        } else if ($moduleToReinstall['name'] === 'Core' ||
+                   $moduleToReinstall['app_type'] === 'core'
+        ) {//Core packages. This can be a problem for packages that are not registered in the system, example(modules_packages, modules_external...)
+           //so, the user has to update whole core.
+            $class = 'System\\Base\\Providers\\CoreServiceProvider\\Install\\Install';
+        }
+
+        $path = lcfirst(str_replace('\\', '/', $class) . '.php');
+
+        try {
+            if ($this->localContent->fileExists($path)) {
+                $module = new $class();
+
+                if ($data['app_type'] === 'core') {
+                    $coreInstall = new CoreInstall;
+
+                    if ($data['type'] === 'core') {
+                        if (isset($data['reinstall_table']) && $data['reinstall_table'] == true) {
+                            $coreInstall->init()->install();
+                        }
+                    } else if ($data['type'] === 'packages') {
+                        $moduleModel = $module->useModel();
+
+                        if (isset($data['truncate_table']) && $data['truncate_table'] == true) {
+                            $coreInstall->init([$moduleModel->getSource()])->truncate();
+                        } else if (isset($data['reinstall_table']) && $data['reinstall_table'] == true) {
+                            $coreInstall->init([$moduleModel->getSource()])->install();
+                        }
+                    }
+                } else {
+                    $module = new $class();
+                    if (isset($data['truncate_table']) && $data['truncate_table'] == true && method_exists($module, 'truncate')) {
+                        $module->init()->truncate();
+                    } else if (isset($data['reinstall_table']) && $data['reinstall_table'] == true) {
+                        $module->init()->install();
+                    }
+                }
+            }
+        } catch (FilesystemException | UnableToCheckExistence | \throwable $e) {
+            throw $e;
+        }
+    }
+
     protected function checkAppType($data)
     {
         if (isset($data['app_type']) &&
@@ -407,12 +486,13 @@ protected function checkAppType($data)
                         [
                             'name'          => $data['app_type']['newTags'][0],
                             'app_type'      => strtolower($data['app_type']['newTags'][0]),
+                            'dashboards'    => $data['dashboards'],
                             'description'   => 'Added via devtools module add.',
                             'version'       => $data['version'],
                             'api_id'        => $data['api_id'],
                             'repo'          => $data['repo'],
                             'updated_by'    => '0',
-                            'installed'     => '1'
+                            'installed'     => $data['installed']
                         ];
 
                     $this->apps->types->add($appType);
@@ -435,13 +515,15 @@ protected function checkAppType($data)
                 $appType = $this->apps->types->getAppTypeById($data['id']);
             }
 
-            if (isset($appType) && strtolower($appType['app_type']) !== 'core') {
+            if (isset($appType)) {
                 $appType['name'] = $data['name'];
                 $appType['app_type'] = strtolower($data['app_type']);
+                $appType['dashboards'] = $data['dashboards'];
                 $appType['description'] = $data['description'];
                 $appType['version'] = $data['version'];
                 $appType['api_id'] = $data['api_id'];
                 $appType['repo'] = $data['repo'];
+                $appType['installed'] = $data['installed'];
 
                 $this->apps->types->update($appType);
 
@@ -451,16 +533,19 @@ protected function checkAppType($data)
             } else {
                 $data['app_type'] = strtolower($data['app_type']);
                 $data['updated_by'] = '0';
-                $data['installed'] = '1';
 
                 $this->apps->types->add($data);
 
                 $this->addUpdateAppTypeFiles($data);
             }
 
-            if ($data['createrepo'] == true) {
+            if (strtolower($data['app_type']) !== 'core' &&
+                $data['createrepo'] == true
+            ) {
                 if (!$this->checkRepo($data)) {
-                    $newRepo = $this->createRepo($data);
+                    if (strtolower($data['app_type']) !== 'core') {
+                        $newRepo = $this->createRepo($data);
+                    }
 
                     $this->addResponse('Added new app type', 0, ['newRepo' => $newRepo]);
                 }
@@ -498,6 +583,7 @@ protected function addUpdateAppTypeFiles($appType)
         $jsonFile = 'apps/' . ucfirst($appType['app_type']) . '/Install/type.json';
 
         $jsonContent["app_type"] = $appType["app_type"];
+        $jsonContent["dashboards"] = $appType["dashboards"];
         $jsonContent["name"] = $appType["name"];
         $jsonContent["description"] = $appType["description"];
         $jsonContent["version"] = $appType["version"];
@@ -811,7 +897,7 @@ protected function getModuleJsonFileLocation(&$data)
                  $data['category'] === 'providers')
             ) {
                 if ($data['category'] === 'basepackagesApis') {
-                    $moduleLocation = 'system/Base/Installer/Packages/Setup/Register/Modules/Packages/Basepackages/ApiClientServices/Apis/';
+                    $moduleLocation = 'system/Base/Installer/Packages/Setup/Register/Modules/Packages/Basepackages/Api/Apis/';
                 } else if (str_starts_with($data['category'], 'basepackages')) {
                     $moduleLocation = 'system/Base/Installer/Packages/Setup/Register/Modules/Packages/Basepackages/';
                 } else if ($data['category'] === 'providers') {
@@ -830,12 +916,12 @@ protected function getModuleJsonFileLocation(&$data)
             (str_starts_with($data['category'], 'basepackages') ||
             $data['category'] === 'providers')
         ) {
-            if ($data['category'] === 'basepackagesApis') {
+            // if ($data['category'] === 'basepackagesApis') {
                 $pathArr = preg_split('/(?=[A-Z])/', ucfirst($data['name']), -1, PREG_SPLIT_NO_EMPTY);
                 $path = implode('/', $pathArr);
-            } else {
-                $path = ucfirst($data['name']);
-            }
+            // } else {
+            //     $path = ucfirst($data['name']);
+            // }
 
             return
                 $moduleLocation .
@@ -908,7 +994,7 @@ protected function getNewFilesLocation($data, $viewPublic = false)
                  $data['category'] === 'providers')
             ) {
                 if ($data['category'] === 'basepackagesApis') {
-                    $moduleLocation = 'system/Base/Providers/BasepackagesServiceProvider/Packages/ApiClientServices/Apis/';
+                    $moduleLocation = 'system/Base/Providers/BasepackagesServiceProvider/Packages/Api/Apis/';
                 } else if (str_starts_with($data['category'], 'basepackages')) {
                     $moduleLocation = 'system/Base/Providers/BasepackagesServiceProvider/Packages/';
                 } else if ($data['category'] === 'providers') {
@@ -1059,6 +1145,29 @@ protected function generateNewComponentsFiles($moduleFilesLocation, $data)
             return false;
         }
 
+        try {
+            $file = $this->localContent->read('apps/Core/Packages/Devtools/Modules/Files/ComponentInstallInstall.txt');
+        } catch (FilesystemException | UnableToReadFile $exception) {
+            $this->addResponse('Unable to read module base component file.');
+
+            return false;
+        }
+
+        $moduleFilesLocation = $moduleFilesLocation . 'Install';
+        $fileName = $moduleFilesLocation . '/Install.php';
+        $moduleFilesLocationClass = str_replace('/', '\\', ucfirst($moduleFilesLocation));
+        // $moduleFilesLocationClass = str_replace('\\' . $data['name'], '', $moduleFilesLocationClass);
+        $file = str_replace('"NAMESPACE"', 'namespace ' . $moduleFilesLocationClass . ';', $file);
+
+        try {
+            $this->localContent->write($fileName, $file);
+            array_push($this->newFiles, $fileName);
+        } catch (FilesystemException | UnableToWriteFile $exception) {
+            $this->addResponse('Unable to write module component file');
+
+            return false;
+        }
+
         return true;
     }
 
@@ -1090,6 +1199,31 @@ protected function generateNewMiddlewaresFiles($moduleFilesLocation, $data)
 
             return false;
         }
+
+        try {
+            $file = $this->localContent->read('apps/Core/Packages/Devtools/Modules/Files/MiddlewareInstallInstall.txt');
+        } catch (FilesystemException | UnableToReadFile $exception) {
+            $this->addResponse('Unable to read module base component file.');
+
+            return false;
+        }
+
+        $moduleFilesLocation = $moduleFilesLocation . 'Install';
+        $fileName = $moduleFilesLocation . '/Install.php';
+        $moduleFilesLocationClass = str_replace('/', '\\', ucfirst($moduleFilesLocation));
+        // $moduleFilesLocationClass = str_replace('\\' . $data['name'], '', $moduleFilesLocationClass);
+        $file = str_replace('"NAMESPACE"', 'namespace ' . $moduleFilesLocationClass . ';', $file);
+
+        try {
+            $this->localContent->write($fileName, $file);
+            array_push($this->newFiles, $fileName);
+        } catch (FilesystemException | UnableToWriteFile $exception) {
+            $this->addResponse('Unable to write module component file');
+
+            return false;
+        }
+
+        return true;
     }
 
     protected function generateNewPackagesFiles($moduleFilesLocation, $data)
@@ -1170,7 +1304,7 @@ protected function generateNewPackagesInstallFiles($data, $moduleFilesLocation)
             $moduleFilesLocation = $moduleFilesLocation . 'Install/Schema';
             $fileName = $moduleFilesLocation . '/' . $data['name'] . '.php';
             $moduleFilesLocationClass = str_replace('/', '\\', ucfirst($moduleFilesLocation));
-            $moduleFilesLocationClass = str_replace('\\' . $data['name'], '', $moduleFilesLocationClass);
+            // $moduleFilesLocationClass = str_replace('\\' . $data['name'], '', $moduleFilesLocationClass);
             $moduleSchemaClass = $moduleFilesLocationClass . '\\' . $data['name'];
         }
 
@@ -1189,7 +1323,7 @@ protected function generateNewPackagesInstallFiles($data, $moduleFilesLocation)
         //Package Installer File only for apps.
         if (!str_starts_with($data['category'], 'basepackages') && $data['category'] !== 'providers') {
             try {
-                $file = $this->localContent->read('apps/Core/Packages/Devtools/Modules/Files/PackageInstallPackage.txt');
+                $file = $this->localContent->read('apps/Core/Packages/Devtools/Modules/Files/PackageInstallInstall.txt');
             } catch (FilesystemException | UnableToReadFile $exception) {
                 $this->addResponse('Unable to read module base package file.');
 
@@ -1198,9 +1332,9 @@ protected function generateNewPackagesInstallFiles($data, $moduleFilesLocation)
 
             if ($data['category'] !== str_starts_with($data['category'], 'basepackages') && $data['category'] !== 'providers') {
                 $moduleFilesLocation = str_replace('/Schema', '', $moduleFilesLocation);
-                $fileName = $moduleFilesLocation . '/' . 'Package.php';
+                $fileName = $moduleFilesLocation . '/' . 'Install.php';
                 $moduleFilesLocationClass = str_replace('/', '\\', ucfirst($moduleFilesLocation));
-                $moduleFilesLocationClass = str_replace('\\' . $data['name'], '', $moduleFilesLocationClass);
+                // $moduleFilesLocationClass = str_replace('\\' . $data['name'], '', $moduleFilesLocationClass);
                 $file = str_replace('"NAMESPACE"', 'namespace ' . $moduleFilesLocationClass . ';', $file);
                 $file = str_replace('"PACKAGESCHEMACLASS"', $moduleSchemaClass . ';', $file);
                 $file = str_replace('"PACKAGESCHEMANAME"', $data['name'], $file);
@@ -1233,7 +1367,7 @@ protected function generateNewPackagesModelFiles($data, $moduleFilesLocation)
         if (str_starts_with($data['category'], 'basepackages') || $data['category'] === 'providers') {
             if (str_starts_with($data['category'], 'basepackages')) {
                 if ($data['category'] === 'basepackagesApis') {
-                    $moduleFilesLocation = 'system/Base/Providers/BasepackagesServiceProvider/Packages/Model/ApiClientServices/Apis/';
+                    $moduleFilesLocation = 'system/Base/Providers/BasepackagesServiceProvider/Packages/Model/Api/Apis/';
                     $pathArr = preg_split('/(?=[A-Z])/', $data['name'], -1, PREG_SPLIT_NO_EMPTY);
                     unset($pathArr[$this->helper->lastKey($pathArr)]);
 
@@ -1257,7 +1391,7 @@ protected function generateNewPackagesModelFiles($data, $moduleFilesLocation)
             $moduleFilesLocation = $moduleFilesLocation . 'Model';
             $fileName = $moduleFilesLocation . '/' . 'Apps' . ucfirst($data['app_type']) . ucfirst($data['name']) . '.php';
             $moduleFilesLocationClass = str_replace('/', '\\', ucfirst($moduleFilesLocation));
-            $moduleFilesLocationClass = str_replace('\\' . ucfirst($data['name']), '', $moduleFilesLocationClass);
+            // $moduleFilesLocationClass = str_replace('\\' . ucfirst($data['name']), '', $moduleFilesLocationClass);
             $className = 'Apps' . ucfirst($data['app_type']) . ucfirst($data['name']);
         }
 
@@ -1373,11 +1507,11 @@ protected function addUpdateComponentMenu($data)
             $data['menu'] = $this->helper->decode($data['menu'], true);
 
             if (isset($menu)) {
-                $this->basepackages->menus->updateMenu($data['menu_id'], $data['app_type'], $data['menu']);
+                $this->basepackages->menus->updateMenu($data['menu_id'], $data);
 
                 return;
             } else {
-                $menu = $this->basepackages->menus->addMenu($data['app_type'], $data['menu']);
+                $menu = $this->basepackages->menus->addMenu($data);
 
                 if ($menu) {
                     $module = $this->modules->{$data['module_type']}->packagesData->last;
@@ -2133,8 +2267,7 @@ public function generateRelease($data)
 
                 if (isset($data['module_type']) &&
                     $data['module_type'] === 'views' &&
-                    isset($data['base_view_module_id']) &&
-                    $data['base_view_module_id'] == 0
+                    $module['is_subview'] === false
                 ) {
                     array_push($reposArr, $module['repo'] . '-public');
                 }
@@ -2221,8 +2354,7 @@ public function generateRelease($data)
 
         if (isset($data['module_type']) &&
             $data['module_type'] === 'views' &&
-            isset($module['base_view_module_id']) &&
-            $module['base_view_module_id'] == 0
+            $module['is_subview'] === false
         ) {
             array_push($reposArr, $module['repo'] . '-public');
         }
@@ -2683,8 +2815,7 @@ protected function checkPullRequests($data)
 
         if (isset($data['module_type']) &&
             $data['module_type'] === 'views' &&
-            isset($data['base_view_module_id']) &&
-            $data['base_view_module_id'] == 0
+            $data['is_subview'] === false
         ) {
             array_push($reposArr, $data['repo'] . '-public');
         }
@@ -2967,7 +3098,7 @@ public function generateModuleRepoUrl($data)
             }
         }
 
-        $this->addResponse('Generated Repo Url', 0, ['repo' => $url]);
+        $this->addResponse('Generated Repo Url', 0, ['repo' => strtolower($url)]);
 
         return true;
     }
diff --git a/apps/Core/Packages/Devtools/Modules/Files/ApptypesGitignore.txt b/apps/Core/Packages/Devtools/Modules/Files/ApptypesGitignore.txt
index a61ddb138..cc159e3de 100644
--- a/apps/Core/Packages/Devtools/Modules/Files/ApptypesGitignore.txt
+++ b/apps/Core/Packages/Devtools/Modules/Files/ApptypesGitignore.txt
@@ -1,4 +1,8 @@
 Components/*
+!Components/.gitkeep
 Middlewares/*
+!Middlewares/.gitkeep
 Packages/*
-Views/*
\ No newline at end of file
+!Packages/.gitkeep
+Views/*
+!Views/.gitkeep
\ No newline at end of file
diff --git a/apps/Core/Packages/Devtools/Modules/Files/ComponentInstallInstall.txt b/apps/Core/Packages/Devtools/Modules/Files/ComponentInstallInstall.txt
new file mode 100644
index 000000000..675bf57b6
--- /dev/null
+++ b/apps/Core/Packages/Devtools/Modules/Files/ComponentInstallInstall.txt
@@ -0,0 +1,18 @@
+<?php
+
+"NAMESPACE"
+
+use System\Base\BasePackage;
+
+class Install extends BasePackage
+{
+    public function install()
+    {
+        return true;
+    }
+
+    public function uninstall()
+    {
+        return true;
+    }
+}
\ No newline at end of file
diff --git a/apps/Core/Packages/Devtools/Modules/Files/MiddlewareInstallInstall.txt b/apps/Core/Packages/Devtools/Modules/Files/MiddlewareInstallInstall.txt
new file mode 100644
index 000000000..675bf57b6
--- /dev/null
+++ b/apps/Core/Packages/Devtools/Modules/Files/MiddlewareInstallInstall.txt
@@ -0,0 +1,18 @@
+<?php
+
+"NAMESPACE"
+
+use System\Base\BasePackage;
+
+class Install extends BasePackage
+{
+    public function install()
+    {
+        return true;
+    }
+
+    public function uninstall()
+    {
+        return true;
+    }
+}
\ No newline at end of file
diff --git a/apps/Core/Packages/Devtools/Modules/Files/PackageInstallInstall.txt b/apps/Core/Packages/Devtools/Modules/Files/PackageInstallInstall.txt
new file mode 100644
index 000000000..7d46bcfba
--- /dev/null
+++ b/apps/Core/Packages/Devtools/Modules/Files/PackageInstallInstall.txt
@@ -0,0 +1,43 @@
+<?php
+
+"NAMESPACE"
+
+use "PACKAGESCHEMACLASS"
+use System\Base\BasePackage;
+
+class Install extends BasePackage
+{
+    public function install()
+    {
+        $this->preInstall();
+
+        $this->installDb();
+
+        $this->postInstall();
+
+        return true;
+    }
+
+    protected function preInstall()
+    {
+        return true;
+    }
+
+    protected function installDb()
+    {
+        //Refer to Package installation for Core.
+        return true;
+    }
+
+    protected function postInstall()
+    {
+        return true;
+    }
+
+    public function uninstall()
+    {
+        //Check Relationship
+        //Drop Table(s)
+        return true;
+    }
+}
\ No newline at end of file
diff --git a/apps/Core/Packages/Devtools/Modules/Files/PackageInstallPackage.txt b/apps/Core/Packages/Devtools/Modules/Files/PackageInstallPackage.txt
deleted file mode 100644
index 61adb067c..000000000
--- a/apps/Core/Packages/Devtools/Modules/Files/PackageInstallPackage.txt
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-
-"NAMESPACE"
-
-use "PACKAGESCHEMACLASS"
-use System\Base\BasePackage;
-
-class Package extends BasePackage
-{
-    public function install()
-    {
-        //Run Install
-        $this->installSchema();
-    }
-
-    public function update()
-    {
-        //Run version specific Updates
-    }
-
-    public function uninstall()
-    {
-        //Check Relationship
-        //Drop Table(s)
-        $this->dropTable('table_name');
-    }
-
-    public function reinstall()
-    {
-        //Remove this from production
-        $this->installSchema(true);
-    }
-
-    //Install Schema
-    protected function installSchema(bool $dropTables = false)
-    {
-        try {
-            if ($dropTables) {
-                $this->createTable('table_name', '', (new "PACKAGESCHEMANAME")->columns(), $dropTables);
-                $this->addIndex('table_name', (new "PACKAGESCHEMANAME")->indexes());//Add index if any after creating table
-            } else {
-                $this->createTable('table_name', '', (new "PACKAGESCHEMANAME")->columns());
-                $this->addIndex('table_name', (new "PACKAGESCHEMANAME")->indexes());
-            }
-
-            return true;
-        } catch (\PDOException $e) {
-            //Do something
-        }
-    }
-
-    protected function modifySchema()
-    {
-        // Example of adding new column to table
-        // $this->alterTable(
-        //     'add',
-        //     'table_name',
-        //     [
-        //         new Column(
-        //             'added',
-        //             [
-        //                 'type'          => Column::TYPE_VARCHAR,
-        //                 'size'          => 1024,
-        //                 'notNull'       => false,
-        //                 'comment'       => 'ADDED'
-        //             ]
-        //         ),
-        //         new Column(
-        //             'added_2',
-        //             [
-        //                 'type'          => Column::TYPE_VARCHAR,
-        //                 'size'          => 1024,
-        //                 'notNull'       => false,
-        //                 'comment'       => 'ADDED 2'
-        //             ]
-        //         )
-        //     ]
-        // );
-
-        // Example of modifying column to table
-        // $this->alterTable(
-        //     'modify',
-        //     'table_name',
-        //     [
-        //         new Column(
-        //             'added',
-        //             [
-        //                 'type'          => Column::TYPE_VARCHAR,
-        //                 'size'          => 100,
-        //                 'notNull'       => false,
-        //                 'comment'       => 'ADDED'
-        //             ]
-        //         ),
-        //         new Column(
-        //             'added_2',
-        //             [
-        //                 'type'          => Column::TYPE_VARCHAR,
-        //                 'size'          => 100,
-        //                 'notNull'       => false,
-        //                 'comment'       => 'ADDED 2'
-        //             ]
-        //         )
-        //     ]
-        // );
-        //
-        // Example of deleting column from table
-        // $this->alterTable(
-        //     'drop',
-        //     'table_name',
-        //     [
-        //         'added',
-        //         'added_2',
-        //     ]
-        // );
-
-        // Example of dropping index
-        // $this->dropIndex('table_name', 'column_contact_mobile_index');
-    }
-}
\ No newline at end of file
diff --git a/apps/Core/Packages/Devtools/Modules/Files/PackageInstallSchema.txt b/apps/Core/Packages/Devtools/Modules/Files/PackageInstallSchema.txt
index 1cf9c0377..3862c7e5b 100644
--- a/apps/Core/Packages/Devtools/Modules/Files/PackageInstallSchema.txt
+++ b/apps/Core/Packages/Devtools/Modules/Files/PackageInstallSchema.txt
@@ -58,7 +58,7 @@ class "PACKAGESCHEMANAME"
         return
         [
             new Index(
-                'column_first_name_index',
+                'column_INDEX',
                 [
                     'first_name'
                 ],
diff --git a/apps/Core/Packages/Devtools/Modules/Files/ViewsGitignore.txt b/apps/Core/Packages/Devtools/Modules/Files/ViewsGitignore.txt
index 6c6f7e890..b6a8b6077 100644
--- a/apps/Core/Packages/Devtools/Modules/Files/ViewsGitignore.txt
+++ b/apps/Core/Packages/Devtools/Modules/Files/ViewsGitignore.txt
@@ -4,5 +4,6 @@ html/*
 !html/
 !html/layouts/
 !html/common/
+!html/errors/
 !README.md
 !view.json
\ No newline at end of file
diff --git a/apps/Core/Packages/Devtools/Modules/Install/package.json b/apps/Core/Packages/Devtools/Modules/Install/package.json
index c9126ea43..9786533c1 100644
--- a/apps/Core/Packages/Devtools/Modules/Install/package.json
+++ b/apps/Core/Packages/Devtools/Modules/Install/package.json
@@ -23,6 +23,6 @@
 		"external" : []
 	},
 	"settings" : {
-		"api_clients" : []
+		"api_clients" : [1,2]
 	}
 }
\ No newline at end of file
diff --git a/apps/Core/Views/Default/html/apps/wizard/register/form.html b/apps/Core/Views/Default/html/apps/wizard/register/form.html
index 4303c79c4..3fda3bf97 100644
--- a/apps/Core/Views/Default/html/apps/wizard/register/form.html
+++ b/apps/Core/Views/Default/html/apps/wizard/register/form.html
@@ -44,10 +44,8 @@
     {% set appAutoUnblockIpMinutes = app['auto_unblock_ip_minutes'] %}
     {% set appIncorrectLoginAttemptBlockIp = app['incorrect_login_attempt_block_ip'] %}
     {% set wizard = false %}
-    {% if appType == 'core' or appType == 'dash' %}
-        {% set defaultDashboardHidden = '' %}
-    {% endif %}
     {% if app['settings']['defaultDashboard'] is defined %}
+        {% set defaultDashboardHidden = '' %}
         {% set defaultDashboard = app['settings']['defaultDashboard'] %}
     {% endif %}
 {% else %}
@@ -165,6 +163,7 @@
                         'fieldDataSelect2OptionsKey'           : 'app_type',
                         'fieldDataSelect2OptionsValue'         : 'name',
                         'fieldDataSelect2OptionsArray'         : true,
+                        'fieldDataSelect2AddDataAttrFromData'  : ['dashboards'],
                         'fieldDataSelect2OptionsSelected'      : appType
                     ]
                 )}}
@@ -226,6 +225,7 @@
 </form>
 {% endif %}
 <script>
+/* globals paginatedPNotify */
 var dataCollectionComponent, dataCollectionSection, dataCollectionSectionForm;
 
 if (!window['dataCollection']['{{componentId}}']) {
@@ -255,21 +255,62 @@
         '{{componentId}}-{{sectionId}}-id'                                  : { },
         '{{componentId}}-{{sectionId}}-name'                                : { },
         '{{componentId}}-{{sectionId}}-app_type'                            : {
-            'placeholder'   : 'SELECT APP TYPE'
-        },
-        '{{componentId}}-{{sectionId}}-default_dashboard'                   : {
-            'placeholder'   : 'SELECT DEFAULT DASHBOARD',
+            'placeholder'   : 'SELECT APP TYPE',
             afterInit       : function() {
                 $('#{{componentId}}-{{sectionId}}-app_type').on('select2:select', function (e) {
                     var data = e.params.data;
 
-                    if (data.id === 'dash' || data.id === 'core') {
-                        $('#{{componentId}}-{{sectionId}}-default_dashboard').attr('disabled', false);
-                        $('#default_dashboard').attr('hidden', false);
-                        $('#{{componentId}}-{{sectionId}}-default_dashboard').val(0).trigger('change');
-                        $('#{{componentId}}-{{sectionId}}-default_dashboard').on('select2:select', function() {
-                            window.dataCollection['{{componentId}}']['{{componentId}}-{{sectionId}}']['formValidator'].valid();
-                        });
+                    if ($(data.element).data()['dashboards'] && $(data.element).data()['dashboards'] == true) {
+                        var postData = { };
+                        postData[$('#security-token').attr('name')] = $('#security-token').val();
+                        postData['app_type'] = $(data.element).data()['value'];
+
+                        $.post('{{links.url("dashboards/getDashboardsByAppType")}}', postData, function(response) {
+                            if (response.tokenKey && response.token) {
+                                $("#security-token").attr("name", response.tokenKey);
+                                $("#security-token").val(response.token);
+                            }
+
+                            if (response.responseCode == 0) {
+                                if (response.responseData && response.responseData.dashboards) {
+                                    if (response.responseData.dashboards.length === 0) {
+                                        $('#{{componentId}}-{{sectionId}}-default_dashboard').attr('disabled', true);
+                                        $('#default_dashboard').attr('hidden', true);
+                                        $('#{{componentId}}-{{sectionId}}-default_dashboard').val(0).trigger('change');
+
+                                        paginatedPNotify('error', {
+                                            title   : 'No dashboards for app type ' + $(data.element).data()['value'] +  ' found! Contact developer.'
+                                        });
+
+                                        return;
+                                    }
+
+                                    for (var dashboard in response.responseData.dashboards) {
+                                        var newOption = new Option(
+                                            response.responseData.dashboards[dashboard]['name'],
+                                            response.responseData.dashboards[dashboard]['id'],
+                                            false,
+                                            false
+                                        );
+
+                                        $('#{{componentId}}-{{sectionId}}-default_dashboard').append(newOption).trigger('change');
+                                    }
+
+                                    $('#{{componentId}}-{{sectionId}}-default_dashboard').attr('disabled', false);
+                                    $('#default_dashboard').attr('hidden', false);
+                                    $('#{{componentId}}-{{sectionId}}-default_dashboard').val(0).trigger('change');
+                                    $('#{{componentId}}-{{sectionId}}-default_dashboard').on('select2:select', function() {
+                                        window.dataCollection['{{componentId}}']['{{componentId}}-{{sectionId}}']['formValidator'].valid();
+                                    });
+                                }
+
+                                return
+                            }
+
+                            paginatedPNotify('error', {
+                                title   : response.responseMessage
+                            });
+                        }, 'json');
                     } else {
                         $('#{{componentId}}-{{sectionId}}-default_dashboard').attr('disabled', true);
                         $('#default_dashboard').attr('hidden', true);
@@ -278,6 +319,9 @@
                 });
             }
         },
+        '{{componentId}}-{{sectionId}}-default_dashboard'                   : {
+            'placeholder'   : 'SELECT DEFAULT DASHBOARD'
+        },
         '{{componentId}}-{{sectionId}}-route'                               : { },
         '{{componentId}}-{{sectionId}}-description'                         : { },
         '{{componentId}}-{{sectionId}}-registration_allowed'                : { },
diff --git a/apps/Core/Views/Default/html/auth/view.html b/apps/Core/Views/Default/html/auth/view.html
index 4b7878d20..0d82f883f 100644
--- a/apps/Core/Views/Default/html/auth/view.html
+++ b/apps/Core/Views/Default/html/auth/view.html
@@ -20,17 +20,17 @@
                     <div class="row">
                         <div class="col">
                             {{adminltetags.useTag('fields',
-                            [
-                            'componentId'                           : componentId,
-                            'sectionId'                             : 'form',
-                            'fieldId'                               : 'user',
-                            'fieldLabel'                            : false,
-                            'fieldType'                             : 'input',
-                            'fieldInputType'                        : 'text',
-                            'fieldPlaceholder'                      : 'Username',
-                            'fieldGroupPostAddonIcon'               : 'user'
+                                [
+                                    'componentId'                           : componentId,
+                                    'sectionId'                             : 'form',
+                                    'fieldId'                               : 'user',
+                                    'fieldLabel'                            : false,
+                                    'fieldType'                             : 'input',
+                                    'fieldInputType'                        : 'text',
+                                    'fieldPlaceholder'                      : 'Username',
+                                    'fieldGroupPostAddonIcon'               : 'user'
                                 ]
-                                )}}
+                            )}}
                         </div>
                     </div>
                     <div class="row">
diff --git a/apps/Core/Views/Default/html/dashboards/dashboards/form.html b/apps/Core/Views/Default/html/dashboards/dashboards/form.html
index 7a9e8e303..87341fd9c 100644
--- a/apps/Core/Views/Default/html/dashboards/dashboards/form.html
+++ b/apps/Core/Views/Default/html/dashboards/dashboards/form.html
@@ -4,10 +4,10 @@
 {% if dashboard['id'] is defined %}
     {% set dashboardId = dashboard['id'] %}
     {% set dashboardName = dashboard['name'] %}
-    {% if dashboard['is_default'] is defined and dashboard['is_default'] == true %}
+    {% if dashboard['user_default'] is defined and dashboard['user_default'] == true %}
         {% set defaultChecked = true %}
     {% endif %}
-    {% if dashboard['is_app_default'] is defined and dashboard['is_app_default'] == true %}
+    {% if dashboard['app_default'] is defined and dashboard['app_default'] == true %}
         {% set appDefaultChecked = true %}
         {% set defaultDisabled = true %}
     {% endif %}
@@ -73,12 +73,12 @@
                     'componentName'                  : componentName,
                     'componentId'                    : componentId,
                     'sectionId'                      : sectionId,
-                    'fieldId'                        : 'is_default',
-                    'fieldLabel'                     : 'Dashboard is default?',
+                    'fieldId'                        : 'user_default',
+                    'fieldLabel'                     : 'Dashboard is user default?',
                     'fieldHelp'                      : true,
-                    'fieldHelpTooltipContent'        : 'Check to make the dashboard default dashboard.',
+                    'fieldHelpTooltipContent'        : "Check to make the dashboard user's default dashboard.",
                     'fieldType'                      : 'checkbox',
-                    'fieldDisabled'                  : defaultDisabled,
+                    'fieldDisabled'                  : false,
                     'fieldCheckboxType'              : 'info',
                     'fieldCheckboxChecked'           : defaultChecked,
                     'fieldCheckboxAdditionClass'     : 'text-sm text-uppercase',
@@ -96,7 +96,7 @@
                     'componentName'                  : componentName,
                     'componentId'                    : componentId,
                     'sectionId'                      : sectionId,
-                    'fieldId'                        : 'is_app_default',
+                    'fieldId'                        : 'app_default',
                     'fieldLabel'                     : 'Dashboard is App default?',
                     'fieldHelp'                      : true,
                     'fieldHelpTooltipContent'        : 'Check to make the dashboard default dashboard.',
@@ -170,8 +170,8 @@
     $.extend(dataCollectionSection, {
         '{{componentId}}-{{sectionId}}-id'                                  : { },
         '{{componentId}}-{{sectionId}}-name'                                : { },
-        '{{componentId}}-{{sectionId}}-is_default'                          : { },
-        '{{componentId}}-{{sectionId}}-is_app_default'                      : { },
+        '{{componentId}}-{{sectionId}}-user_default'                        : { },
+        '{{componentId}}-{{sectionId}}-app_default'                         : { },
         '{{componentId}}-{{sectionId}}-shared'                              : {
             placeholder: "SELECT ACCOUNT(S)",
             "ajax"          : {
diff --git a/apps/Core/Views/Default/html/devtools/modules/apptypes.html b/apps/Core/Views/Default/html/devtools/modules/apptypes.html
index 65ee98db3..c4bd0d393 100644
--- a/apps/Core/Views/Default/html/devtools/modules/apptypes.html
+++ b/apps/Core/Views/Default/html/devtools/modules/apptypes.html
@@ -1,5 +1,13 @@
 {% set moduleApp_typeDisabled = false %}
 {% set createRepoDisabled = true %}
+{% set moduleDashboardsChecked = false %}
+{% if module['dashboards'] is defined and module['dashboards'] == true %}
+    {% set moduleDashboardsChecked = true %}
+{% endif %}
+{% set moduleInstallChecked = false %}
+{% if module['module_details']['installed'] is defined and module['module_details']['installed'] == true %}
+    {% set moduleInstallChecked = true %}
+{% endif %}
 {% if module['id'] is defined %}
     {% set moduleId = module['id'] %}
     {% set moduleName = module['name'] %}
@@ -90,6 +98,29 @@
             ]
         )}}
     </div>
+    <div class="col">
+        {{adminltetags.useTag('fields',
+            [
+                'component'                      : component,
+                'componentName'                  : componentName,
+                'componentId'                    : componentId,
+                'sectionId'                      : sectionId,
+                'fieldId'                        : 'dashboards',
+                'fieldLabel'                     : 'Has Dashboards?',
+                'fieldHelp'                      : true,
+                'fieldDisabled'                  : false,
+                'fieldHelpTooltipContent'        : 'Does app type have dashboards? Dashboards make use of basepackage dashboards to create multiple dashboards and widgets for them.',
+                'fieldType'                      : 'checkbox',
+                'fieldCheckboxType'              : 'primary',
+                'fieldCheckboxChecked'           : moduleDashboardsChecked,
+                'fieldCheckboxAdditionClass'     : 'text-sm text-uppercase',
+                'fieldBazPostOnCreate'           : true,
+                'fieldBazPostOnUpdate'           : true,
+                'fieldBazJstreeSearch'           : true,
+                'fieldBazScan'                   : true
+            ]
+        )}}
+    </div>
 </div>
 <div class="row">
     <div class="col">
@@ -235,4 +266,27 @@
             ]
         )}}
     </div>
+    <div class="col-md-2">
+        {{adminltetags.useTag('fields',
+            [
+                'component'                      : component,
+                'componentName'                  : componentName,
+                'componentId'                    : componentId,
+                'sectionId'                      : sectionId,
+                'fieldId'                        : 'installed',
+                'fieldLabel'                     : 'Installed?',
+                'fieldHelp'                      : true,
+                'fieldDisabled'                  : false,
+                'fieldHelpTooltipContent'        : 'Install/Uninstall module from system.',
+                'fieldType'                      : 'checkbox',
+                'fieldCheckboxType'              : 'primary',
+                'fieldCheckboxChecked'           : moduleInstallChecked,
+                'fieldCheckboxAdditionClass'     : 'text-sm text-uppercase',
+                'fieldBazPostOnCreate'           : true,
+                'fieldBazPostOnUpdate'           : true,
+                'fieldBazJstreeSearch'           : true,
+                'fieldBazScan'                   : true
+            ]
+        )}}
+    </div>
 </div>
\ No newline at end of file
diff --git a/apps/Core/Views/Default/html/devtools/modules/module.html b/apps/Core/Views/Default/html/devtools/modules/module.html
index b805585c4..ff4109049 100644
--- a/apps/Core/Views/Default/html/devtools/modules/module.html
+++ b/apps/Core/Views/Default/html/devtools/modules/module.html
@@ -1188,6 +1188,7 @@
         '{{componentId}}-{{sectionId}}-id'                                      : { },
         '{{componentId}}-{{sectionId}}-app_type'                                : { },
         '{{componentId}}-{{sectionId}}-name'                                    : { },
+        '{{componentId}}-{{sectionId}}-dashboards'                              : { },
         '{{componentId}}-{{sectionId}}-description'                             : { },
         '{{componentId}}-{{sectionId}}-api_id'                                  : {
             'placeholder'   : 'SELECT LOCAL OR REMOTE REPOSITORY',
@@ -1283,6 +1284,7 @@
             }
         },
         '{{componentId}}-{{sectionId}}-createrepo'                              : { },
+        '{{componentId}}-{{sectionId}}-installed'                               : { },
         '{{componentId}}-{{sectionId}}-form'                                    : {
             rules: {
                 '{{componentId}}-{{sectionId}}-name'                            : 'required',
@@ -1636,6 +1638,9 @@
             }
         },
         '{{componentId}}-{{sectionId}}-createrepo'                              : { },
+        '{{componentId}}-{{sectionId}}-installed'                               : { },
+        '{{componentId}}-{{sectionId}}-truncate_table'                          : { },
+        '{{componentId}}-{{sectionId}}-reinstall_table'                         : { },
         '{{componentId}}-{{sectionId}}-class'                                   : {
             afterInit: function() {
                 $('#{{componentId}}-{{sectionId}}-generate-module-class').click(function(e) {
diff --git a/apps/Core/Views/Default/html/devtools/modules/module/info.html b/apps/Core/Views/Default/html/devtools/modules/module/info.html
index f38a19712..8227ec87b 100644
--- a/apps/Core/Views/Default/html/devtools/modules/module/info.html
+++ b/apps/Core/Views/Default/html/devtools/modules/module/info.html
@@ -1,4 +1,8 @@
 {% set createRepoDisabled = true %}
+{% set moduleInstallChecked = false %}
+{% if module['module_details']['installed'] is defined and module['module_details']['installed'] == true %}
+    {% set moduleInstallChecked = true %}
+{% endif %}
 {% if module['id'] is defined %}
     {% set moduleId = module['id'] %}
     {% set moduleName = module['name'] %}
@@ -61,6 +65,7 @@
     {% if type !== 'core' %}
         {% set moduleApps = '' %}
     {% endif %}
+    {% set moduleInstallChecked = true %}
 {% endif %}
 {% set appTypeDisabled = false %}
 {% set moduleCategoryDisabled = false %}
@@ -409,6 +414,81 @@
             ]
         )}}
     </div>
+    <div class="col-md-2">
+        {{adminltetags.useTag('fields',
+            [
+                'component'                      : component,
+                'componentName'                  : componentName,
+                'componentId'                    : componentId,
+                'sectionId'                      : sectionId,
+                'fieldId'                        : 'installed',
+                'fieldLabel'                     : 'Installed?',
+                'fieldHelp'                      : true,
+                'fieldDisabled'                  : false,
+                'fieldHelpTooltipContent'        : 'Install/Uninstall module from system.',
+                'fieldType'                      : 'checkbox',
+                'fieldCheckboxType'              : 'primary',
+                'fieldCheckboxChecked'           : moduleInstallChecked,
+                'fieldCheckboxAdditionClass'     : 'text-sm text-uppercase',
+                'fieldBazPostOnCreate'           : true,
+                'fieldBazPostOnUpdate'           : true,
+                'fieldBazJstreeSearch'           : true,
+                'fieldBazScan'                   : true
+            ]
+        )}}
+    </div>
+    {% if module['id'] is defined %}
+        {% if type === 'packages' %}
+            <div class="col-md-2">
+                {{adminltetags.useTag('fields',
+                    [
+                        'component'                      : component,
+                        'componentName'                  : componentName,
+                        'componentId'                    : componentId,
+                        'sectionId'                      : sectionId,
+                        'fieldId'                        : 'truncate_table',
+                        'fieldLabel'                     : 'Truncate Table?',
+                        'fieldHelp'                      : true,
+                        'fieldDisabled'                  : false,
+                        'fieldHelpTooltipContent'        : 'This will truncate the table(s).',
+                        'fieldType'                      : 'checkbox',
+                        'fieldCheckboxType'              : 'danger',
+                        'fieldCheckboxChecked'           : false,
+                        'fieldCheckboxAdditionClass'     : 'text-sm text-uppercase',
+                        'fieldBazPostOnCreate'           : true,
+                        'fieldBazPostOnUpdate'           : true,
+                        'fieldBazJstreeSearch'           : true,
+                        'fieldBazScan'                   : true
+                    ]
+                )}}
+            </div>
+        {% endif %}
+        {% if type === 'packages' or type === 'core' %}
+            <div class="col-md-2">
+                {{adminltetags.useTag('fields',
+                    [
+                        'component'                      : component,
+                        'componentName'                  : componentName,
+                        'componentId'                    : componentId,
+                        'sectionId'                      : sectionId,
+                        'fieldId'                        : 'reinstall_table',
+                        'fieldLabel'                     : 'Reinstall Table?',
+                        'fieldHelp'                      : true,
+                        'fieldDisabled'                  : false,
+                        'fieldHelpTooltipContent'        : 'This will reinstall the table structure.',
+                        'fieldType'                      : 'checkbox',
+                        'fieldCheckboxType'              : 'danger',
+                        'fieldCheckboxChecked'           : false,
+                        'fieldCheckboxAdditionClass'     : 'text-sm text-uppercase',
+                        'fieldBazPostOnCreate'           : true,
+                        'fieldBazPostOnUpdate'           : true,
+                        'fieldBazJstreeSearch'           : true,
+                        'fieldBazScan'                   : true
+                    ]
+                )}}
+            </div>
+        {% endif %}
+    {% endif %}
 </div>
 {% if type !== 'views' %}
 <div class="row">
diff --git a/apps/Core/Views/Default/html/devtools/modules/select.html b/apps/Core/Views/Default/html/devtools/modules/select.html
index 907016fa7..6fbb4c888 100644
--- a/apps/Core/Views/Default/html/devtools/modules/select.html
+++ b/apps/Core/Views/Default/html/devtools/modules/select.html
@@ -51,7 +51,7 @@
                 'dropdownButtonAdditionalClass'     : 'text-uppercase',
                 'dropdownAlign'                     : 'right',
                 'buttonPosition'                    : 'right',
-                'buttons'                           :
+                'dropdowns'                         :
                     {
                         'apptypes' : {
                             'title'                   : 'App Type',
@@ -118,7 +118,7 @@
                 'fieldBazScan'                         : true,
                 'fieldBazPostOnCreate'                 : true,
                 'fieldBazPostOnUpdate'                 : true,
-                'fieldDataSelect2AddDataAttrFromData'  : ['installed'],
+                'fieldDataSelect2AddDataAttrFromData'  : ['installed', 'is_subview'],
                 'fieldDataSelect2Options'              : modules,
                 'fieldDataSelect2OptionsKey'           : 'id',
                 'fieldDataSelect2OptionsValue'         : 'display_name:app_type|name:app_type',
@@ -236,10 +236,14 @@
             'placeholder'   : 'SELECT MODULE TO EDIT',
             'afterInit'     : function() {
                 var id, label;
+                var isSubView = false;
                 $('#{{componentId}}-{{sectionId}}-modules').on('select2:select', function(e) {
                     id = e.params.data.id;
                     label = $(e.params.data.element).parents('optgroup').attr('label').toLowerCase();
 
+                    if ($(e.params.data.element).data().is_subview && $(e.params.data.element).data().is_subview == true) {
+                        isSubView = true;
+                    }
                     $('#{{componentId}}-{{sectionId}}-edit-module, #{{componentId}}-{{sectionId}}-remove-module').attr('disabled', false);
 
                     if (label !== 'bundles' && label !== 'apptypes') {
@@ -262,15 +266,6 @@
                             $('#{{componentId}}-{{sectionId}}-generate-new-release').attr('disabled', true);
                         }
                     }
-
-                    if ('installed' in $(e.params.data.element).data() &&
-                        $(e.params.data.element).data()['installed'] == 0
-                    ) {
-                        $('#{{componentId}}-{{sectionId}}-clone-module, ' +
-                          '#{{componentId}}-{{sectionId}}-edit-module, ' +
-                          '#{{componentId}}-{{sectionId}}-generate-new-release, ' +
-                          '#{{componentId}}-{{sectionId}}-commit-bundle-json').attr('disabled', true);
-                    }
                 });
 
                 $('#{{componentId}}-{{sectionId}}-include_core_modules').click(function() {
@@ -284,18 +279,18 @@
                 $('#{{componentId}}-{{sectionId}}-edit-module').off();
                 $('#{{componentId}}-{{sectionId}}-edit-module').click(function() {
                     if ($('#{{componentId}}-{{sectionId}}-include_core_modules')[0].checked === true) {
-                        dataCollectionSectionForm['funcs']['loadAjax'](id, label, true);
+                        dataCollectionSectionForm['funcs']['loadAjax'](id, label, true, false, false, false, isSubView);
                     } else {
-                        dataCollectionSectionForm['funcs']['loadAjax'](id, label, false);
+                        dataCollectionSectionForm['funcs']['loadAjax'](id, label, false, false, false, false, isSubView);
                     }
                 });
 
                 $('#{{componentId}}-{{sectionId}}-clone-module').off();
                 $('#{{componentId}}-{{sectionId}}-clone-module').click(function() {
                     if ($('#{{componentId}}-{{sectionId}}-include_core_modules')[0].checked === true) {
-                        dataCollectionSectionForm['funcs']['loadAjax'](id, label, true, false, true);
+                        dataCollectionSectionForm['funcs']['loadAjax'](id, label, true, false, true, false, isSubView);
                     } else {
-                        dataCollectionSectionForm['funcs']['loadAjax'](id, label, false, false, true);
+                        dataCollectionSectionForm['funcs']['loadAjax'](id, label, false, false, true, false, isSubView);
                     }
                 });
 
@@ -349,7 +344,7 @@
     });
 
 dataCollectionSectionForm['funcs']['loadAjax'] =
-    function(id = null, label = null, includecoremodules = false, newrelease = false, clone = false, bundlesjson = false) {
+    function(id = null, label = null, includecoremodules = false, newrelease = false, clone = false, bundlesjson = false, isSubView = false) {
         if (id && label) {
             if (label === 'bundles' && !newrelease) {
                 dataCollectionSectionForm['vars']['url'] = '{{links.url("devtools/modules/q/bundles/true/id/' + id + '")}}';
@@ -371,6 +366,9 @@
                 if (clone) {
                     dataCollectionSectionForm['vars']['url'] = dataCollectionSectionForm['vars']['url'] + '/clone/true';
                 }
+                if (isSubView) {
+                    dataCollectionSectionForm['vars']['url'] = dataCollectionSectionForm['vars']['url'] + '/subview/true';
+                }
             }
         } else if (includecoremodules) {
             if (dataCollectionSectionForm['vars']['url'].includes('/q/')) {
diff --git a/apps/Core/Views/Default/html/devtools/test/view.html b/apps/Core/Views/Default/html/devtools/test/view.html
index 10148545d..bd9098bad 100644
--- a/apps/Core/Views/Default/html/devtools/test/view.html
+++ b/apps/Core/Views/Default/html/devtools/test/view.html
@@ -1,12 +1,4 @@
 Test
 <script>
 /* globals */
-
-var test = '{{test}}';
-test = test.replaceAll('\\', '\\\\\\\\');
-
-var result = JSON.parse(test);
-
-//eslint-disable-next-line
-console.log(result);
 </script>
\ No newline at end of file
diff --git a/apps/Core/Views/Default/html/modules/modules.html b/apps/Core/Views/Default/html/modules/modules.html
index ae260ede5..e2d06e5b7 100644
--- a/apps/Core/Views/Default/html/modules/modules.html
+++ b/apps/Core/Views/Default/html/modules/modules.html
@@ -392,16 +392,24 @@ <h6><i class="fa fa-fw fa-info-circle text-info"></i> Select module from the tre
 
     $('#{{componentId}}-{{sectionId}}-modules').on('search.jstree', function(e, res) {
         if (dataCollectionSectionForm['vars']['syncInfo'] === '') {
+            var updateTexts = { };
+
             $(res.nodes).each(function(i, node) {
                 var updateNode = $('#{{componentId}}-{{sectionId}}-modules').jstree().get_node(node);
                 var apiNode = updateNode.parents[updateNode.parents.length - 2];
-                var apiNodeObj = $('#{{componentId}}-{{sectionId}}-modules').jstree().get_node(apiNode);
                 var update = 'update';
                 if (res.nodes.length > 1) {
                     update = 'updates';
                 }
-                dataCollectionSectionForm['vars']['syncInfo'] += apiNodeObj.text + ' has ' + res.nodes.length + ' new ' + update + ' available.<br>';
+                var apiNodeObj = $('#{{componentId}}-{{sectionId}}-modules').jstree().get_node(apiNode);
+                updateTexts[apiNodeObj.text] = ' has ' + res.nodes.length + ' new ' + update + ' available.';
             });
+
+            if (Object.keys(updateTexts).length > 0) {
+                for (var updateText in updateTexts) {
+                    dataCollectionSectionForm['vars']['syncInfo'] += updateText + updateTexts[updateText] + '<br>';
+                }
+            }
         }
 
         if (dataCollectionSectionForm['vars']['initJstree'] === true) {
@@ -416,7 +424,6 @@ <h6><i class="fa fa-fw fa-info-circle text-info"></i> Select module from the tre
                     textTrusted : true
                 });
             }
-
         }
 
         dataCollectionSectionForm['vars']['syncInfo'] = '';
@@ -476,7 +483,6 @@ <h6><i class="fa fa-fw fa-info-circle text-info"></i> Select module from the tre
 
         if ($(this)[0].id === '{{componentId}}-{{sectionId}}-modules-repo-sync') {
             dataCollectionSectionForm['funcs']['toggleJstreeTool']($(this)[0].id);
-
             dataCollectionSectionForm['funcs']['initSync'](
                 $('#{{componentId}}-{{sectionId}}-modules').jstree().get_selected(true)[0].data.apiid
             );
@@ -689,13 +695,18 @@ <h6><i class="fa fa-fw fa-info-circle text-info"></i> Select module from the tre
 
         if (selected[0].id.startsWith('j')) {
             if (selected[0].data.type !== 'repo') {
-                $('#{{componentId}}-{{sectionId}}-modules').jstree().deselect_node(selected);
+                if (selected[0].data.type === 'apptype') {
+                    dataCollectionSectionForm['funcs']['toggleJstreeTool']('{{componentId}}-{{sectionId}}-modules-repo-sync');
+                    dataCollectionSectionForm['funcs']['moduleinfo'](['loader']);
+                    dataCollectionSectionForm['funcs']['getSelectedModuleInfo'](selected[0].data.id, true);
+                } else {
+                    $('#{{componentId}}-{{sectionId}}-modules').jstree().deselect_node(selected);
 
-                dataCollectionSectionForm['funcs']['toggleJstreeTool']('{{componentId}}-{{sectionId}}-modules-repo-add');
-                dataCollectionSectionForm['funcs']['toggleJstreeTool']('{{componentId}}-{{sectionId}}-modules-repo-update');
-                dataCollectionSectionForm['funcs']['toggleJstreeTool']('{{componentId}}-{{sectionId}}-modules-repo-sync');
-                dataCollectionSectionForm['funcs']['moduleinfo'](['noinfo']);
-                return false;
+                    dataCollectionSectionForm['funcs']['toggleJstreeTool']('{{componentId}}-{{sectionId}}-modules-repo-update');
+                    dataCollectionSectionForm['funcs']['toggleJstreeTool']('{{componentId}}-{{sectionId}}-modules-repo-sync');
+                    dataCollectionSectionForm['funcs']['moduleinfo'](['noinfo']);
+                    return false;
+                }
             } else if (selected[0].data.type === 'repo') {
                 dataCollectionSectionForm['funcs']['toggleJstreeTool']('{{componentId}}-{{sectionId}}-modules-repo-add', 'success', false);
                 dataCollectionSectionForm['funcs']['toggleJstreeTool']('{{componentId}}-{{sectionId}}-modules-repo-update', 'warning', false);
@@ -703,12 +714,10 @@ <h6><i class="fa fa-fw fa-info-circle text-info"></i> Select module from the tre
                     'href', '{{links.url("system/api/client/services/q/id/' + selected[0].data.apiid + '")}}'
                 );
                 dataCollectionSectionForm['funcs']['toggleJstreeTool']('{{componentId}}-{{sectionId}}-modules-repo-sync', 'primary', false);
+                dataCollectionSectionForm['funcs']['moduleinfo']();
             }
-
-            dataCollectionSectionForm['funcs']['moduleinfo']();
         } else {
             if (selected[0].data.type !== 'repo') {
-                dataCollectionSectionForm['funcs']['toggleJstreeTool']('{{componentId}}-{{sectionId}}-modules-repo-add');
                 dataCollectionSectionForm['funcs']['toggleJstreeTool']('{{componentId}}-{{sectionId}}-modules-repo-update');
                 dataCollectionSectionForm['funcs']['toggleJstreeTool']('{{componentId}}-{{sectionId}}-modules-repo-sync');
             }
@@ -748,7 +757,7 @@ <h6><i class="fa fa-fw fa-info-circle text-info"></i> Select module from the tre
         }
     }
 }
-dataCollectionSectionForm['funcs']['moduleinfo'] = function(show = ['noinfo'], showButtons = ['cancel'], showSettings = true, showBundleModules = false) {
+dataCollectionSectionForm['funcs']['moduleinfo'] = function(show = ['noinfo'], showButtons = ['cancel'], showSettings = true, showBundleModules = false, showChangeLogs = false) {
     $('#{{componentId}}-{{sectionId}}-tabs-tabLinks a').removeClass('active');
     $('#{{componentId}}-{{sectionId}}-tabs-tabContent .tab-pane').removeClass('active show');
     $('#{{componentId}}-{{sectionId}}-tabs-info').addClass('active show');
@@ -764,6 +773,11 @@ <h6><i class="fa fa-fw fa-info-circle text-info"></i> Select module from the tre
     } else {
         $('a[href*="#{{componentId}}-{{sectionId}}-tabs-bundlemodules"]').parent().removeClass('d-none');
     }
+    if (!showChangeLogs) {
+        $('a[href*="#{{componentId}}-{{sectionId}}-tabs-changelogs"]').parent().addClass('d-none');
+    } else {
+        $('a[href*="#{{componentId}}-{{sectionId}}-tabs-changelogs"]').parent().removeClass('d-none');
+    }
 
     if (show.length > 0) {
         var moduleinfos = ['loader', 'info', 'noinfo', 'error', 'buttons'];
@@ -776,7 +790,7 @@ <h6><i class="fa fa-fw fa-info-circle text-info"></i> Select module from the tre
         });
     }
 
-    if (showButtons.length > 0) {
+    if (showButtons && showButtons.length > 0) {
         var modulebuttons = ['install', 'update', 'uninstall', 'remove', 'cancel', 'repo-sync'];
         $(modulebuttons).each(function(e, modulebutton) {
             if (showButtons.includes(modulebutton)) {
@@ -788,26 +802,33 @@ <h6><i class="fa fa-fw fa-info-circle text-info"></i> Select module from the tre
     }
 }
 
-dataCollectionSectionForm['funcs']['getSelectedModuleInfo'] = function(selected) {
+dataCollectionSectionForm['funcs']['getSelectedModuleInfo'] = function(selected, apptype = false) {
     if (!selected) {
         return false;
     }
 
     var splitModule, moduleType, moduleId;
 
-    splitModule = selected.split('-');
-    moduleId = splitModule[1];
-
-    if (selected.startsWith('components')) {
-        moduleType = 'components';
-    } else if (selected.startsWith('packages')) {
-        moduleType = 'packages';
-    } else if (selected.startsWith('middlewares')) {
-        moduleType = 'middlewares';
-    } else if (selected.startsWith('views')) {
-        moduleType = 'views';
-    } else if (selected.startsWith('bundles')) {
-        moduleType = 'bundles';
+    if (apptype) {
+        moduleType = 'apptype';
+        moduleId = selected;
+    } else {
+        splitModule = selected.split('-');
+        moduleId = splitModule[1];
+
+        if (selected.startsWith('components')) {
+            moduleType = 'components';
+        } else if (selected.startsWith('packages')) {
+            moduleType = 'packages';
+        } else if (selected.startsWith('middlewares')) {
+            moduleType = 'middlewares';
+        } else if (selected.startsWith('views')) {
+            moduleType = 'views';
+        } else if (selected.startsWith('bundles')) {
+            moduleType = 'bundles';
+        } else if (selected.startsWith('external')) {
+            moduleType = 'externals';
+        }
     }
 
     if (moduleType && moduleId) {
@@ -819,7 +840,7 @@ <h6><i class="fa fa-fw fa-info-circle text-info"></i> Select module from the tre
     return false;
 }
 
-dataCollectionSectionForm['funcs']['getModuleInfo'] = function(moduleType, moduleId, sync = false) {
+dataCollectionSectionForm['funcs']['getModuleInfo'] = function(moduleType, moduleId = null, sync = false) {
     var postData = { };
     postData[$('#security-token').attr('name')] = $('#security-token').val();
     postData['module_type'] = moduleType;
@@ -835,14 +856,18 @@ <h6><i class="fa fa-fw fa-info-circle text-info"></i> Select module from the tre
             $('#security-token').val(response.token);
         }
 
-        $('#{{componentId}}-{{sectionId}}-moduleinfo-repo-sync').attr('disabled', false);
-        $('#{{componentId}}-{{sectionId}}-moduleinfo-repo-sync').children("i").removeClass("fa-cog fa-spin").addClass("fa-sync-alt");
+        if (moduleType !== 'externals') {
+            $('#{{componentId}}-{{sectionId}}-moduleinfo-repo-sync').attr('disabled', false);
+            $('#{{componentId}}-{{sectionId}}-moduleinfo-repo-sync').children("i").removeClass("fa-cog fa-spin").addClass("fa-sync-alt");
+        }
 
         if (response.responseCode == 0) {
             if (response.responseData.module) {
 
                 dataCollectionSectionForm['vars']['module'] = response.responseData.module;
-
+                if (moduleType === 'apptype') {
+                    dataCollectionSectionForm['vars']['module']['module_type'] = 'apptype';
+                }
                 dataCollectionSectionForm['funcs']['processModuleInfo'](response.responseData.module);
             }
         } else if (response.responseCode == 1) {
@@ -886,24 +911,44 @@ <h6><i class="fa fa-fw fa-info-circle text-info"></i> Select module from the tre
     moduleData['version'] = '<span class="badge badge-info text-xs">' + moduleData['version'] + '</span>';
 
     $('#app_type').html(moduleData.app_type);
-    $('#category').html(moduleData.category);
+    if (moduleData.category) {
+        $('#category').html(moduleData.category);
+        $('#category-field').attr('hidden', false);
+        $('#developer-field').attr('hidden', true);
+        $('#developer-field').attr('hidden', true);
+        $('#required_by-field').attr('hidden', true);
+        $('#required_by').attr('hidden', true);
+    } else if (moduleData.developer) {
+        $('#developer').html(moduleData.developer);
+        $('#category-field').attr('hidden', true);
+        $('#developer-field').attr('hidden', false);
+        $('#required_by-field').attr('hidden', false);
+        $('#required_by').html(BazHelpers.createHtmlList({'obj': moduleData.required_by}));
+        $('#required_by').attr('hidden', false);
+    }
     $('#update_available').html(moduleData.update_available);
     $('#update_version').html(moduleData.update_version);
     $('#updated_on').html(moduleData.updated_on);
     $('#installed').html(moduleData.installed);
     $('#version').html(moduleData.version);
     $('#updated_by').html(moduleData.updated_by);
-    $('#module_type').html(moduleData.module_type);
+    if (moduleData.module_type) {
+        $('#module_type').html(moduleData.module_type);
+    } else {
+        $('#module_type').html('-');
+    }
     if (moduleData.display_name) {
         $('#display_name').html(moduleData.display_name);
-        $('#display_name').html(moduleData.display_name);
     } else {
         $('#display_name').html(moduleData.name);
     }
     $('#module_id').html(moduleData.id);
     $('#description').html(moduleData.description);
 
-    if (moduleData.repo_details.latestRelease && moduleData.repo_details.latestRelease.body) {
+    if (moduleData.module_type !== 'externals' &&
+        moduleData.repo_details.latestRelease &&
+        moduleData.repo_details.latestRelease.body
+    ) {
         var changelogText;
         if (moduleData.repo_details.latestRelease.prerelease === false) {
             changelogText =
@@ -919,7 +964,7 @@ <h6><i class="fa fa-fw fa-info-circle text-info"></i> Select module from the tre
     }
 
     $('#{{componentId}}-{{sectionId}}-auto_update')[0].checked = false;
-    if (moduleInfo.auto_update !== 'null') {
+    if (moduleInfo.auto_update && moduleInfo.auto_update !== 'null') {
         if (moduleInfo.auto_update == '0') {
             $('#{{componentId}}-{{sectionId}}-auto_update')[0].checked = false;
         } else if (moduleInfo.auto_update == '1') {
@@ -927,7 +972,7 @@ <h6><i class="fa fa-fw fa-info-circle text-info"></i> Select module from the tre
         }
     }
 
-    if (moduleInfo.level_of_update !== 'null') {
+    if (moduleInfo.level_of_update && moduleInfo.level_of_update !== 'null') {
         $('#{{componentId}}-{{sectionId}}-level_of_update').val(moduleInfo.level_of_update).trigger('change');
     }
 
@@ -936,17 +981,33 @@ <h6><i class="fa fa-fw fa-info-circle text-info"></i> Select module from the tre
             if (dataCollectionSectionForm['vars']['queue']['tasks']['update'][moduleInfo.module_type] &&
                 (BazHelpers.getKeyByValue(dataCollectionSectionForm['vars']['queue']['tasks']['update'][moduleInfo.module_type], moduleInfo.id) > -1)
             ) {
-                dataCollectionSectionForm['funcs']['moduleinfo'](['info'], ['cancel', 'repo-sync']);
+                if (moduleData['module_type'] !== 'externals') {
+                    dataCollectionSectionForm['funcs']['moduleinfo'](['info'], ['cancel', 'repo-sync']);
+                } else {
+                    dataCollectionSectionForm['funcs']['moduleinfo'](['info'], ['cancel'], false);
+                }
             } else {
-                dataCollectionSectionForm['funcs']['moduleinfo'](['info'], ['update', 'remove', 'repo-sync']);
+                if (moduleData['module_type'] !== 'externals') {
+                    dataCollectionSectionForm['funcs']['moduleinfo'](['info'], ['update', 'remove', 'repo-sync']);
+                } else {
+                    dataCollectionSectionForm['funcs']['moduleinfo'](['info'], ['update', 'remove'], false);
+                }
             }
         } else {
             if (dataCollectionSectionForm['vars']['queue']['tasks']['install'][moduleInfo.module_type] &&
                 (BazHelpers.getKeyByValue(dataCollectionSectionForm['vars']['queue']['tasks']['install'][moduleInfo.module_type], moduleInfo.id) > -1)
             ) {
-                dataCollectionSectionForm['funcs']['moduleinfo'](['info'], ['cancel', 'repo-sync']);
+                if (moduleData['module_type'] !== 'externals') {
+                    dataCollectionSectionForm['funcs']['moduleinfo'](['info'], ['cancel', 'repo-sync']);
+                } else {
+                    dataCollectionSectionForm['funcs']['moduleinfo'](['info'], ['cancel'], false);
+                }
             } else {
-                dataCollectionSectionForm['funcs']['moduleinfo'](['info'], ['uninstall', 'remove', 'repo-sync']);
+                if (moduleData['module_type'] !== 'externals') {
+                    dataCollectionSectionForm['funcs']['moduleinfo'](['info'], ['uninstall', 'remove', 'repo-sync']);
+                } else {
+                    dataCollectionSectionForm['funcs']['moduleinfo'](['info'], ['uninstall', 'remove'], false);
+                }
             }
         }
     } else {
@@ -958,9 +1019,17 @@ <h6><i class="fa fa-fw fa-info-circle text-info"></i> Select module from the tre
         }
 
         if (index > -1) {
-            dataCollectionSectionForm['funcs']['moduleinfo']([], ['cancel', 'repo-sync']);
+            if (moduleData['module_type'] !== 'externals') {
+                dataCollectionSectionForm['funcs']['moduleinfo']([], ['cancel', 'repo-sync']);
+            } else {
+                dataCollectionSectionForm['funcs']['moduleinfo']([], ['cancel'], false);
+            }
         } else {
-            dataCollectionSectionForm['funcs']['moduleinfo']([], ['install', 'remove', 'repo-sync']);
+            if (moduleData['module_type'] !== 'externals') {
+                dataCollectionSectionForm['funcs']['moduleinfo']([], ['install', 'remove', 'repo-sync']);
+            } else {
+                dataCollectionSectionForm['funcs']['moduleinfo']([], ['install', 'remove'], false);
+            }
         }
     }
 
@@ -1027,7 +1096,7 @@ <h6><i class="fa fa-fw fa-info-circle text-info"></i> Select module from the tre
         dataCollectionSectionForm['funcs']['moduleinfo'](['info', 'buttons'], []);
 
         if (moduleData['app_type'] === 'core') {
-            if (moduleInfo['name'] !== 'Core') {
+            if (moduleInfo['name'] !== 'Core' && moduleData['module_type'] !== 'externals') {
                 dataCollectionSectionForm['funcs']['moduleinfo'](['info'], [], false);
             } else {
                 if (dataCollectionSectionForm['vars']['queue']['tasks']['update'][moduleData.module_type]) {
@@ -1035,12 +1104,24 @@ <h6><i class="fa fa-fw fa-info-circle text-info"></i> Select module from the tre
                 }
 
                 if (index !== 'undefined' && index > -1) {
-                    dataCollectionSectionForm['funcs']['moduleinfo'](['info', 'buttons'], ['cancel', 'repo-sync']);
+                    if (moduleData['module_type'] !== 'externals') {
+                        dataCollectionSectionForm['funcs']['moduleinfo'](['info', 'buttons'], ['cancel', 'repo-sync']);
+                    } else {
+                        dataCollectionSectionForm['funcs']['moduleinfo'](['info', 'buttons'], ['cancel'], false);
+                    }
                 } else {
-                    if (moduleInfo.update_available == '1') {
-                        dataCollectionSectionForm['funcs']['moduleinfo']([], ['update', 'repo-sync']);
+                    if (moduleData['module_type'] !== 'externals') {
+                        if (moduleInfo.update_available == '1') {
+                            dataCollectionSectionForm['funcs']['moduleinfo']([], ['update', 'repo-sync']);
+                        } else {
+                            dataCollectionSectionForm['funcs']['moduleinfo']([], ['repo-sync']);
+                        }
                     } else {
-                        dataCollectionSectionForm['funcs']['moduleinfo']([], ['repo-sync']);
+                        if (moduleInfo.update_available == '1') {
+                            dataCollectionSectionForm['funcs']['moduleinfo']([], ['update']);
+                        } else {
+                            dataCollectionSectionForm['funcs']['moduleinfo']([], false, false);
+                        }
                     }
                 }
             }
@@ -1116,9 +1197,13 @@ <h6><i class="fa fa-fw fa-info-circle text-info"></i> Select module from the tre
 
         dataCollectionSectionForm['funcs']['moduleinfo'](['loader', 'buttons'], ['repo-sync']);
 
+        var moduleId = dataCollectionSectionForm['vars']['module']['id'];
+        if (dataCollectionSectionForm['vars']['module']['module_type'] === 'apptype') {
+            moduleId = dataCollectionSectionForm['vars']['module']['app_type'];
+        }
         dataCollectionSectionForm['funcs']['getModuleInfo'](
             dataCollectionSectionForm['vars']['module']['module_type'],
-            dataCollectionSectionForm['vars']['module']['id'],
+            moduleId,
             true
         );
     });
@@ -1157,29 +1242,47 @@ <h6><i class="fa fa-fw fa-info-circle text-info"></i> Select module from the tre
 
             if (task === 'install') {
                 dataCollectionSectionForm['funcs']['moduleinfo'](['info', 'buttons'], ['cancel', 'repo-sync']);
-                dataCollectionSectionForm['funcs']['toggleJstreeTool']('{{componentId}}-{{sectionId}}-modules-filter-install', 'primary', false);
-                dataCollectionSectionForm['funcs']['toggleJstreeTool']('{{componentId}}-{{sectionId}}-modules-filter-queue', 'purple', false);
-                dataCollectionSectionForm['funcs']['applyColorsToTreeIconsAndUpdateText'](moduleType + '-' + id, true);
+                if (moduleType === 'apptype') {
+                    dataCollectionSectionForm['funcs']['initQueueButtons']();
+                } else {
+                    dataCollectionSectionForm['funcs']['toggleJstreeTool']('{{componentId}}-{{sectionId}}-modules-filter-install', 'primary', false);
+                    dataCollectionSectionForm['funcs']['toggleJstreeTool']('{{componentId}}-{{sectionId}}-modules-filter-queue', 'purple', false);
+                    dataCollectionSectionForm['funcs']['applyColorsToTreeIconsAndUpdateText'](moduleType + '-' + id, true);
+                }
             } else if (task === 'update') {
                 dataCollectionSectionForm['funcs']['moduleinfo'](['info', 'buttons'], ['cancel', 'repo-sync']);
-                dataCollectionSectionForm['funcs']['toggleJstreeTool']('{{componentId}}-{{sectionId}}-modules-filter-update', 'info', false);
-                dataCollectionSectionForm['funcs']['toggleJstreeTool']('{{componentId}}-{{sectionId}}-modules-filter-queue', 'purple', false);
-                dataCollectionSectionForm['funcs']['applyColorsToTreeIconsAndUpdateText'](moduleType + '-' + id);
+                if (moduleType === 'apptype') {
+                    dataCollectionSectionForm['funcs']['initQueueButtons']();
+                } else {
+                    dataCollectionSectionForm['funcs']['toggleJstreeTool']('{{componentId}}-{{sectionId}}-modules-filter-update', 'info', false);
+                    dataCollectionSectionForm['funcs']['toggleJstreeTool']('{{componentId}}-{{sectionId}}-modules-filter-queue', 'purple', false);
+                    dataCollectionSectionForm['funcs']['applyColorsToTreeIconsAndUpdateText'](moduleType + '-' + id);
+                }
             } else if (task === 'uninstall') {
                 dataCollectionSectionForm['funcs']['moduleinfo'](['info', 'buttons'], ['cancel', 'repo-sync']);
-                dataCollectionSectionForm['funcs']['toggleJstreeTool']('{{componentId}}-{{sectionId}}-modules-filter-uninstall', 'warning', false);
-                dataCollectionSectionForm['funcs']['toggleJstreeTool']('{{componentId}}-{{sectionId}}-modules-filter-queue', 'purple', false);
-                dataCollectionSectionForm['funcs']['applyColorsToTreeIconsAndUpdateText'](moduleType + '-' + id, false, true);
+                if (moduleType === 'apptype') {
+                    dataCollectionSectionForm['funcs']['initQueueButtons']();
+                } else {
+                    dataCollectionSectionForm['funcs']['toggleJstreeTool']('{{componentId}}-{{sectionId}}-modules-filter-uninstall', 'warning', false);
+                    dataCollectionSectionForm['funcs']['toggleJstreeTool']('{{componentId}}-{{sectionId}}-modules-filter-queue', 'purple', false);
+                    dataCollectionSectionForm['funcs']['applyColorsToTreeIconsAndUpdateText'](moduleType + '-' + id, false, true);
+                }
             } else if (task === 'remove') {
                 dataCollectionSectionForm['funcs']['moduleinfo'](['info', 'buttons'], ['cancel']);
-                dataCollectionSectionForm['funcs']['toggleJstreeTool']('{{componentId}}-{{sectionId}}-modules-filter-remove', 'danger', false);
-                dataCollectionSectionForm['funcs']['toggleJstreeTool']('{{componentId}}-{{sectionId}}-modules-filter-queue', 'purple', false);
-                dataCollectionSectionForm['funcs']['applyColorsToTreeIconsAndUpdateText'](moduleType + '-' + id, false, false, true);
+                if (moduleType === 'apptype') {
+                    dataCollectionSectionForm['funcs']['initQueueButtons']();
+                } else {
+                    dataCollectionSectionForm['funcs']['toggleJstreeTool']('{{componentId}}-{{sectionId}}-modules-filter-remove', 'danger', false);
+                    dataCollectionSectionForm['funcs']['toggleJstreeTool']('{{componentId}}-{{sectionId}}-modules-filter-queue', 'purple', false);
+                    dataCollectionSectionForm['funcs']['applyColorsToTreeIconsAndUpdateText'](moduleType + '-' + id, false, false, true);
+                }
             } else if (task === 'cancel') {
                 dataCollectionSectionForm['funcs']['processModuleInfo'](dataCollectionSectionForm['vars']['module']);
 
                 for (var queueTask in dataCollectionSectionForm['vars']['queue']['tasks']) {
-                    if (dataCollectionSectionForm['vars']['queue']['tasks'][queueTask].length === 0) {
+                    if (!dataCollectionSectionForm['vars']['queue']['tasks'][queueTask] ||
+                        (dataCollectionSectionForm['vars']['queue']['tasks'][queueTask] && dataCollectionSectionForm['vars']['queue']['tasks'][queueTask].length === 0)
+                    ) {
                         dataCollectionSectionForm['funcs']['toggleJstreeTool']('{{componentId}}-{{sectionId}}-modules-filter-' + queueTask);
                     }
                 }
@@ -1187,6 +1290,10 @@ <h6><i class="fa fa-fw fa-info-circle text-info"></i> Select module from the tre
                 dataCollectionSectionForm['funcs']['applyColorsToTreeIconsAndUpdateText'](
                     dataCollectionSectionForm['vars']['module']['module_type'] + '-' + dataCollectionSectionForm['vars']['module']['id']
                 );
+
+                if (dataCollectionSectionForm['vars']['queue']['total'] === 0) {
+                    dataCollectionSectionForm['funcs']['initQueueButtons'](false);
+                }
             } else if (task === 'clearQueue') {
                 dataCollectionSectionForm['funcs']['clearQueue']();
             }
@@ -1231,20 +1338,7 @@ <h6><i class="fa fa-fw fa-info-circle text-info"></i> Select module from the tre
                                                     BazCore.updateBreadcrumb();
                                                 }
             });
-            // dataCollectionSectionForm['funcs']['analyseQueue']();
         });
-
-        // $('#{{componentId}}-{{sectionId}}-perform-precheck').click(function(e) {
-        //     e.preventDefault();
-
-        //     dataCollectionSectionForm['funcs']['processQueue']();
-        // });
-
-        // $('#{{componentId}}-{{sectionId}}-process-queue').click(function(e) {
-        //     e.preventDefault();
-
-        //     dataCollectionSectionForm['funcs']['processQueue']('process');
-        // });
     } else {
         $('#{{componentId}}-{{sectionId}}-analyse-queue').addClass('disabled');
         $('#{{componentId}}-{{sectionId}}-clear-queue').attr('disabled', true);
@@ -1269,34 +1363,6 @@ <h6><i class="fa fa-fw fa-info-circle text-info"></i> Select module from the tre
     dataCollectionSectionForm['funcs']['moduleinfo'](['noinfo']);
     $('#{{componentId}}-{{sectionId}}-modules').jstree().deselect_all();
 }
-// dataCollectionSectionForm['funcs']['processQueue'] = function(task = 'precheck') {
-//     var postData = { };
-//     postData[$('#security-token').attr('name')] = $('#security-token').val();
-//     postData['queue'] = dataCollectionSectionForm['vars']['queue']['tasks'];
-//     postData['process'] = 'runprecheck';
-//     if (task === 'process') {
-//         postData['process'] = 'runprocess';
-//     }
-
-//     $.post('{{links.url("modules/processQueue")}}', postData, function(response) {
-//         if (response.tokenKey && response.token) {
-//             $('#security-token').attr('name', response.tokenKey);
-//             $('#security-token').val(response.token);
-//         }
-
-//         if (response.responseCode == 0) {
-//             paginatedPNotify('success', {
-//                 text        : response.responseMessage,
-//                 textTrusted : true
-//             });
-//         } else {
-//             paginatedPNotify('error', {
-//                 text        : response.responseMessage,
-//                 textTrusted : true
-//             });
-//         }
-//     }, 'json');
-// }
 
 dataCollectionSectionForm['funcs']['initSync'] = function(val) {
     dataCollectionSectionForm['vars']['sync'] = true;
diff --git a/apps/Core/Views/Default/html/modules/modules/info.html b/apps/Core/Views/Default/html/modules/modules/info.html
index aa6beb68b..7502cabf2 100644
--- a/apps/Core/Views/Default/html/modules/modules/info.html
+++ b/apps/Core/Views/Default/html/modules/modules/info.html
@@ -22,10 +22,14 @@
         <label>MODULE TYPE: </label>
         <span class="text-uppercase" id="module_type"></span>
     </div>
-    <div class="col">
+    <div class="col" id="category-field" hidden>
         <label>CATEGORY: </label>
         <span class="text-uppercase" id="category"></span>
     </div>
+    <div class="col" id="developer-field" hidden>
+        <label>DEVELOPER: </label>
+        <span class="text-uppercase" id="developer"></span>
+    </div>
 </div>
 <div class="row">
     <div class="col">
@@ -50,6 +54,12 @@
         <span class="text-uppercase" id="module_id" hidden></span>
     </div>
 </div>
+<div class="row" id="required_by-field" hidden>
+    <div class="col">
+        <label>REQUIRED BY: </label><br>
+        <span class="text-uppercase" id="required_by" hidden></span>
+    </div>
+</div>
 <hr>
 <div class="row" id="{{componentId}}-{{sectionId}}-moduleinfo-buttons" hidden>
     <div class="col">
diff --git a/apps/Core/Views/Default/html/modules/analyse.html b/apps/Core/Views/Default/html/modules/queue/analyse.html
similarity index 79%
rename from apps/Core/Views/Default/html/modules/analyse.html
rename to apps/Core/Views/Default/html/modules/queue/analyse.html
index 23ae10323..0567bf6c9 100644
--- a/apps/Core/Views/Default/html/modules/analyse.html
+++ b/apps/Core/Views/Default/html/modules/queue/analyse.html
@@ -15,7 +15,37 @@
 {% if queue['tasks_count']['remove'] is defined %}
     {% set queueTasksCounterRemove = queue['tasks_count']['remove'] %}
 {% endif %}
+{% set queueStatus = 'Analysis Complete' %}
+{% if queue['status'] == '1' %}
+    {% set queueStatus = 'Precheck Complete' %}
+{% elseif queue['status'] == '2' %}
+    {% set queueStatus = 'Process Complete' %}
+{% endif %}
+{% set queuePrecheckedAt = '-' %}
+{% set queuePrecheckedBy = '-' %}
+{% set queueProcessedAt = '-' %}
+{% set queueProcessedBy = '-' %}
+{% if queue['prechecked_at'] is defined %}
+    {% set queuePrecheckedAt = queue['prechecked_at'] %}
+{% endif %}
+{% if queue['prechecked_by'] is defined %}
+    {% set queuePrecheckedBy = queue['prechecked_by'] %}
+{% endif %}
+{% if queue['processed_at'] is defined %}
+    {% set queueProcessedAt = queue['processed_at'] %}
+{% endif %}
+{% if queue['processed_by'] is defined %}
+    {% set queueProcessedBy = queue['processed_by'] %}
+{% endif %}
 <div class="row">
+    <div class="col">
+        <label>ID: </label>
+        <span class="text-uppercase" id="queue-id">{{queue['id']}}</span>
+    </div>
+    <div class="col">
+        <label>STATUS: </label>
+        <span class="text-uppercase" id="status">{{queueStatus}}</span>
+    </div>
     <div class="col">
         {{adminltetags.useTag('buttons',
             [
@@ -39,6 +69,26 @@
         )}}
     </div>
 </div>
+<hr>
+<div class="row">
+    <div class="col">
+        <label>PRECHECKED AT: </label>
+        <span class="text-uppercase" id="prechecked_at">{{queuePrecheckedAt}}</span>
+    </div>
+    <div class="col">
+        <label>PRECHECKED BY: </label>
+        <span id="prechecked_by">{{queuePrecheckedBy}}</span>
+    </div>
+    <div class="col">
+        <label>PROCESSED AT: </label>
+        <span class="text-uppercase" id="processed_at">{{queueProcessedAt}}</span>
+    </div>
+    <div class="col">
+        <label>PROCESSED BY: </label>
+        <span id="processed_by">{{queueProcessedBy}}</span>
+    </div>
+</div>
+<hr class="mt-0">
 <div class="row">
     <div class="col">
         {{adminltetags.useTag('fields',
@@ -86,6 +136,7 @@
         )}}
     </div>
 </div>
+<hr class="mt-0">
 {% set moduleHtml = '' %}
 {% set hasAnalysisError = 'false' %}
 {% if queue['tasks']['analysed']|length > 0 %}
@@ -126,7 +177,7 @@
                             '           <td>' ~  module['repo'] ~ '</td>' ~
                             '           <td>' ~  '<span class="badge badge-' ~ color ~ ' mt-1 text-xs text-uppercase">' ~ taskName ~ '</span></td>' ~
                             '           <td id="{{componentId}}-{{sectionId}}-analyse-queue-modules-logs-' ~ module['id'] ~ '">' ~
-                            '               <a href="#" type="button" data-error="' ~ error ~ '" data-task="' ~ taskName ~ '" data-moduletype="' ~ modulesType ~ '" data-id="' ~ module['id'] ~ '" class="ml-1 mr-1 text-white btn btn-info btn-xs viewLogs">' ~
+                            '               <a href="#" type="button" data-error="' ~ error ~ '" data-task="' ~ task ~ '" data-taskName="' ~ taskName ~ '" data-moduletype="' ~ modulesType ~ '" data-id="' ~ module['id'] ~ '" class="ml-1 mr-1 text-white btn btn-info btn-xs viewLogs">' ~
                             '                   <i class="fas fa-fw fa-xs fa-eye"></i>' ~
                             '               </a>' ~
                             '           </td>' ~
@@ -161,7 +212,7 @@
     <hr>
     <div class="row">
         <div class="col">
-            <div id="installer-progress" class="mb-3"></div>
+            <div id="installer-progress" class="mb-3" hidden></div>
         </div>
     </div>
 {% endif %}
@@ -199,7 +250,7 @@
 dataCollectionSectionForm['vars']['queue'] = JSON.parse('{{queue}}');
 dataCollectionSectionForm['funcs'] = { };
 dataCollectionSectionForm['funcs']['init'] = function() {
-    BazProgress.buildProgressBar($('#installer-progress'), false, false, true);
+    BazProgress.buildProgressBar($('#installer-progress'), false, true, true);
 
     if ($.fn.DataTable && !$.fn.DataTable.isDataTable('#{{componentId}}-{{sectionId}}-queue-table')) {
         $('#{{componentId}}-{{sectionId}}-queue-table').DataTable({
@@ -228,6 +279,13 @@
     postData['id'] = dataCollectionSectionForm['vars']['queue']['id'];
     postData['settings'] = { };
     postData['settings']['backupSettings'] = { };
+    var backup = $("input[type='radio'][name='backup']:checked").data('value');
+
+    if (backup === 'backup-off') {
+        postData['settings']['backupSettings']['backup'] = false;
+    } else {
+        postData['settings']['backupSettings']['backup'] = true;
+    }
     postData['settings']['backupSettings']['apps_dir'] = $('#{{componentId}}-{{sectionId}}-apps_dir')[0].checked;
     postData['settings']['backupSettings']['systems_dir'] = $('#{{componentId}}-{{sectionId}}-systems_dir')[0].checked;
     postData['settings']['backupSettings']['public_dir'] = $('#{{componentId}}-{{sectionId}}-public_dir')[0].checked;
@@ -242,8 +300,9 @@
     postData['settings']['backupSettings']['password_protect'] = $('#{{componentId}}-{{sectionId}}-password_protect').val().trim();
     postData['settings']['backupSettings']['notes'] = $('#{{componentId}}-{{sectionId}}-notes').val().trim();
     postData['settings']['emailReport'] = $('#{{componentId}}-{{sectionId}}-email_report').val().trim();
-    postData['settings']['rsync'] = { };
-    postData['settings']['rsync']['deleteDestinationFiles'] = $('#{{componentId}}-{{sectionId}}-delete_destination_files')[0].checked;
+    postData['settings']['files'] = { };
+    postData['settings']['files']['deleteSourceFiles'] = $('#{{componentId}}-{{sectionId}}-delete_source_files')[0].checked;
+    postData['settings']['files']['deleteDestinationFiles'] = $('#{{componentId}}-{{sectionId}}-delete_destination_files')[0].checked;
 
     $.post('{{links.url("modules/saveQueueSettings")}}', postData, function(response) {
         if (response.tokenKey && response.token) {
@@ -253,6 +312,7 @@
 
         if (response.responseCode == 0) {
             paginatedPNotify('success', {text : response.responseMessage});
+            $('#{{componentId}}-{{sectionId}}-queue-settings-modal').modal('hide');
         } else {
             paginatedPNotify('error', {text : response.responseMessage});
         }
@@ -275,6 +335,7 @@
     }
 
     $('tr').removeClass('bg-danger');
+    BazProgress.switchProgressBarColor();
 
     var postData = { };
     postData[$('#security-token').attr('name')] = $('#security-token').val();
@@ -294,10 +355,8 @@
         }
 
         if (response.responseCode == 0) {
-            paginatedPNotify('success', {
-                text        : response.responseMessage,
-                textTrusted : true
-            });
+            var notifyText = response.responseMessage;
+            var notifyType = 'success';
 
             if (postData['process'] === 'runprecheck') {
                 $('#{{componentId}}-{{sectionId}}-re-analyse').removeClass('disabled');
@@ -306,12 +365,48 @@
                 $('#{{componentId}}-{{sectionId}}-perform-precheck').children('i').attr('hidden', true);
                 $('#{{componentId}}-{{sectionId}}-process-queue').attr('disabled', false);
                 $('#{{componentId}}-{{sectionId}}-process-queue').attr('hidden', false);
+                if (response.responseData.queue) {
+                    if (response.responseData.queue.prechecked_at) {
+                        $('#prechecked_at').html(response.responseData.queue.prechecked_at);
+                    }
+                    if (response.responseData.queue.prechecked_by) {
+                        $('#prechecked_by').html(response.responseData.queue.prechecked_by);
+                    }
+                    if (response.responseData.queue.status == 1) {
+                        $('#status').html('Precheck Complete');
+                    }
+                }
             } else if (postData['process'] === 'runprocess') {
                 $('#{{componentId}}-{{sectionId}}-re-analyse').attr('hidden', true);
                 $('#{{componentId}}-{{sectionId}}-perform-precheck').attr('hidden', true);
                 $('#{{componentId}}-{{sectionId}}-process-queue').attr('hidden', true);
                 $('#{{componentId}}-{{sectionId}}-process-queue').children('i').attr('hidden', true);
+                $('#{{componentId}}-{{sectionId}}-cancel').attr('hidden', true);
+                $('#{{componentId}}-{{sectionId}}-close').attr('hidden', false);
+                if (response.responseData.queue) {
+                    if (response.responseData.queue.processed_at) {
+                        $('#processed_at').html(response.responseData.queue.processed_at);
+                    }
+                    if (response.responseData.queue.processed_by) {
+                        $('#processed_by').html(response.responseData.queue.processed_by);
+                    }
+                    if (response.responseData.queue.status == 2) {
+                        $('#status').html('Process Complete');
+                    }
+                }
+
+                if (response.responseData && response.responseData.emailReport && response.responseData.emailReport == true) {
+                    notifyText += '. An email report was successfully sent to : ' + $('#{{componentId}}-{{sectionId}}-email_report').val().trim();
+                } else {
+                    notifyType = 'notice';
+                    notifyText += '. Failed to send email report!';
+                }
             }
+
+            paginatedPNotify(notifyType, {
+                text        : notifyText,
+                textTrusted : true
+            });
         } else {
             paginatedPNotify('error', {
                 text        : response.responseMessage,
@@ -332,7 +427,9 @@
                         for (var moduleType in dataCollectionSectionForm['vars']['queue']['results'][task]) {
                             if (Object.keys(dataCollectionSectionForm['vars']['queue']['results'][task][moduleType]).length > 0) {
                                 for (var taskModule in dataCollectionSectionForm['vars']['queue']['results'][task][moduleType]) {
-                                    if (dataCollectionSectionForm['vars']['queue']['results'][task][moduleType][taskModule]['precheck'] === 'fail') {
+                                    if (dataCollectionSectionForm['vars']['queue']['results'][task][moduleType][taskModule]['precheck'] === 'fail' ||
+                                        dataCollectionSectionForm['vars']['queue']['results'][task][moduleType][taskModule]['result'] === 'fail'
+                                    ) {
                                         var moduleLogs = document.querySelectorAll("[data-id='" + taskModule + "']");
 
                                         if (moduleLogs.length === 1) {
@@ -435,10 +532,10 @@
         ) {
             logObject = Object.assign({}, dataCollectionSectionForm['vars']['queue']['results']['first']['external'][$(this).data()['id']]);
         } else if ($(this).data()['moduletype'] === 'packages' &&
-                   $(this).data()['task'] === 'update' &&
-                   dataCollectionSectionForm['vars']['queue']['results']['first']['packages'][$(this).data()['id']]
+                   $(this).data()['taskName'] === 'update' &&
+                   dataCollectionSectionForm['vars']['queue']['results']['update']['packages'][$(this).data()['id']]
         ) {
-            logObject = Object.assign({}, dataCollectionSectionForm['vars']['queue']['results']['first']['packages'][$(this).data()['id']]);
+            logObject = Object.assign({}, dataCollectionSectionForm['vars']['queue']['results']['update']['packages'][$(this).data()['id']]);
         } else {
             logObject = Object.assign({}, dataCollectionSectionForm['vars']['queue']['results'][$(this).data()['task']][$(this).data()['moduletype']][$(this).data()['id']]);
         }
@@ -457,8 +554,12 @@
             if (object === 'analyse_logs' || object === 'precheck_logs' || object === 'result_logs') {
                 if (logObject[object] !== '-') {
                     if ($(this).data()['moduletype'] !== 'external') {
-                        logObject[object] = JSON.parse(logObject[object]);
-                        logObject[object] = BazHelpers.createHtmlList({'obj': logObject[object]});
+                        try {
+                            logObject[object] = JSON.parse(logObject[object]);
+                            logObject[object] = BazHelpers.createHtmlList({'obj': logObject[object]});
+                        } catch (e) {
+                            //Do nothing
+                        }
                     }
 
                     logObject[object] = '<pre>' + logObject[object] + '</pre>';
@@ -476,7 +577,34 @@
 
 dataCollectionSection =
     $.extend(dataCollectionSection, {
-        '{{componentId}}-{{sectionId}}-apps_dir'                                : { },
+        '{{componentId}}-{{sectionId}}-apps_dir'                                : {
+            afterInit : function() {
+                var backup, disabled;
+
+                $("input[type='radio'][name='backup']:checked").parents('.btn-group').click(function() {
+                    backup = $("input[type='radio'][name='backup']:checked").data('value');
+
+                    if (backup === 'backup-off') {
+                        disabled = true;
+                    } else {
+                        disabled = false;
+                    }
+                    $('#{{componentId}}-{{sectionId}}-apps_dir').attr('disabled', disabled);
+                    $('#{{componentId}}-{{sectionId}}-systems_dir').attr('disabled', disabled);
+                    $('#{{componentId}}-{{sectionId}}-public_dir').attr('disabled', disabled);
+                    $('#{{componentId}}-{{sectionId}}-private_dir').attr('disabled', disabled);
+                    $('#{{componentId}}-{{sectionId}}-external_dir').attr('disabled', disabled);
+                    $('#{{componentId}}-{{sectionId}}-html_compiled_dir').attr('disabled', disabled);
+                    $('#{{componentId}}-{{sectionId}}-var_dir').attr('disabled', disabled);
+                    $('#{{componentId}}-{{sectionId}}-external_vendor_dir').attr('disabled', disabled);
+                    $('#{{componentId}}-{{sectionId}}-old_backups_dir').attr('disabled', disabled);
+                    $('#{{componentId}}-{{sectionId}}-database').attr('disabled', disabled);
+                    $('#{{componentId}}-{{sectionId}}-keys').attr('disabled', disabled);
+                    $('#{{componentId}}-{{sectionId}}-password_protect').attr('disabled', disabled);
+                    $('#{{componentId}}-{{sectionId}}-notes').attr('disabled', disabled);
+                });
+            }
+        },
         '{{componentId}}-{{sectionId}}-systems_dir'                             : {
             afterInit : function() {
                 $('#{{componentId}}-{{sectionId}}-systems_dir').click(function() {
@@ -536,6 +664,7 @@
         '{{componentId}}-{{sectionId}}-password_protect'                        : { },
         '{{componentId}}-{{sectionId}}-notes'                                   : { },
         '{{componentId}}-{{sectionId}}-email_report'                            : { },
+        '{{componentId}}-{{sectionId}}-delete_source_files'                     : { },
         '{{componentId}}-{{sectionId}}-delete_destination_files'                : { },
         '{{componentId}}-{{sectionId}}-form'                                    : $.extend(dataCollectionSectionForm, {
             rules: {
@@ -548,17 +677,33 @@
         })
     });
 
+function stringToBoolean(string) {
+    switch (string.toLowerCase().trim()) {
+        case "true":
+        case "yes":
+        case "1":
+          return true;
+
+        case "false":
+        case "no":
+        case "0":
+        case null:
+        case undefined:
+        case 'undefined':
+          return false;
+
+        default:
+          return JSON.parse(string);
+    }
+}
+
 $(document).ready(function() {
-    dataCollectionSectionForm['vars']['hasAnalysisError'] = BazHelpers.stringToBoolean("{{hasAnalysisError}}");
+    dataCollectionSectionForm['vars']['hasAnalysisError'] = stringToBoolean("{{hasAnalysisError}}");
 
     dataCollectionSectionForm['funcs']['initQueueButtons']();
 
     dataCollectionSectionForm['funcs']['init']();
 });
-
-$(window).on('load', function() {
-    dataCollectionSectionForm['funcs']['init']();
-});
 </script>
 <div>
     {{adminltetags.useTag('modal',
@@ -568,13 +713,13 @@
             'componentId'               : componentId,
             'sectionId'                 : sectionId,
             'modalId'                   : 'queue-settings-modal',
-            'modalBodyInclude'          : 'modules/settings',
+            'modalBodyInclude'          : 'modules/queue/settings',
             'modalSize'                 : 'xl',
             'modalHeader'               : true,
             'modalFooter'               : true,
             'modalHeaderCloseButton'    : true,
             'modalEscClose'             : true,
-            'modalTitle'                : '<i class="fa fas fa-fw fa-cogs"></i> QUEUE SETTINGS',
+            'modalTitle'                : '<i class="fa fas fa-fw fa-cogs"></i> SETTINGS',
             'modalFooterButtons'        :
                 [
                 'component'                     : component,
@@ -605,7 +750,7 @@
             'componentId'               : componentId,
             'sectionId'                 : sectionId,
             'modalId'                   : 'queue-logs-modal',
-            'modalBodyInclude'          : 'modules/logs',
+            'modalBodyInclude'          : 'modules/queue/logs',
             'modalSize'                 : 'xl',
             'modalHeader'               : true,
             'modalFooter'               : true,
diff --git a/apps/Core/Views/Default/html/modules/logs.html b/apps/Core/Views/Default/html/modules/queue/logs.html
similarity index 100%
rename from apps/Core/Views/Default/html/modules/logs.html
rename to apps/Core/Views/Default/html/modules/queue/logs.html
diff --git a/apps/Core/Views/Default/html/modules/settings.html b/apps/Core/Views/Default/html/modules/queue/settings.html
similarity index 81%
rename from apps/Core/Views/Default/html/modules/settings.html
rename to apps/Core/Views/Default/html/modules/queue/settings.html
index f8b348c4f..8e61b4815 100644
--- a/apps/Core/Views/Default/html/modules/settings.html
+++ b/apps/Core/Views/Default/html/modules/queue/settings.html
@@ -9,42 +9,57 @@
 {% set settingsBackupSettingsOldBackupsDirChecked = false %}
 {% set settingsBackupSettingsDatabaseChecked = false %}
 {% set settingsBackupSettingsKeysChecked = false %}
-{% if queue['settings']['backupSettings']['apps_dir'] == 'true' %}
-    {% set settingsBackupSettingsAppsDirChecked = true %}
+{% set settingsBackupSettingsKeysDisabled = false %}
+{% set settingsBackupSettingsBackup = 'backup-off' %}
+{% set settingsBackupSettingsPasswordProtectDisabled = true %}
+{% set settingsBackupSettingsNotesDisabled = true %}
+{% if queue['settings']['backupSettings']['backup'] == true %}
+    {% set settingsBackupSettingsPasswordProtectDisabled = false %}
+    {% set settingsBackupSettingsNotesDisabled = false %}
+    {% set settingsBackupSettingsBackup = 'backup-on' %}
+    {% if queue['settings']['backupSettings']['apps_dir'] == true %}
+        {% set settingsBackupSettingsAppsDirChecked = true %}
+        {% set settingsBackupSettingsKeysDisabled = true %}
+    {% endif %}
+    {% if queue['settings']['backupSettings']['systems_dir'] == true %}
+        {% set settingsBackupSettingsSystemsDirChecked = true %}
+        {% set settingsBackupSettingsKeysChecked = true %}
+    {% endif %}
+    {% if queue['settings']['backupSettings']['public_dir'] == true %}
+        {% set settingsBackupSettingsPublicDirChecked = true %}
+    {% endif %}
+    {% if queue['settings']['backupSettings']['private_dir'] == true %}
+        {% set settingsBackupSettingsPrivateDirChecked = true %}
+    {% endif %}
+    {% if queue['settings']['backupSettings']['external_dir'] == true %}
+        {% set settingsBackupSettingsExternalDirChecked = true %}
+    {% endif %}
+    {% if queue['settings']['backupSettings']['html_compiled_dir'] == true %}
+        {% set settingsBackupSettingsHTMLCompiledDirChecked = true %}
+    {% endif %}
+    {% if queue['settings']['backupSettings']['var_dir'] == true %}
+        {% set settingsBackupSettingsVarDirChecked = true %}
+    {% endif %}
+    {% if queue['settings']['backupSettings']['external_vendor_dir'] == true %}
+        {% set settingsBackupSettingsExternalVendorDirChecked = true %}
+    {% endif %}
+    {% if queue['settings']['backupSettings']['old_backups_dir'] == true %}
+        {% set settingsBackupSettingsOldBackupsDirChecked = true %}
+    {% endif %}
+    {% if queue['settings']['backupSettings']['database'] == true %}
+        {% set settingsBackupSettingsDatabaseChecked = true %}
+    {% endif %}
+    {% if queue['settings']['backupSettings']['keys'] == true %}
+        {% set settingsBackupSettingsKeysChecked = true %}
+    {% endif %}
 {% endif %}
-{% if queue['settings']['backupSettings']['systems_dir'] == 'true' %}
-    {% set settingsBackupSettingsSystemsDirChecked = true %}
+{% set settingsFilesDeleteSourceFilesChecked = false %}
+{% if queue['settings']['files']['deleteSourceFiles'] == true %}
+    {% set settingsFilesDeleteSourceFilesChecked = true %}
 {% endif %}
-{% if queue['settings']['backupSettings']['public_dir'] == 'true' %}
-    {% set settingsBackupSettingsPublicDirChecked = true %}
-{% endif %}
-{% if queue['settings']['backupSettings']['private_dir'] == 'true' %}
-    {% set settingsBackupSettingsPrivateDirChecked = true %}
-{% endif %}
-{% if queue['settings']['backupSettings']['external_dir'] == 'true' %}
-    {% set settingsBackupSettingsExternalDirChecked = true %}
-{% endif %}
-{% if queue['settings']['backupSettings']['html_compiled_dir'] == 'true' %}
-    {% set settingsBackupSettingsHTMLCompiledDirChecked = true %}
-{% endif %}
-{% if queue['settings']['backupSettings']['var_dir'] == 'true' %}
-    {% set settingsBackupSettingsVarDirChecked = true %}
-{% endif %}
-{% if queue['settings']['backupSettings']['external_vendor_dir'] == 'true' %}
-    {% set settingsBackupSettingsExternalVendorDirChecked = true %}
-{% endif %}
-{% if queue['settings']['backupSettings']['old_backups_dir'] == 'true' %}
-    {% set settingsBackupSettingsOldBackupsDirChecked = true %}
-{% endif %}
-{% if queue['settings']['backupSettings']['database'] == 'true' %}
-    {% set settingsBackupSettingsDatabaseChecked = true %}
-{% endif %}
-{% if queue['settings']['backupSettings']['keys'] == 'true' %}
-    {% set settingsBackupSettingsKeysChecked = true %}
-{% endif %}
-{% set settingsRSyncDeleteDestinationFilesChecked = false %}
-{% if queue['settings']['rsync']['deleteDestinationFiles'] == 'true' %}
-    {% set settingsRSyncDeleteDestinationFilesChecked = true %}
+{% set settingsFilesDeleteDestinationFilesChecked = false %}
+{% if queue['settings']['files']['deleteDestinationFiles'] == true %}
+    {% set settingsFilesDeleteDestinationFilesChecked = true %}
 {% endif %}
 <div class="row">
     <div class="col">
@@ -71,6 +86,38 @@
                     )}}
                 </div>
             </div>
+            <div class="row">
+                <div class="col">
+                    {{adminltetags.useTag('buttons',
+                        [
+                            'component'                         : component,
+                            'componentName'                     : componentName,
+                            'componentId'                       : componentId,
+                            'sectionId'                         : sectionId,
+                            'buttonType'                        : 'ButtonGroup',
+                            'buttonId'                          : 'backup',
+                            'groupButtonType'                   : 'radio',
+                            'groupButtonSize'                   : 'sm',
+                            'groupButtonPosition'               : 'right',
+                            'groupRadioButtonChecked'           : settingsBackupSettingsBackup,
+                            'groupRadioButtonStyle'             : 'outline',
+                            'buttons'                           :
+                                {
+                                    'backup-off' : {
+                                        'title'                   : 'Backup Off',
+                                        'type'                    : 'primary',
+                                        'value'                   : 'backup-off'
+                                    },
+                                    'backup-on' : {
+                                        'title'                   : 'Backup On',
+                                        'type'                    : 'success',
+                                        'value'                   : 'backup-on'
+                                    }
+                                }
+                        ]
+                    )}}
+                </div>
+            </div>
             <div class="row">
                 <div class="col">
                     {{adminltetags.useTag('fields',
@@ -327,7 +374,7 @@
                             'fieldType'                      : 'checkbox',
                             'fieldCheckboxType'              : 'danger',
                             'fieldCheckboxChecked'           : settingsBackupSettingsKeysChecked,
-                            'fieldDisabled'                  : true,
+                            'fieldDisabled'                  : settingsBackupSettingsKeysDisabled,
                             'fieldCheckboxLabel'             : 'SECURITY AND DB KEYS',
                             'fieldBazJstreeSearch'           : true,
                             'fieldBazPostOnCreate'           : false,
@@ -351,6 +398,7 @@
                             'fieldInputPasswordGenerate'            : true,
                             'fieldInputPasswordStrengthMeter'       : true,
                             'fieldHelp'                             : true,
+                            'fieldDisabled'                         : settingsBackupSettingsPasswordProtectDisabled,
                             'fieldHelpTooltipContent'               : 'We will password protect the zip file if password is provided. Password protection is a must in case of Security and DB keys (if not provided, a new password will be auto generated). During restore, you need to enter this password, else restore will fail. Please keep this password safe.',
                             'fieldRequired'                         : false,
                             'fieldBazScan'                          : true,
@@ -375,6 +423,7 @@
                             'fieldType'                      : 'textarea',
                             'fieldDataMaxLength'             : 2048,
                             'fieldHelp'                      : true,
+                            'fieldDisabled'                  : settingsBackupSettingsNotesDisabled,
                             'fieldHelpTooltipContent'        : 'Backup Notes',
                             'fieldRequired'                  : false,
                             'fieldBazScan'                   : true,
@@ -443,8 +492,8 @@
                             'componentName'                         : componentName,
                             'componentId'                           : componentId,
                             'sectionId'                             : sectionId,
-                            'fieldId'                               : 'rsync_settings',
-                            'fieldLabel'                            : 'RSYNC SETTINGS',
+                            'fieldId'                               : 'files_settings',
+                            'fieldLabel'                            : 'FILES SETTINGS',
                             'fieldLabelLegend'                      : true,
                             'fieldHidden'                           : false,
                             'fieldType'                             : 'html',
@@ -458,6 +507,29 @@
                 </div>
             </div>
             <div class="row">
+                <div class="col">
+                    {{adminltetags.useTag('fields',
+                        [
+                            'component'                      : component,
+                            'componentName'                  : componentName,
+                            'componentId'                    : componentId,
+                            'sectionId'                      : sectionId,
+                            'fieldId'                        : 'delete_source_files',
+                            'fieldLabel'                     : false,
+                            'fieldHelp'                      : true,
+                            'fieldHelpTooltipContent'        : 'Delete downloaded source files? Files are only deleted on successful installation/upgrade.',
+                            'fieldRequired'                  : false,
+                            'fieldType'                      : 'checkbox',
+                            'fieldCheckboxType'              : 'success',
+                            'fieldCheckboxChecked'           : settingsFilesDeleteSourceFilesChecked,
+                            'fieldCheckboxLabel'             : 'DELETE SOURCE FILES?',
+                            'fieldBazJstreeSearch'           : true,
+                            'fieldBazPostOnCreate'           : false,
+                            'fieldBazPostOnUpdate'           : false,
+                            'fieldBazScan'                   : true
+                        ]
+                    )}}
+                </div>
                 <div class="col">
                     {{adminltetags.useTag('fields',
                         [
@@ -472,7 +544,7 @@
                             'fieldRequired'                  : false,
                             'fieldType'                      : 'checkbox',
                             'fieldCheckboxType'              : 'danger',
-                            'fieldCheckboxChecked'           : settingsRSyncDeleteDestinationFilesChecked,
+                            'fieldCheckboxChecked'           : settingsFilesDeleteDestinationFilesChecked,
                             'fieldCheckboxLabel'             : 'RSYNC DELETE DESTINATION FILES?',
                             'fieldBazJstreeSearch'           : true,
                             'fieldBazPostOnCreate'           : false,
diff --git a/apps/Core/Views/Default/html/modules/view.html b/apps/Core/Views/Default/html/modules/view.html
index ed2a1d5d5..3f105c463 100644
--- a/apps/Core/Views/Default/html/modules/view.html
+++ b/apps/Core/Views/Default/html/modules/view.html
@@ -3,6 +3,8 @@
     {% set precheckHidden = false %}
     {% set analyseHidden = false %}
     {% set processHidden = true %}
+    {% set cancelHidden = false %}
+    {% set closeHidden = true %}
     {% if queue['status'] == 1 %}
         {% set precheckHidden = false %}
         {% set precheckTitle = 'Re-Perform Precheck' %}
@@ -11,6 +13,8 @@
         {% set precheckHidden = true %}
         {% set analyseHidden = true %}
         {% set processHidden = true %}
+        {% set cancelHidden = true %}
+        {% set closeHidden = false %}
     {% endif %}
     {% set footerContent =
         adminltetags.useTag('buttons',
@@ -47,6 +51,16 @@
                             'title'                   : 'Cancel',
                             'type'                    : 'secondary',
                             'position'                : 'right',
+                            'hidden'                  : cancelHidden,
+                            'buttonAdditionalClass'   : 'contentAjaxLink',
+                            'url'                     : links.url('modules')
+                        ],
+                        'close' : [
+                            'title'                   : 'Close',
+                            'type'                    : 'secondary',
+                            'position'                : 'right',
+                            'hidden'                  : closeHidden,
+                            'buttonAdditionalClass'   : 'contentAjaxLink',
                             'url'                     : links.url('modules')
                         ]
                     ]
@@ -64,10 +78,10 @@
             'cardFooter'                  : true,
             'cardType'                    : 'primary',
             'cardIcon'                    : 'th',
-            'cardTitle'                   : 'Analyse Modules',
+            'cardTitle'                   : 'Analyse Queue Modules',
             'cardAdditionalClass'         : 'rounded-0',
             'cardCollapsed'               : false,
-            'cardBodyInclude'             : 'modules/analyse',
+            'cardBodyInclude'             : 'modules/queue/analyse',
             'cardShowTools'               : ['maximize'],
             'cardFooterContent'           : footerContent
         ]
diff --git a/apps/Core/Views/Default/html/system/api/client/services/list.html b/apps/Core/Views/Default/html/system/api/client/services/list.html
index 2044c1cb6..99ff46b84 100644
--- a/apps/Core/Views/Default/html/system/api/client/services/list.html
+++ b/apps/Core/Views/Default/html/system/api/client/services/list.html
@@ -52,7 +52,7 @@
                 'dropdownButtonAdditionalClass'     : 'text-uppercase',
                 'buttonPosition'                    : 'right',
                 'dropdownAlign'                     : 'right',
-                'buttons'                           : apiButtons
+                'dropdowns'                         : apiButtons
             },
         'dtTable'               : table,
         'dtColumns'             : table['columns'],
diff --git a/apps/Core/Views/Default/html/system/email/queue/list.html b/apps/Core/Views/Default/html/system/email/queue/list.html
index b575dd87d..8ece19316 100644
--- a/apps/Core/Views/Default/html/system/email/queue/list.html
+++ b/apps/Core/Views/Default/html/system/email/queue/list.html
@@ -29,7 +29,7 @@
                 'dropdownButtonAdditionalClass'     : 'text-uppercase',
                 'buttonPosition'                    : 'right',
                 'dropdownAlign'                     : 'right',
-                'buttons'               :
+                'dropdowns'               :
                     {
                         'process-high' : {
                             'title'                   : 'High Priority',
diff --git a/apps/Core/Views/Default/html/system/menus/form.html b/apps/Core/Views/Default/html/system/menus/form.html
new file mode 100644
index 000000000..cf26b9432
--- /dev/null
+++ b/apps/Core/Views/Default/html/system/menus/form.html
@@ -0,0 +1,167 @@
+{% if menu['id'] is defined %}
+    {% set menuId = menu['id'] %}
+    {% set menuRoute = menu['route'] %}
+    {% set menuAppType = menu['app_type'] %}
+    {% set menuMenu = menu['menu'] %}
+{% else %}
+    {% set menuId = '' %}
+    {% set menuRoute = '' %}
+    {% set menuAppType = '' %}
+    {% set menuMenu = '' %}
+{% endif %}
+<form data-validateon="section" id="{{componentId}}-{{sectionId}}-form">
+    <fieldset id="{{componentId}}-{{sectionId}}-fieldset">
+        <div class="row">
+            <div class="col">
+                {{adminltetags.useTag('fields',
+                    [
+                        'component'                      : component,
+                        'componentName'                  : componentName,
+                        'componentId'                    : componentId,
+                        'sectionId'                      : sectionId,
+                        'fieldId'                        : 'id',
+                        'fieldLabel'                     : 'Menu ID',
+                        'fieldType'                      : 'input',
+                        'fieldHelp'                      : true,
+                        'fieldHelpTooltipContent'        : 'Menu ID',
+                        'fieldRequired'                  : true,
+                        'fieldBazScan'                   : true,
+                        'fieldBazPostOnCreate'           : false,
+                        'fieldBazPostOnUpdate'           : true,
+                        'fieldHidden'                    : true,
+                        'fieldDisabled'                  : true,
+                        'fieldValue'                     : menuId
+                    ]
+                )}}
+            </div>
+        </div>
+        <div class="row">
+            <div class="col">
+                {{adminltetags.useTag('fields',
+                    [
+                        'component'                      : component,
+                        'componentName'                  : componentName,
+                        'componentId'                    : componentId,
+                        'sectionId'                      : sectionId,
+                        'fieldId'                        : 'route',
+                        'fieldLabel'                     : 'Route',
+                        'fieldType'                      : 'input',
+                        'fieldHelp'                      : true,
+                        'fieldHelpTooltipContent'        : 'Route Example: system/menus',
+                        'fieldRequired'                  : true,
+                        'fieldBazScan'                   : true,
+                        'fieldBazPostOnCreate'           : true,
+                        'fieldBazPostOnUpdate'           : true,
+                        'fieldDataInputMinLength'        : 1,
+                        'fieldDataInputMaxLength'        : 50,
+                        'fieldValue'                     : menuRoute
+                    ]
+                )}}
+            </div>
+            <div class="col">
+                {{adminltetags.useTag('fields',
+                    [
+                        'component'                            : component,
+                        'componentName'                        : componentName,
+                        'componentId'                          : componentId,
+                        'sectionId'                            : sectionId,
+                        'fieldId'                              : 'app_type',
+                        'fieldLabel'                           : 'App Type',
+                        'fieldType'                            : 'select2',
+                        'fieldHelp'                            : true,
+                        'fieldHelpTooltipContent'              : 'Select App Type for the menu.',
+                        'fieldRequired'                        : true,
+                        'fieldBazScan'                         : true,
+                        'fieldBazPostOnCreate'                 : true,
+                        'fieldBazPostOnUpdate'                 : true,
+                        'fieldDataSelect2Options'              : appTypes,
+                        'fieldDataSelect2OptionsKey'           : 'app_type',
+                        'fieldDataSelect2OptionsValue'         : 'name',
+                        'fieldDataSelect2OptionsArray'         : true,
+                        'fieldDataSelect2OptionsSelected'      : menuAppType
+                    ]
+                )}}
+            </div>
+        </div>
+        <div class="row">
+            <div class="col">
+                {{adminltetags.useTag('fields',
+                    [
+                        'component'                      : component,
+                        'componentName'                  : componentName,
+                        'componentId'                    : componentId,
+                        'sectionId'                      : sectionId,
+                        'fieldId'                        : 'menu',
+                        'fieldLabel'                     : 'Menu',
+                        'fieldType'                      : 'textarea',
+                        'fieldDataMaxLength'             : 4096,
+                        'fieldHelp'                      : true,
+                        'fieldHelpTooltipContent'        : 'Menu',
+                        'fieldRequired'                  : true,
+                        'fieldBazScan'                   : true,
+                        'fieldBazPostOnCreate'           : true,
+                        'fieldBazPostOnUpdate'           : true,
+                        'fieldDataInputMaxLength'        : 4096,
+                        'fieldTextareaRows'              : 10,
+                        'fieldValue'                     : menuMenu
+                    ]
+                )}}
+            </div>
+        </div>
+    </fieldset>
+</form>
+<script>
+/* globals */
+var dataCollectionComponent, dataCollectionSection, dataCollectionSectionForm;
+
+if (!window['dataCollection']['{{componentId}}']) {
+    dataCollectionComponent =
+        window['dataCollection']['{{componentId}}'] = { };
+} else {
+    dataCollectionComponent =
+        window['dataCollection']['{{componentId}}'];
+}
+if (!dataCollectionComponent['{{componentId}}-{{sectionId}}']) {
+    dataCollectionSection =
+        dataCollectionComponent['{{componentId}}-{{sectionId}}'] = { };
+} else {
+    dataCollectionSection =
+        dataCollectionComponent['{{componentId}}-{{sectionId}}'];
+}
+if (!dataCollectionSection['{{componentId}}-{{sectionId}}-form']) {
+    dataCollectionSectionForm =
+        dataCollectionSection['{{componentId}}-{{sectionId}}-form'] = { };
+} else {
+    dataCollectionSectionForm =
+        dataCollectionSection['{{componentId}}-{{sectionId}}-form'];
+}
+
+dataCollectionSection =
+    $.extend(dataCollectionSection, {
+        '{{componentId}}-{{sectionId}}-id'                      : { },
+        '{{componentId}}-{{sectionId}}-route'                   : { },
+        '{{componentId}}-{{sectionId}}-app_type'                : {
+            placeholder : 'SELECT APP TYPE'
+        },
+        '{{componentId}}-{{sectionId}}-menu'                    : {
+            afterInit: function() {
+                var menu = '{{menuMenu}}';
+                if (menu !== '') {
+                    $('#{{componentId}}-{{sectionId}}-menu').val(JSON.stringify(JSON.parse(menu), null, 4));
+                }
+            }
+        },
+        '{{componentId}}-{{sectionId}}-form'                    : {
+            rules: {
+                '{{componentId}}-{{sectionId}}-route'           : 'required',
+                '{{componentId}}-{{sectionId}}-app_type'        : 'required',
+                '{{componentId}}-{{sectionId}}-menu'            : 'required',
+            },
+            messages: {
+                '{{componentId}}-{{sectionId}}-route'           : 'Please enter menu route',
+                '{{componentId}}-{{sectionId}}-app_type'        : 'Please select app type',
+                '{{componentId}}-{{sectionId}}-menu'            : 'Please enter menu'
+            }
+        }
+    });
+</script>
\ No newline at end of file
diff --git a/apps/Core/Views/Default/html/system/menus/list.html b/apps/Core/Views/Default/html/system/menus/list.html
new file mode 100644
index 000000000..7067e9104
--- /dev/null
+++ b/apps/Core/Views/Default/html/system/menus/list.html
@@ -0,0 +1,30 @@
+{{adminltetags.useTag('content',
+    [
+        'component'             : table['component'],
+        'componentName'         : componentName,
+        'componentId'           : componentId,
+        'parentComponentId'     : parent,
+        'sectionId'             : 'listing',
+        'contentType'           : 'sectionWithListing',
+        'cardHeader'            : true,
+        'cardType'              : 'primary',
+        'cardIcon'              : 'bars',
+        'cardTitle'             : componentName,
+        'cardAdditionalClass'   : 'rounded-0',
+        'dtFilter'              : false,
+        'dtFilters'             : table['filters'],
+        'dtFilterColumns'       : table['filterColumns'],
+        'dtFixedHeader'         : true,
+        'dtTable'               : table,
+        'dtColumns'             : table['columns'],
+        'dtPostUrl'             : table['postUrl'],
+        'dtPostUrlParams'       : table['postUrlParams'],
+        'dtStriped'             : true,
+        'dtStateSave'           : false,
+        'dtBordered'            : false,
+        'dtHideIdColumn'        : true,
+        'dtNoOfColumnsToShow'   : 6,
+        'dtTableCompact'        : true,
+        'dtZeroRecords'         : 'No menus data available. Menus are added via component.json file during installation or you can make custom menu in the app.'
+    ]
+)}}
\ No newline at end of file
diff --git a/apps/Core/Views/Default/html/system/menus/view.html b/apps/Core/Views/Default/html/system/menus/view.html
new file mode 100644
index 000000000..b0c413839
--- /dev/null
+++ b/apps/Core/Views/Default/html/system/menus/view.html
@@ -0,0 +1,29 @@
+{% if menu['id'] is defined %}
+    {% set menuId = menu['id'] %}
+    {% set title = ' Menu (' ~ menu['route'] ~ ')' %}
+{% else %}
+    {% set menuId = '' %}
+    {% set title = 'New Menu' %}
+{% endif %}
+
+{{adminltetags.useTag('content',
+    [
+        'component'                     : component,
+        'componentName'                 : componentName,
+        'componentId'                   : componentId,
+        'parentComponentId'             : parent,
+        'sectionId'                     : 'main',
+        'contentType'                   : 'sectionWithForm',
+        'cardHeader'                    : true,
+        'cardFooter'                    : true,
+        'cardType'                      : 'primary',
+        'cardIcon'                      : 'bars',
+        'cardTitle'                     : title,
+        'cardAdditionalClass'           : 'rounded-0',
+        'cardBodyInclude'               : 'menus/form',
+        'formButtons'                   :
+        [
+            'closeActionUrl'                : 'system/menus'
+        ]
+    ]
+)}}
\ No newline at end of file
diff --git a/apps/Core/Views/Default/html/system/notifications/list.html b/apps/Core/Views/Default/html/system/notifications/list.html
index 1d46dcfbe..48fc78d61 100644
--- a/apps/Core/Views/Default/html/system/notifications/list.html
+++ b/apps/Core/Views/Default/html/system/notifications/list.html
@@ -60,7 +60,7 @@
                 'dropdownButtonDisabled'            : true,
                 'buttonPosition'                    : 'right',
                 'dropdownAlign'                     : 'right',
-                'buttons'                           :
+                'dropdowns'                         :
                     {
                         'mark-read' : {
                             'title'                 : 'Read',
diff --git a/apps/Core/Views/Default/html/system/storages/list.html b/apps/Core/Views/Default/html/system/storages/list.html
index af667a542..7dace9692 100644
--- a/apps/Core/Views/Default/html/system/storages/list.html
+++ b/apps/Core/Views/Default/html/system/storages/list.html
@@ -26,7 +26,7 @@
                 'dropdownButtonAdditionalClass'     : 'text-uppercase',
                 'buttonPosition'                    : 'right',
                 'dropdownAlign'                     : 'right',
-                'buttons'                           :
+                'dropdowns'                         :
                     {
                         'local-storage' : {
                             'title'                   : 'Local Storage',
diff --git a/apps/Core/Views/Default/html/system/tools/importexport/list.html b/apps/Core/Views/Default/html/system/tools/importexport/list.html
index 9d98c71a2..5f84ce938 100644
--- a/apps/Core/Views/Default/html/system/tools/importexport/list.html
+++ b/apps/Core/Views/Default/html/system/tools/importexport/list.html
@@ -29,7 +29,7 @@
                 'dropdownButtonAdditionalClass'     : 'text-uppercase',
                 'buttonPosition'                    : 'right',
                 'dropdownAlign'                     : 'right',
-                'buttons'                           :
+                'dropdowns'                         :
                     {
                         'import' : {
                             'title'                   : 'Import',
diff --git a/public/core/default/css/core.css b/public/core/default/css/core.css
index 3f42a8a4b..6078b81c2 100644
--- a/public/core/default/css/core.css
+++ b/public/core/default/css/core.css
@@ -37,7 +37,7 @@
   --breakpoint-md: 768px;
   --breakpoint-lg: 992px;
   --breakpoint-xl: 1200px;
-  --font-family-sans-serif: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
+  --font-family-sans-serif: -apple-system, BlinkMacSystemFont, "Segoe UI", Arial, Roboto, "Helvetica Neue", "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
   --font-family-monospace: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
 }
 
@@ -60,7 +60,7 @@ article, aside, figcaption, figure, footer, header, hgroup, main, nav, section {
 
 body {
   margin: 0;
-  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
+  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Arial, Roboto, "Helvetica Neue", "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
   font-size: 1rem;
   font-weight: 400;
   line-height: 1.5;
@@ -5564,7 +5564,7 @@ a.close.disabled, a.disabled.mailbox-attachment-close {
   z-index: 1070;
   display: block;
   margin: 0;
-  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
+  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Arial, Roboto, "Helvetica Neue", "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
   font-style: normal;
   font-weight: 400;
   line-height: 1.5;
@@ -5666,7 +5666,7 @@ a.close.disabled, a.disabled.mailbox-attachment-close {
   z-index: 1060;
   display: block;
   max-width: 276px;
-  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
+  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Arial, Roboto, "Helvetica Neue", "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
   font-style: normal;
   font-weight: 400;
   line-height: 1.5;
@@ -31522,7 +31522,7 @@ select.form-control-sm ~ .select2-container--default .select2-selection--multipl
   position: relative;
 }
 .mapael .mapTooltip {
-  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
+  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Arial, Roboto, "Helvetica Neue", "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
   font-style: normal;
   font-weight: 400;
   line-height: 1.5;
diff --git a/public/core/default/js/footer/core/Baz/BazProgress.js b/public/core/default/js/footer/core/Baz/BazProgress.js
index 20533bc42..565385bb5 100644
--- a/public/core/default/js/footer/core/Baz/BazProgress.js
+++ b/public/core/default/js/footer/core/Baz/BazProgress.js
@@ -211,6 +211,7 @@ var BazProgress = function() {
                                 $('.child-progress-span').attr('hidden', true);
                                 $('.' + $(element)[0].id + '-child-bar').css('width', '0%');
                                 $('.' + $(element)[0].id + '-child-bar').attr('aria-valuenow', 0);
+                                switchProgressBarColor('.' + $(element)[0].id + '-child-bar', 'info');
 
                                 if (responseData['runners']['running'] &&
                                     responseData['runners']['running']['remoteWeb'] &&
@@ -229,6 +230,7 @@ var BazProgress = function() {
                                     } else {
                                         $('.' + $(element)[0].id + '-remote-bar').css('width', '0%');
                                         $('.' + $(element)[0].id + '-remote-bar').attr('aria-valuenow', 0);
+                                        switchProgressBarColor('.' + $(element)[0].id + '-remote-bar', 'info');
                                     }
                                 } else {
                                     $('.progress-remote, .remote-progress-span').attr('hidden', true);
@@ -265,17 +267,13 @@ var BazProgress = function() {
                             $('.' + $(element)[0].id + '-child-bar').css('width', '100%');
                             $('.' + $(element)[0].id + '-child-bar').attr('aria-valuenow', 100);
                             $('.' + $(element)[0].id + '-child-progress-span').html('Done (100%)');
-                            $('.' + $(element)[0].id + '-child-bar').removeClass(function (index, className) {
-                                return (className.match (/(^|\s)bg-\S+/g) || []).join(' ');
-                            }).addClass('bg-success');
+                            switchProgressBarColor('.' + $(element)[0].id + '-child-bar', 'success');
                         } else {
                             $('.' + $(element)[0].id + '-bar').removeClass('progress-bar-animated');
                             $('.' + $(element)[0].id + '-bar').css('width', '100%');
                             $('.' + $(element)[0].id + '-bar').attr('aria-valuenow', 100);
                             $('.' + $(element)[0].id + '-progress-span').html('Done (100%)');
-                            $('.' + $(element)[0].id + '-bar').removeClass(function (index, className) {
-                                return (className.match (/(^|\s)bg-\S+/g) || []).join(' ');
-                            }).addClass('bg-success');
+                            switchProgressBarColor('.' + $(element)[0].id + '-bar', 'success');
                             $('#' + $(element)[0].id + ' .progress-child').attr('hidden', true);
                             $('.child-progress-span').attr('hidden', true);
 
@@ -297,8 +295,10 @@ var BazProgress = function() {
                             isDownload = false;
                             $('.' + $(element)[0].id + '-child-bar').css('width', '0%');
                             $('.' + $(element)[0].id + '-child-bar').attr('aria-valuenow', 0);
+                            switchProgressBarColor('.' + $(element)[0].id + '-child-bar', 'info');
                             $('.' + $(element)[0].id + '-remote-bar').css('width', '0%');
                             $('.' + $(element)[0].id + '-remote-bar').attr('aria-valuenow', 0);
+                            switchProgressBarColor('.' + $(element)[0].id + '-remote-bar', 'info');
                             $('.progress-remote, .remote-progress-span').attr('hidden', true);
                         }
                     } else {
@@ -322,6 +322,16 @@ var BazProgress = function() {
         }
     }
 
+    function switchProgressBarColor(bar = null, color = 'info') {
+        if (!bar) {
+            bar = '.' + $(element)[0].id + '-bar';
+        }
+
+        $(bar).removeClass(function (index, className) {
+            return (className.match (/(^|\s)bg-\S+/g) || []).join(' ');
+        }).addClass('bg-' + color);
+    }
+
     function getText(responseData) {
         var text = responseData['runners']['running']['text'] + ' (' + responseData['percentComplete'] + '%)';
 
@@ -367,6 +377,7 @@ var BazProgress = function() {
         $('#' + $(element)[0].id).attr('hidden', true);
         $('.' + $(element)[0].id + '-bar').css('width', '0%');
         $('.' + $(element)[0].id + '-bar').attr('aria-valuenow', 0);
+        switchProgressBarColor('.' + $(element)[0].id + '-bar', 'info');
         downloadTotal = 0;
         downloadedBytes = 0;
         uploadTotal = 0;
@@ -413,6 +424,9 @@ var BazProgress = function() {
         BazProgress.buildProgressBar = function(el, mSH = false, child = false, remoteWeb = false) {
             buildProgressBar(el, mSH, child, remoteWeb);
         }
+        BazProgress.switchProgressBarColor = function(el, color) {
+            switchProgressBarColor(el, color);
+        }
         BazProgress.setCallable = function(callable) {
             setCallable(callable);
         }
diff --git a/public/core/default/js/footer/core/Baz/BazTunnels.js b/public/core/default/js/footer/core/Baz/BazTunnels.js
index 0e0de81c2..b214e78c7 100644
--- a/public/core/default/js/footer/core/Baz/BazTunnels.js
+++ b/public/core/default/js/footer/core/Baz/BazTunnels.js
@@ -26,9 +26,6 @@ var BazTunnels = function() {
     dataCollection.env.wsTunnels.messenger = { };
     dataCollection.env.wsTunnels.pusher = { };
 
-    // var reconnectMessengerTunnel = null;
-    // var reconnectPusherTunnel = null;
-
     // Error
     // function error(errorMsg) {
     //     throw new Error(errorMsg);
@@ -173,7 +170,7 @@ var BazTunnels = function() {
 
                     BazHelpers.setTimeoutTimers.add(function() {
                         initPusherTunnel(options);
-                    }, 60000, null, 'initPusherTunnel');
+                    }, 30000, null, 'initPusherTunnel');
                 },
                 {
                     'skipSubprotocolCheck': true
diff --git a/public/core/default/js/footer/jsFooterCore.js b/public/core/default/js/footer/jsFooterCore.js
index 40239bf02..468c3ed90 100644
--- a/public/core/default/js/footer/jsFooterCore.js
+++ b/public/core/default/js/footer/jsFooterCore.js
@@ -10100,9 +10100,6 @@ var BazTunnels = function() {
     dataCollection.env.wsTunnels.messenger = { };
     dataCollection.env.wsTunnels.pusher = { };
 
-    // var reconnectMessengerTunnel = null;
-    // var reconnectPusherTunnel = null;
-
     // Error
     // function error(errorMsg) {
     //     throw new Error(errorMsg);
@@ -10247,7 +10244,7 @@ var BazTunnels = function() {
 
                     BazHelpers.setTimeoutTimers.add(function() {
                         initPusherTunnel(options);
-                    }, 60000, null, 'initPusherTunnel');
+                    }, 30000, null, 'initPusherTunnel');
                 },
                 {
                     'skipSubprotocolCheck': true
@@ -12005,6 +12002,7 @@ var BazProgress = function() {
                                 $('.child-progress-span').attr('hidden', true);
                                 $('.' + $(element)[0].id + '-child-bar').css('width', '0%');
                                 $('.' + $(element)[0].id + '-child-bar').attr('aria-valuenow', 0);
+                                switchProgressBarColor('.' + $(element)[0].id + '-child-bar', 'info');
 
                                 if (responseData['runners']['running'] &&
                                     responseData['runners']['running']['remoteWeb'] &&
@@ -12023,6 +12021,7 @@ var BazProgress = function() {
                                     } else {
                                         $('.' + $(element)[0].id + '-remote-bar').css('width', '0%');
                                         $('.' + $(element)[0].id + '-remote-bar').attr('aria-valuenow', 0);
+                                        switchProgressBarColor('.' + $(element)[0].id + '-remote-bar', 'info');
                                     }
                                 } else {
                                     $('.progress-remote, .remote-progress-span').attr('hidden', true);
@@ -12059,17 +12058,13 @@ var BazProgress = function() {
                             $('.' + $(element)[0].id + '-child-bar').css('width', '100%');
                             $('.' + $(element)[0].id + '-child-bar').attr('aria-valuenow', 100);
                             $('.' + $(element)[0].id + '-child-progress-span').html('Done (100%)');
-                            $('.' + $(element)[0].id + '-child-bar').removeClass(function (index, className) {
-                                return (className.match (/(^|\s)bg-\S+/g) || []).join(' ');
-                            }).addClass('bg-success');
+                            switchProgressBarColor('.' + $(element)[0].id + '-child-bar', 'success');
                         } else {
                             $('.' + $(element)[0].id + '-bar').removeClass('progress-bar-animated');
                             $('.' + $(element)[0].id + '-bar').css('width', '100%');
                             $('.' + $(element)[0].id + '-bar').attr('aria-valuenow', 100);
                             $('.' + $(element)[0].id + '-progress-span').html('Done (100%)');
-                            $('.' + $(element)[0].id + '-bar').removeClass(function (index, className) {
-                                return (className.match (/(^|\s)bg-\S+/g) || []).join(' ');
-                            }).addClass('bg-success');
+                            switchProgressBarColor('.' + $(element)[0].id + '-bar', 'success');
                             $('#' + $(element)[0].id + ' .progress-child').attr('hidden', true);
                             $('.child-progress-span').attr('hidden', true);
 
@@ -12091,8 +12086,10 @@ var BazProgress = function() {
                             isDownload = false;
                             $('.' + $(element)[0].id + '-child-bar').css('width', '0%');
                             $('.' + $(element)[0].id + '-child-bar').attr('aria-valuenow', 0);
+                            switchProgressBarColor('.' + $(element)[0].id + '-child-bar', 'info');
                             $('.' + $(element)[0].id + '-remote-bar').css('width', '0%');
                             $('.' + $(element)[0].id + '-remote-bar').attr('aria-valuenow', 0);
+                            switchProgressBarColor('.' + $(element)[0].id + '-remote-bar', 'info');
                             $('.progress-remote, .remote-progress-span').attr('hidden', true);
                         }
                     } else {
@@ -12116,6 +12113,16 @@ var BazProgress = function() {
         }
     }
 
+    function switchProgressBarColor(bar = null, color = 'info') {
+        if (!bar) {
+            bar = '.' + $(element)[0].id + '-bar';
+        }
+
+        $(bar).removeClass(function (index, className) {
+            return (className.match (/(^|\s)bg-\S+/g) || []).join(' ');
+        }).addClass('bg-' + color);
+    }
+
     function getText(responseData) {
         var text = responseData['runners']['running']['text'] + ' (' + responseData['percentComplete'] + '%)';
 
@@ -12161,6 +12168,7 @@ var BazProgress = function() {
         $('#' + $(element)[0].id).attr('hidden', true);
         $('.' + $(element)[0].id + '-bar').css('width', '0%');
         $('.' + $(element)[0].id + '-bar').attr('aria-valuenow', 0);
+        switchProgressBarColor('.' + $(element)[0].id + '-bar', 'info');
         downloadTotal = 0;
         downloadedBytes = 0;
         uploadTotal = 0;
@@ -12207,6 +12215,9 @@ var BazProgress = function() {
         BazProgress.buildProgressBar = function(el, mSH = false, child = false, remoteWeb = false) {
             buildProgressBar(el, mSH, child, remoteWeb);
         }
+        BazProgress.switchProgressBarColor = function(el, color) {
+            switchProgressBarColor(el, color);
+        }
         BazProgress.setCallable = function(callable) {
             setCallable(callable);
         }
diff --git a/public/core/default/js/footer/jsFooterPlugins.js b/public/core/default/js/footer/jsFooterPlugins.js
index f23583869..48decfe16 100644
--- a/public/core/default/js/footer/jsFooterPlugins.js
+++ b/public/core/default/js/footer/jsFooterPlugins.js
@@ -60,7 +60,6 @@ function paginatedPNotify(type, opts) {
     opts['stack'] = window.stackPaginate;
     opts['destroy'] = true;
     opts['delay'] = 2000;
-    opts['destroy'] = true;
     opts['titleTrusted'] = true;
     opts['modules'] = new Map([
       ...PNotify.defaultModules,
diff --git a/public/core/default/js/footer/plugins/pnotify/5.2.0/PNotify.js b/public/core/default/js/footer/plugins/pnotify/5.2.0/PNotify.js
index 3738562e8..ced2e6a6e 100644
--- a/public/core/default/js/footer/plugins/pnotify/5.2.0/PNotify.js
+++ b/public/core/default/js/footer/plugins/pnotify/5.2.0/PNotify.js
@@ -37,7 +37,6 @@ function paginatedPNotify(type, opts) {
     opts['stack'] = window.stackPaginate;
     opts['destroy'] = true;
     opts['delay'] = 2000;
-    opts['destroy'] = true;
     opts['titleTrusted'] = true;
     opts['modules'] = new Map([
       ...PNotify.defaultModules,
diff --git a/public/core/default/js/header/dependencies/Baz/BazContentLoader.js b/public/core/default/js/header/dependencies/Baz/BazContentLoader.js
index 5f6c8f190..d0a3258b9 100644
--- a/public/core/default/js/header/dependencies/Baz/BazContentLoader.js
+++ b/public/core/default/js/header/dependencies/Baz/BazContentLoader.js
@@ -148,6 +148,10 @@ var BazContentLoader = function() {
     }
 
     function loadAjax(element, options, popped) {
+        if (element.length === 0) {
+            return false;
+        }
+
         BazHelpers.setTimeoutTimers.stopAll();//Stop all timers from previous component.
         var urlToLoad, elementId;
         var dataCollection = window.dataCollection;
diff --git a/public/core/default/js/header/dependencies/Baz/BazCore.js b/public/core/default/js/header/dependencies/Baz/BazCore.js
index 17261a46f..e99e9b46a 100644
--- a/public/core/default/js/header/dependencies/Baz/BazCore.js
+++ b/public/core/default/js/header/dependencies/Baz/BazCore.js
@@ -116,6 +116,15 @@ var BazCore = function() {
         if (dataCollection.env.currentRoute.indexOf('auth') === -1) {
             BazTunnels.init();
         }
+        $('#body').on('bazContentLoaderAjaxComplete', function() {
+            //eslint-disable-next-line
+            console.log(dataCollection.env.wsTunnels.pusher._websocket_connected);
+            if (dataCollection.env.wsTunnels.pusher._websocket_connected !== 'undefined' &&
+                dataCollection.env.wsTunnels.pusher._websocket_connected === false
+            ) {
+                BazTunnels.init();
+            }
+        });
         initPings();
     }
 
diff --git a/public/core/default/js/header/jsHeaderCore.js b/public/core/default/js/header/jsHeaderCore.js
index ca25076a4..660c19b10 100644
--- a/public/core/default/js/header/jsHeaderCore.js
+++ b/public/core/default/js/header/jsHeaderCore.js
@@ -148,6 +148,10 @@ var BazContentLoader = function() {
     }
 
     function loadAjax(element, options, popped) {
+        if (element.length === 0) {
+            return false;
+        }
+
         BazHelpers.setTimeoutTimers.stopAll();//Stop all timers from previous component.
         var urlToLoad, elementId;
         var dataCollection = window.dataCollection;
@@ -554,6 +558,15 @@ var BazCore = function() {
         if (dataCollection.env.currentRoute.indexOf('auth') === -1) {
             BazTunnels.init();
         }
+        $('#body').on('bazContentLoaderAjaxComplete', function() {
+            //eslint-disable-next-line
+            console.log(dataCollection.env.wsTunnels.pusher._websocket_connected);
+            if (dataCollection.env.wsTunnels.pusher._websocket_connected !== 'undefined' &&
+                dataCollection.env.wsTunnels.pusher._websocket_connected === false
+            ) {
+                BazTunnels.init();
+            }
+        });
         initPings();
     }
 
diff --git a/public/index.php b/public/index.php
index fb46a35f0..482532023 100644
--- a/public/index.php
+++ b/public/index.php
@@ -94,4 +94,4 @@
 			}
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/system/Base/Helpers.php b/system/Base/Helpers.php
index c20444975..a52c777a8 100644
--- a/system/Base/Helpers.php
+++ b/system/Base/Helpers.php
@@ -473,6 +473,30 @@ function array_get_values_recursive($keys = [], array $arr) {
     }
 }
 
+if (!function_exists('extractLineFromFile')) {
+    function extractLineFromFile($file, $word)
+    {
+        $lineWithWord = NULL;
+
+        $handle = fopen($file, "r");
+
+        if ($handle) {
+            while (($line = fgets($handle)) !== false) {
+                if (strpos($line, $word) === 0) {
+                    $parts = explode(' ', $line);
+
+                    $lineWithWord = rtrim(trim($parts[1]), ';');
+
+                    break;
+                }
+            }
+
+            fclose($handle);
+        }
+
+        return $lineWithWord;
+    }
+}
 
 if (!function_exists('arraySqueeze')) {
     //$task = keep - Keep the data of defined keys, remove rest
@@ -516,6 +540,46 @@ function arrayFilterKeywords($array, array $keywords, $task = 'keep')
             }
         });
 
+        return $array;
+    }
+}
+
+if (!function_exists('printArrayList')) {
+    function printArrayList($array) {
+        $html = "<ul>";
+
+        foreach($array as $k => $v) {
+            if (!is_array($v) && !is_null($v) && is_string($v) && str_starts_with($v, '{') && str_ends_with($v, '}')) {
+                $v = @json_decode($v, true);
+            }
+
+            if (is_array($v)) {
+                $html .= "<li>" . $k . " : </li>";
+                $html .= "    " . printArrayList($v);
+                continue;
+            }
+
+            $html .= "<li>" . $k . " : " . $v . "</li>";
+        }
+
+        $html .= "</ul>";
+
+        return $html;
+    }
+}
+
+if (!function_exists('arrayReplace')) {
+    function arrayReplace($array, $findKey, $replace) {
+        if (is_array($array)) {
+            foreach ($array as $key=>$val) {
+                if ($key === $findKey) {
+                    $array[$key] = $replace;
+                } else if (is_array($array[$key])) {
+                    $array[$key] = arrayReplace($array[$key], $findKey, $replace);
+                }
+            }
+        }
+
         return $array;
     }
 }
\ No newline at end of file
diff --git a/system/Base/Installer/Components/Setup.php b/system/Base/Installer/Components/Setup.php
index f1366026f..240b4f416 100644
--- a/system/Base/Installer/Components/Setup.php
+++ b/system/Base/Installer/Components/Setup.php
@@ -417,6 +417,8 @@ public function run($onlyUpdateDb = false, $message = null)
 
 				$this->setupPackage->registerModule('views');
 
+				$this->setupPackage->registerModule('externals');
+
 				$this->setupPackage->registerCoreRole();
 
 				$this->setupPackage->registerRegisteredUserAndGuestRoles();
@@ -589,6 +591,10 @@ protected function registerProgressMethods()
 					'method'	=> 'registerModule',
 					'text'		=> 'Registering views modules...'
 				],
+				[
+					'method'	=> 'registerModule',
+					'text'		=> 'Registering external modules...'
+				],
 				[
 					'method'	=> 'registerCoreRole',
 					'text'		=> 'Registering core role...'
@@ -800,6 +806,12 @@ protected function renderView($precheckFail = false, $onlyUpdateDb = false, $mes
 					$this->localContent->read('/system/Base/Providers/BasepackagesServiceProvider/Packages/Geo/Data/AllCountries.json'),
 					true
 				);
+
+			$this->view->coreJson =
+				$this->helper->decode(
+					$this->localContent->read('system/Base/Installer/Packages/Setup/Register/Modules/Packages/Providers/Core/package.json'),
+					true
+				);
 		}
 
 		echo $this->container->getShared('view')->render(
diff --git a/system/Base/Installer/Packages/Setup.php b/system/Base/Installer/Packages/Setup.php
index 5c5bfbe08..251b63762 100644
--- a/system/Base/Installer/Packages/Setup.php
+++ b/system/Base/Installer/Packages/Setup.php
@@ -26,6 +26,7 @@
 use System\Base\Installer\Packages\Setup\Register\Modules\Middleware as RegisterMiddleware;
 use System\Base\Installer\Packages\Setup\Register\Modules\Package as RegisterPackage;
 use System\Base\Installer\Packages\Setup\Register\Modules\View as RegisterView;
+use System\Base\Installer\Packages\Setup\Register\Modules\External as RegisterExternal;
 use System\Base\Installer\Packages\Setup\Register\Providers\App as RegisterCoreApp;
 use System\Base\Installer\Packages\Setup\Register\Providers\App\Type as RegisterCoreAppType;
 use System\Base\Installer\Packages\Setup\Register\Providers\Core as RegisterCore;
@@ -397,7 +398,7 @@ protected function buildSchema()
 
 	protected function registerRepos()
 	{
-		(new RegisterRepos())->register($this->db, $this->ff);
+		(new RegisterRepos())->register($this->db, $this->ff, $this->postData);
 
 		return true;
 	}
@@ -464,7 +465,7 @@ protected function registerModule($type)
 					}
 
 					if ($jsonFile['menu'] && $jsonFile['menu'] !== 'false') {
-						$menuId = $this->registerCoreMenu($jsonFile['app_type'], $jsonFile['menu']);
+						$menuId = $this->registerCoreMenu($jsonFile);
 					} else {
 						$menuId = null;
 					}
@@ -521,13 +522,6 @@ protected function registerModule($type)
 						$this->registerStorages($jsonFile);
 					}
 
-					$jsonFile['files'] = [];
-
-					if ($jsonFile['name'] === 'Core') {
-						$jsonFile['files'] =
-							array_merge_recursive($this->basepackages->utils->init($this->container)->scanDir('system/', true), $this->basepackages->utils->init($this->container)->scanDir('apps/', true));
-					}
-
 					$this->registerCorePackage($jsonFile);
 				}
 			}
@@ -573,6 +567,14 @@ protected function registerModule($type)
 			}
 
 			$this->registerCoreView($jsonFile);
+		} else if ($type === 'externals') {
+			try {
+				$composerJsonFile = $this->helper->decode(file_get_contents(base_path('external/composer.json')), true);
+			} catch (\throwable $e) {
+				throw new \Exception($e->getMessage() . '. Problem reading composer.json');
+			}
+
+			$this->registerCoreExternal($composerJsonFile);
 		}
 
 		return true;
@@ -598,9 +600,9 @@ protected function updateCoreAppComponents()
 		return (new RegisterCoreApp())->update($this->db, $this->ff);
 	}
 
-	protected function registerCoreMenu($appType, array $menu)
+	protected function registerCoreMenu($componentJsonFile)
 	{
-		return (new RegisterMenu())->register($this->db, $this->ff, $appType, $menu, $this->helper);
+		return (new RegisterMenu())->register($this->db, $this->ff, $componentJsonFile, $this->helper);
 	}
 
 	protected function registerCorePackage(array $packageFile)
@@ -618,6 +620,11 @@ protected function registerCoreView(array $viewFile)
 		return (new RegisterView())->register($this->db, $this->ff, $viewFile, $this->helper);
 	}
 
+	protected function registerCoreExternal(array $composerJsonFile)
+	{
+		return (new RegisterExternal())->register($this->db, $this->ff, $composerJsonFile, $this->helper);
+	}
+
 	public function validateData()
 	{
 		$this->validation->add('email', Email::class, ["message" => "Please enter valid email address."]);
diff --git a/system/Base/Installer/Packages/Setup/Register/Basepackages/ApiClientServices/Apis/Repos.php b/system/Base/Installer/Packages/Setup/Register/Basepackages/ApiClientServices/Apis/Repos.php
index 30d7e50af..8ab1450e2 100644
--- a/system/Base/Installer/Packages/Setup/Register/Basepackages/ApiClientServices/Apis/Repos.php
+++ b/system/Base/Installer/Packages/Setup/Register/Basepackages/ApiClientServices/Apis/Repos.php
@@ -4,7 +4,7 @@
 
 class Repos
 {
-    public function register($db, $ff)
+    public function register($db, $ff, $postData)
     {
         $coreRepo =
             [
@@ -16,23 +16,28 @@ public function register($db, $ff)
                 'authorization'         => ''
             ];
 
+        $usedBy = ["modules"];
+        if ($postData['dev'] == 'true') {
+            array_push($usedBy, "devtoolsmodules");
+        }
+
         $coreApi =
             [
-                'name'              => 'SP Framework Core',
-                'description'       => 'SP Framework Core Repository',
-                'category'          => 'repos',
-                'provider'          => 'Github',
-                'in_use'            => 0,
-                'used_by'           => json_encode([]),
-                'setup'             => 4,
-                'location'          => 'basepackages'
+                'name'                  => 'SP Framework Core',
+                'description'           => 'SP Framework Core Repository',
+                'category'              => 'repos',
+                'provider'              => 'Github',
+                'in_use'                => 1,
+                'used_by'               => json_encode($usedBy),
+                'setup'                 => 4,
+                'location'              => 'basepackages'
             ];
 
         $modulesRepo =
             [
                 'api_url'               => 'https://api.github.com',
                 'org_user'              => 'sp-modules',
-                'repo_url'              => 'https://github.com/sp-modules/',
+                'repo_url'              => 'https://github.com/sp-modules',
                 'branch'                => 'main',
                 'auth_type'             => 'autho',
                 'authorization'         => ''
@@ -44,8 +49,8 @@ public function register($db, $ff)
                 'description'           => 'SP Framework Modules Repository',
                 'category'              => 'repos',
                 'provider'              => 'Github',
-                'in_use'                => 0,
-                'used_by'               => json_encode([]),
+                'in_use'                => 1,
+                'used_by'               => json_encode($usedBy),
                 'setup'                 => 4,
                 'location'              => 'basepackages'
             ];
diff --git a/system/Base/Installer/Packages/Setup/Register/Basepackages/Dashboard.php b/system/Base/Installer/Packages/Setup/Register/Basepackages/Dashboard.php
index ea23f2572..48a336f7b 100644
--- a/system/Base/Installer/Packages/Setup/Register/Basepackages/Dashboard.php
+++ b/system/Base/Installer/Packages/Setup/Register/Basepackages/Dashboard.php
@@ -8,9 +8,8 @@ public function register($db, $ff, $componentFile, $helper)
     {
         $dashboard =
             [
-                'name'                  => 'Default',
-                'app_id'                => 1,
-                'app_default'           => 1,
+                'name'                  => 'Core Default',
+                'app_type'              => 'core',
                 'created_by'            => 1,
                 'settings'              => $helper->encode($componentFile['settings'])
             ];
@@ -24,5 +23,34 @@ public function register($db, $ff, $componentFile, $helper)
 
             $dashboardStore->updateOrInsert($dashboard);
         }
+
+        //Register Timezone Widget
+        $widget =
+            [
+                "dashboard_id"              =>  1,
+                "sequence"                  =>  0,
+                "widget_id"                 =>  1,
+                "settings"                  =>
+                    $helper->encode([
+                        "minW"              =>  "3",
+                        "method"            =>  "worldClock",
+                        "widget_id"         =>  "1",
+                        "dashboard_id"      =>  "1",
+                        "x"                 =>  "0",
+                        "y"                 =>  "0",
+                        "clocks"            => ["australiamelbourne"],
+                        "w"                 =>  "12"
+                    ])
+            ];
+
+        if ($db) {
+            $db->insertAsDict('basepackages_dashboards_widgets', $widget);
+        }
+
+        if ($ff) {
+            $widgetStore = $ff->store('basepackages_dashboards_widgets');
+
+            $widgetStore->updateOrInsert($widget);
+        }
     }
 }
\ No newline at end of file
diff --git a/system/Base/Installer/Packages/Setup/Register/Basepackages/Menu.php b/system/Base/Installer/Packages/Setup/Register/Basepackages/Menu.php
index 3587b16c1..8065f4dc9 100644
--- a/system/Base/Installer/Packages/Setup/Register/Basepackages/Menu.php
+++ b/system/Base/Installer/Packages/Setup/Register/Basepackages/Menu.php
@@ -4,8 +4,10 @@
 
 class Menu
 {
-    public function register($db, $ff, $appType, array $menu, $helper)
+    public function register($db, $ff, $componentJsonFile, $helper)
     {
+        $menu = $componentJsonFile['menu'];
+
         if (isset($menu['seq'])) {
             $sequence = $menu['seq'];
             unset($menu['seq']);
@@ -19,7 +21,8 @@ public function register($db, $ff, $appType, array $menu, $helper)
             [
                 'menu'                  => $helper->encode($menu),
                 'apps'                  => $helper->encode(['1' => ['enabled'  => true]]),
-                'app_type'              => $appType,
+                'app_type'              => $componentJsonFile['app_type'],
+                'route'                 => $componentJsonFile['route'],
                 'sequence'              => $sequence
             ];
 
diff --git a/system/Base/Installer/Packages/Setup/Register/Modules/Component.php b/system/Base/Installer/Packages/Setup/Register/Modules/Component.php
index b37cbca8b..0a61d2a19 100644
--- a/system/Base/Installer/Packages/Setup/Register/Modules/Component.php
+++ b/system/Base/Installer/Packages/Setup/Register/Modules/Component.php
@@ -40,10 +40,6 @@ public function register($db, $ff, $componentFile, $menuId, $helper)
 				'installed'				=> 1,
 				'apps'					=>
 					$helper->encode($componentApp),
-				'files'					=>
-					isset($componentFile['files']) ?
-					$helper->encode($componentFile['files']) :
-					$helper->encode([]),
 				'settings'				=>
 					isset($componentFile['settings']) ?
 					$helper->encode($componentFile['settings']) :
diff --git a/system/Base/Installer/Packages/Setup/Register/Modules/External.php b/system/Base/Installer/Packages/Setup/Register/Modules/External.php
new file mode 100644
index 000000000..4f9beed19
--- /dev/null
+++ b/system/Base/Installer/Packages/Setup/Register/Modules/External.php
@@ -0,0 +1,135 @@
+<?php
+
+namespace System\Base\Installer\Packages\Setup\Register\Modules;
+
+class External
+{
+    public function register($db, $ff, $composerJsonFile, $helper)
+    {
+        if (isset($composerJsonFile['require']) && is_array($composerJsonFile['require']) && count($composerJsonFile) > 0) {
+            $installedComposerPackages = $this->executeComposer();
+
+            $coreId = $this->getCoreId($db, $ff);
+
+            try {
+                $installedComposerPackages = $helper->decode($installedComposerPackages, true);
+            } catch (\throwable $e) {
+                //Do nothing.
+            }
+
+            if (isset($installedComposerPackages['installed']) && count($installedComposerPackages['installed']) > 0) {
+                array_walk($installedComposerPackages['installed'], function($installedComposerPackage, $index) use (&$installedComposerPackages) {
+                    $installedComposerPackages[$installedComposerPackage['name']] = $installedComposerPackage;
+                    unset($installedComposerPackages[$index]);
+                });
+
+                unset($installedComposerPackages['installed']);
+            }
+
+            foreach ($composerJsonFile['require'] as $externalPackageName => $externalPackageversion) {
+                $externalPackageNameArr = explode('/', $externalPackageName);
+                if (count($externalPackageNameArr) === 2) {
+                    $externalPackage =
+                        [
+                            'developer'             => $externalPackageNameArr[0],
+                            'name'                  => $externalPackageNameArr[1],
+                            'display_name'          => $externalPackageName,
+                            'description'           =>
+                                (isset($installedComposerPackages[$externalPackageName]['description'])) ? $installedComposerPackages[$externalPackageName]['description'] : '',
+                            'module_type'           => 'externals',
+                            'app_type'              => 'core',
+                            'version'               =>
+                                (isset($installedComposerPackages[$externalPackageName]['version'])) ? $installedComposerPackages[$externalPackageName]['version'] : '',
+                            'patches'               =>
+                                (isset($composerJsonFile['extra']['patches'][$externalPackageName])) ?
+                                    $helper->encode($composerJsonFile['extra']['patches'][$externalPackageName]) :
+                                    $helper->encode([]),
+                            'abandoned'             =>
+                                (isset($installedComposerPackages[$externalPackageName]['abandoned'])) ? (($installedComposerPackages[$externalPackageName]['abandoned'] == true) ? 1 : 0) : 0,
+                            'installed'             => 1,
+                            'required_by'           => $helper->encode(['packages' => [$coreId]]),
+                            'updated_by'            => 0
+                        ];
+
+                    if ($db) {
+                        $db->insertAsDict('modules_externals', $externalPackage);
+                    }
+
+                    if ($ff) {
+                        $externalPackageStore = $ff->store('modules_externals');
+
+                        $externalPackageStore->updateOrInsert($externalPackage);
+                    }
+                }
+            }
+        }
+    }
+
+    protected function executeComposer()
+    {
+        try {
+            putenv('COMPOSER_HOME=' . base_path('external/'));
+
+            $stream = fopen(base_path('external/composer.info'), 'w');
+            $input = new \Symfony\Component\Console\Input\StringInput('show -f json -d ' . base_path('external/'));
+            $output = new \Symfony\Component\Console\Output\StreamOutput($stream);
+
+            $application = new \Composer\Console\Application();
+            $application->setAutoExit(false); // prevent `$application->run` method from exiting the script
+
+            $app = $application->run($input, $output);
+        } catch (\throwable $e) {
+            throw $e;
+        }
+
+        if ($app !== 0) {
+            return false;
+        }
+
+        $file = '';
+
+        $handle = fopen(base_path('external/composer.info'), "r");
+
+        if ($handle) {
+            while (($line = fgets($handle)) !== false) {
+                if (!str_contains($line, '<warning>')) {
+                    $file .= $line;
+                }
+            }
+
+            fclose($handle);
+        }
+
+        return $file;
+    }
+
+    protected function getCoreId($db, $ff)
+    {
+        if ($ff) {
+            $modulesStore = $ff->store('modules_packages');
+
+            $core = $modulesStore->findOneBy(['name', '=', 'Core']);
+
+            if ($core) {
+                return $core['id'];
+            }
+        }
+
+        if ($db) {
+            $core =
+                $db->fetchAll(
+                    "SELECT * FROM modules_packages WHERE name LIKE :name",
+                    Enum::FETCH_ASSOC,
+                    [
+                        "name" => "Core",
+                    ]
+                );
+
+            if ($core) {
+                return $core['id'];
+            }
+        }
+
+        return 0;
+    }
+}
\ No newline at end of file
diff --git a/system/Base/Installer/Packages/Setup/Register/Modules/Middleware.php b/system/Base/Installer/Packages/Setup/Register/Modules/Middleware.php
index 417519945..b155e5b0b 100644
--- a/system/Base/Installer/Packages/Setup/Register/Modules/Middleware.php
+++ b/system/Base/Installer/Packages/Setup/Register/Modules/Middleware.php
@@ -36,10 +36,6 @@ public function register($db, $ff, $middlewareFile, $helper)
 				'apps'					=> $apps,
 				'api_id'				=> 1,
 				'installed'				=> 1,
-				'files'					=>
-					isset($middlewareFile['files']) ?
-					$helper->encode($middlewareFile['files']) :
-					$helper->encode([]),
 				'updated_by'			=> 0
 			];
 
diff --git a/system/Base/Installer/Packages/Setup/Register/Modules/Package.php b/system/Base/Installer/Packages/Setup/Register/Modules/Package.php
index ad5458ebd..928a73473 100644
--- a/system/Base/Installer/Packages/Setup/Register/Modules/Package.php
+++ b/system/Base/Installer/Packages/Setup/Register/Modules/Package.php
@@ -29,10 +29,6 @@ public function register($db, $ff, $packageFile, $helper)
 					$helper->encode(['1'=>['enabled'=>true]]),
 				'api_id'				=> 1,
 				'installed'				=> 1,
-				'files'					=>
-					isset($packageFile['files']) ?
-					$helper->encode($packageFile['files']) :
-					$helper->encode([]),
 				'updated_by'			=> 0
 			];
 
diff --git a/system/Base/Installer/Packages/Setup/Register/Modules/Packages/Basepackages/Activity/Logs/package.json b/system/Base/Installer/Packages/Setup/Register/Modules/Packages/Basepackages/Activity/Logs/package.json
new file mode 100644
index 000000000..61c6263c0
--- /dev/null
+++ b/system/Base/Installer/Packages/Setup/Register/Modules/Packages/Basepackages/Activity/Logs/package.json
@@ -0,0 +1,24 @@
+{
+    "name"          : "ActivityLogs",
+    "display_name"  : "Activity Logs",
+    "description"   : "Basepackage Activity Logs",
+    "module_type"   : "packages",
+    "app_type"      : "core",
+    "category"      : "basepackages",
+    "version"       : "0.0.0",
+    "repo"          : "https://.../",
+    "class"         : "System\\Base\\Providers\\BasepackagesServiceProvider\\Packages\\ActivityLogs",
+    "dependencies"  : {
+        "core"          : {
+            "name"      : "Core",
+            "version"   : "0.0.0",
+            "repo"      : "https://.../"
+        },
+        "components"    : [],
+        "packages"      : [],
+        "middlewares"   : [],
+        "views"         : [],
+        "external"      : []
+    },
+    "settings"      : { }
+}
\ No newline at end of file
diff --git a/system/Base/Installer/Packages/Setup/Register/Modules/Packages/Basepackages/AddressBook/package.json b/system/Base/Installer/Packages/Setup/Register/Modules/Packages/Basepackages/Address/Book/package.json
similarity index 100%
rename from system/Base/Installer/Packages/Setup/Register/Modules/Packages/Basepackages/AddressBook/package.json
rename to system/Base/Installer/Packages/Setup/Register/Modules/Packages/Basepackages/Address/Book/package.json
diff --git a/system/Base/Installer/Packages/Setup/Register/Modules/Packages/Basepackages/ApiClientServices/Apis/Repos/Gitea/package.json b/system/Base/Installer/Packages/Setup/Register/Modules/Packages/Basepackages/Api/Apis/Repos/Gitea/package.json
similarity index 100%
rename from system/Base/Installer/Packages/Setup/Register/Modules/Packages/Basepackages/ApiClientServices/Apis/Repos/Gitea/package.json
rename to system/Base/Installer/Packages/Setup/Register/Modules/Packages/Basepackages/Api/Apis/Repos/Gitea/package.json
diff --git a/system/Base/Installer/Packages/Setup/Register/Modules/Packages/Basepackages/ApiClientServices/Apis/Repos/Github/package.json b/system/Base/Installer/Packages/Setup/Register/Modules/Packages/Basepackages/Api/Apis/Repos/Github/package.json
similarity index 100%
rename from system/Base/Installer/Packages/Setup/Register/Modules/Packages/Basepackages/ApiClientServices/Apis/Repos/Github/package.json
rename to system/Base/Installer/Packages/Setup/Register/Modules/Packages/Basepackages/Api/Apis/Repos/Github/package.json
diff --git a/system/Base/Installer/Packages/Setup/Register/Modules/Packages/Basepackages/ApiClientServices/package.json b/system/Base/Installer/Packages/Setup/Register/Modules/Packages/Basepackages/Api/Client/Services/package.json
similarity index 100%
rename from system/Base/Installer/Packages/Setup/Register/Modules/Packages/Basepackages/ApiClientServices/package.json
rename to system/Base/Installer/Packages/Setup/Register/Modules/Packages/Basepackages/Api/Client/Services/package.json
diff --git a/system/Base/Installer/Packages/Setup/Register/Modules/Packages/Basepackages/BackupRestore/package.json b/system/Base/Installer/Packages/Setup/Register/Modules/Packages/Basepackages/Backup/Restore/package.json
similarity index 100%
rename from system/Base/Installer/Packages/Setup/Register/Modules/Packages/Basepackages/BackupRestore/package.json
rename to system/Base/Installer/Packages/Setup/Register/Modules/Packages/Basepackages/Backup/Restore/package.json
diff --git a/system/Base/Installer/Packages/Setup/Register/Modules/Packages/Basepackages/Dashboards/package.json b/system/Base/Installer/Packages/Setup/Register/Modules/Packages/Basepackages/Dashboards/package.json
new file mode 100644
index 000000000..eb09f357f
--- /dev/null
+++ b/system/Base/Installer/Packages/Setup/Register/Modules/Packages/Basepackages/Dashboards/package.json
@@ -0,0 +1,26 @@
+{
+	"name" : "Dashboards",
+	"display_name" : "Dashboards",
+	"description" : "Basepackage Dashboards",
+	"module_type" : "packages",
+	"app_type" : "core",
+	"category" : "basepackages",
+	"version" : "0.0.0",
+	"repo" : "https://.../",
+	"class" : "System\\Base\\Providers\\BasepackagesServiceProvider\\Packages\\Dashboards",
+	"dependencies" : 
+	{
+		"core" : 
+		{
+			"name" : "Core",
+			"version" : "0.0.0",
+			"repo" : "https://.../"
+		},
+		"components" : [],
+		"packages" : [],
+		"middlewares" : [],
+		"views" : [],
+		"external" : []
+	},
+	"settings" : []
+}
\ No newline at end of file
diff --git a/system/Base/Installer/Packages/Setup/Register/Modules/Packages/Basepackages/EmailServices/package.json b/system/Base/Installer/Packages/Setup/Register/Modules/Packages/Basepackages/Email/Services/package.json
similarity index 100%
rename from system/Base/Installer/Packages/Setup/Register/Modules/Packages/Basepackages/EmailServices/package.json
rename to system/Base/Installer/Packages/Setup/Register/Modules/Packages/Basepackages/Email/Services/package.json
diff --git a/system/Base/Installer/Packages/Setup/Register/Modules/Packages/Basepackages/GeoCities/package.json b/system/Base/Installer/Packages/Setup/Register/Modules/Packages/Basepackages/Geo/Cities/package.json
similarity index 100%
rename from system/Base/Installer/Packages/Setup/Register/Modules/Packages/Basepackages/GeoCities/package.json
rename to system/Base/Installer/Packages/Setup/Register/Modules/Packages/Basepackages/Geo/Cities/package.json
diff --git a/system/Base/Installer/Packages/Setup/Register/Modules/Packages/Basepackages/GeoCountries/package.json b/system/Base/Installer/Packages/Setup/Register/Modules/Packages/Basepackages/Geo/Countries/package.json
similarity index 100%
rename from system/Base/Installer/Packages/Setup/Register/Modules/Packages/Basepackages/GeoCountries/package.json
rename to system/Base/Installer/Packages/Setup/Register/Modules/Packages/Basepackages/Geo/Countries/package.json
diff --git a/system/Base/Installer/Packages/Setup/Register/Modules/Packages/Basepackages/GeoStates/package.json b/system/Base/Installer/Packages/Setup/Register/Modules/Packages/Basepackages/Geo/States/package.json
similarity index 100%
rename from system/Base/Installer/Packages/Setup/Register/Modules/Packages/Basepackages/GeoStates/package.json
rename to system/Base/Installer/Packages/Setup/Register/Modules/Packages/Basepackages/Geo/States/package.json
diff --git a/system/Base/Installer/Packages/Setup/Register/Modules/Packages/Basepackages/GeoTimezones/package.json b/system/Base/Installer/Packages/Setup/Register/Modules/Packages/Basepackages/Geo/Timezones/package.json
similarity index 100%
rename from system/Base/Installer/Packages/Setup/Register/Modules/Packages/Basepackages/GeoTimezones/package.json
rename to system/Base/Installer/Packages/Setup/Register/Modules/Packages/Basepackages/Geo/Timezones/package.json
diff --git a/system/Base/Installer/Packages/Setup/Register/Modules/Packages/Basepackages/ImportExport/package.json b/system/Base/Installer/Packages/Setup/Register/Modules/Packages/Basepackages/Import/package.json
similarity index 100%
rename from system/Base/Installer/Packages/Setup/Register/Modules/Packages/Basepackages/ImportExport/package.json
rename to system/Base/Installer/Packages/Setup/Register/Modules/Packages/Basepackages/Import/package.json
diff --git a/system/Base/Installer/Packages/Setup/Register/Modules/Packages/Basepackages/Menus/package.json b/system/Base/Installer/Packages/Setup/Register/Modules/Packages/Basepackages/Menus/package.json
new file mode 100644
index 000000000..00ee598a0
--- /dev/null
+++ b/system/Base/Installer/Packages/Setup/Register/Modules/Packages/Basepackages/Menus/package.json
@@ -0,0 +1,24 @@
+{
+    "name"          : "Menus",
+    "display_name"  : "Menus",
+    "description"   : "Menus package",
+    "module_type"   : "packages",
+    "app_type"      : "core",
+    "category"      : "basepackages",
+    "version"       : "0.0.0",
+    "repo"          : "https://.../",
+    "class"         : "System\\Base\\Providers\\BasepackagesServiceProvider\\Packages\\Menus",
+    "dependencies"  : {
+        "core"          : {
+            "name"      : "Core",
+            "version"   : "0.0.0",
+            "repo"      : "https://.../"
+        },
+        "components"    : [],
+        "packages"      : [],
+        "middlewares"   : [],
+        "views"         : [],
+        "external"      : []
+    },
+    "settings"      : {"componentRoute":"system/menus"}
+}
\ No newline at end of file
diff --git a/system/Base/Installer/Packages/Setup/Register/Modules/Packages/Basepackages/UsersAccounts/package.json b/system/Base/Installer/Packages/Setup/Register/Modules/Packages/Basepackages/Users/Accounts/package.json
similarity index 100%
rename from system/Base/Installer/Packages/Setup/Register/Modules/Packages/Basepackages/UsersAccounts/package.json
rename to system/Base/Installer/Packages/Setup/Register/Modules/Packages/Basepackages/Users/Accounts/package.json
diff --git a/system/Base/Installer/Packages/Setup/Register/Modules/Packages/Basepackages/UsersProfiles/package.json b/system/Base/Installer/Packages/Setup/Register/Modules/Packages/Basepackages/Users/Profiles/package.json
similarity index 100%
rename from system/Base/Installer/Packages/Setup/Register/Modules/Packages/Basepackages/UsersProfiles/package.json
rename to system/Base/Installer/Packages/Setup/Register/Modules/Packages/Basepackages/Users/Profiles/package.json
diff --git a/system/Base/Installer/Packages/Setup/Register/Modules/Packages/Basepackages/UsersRoles/package.json b/system/Base/Installer/Packages/Setup/Register/Modules/Packages/Basepackages/Users/Roles/package.json
similarity index 100%
rename from system/Base/Installer/Packages/Setup/Register/Modules/Packages/Basepackages/UsersRoles/package.json
rename to system/Base/Installer/Packages/Setup/Register/Modules/Packages/Basepackages/Users/Roles/package.json
diff --git a/system/Base/Installer/Packages/Setup/Register/Modules/Packages/Basepackages/WorkersJobs/package.json b/system/Base/Installer/Packages/Setup/Register/Modules/Packages/Basepackages/Workers/Jobs/package.json
similarity index 100%
rename from system/Base/Installer/Packages/Setup/Register/Modules/Packages/Basepackages/WorkersJobs/package.json
rename to system/Base/Installer/Packages/Setup/Register/Modules/Packages/Basepackages/Workers/Jobs/package.json
diff --git a/system/Base/Installer/Packages/Setup/Register/Modules/Packages/Basepackages/WorkersSchedules/package.json b/system/Base/Installer/Packages/Setup/Register/Modules/Packages/Basepackages/Workers/Schedules/package.json
similarity index 100%
rename from system/Base/Installer/Packages/Setup/Register/Modules/Packages/Basepackages/WorkersSchedules/package.json
rename to system/Base/Installer/Packages/Setup/Register/Modules/Packages/Basepackages/Workers/Schedules/package.json
diff --git a/system/Base/Installer/Packages/Setup/Register/Modules/Packages/Basepackages/WorkersTasks/package.json b/system/Base/Installer/Packages/Setup/Register/Modules/Packages/Basepackages/Workers/Tasks/package.json
similarity index 100%
rename from system/Base/Installer/Packages/Setup/Register/Modules/Packages/Basepackages/WorkersTasks/package.json
rename to system/Base/Installer/Packages/Setup/Register/Modules/Packages/Basepackages/Workers/Tasks/package.json
diff --git a/system/Base/Installer/Packages/Setup/Register/Modules/Packages/Basepackages/WorkersWorkers/package.json b/system/Base/Installer/Packages/Setup/Register/Modules/Packages/Basepackages/Workers/Workers/package.json
similarity index 100%
rename from system/Base/Installer/Packages/Setup/Register/Modules/Packages/Basepackages/WorkersWorkers/package.json
rename to system/Base/Installer/Packages/Setup/Register/Modules/Packages/Basepackages/Workers/Workers/package.json
diff --git a/system/Base/Installer/Packages/Setup/Register/Modules/Packages/Providers/ApiServerClients/package.json b/system/Base/Installer/Packages/Setup/Register/Modules/Packages/Providers/Api/Server/Clients/package.json
similarity index 100%
rename from system/Base/Installer/Packages/Setup/Register/Modules/Packages/Providers/ApiServerClients/package.json
rename to system/Base/Installer/Packages/Setup/Register/Modules/Packages/Providers/Api/Server/Clients/package.json
diff --git a/system/Base/Installer/Packages/Setup/Register/Modules/Packages/Providers/ApiServerScopes/package.json b/system/Base/Installer/Packages/Setup/Register/Modules/Packages/Providers/Api/Server/Scopes/package.json
similarity index 100%
rename from system/Base/Installer/Packages/Setup/Register/Modules/Packages/Providers/ApiServerScopes/package.json
rename to system/Base/Installer/Packages/Setup/Register/Modules/Packages/Providers/Api/Server/Scopes/package.json
diff --git a/system/Base/Installer/Packages/Setup/Register/Modules/Packages/Providers/ApiServerServices/package.json b/system/Base/Installer/Packages/Setup/Register/Modules/Packages/Providers/Api/Server/Services/package.json
similarity index 100%
rename from system/Base/Installer/Packages/Setup/Register/Modules/Packages/Providers/ApiServerServices/package.json
rename to system/Base/Installer/Packages/Setup/Register/Modules/Packages/Providers/Api/Server/Services/package.json
diff --git a/system/Base/Installer/Packages/Setup/Register/Modules/Packages/Providers/AppsTypes/package.json b/system/Base/Installer/Packages/Setup/Register/Modules/Packages/Providers/Apps/Types/package.json
similarity index 100%
rename from system/Base/Installer/Packages/Setup/Register/Modules/Packages/Providers/AppsTypes/package.json
rename to system/Base/Installer/Packages/Setup/Register/Modules/Packages/Providers/Apps/Types/package.json
diff --git a/system/Base/Installer/Packages/Setup/Register/Modules/Packages/Providers/ModulesManager/package.json b/system/Base/Installer/Packages/Setup/Register/Modules/Packages/Providers/Modules/Manager/package.json
similarity index 96%
rename from system/Base/Installer/Packages/Setup/Register/Modules/Packages/Providers/ModulesManager/package.json
rename to system/Base/Installer/Packages/Setup/Register/Modules/Packages/Providers/Modules/Manager/package.json
index 6e00b9ef8..1dd69676d 100644
--- a/system/Base/Installer/Packages/Setup/Register/Modules/Packages/Providers/ModulesManager/package.json
+++ b/system/Base/Installer/Packages/Setup/Register/Modules/Packages/Providers/Modules/Manager/package.json
@@ -22,6 +22,6 @@
     },
     "settings"      : {
         "componentRoute":"modules",
-        "api_clients" : []
+        "api_clients" : [1,2]
     }
 }
\ No newline at end of file
diff --git a/system/Base/Installer/Packages/Setup/Register/Modules/View.php b/system/Base/Installer/Packages/Setup/Register/Modules/View.php
index 98fbd99ed..c47cc97a5 100644
--- a/system/Base/Installer/Packages/Setup/Register/Modules/View.php
+++ b/system/Base/Installer/Packages/Setup/Register/Modules/View.php
@@ -31,10 +31,6 @@ public function register($db, $ff, $viewFile, $helper)
 					$helper->encode(['1'=>['enabled'=>true]]),
 				'api_id'				=> 1,
 				'installed'				=> 1,
-				'files'					=>
-					isset($viewFile['files']) ?
-					$helper->encode($viewFile['files']) :
-					$helper->encode([]),
 				'updated_by'			=> 0
 			];
 
diff --git a/system/Base/Installer/Packages/Setup/Register/Providers/App/Type.php b/system/Base/Installer/Packages/Setup/Register/Providers/App/Type.php
index 270da5276..b0555d6d3 100644
--- a/system/Base/Installer/Packages/Setup/Register/Providers/App/Type.php
+++ b/system/Base/Installer/Packages/Setup/Register/Providers/App/Type.php
@@ -10,6 +10,7 @@ public function register($db, $ff, $typeFile)
             [
                 'name'              => $typeFile['name'],
                 'app_type'          => $typeFile['app_type'],
+                'dashboards'        => $typeFile['dashboards'] == 'true' ? 1 : 0,
                 'description'       => $typeFile['description'],
                 'api_id'            => 1,
                 'repo'              => $typeFile['repo'],
diff --git a/system/Base/Installer/Packages/Setup/Schema.php b/system/Base/Installer/Packages/Setup/Schema.php
index c63350e71..861281279 100644
--- a/system/Base/Installer/Packages/Setup/Schema.php
+++ b/system/Base/Installer/Packages/Setup/Schema.php
@@ -43,6 +43,7 @@
 use System\Base\Installer\Packages\Setup\Schema\Basepackages\Workers\Workers;
 use System\Base\Installer\Packages\Setup\Schema\Modules\Bundles;
 use System\Base\Installer\Packages\Setup\Schema\Modules\Components;
+use System\Base\Installer\Packages\Setup\Schema\Modules\Externals;
 use System\Base\Installer\Packages\Setup\Schema\Modules\Middlewares;
 use System\Base\Installer\Packages\Setup\Schema\Modules\Packages;
 use System\Base\Installer\Packages\Setup\Schema\Modules\Queues;
@@ -113,6 +114,7 @@
 use System\Base\Providers\ModulesServiceProvider\Model\ServiceProviderModulesQueues;
 use System\Base\Providers\ModulesServiceProvider\Modules\Model\ModulesBundles;
 use System\Base\Providers\ModulesServiceProvider\Modules\Model\ModulesComponents;
+use System\Base\Providers\ModulesServiceProvider\Modules\Model\ModulesExternals;
 use System\Base\Providers\ModulesServiceProvider\Modules\Model\ModulesMiddlewares;
 use System\Base\Providers\ModulesServiceProvider\Modules\Model\ModulesPackages;
 use System\Base\Providers\ModulesServiceProvider\Modules\Model\ModulesViews;
@@ -171,6 +173,10 @@ public function getSchema()
                     'schema'    => new Settings,
                     'model'     => new ModulesViewsSettings,
                 ],
+            'modules_externals'                         => [
+                    'schema'    => new Externals,
+                    'model'     => new ModulesExternals,
+                ],
             'basepackages_email_services'               => [
                     'schema'    => new EmailServices,
                     'model'     => new BasepackagesEmailServices,
@@ -354,11 +360,7 @@ public function getSchema()
             'service_provider_api_scopes'               => [
                     'schema'    => new Scopes,
                     'model'     => new ServiceProviderApiScopes,
-                ],
-            'test_schema'                               => [
-                    'schema'    => new \System\Base\Installer\Packages\Setup\Schema\TestSchema,
-                    'model'     => new \System\Base\Installer\Packages\Setup\Schema\TestModel,
-                ],
+                ]
         ];
     }
 }
\ No newline at end of file
diff --git a/system/Base/Installer/Packages/Setup/Schema/Basepackages/Dashboards.php b/system/Base/Installer/Packages/Setup/Schema/Basepackages/Dashboards.php
index cdc777d43..8733b79be 100644
--- a/system/Base/Installer/Packages/Setup/Schema/Basepackages/Dashboards.php
+++ b/system/Base/Installer/Packages/Setup/Schema/Basepackages/Dashboards.php
@@ -29,17 +29,11 @@ public function columns()
                     ]
                 ),
                 new Column(
-                    'app_id',
+                    'app_type',
                     [
-                        'type'    => Column::TYPE_INTEGER,
-                        'notNull' => true
-                    ]
-                ),
-                new Column(
-                    'app_default',
-                    [
-                        'type'    => Column::TYPE_BOOLEAN,
-                        'notNull' => true
+                        'type'    => Column::TYPE_VARCHAR,
+                        'size'    => 50,
+                        'notNull' => true,
                     ]
                 ),
                 new Column(
@@ -57,9 +51,9 @@ public function columns()
                     ]
                 ),
                 new Column(
-                    'is_default',
+                    'user_default',
                     [
-                        'type'    => Column::TYPE_BOOLEAN,
+                        'type'    => Column::TYPE_JSON,
                         'notNull' => false
                     ]
                 ),
diff --git a/system/Base/Installer/Packages/Setup/Schema/Basepackages/Menus.php b/system/Base/Installer/Packages/Setup/Schema/Basepackages/Menus.php
index 7dd2f420e..d3fffe87d 100644
--- a/system/Base/Installer/Packages/Setup/Schema/Basepackages/Menus.php
+++ b/system/Base/Installer/Packages/Setup/Schema/Basepackages/Menus.php
@@ -44,6 +44,14 @@ public function columns()
                             'notNull' => true,
                         ]
                     ),
+                    new Column(
+                        'route',
+                        [
+                            'type'    => Column::TYPE_VARCHAR,
+                            'size'    => 50,
+                            'notNull' => true,
+                        ]
+                    ),
                     new Column(
                         'sequence',
                         [
diff --git a/system/Base/Installer/Packages/Setup/Schema/Modules/Components.php b/system/Base/Installer/Packages/Setup/Schema/Modules/Components.php
index dad56a6d0..6f891b8b0 100644
--- a/system/Base/Installer/Packages/Setup/Schema/Modules/Components.php
+++ b/system/Base/Installer/Packages/Setup/Schema/Modules/Components.php
@@ -151,13 +151,6 @@ public function columns()
 							'notNull' => true,
 						]
 					),
-					new Column(
-						'files',
-						[
-							'type'    => Column::TYPE_MEDIUMTEXT,
-							'notNull' => false,
-						]
-					),
 					new Column(
 						'api_id',
 						[
diff --git a/system/Base/Installer/Packages/Setup/Schema/Modules/Externals.php b/system/Base/Installer/Packages/Setup/Schema/Modules/Externals.php
new file mode 100644
index 000000000..047432e72
--- /dev/null
+++ b/system/Base/Installer/Packages/Setup/Schema/Modules/Externals.php
@@ -0,0 +1,158 @@
+<?php
+
+namespace System\Base\Installer\Packages\Setup\Schema\Modules;
+
+use Phalcon\Db\Column;
+use Phalcon\Db\Index;
+
+class Externals
+{
+    public function columns()
+    {
+        return
+            [
+               'columns' => [
+                    new Column(
+                        'id',
+                        [
+                            'type'          => Column::TYPE_SMALLINTEGER,
+                            'notNull'       => true,
+                            'autoIncrement' => true,
+                            'primary'       => true,
+                        ]
+                    ),
+                    new Column(
+                        'developer',
+                        [
+                            'type'    => Column::TYPE_VARCHAR,
+                            'size'    => 50,
+                            'notNull' => true,
+                        ]
+                    ),
+                    new Column(
+                        'name',
+                        [
+                            'type'    => Column::TYPE_VARCHAR,
+                            'size'    => 50,
+                            'notNull' => true,
+                        ]
+                    ),
+                    new Column(
+                        'display_name',
+                        [
+                            'type'    => Column::TYPE_VARCHAR,
+                            'size'    => 50,
+                            'notNull' => true,
+                        ]
+                    ),
+                    new Column(
+                        'description',
+                        [
+                            'type'    => Column::TYPE_VARCHAR,
+                            'size'    => 2048,
+                            'notNull' => false,
+                        ]
+                    ),
+                    new Column(
+                        'module_type',
+                        [
+                            'type'    => Column::TYPE_VARCHAR,
+                            'size'    => 50,
+                            'notNull' => true,
+                        ]
+                    ),
+                    new Column(
+                        'app_type',
+                        [
+                            'type'    => Column::TYPE_VARCHAR,
+                            'size'    => 50,
+                            'notNull' => true,
+                        ]
+                    ),
+                    new Column(
+                        'abandoned',
+                        [
+                            'type'    => Column::TYPE_TINYINTEGER,
+                            'notNull' => false,
+                        ]
+                    ),
+                    new Column(
+                        'version',
+                        [
+                            'type'    => Column::TYPE_VARCHAR,
+                            'size'    => 100,
+                            'notNull' => false,
+                        ]
+                    ),
+                    new Column(
+                        'patches',
+                        [
+                            'type'    => Column::TYPE_JSON,
+                            'notNull' => false,
+                        ]
+                    ),
+                    new Column(
+                        'installed',
+                        [
+                            'type'    => Column::TYPE_TINYINTEGER,
+                            'notNull' => true,
+                        ]
+                    ),
+                    new Column(
+                        'required_by',
+                        [
+                            'type'    => Column::TYPE_JSON,
+                            'notNull' => false,
+                        ]
+                    ),
+                    new Column(
+                        'update_available',
+                        [
+                            'type'    => Column::TYPE_TINYINTEGER,
+                            'size'    => 1,
+                            'notNull' => false,
+                        ]
+                    ),
+                    new Column(
+                        'update_version',
+                        [
+                            'type'    => Column::TYPE_VARCHAR,
+                            'size'    => 15,
+                            'notNull' => false,
+                        ]
+                    ),
+                    new Column(
+                        'updated_by',
+                        [
+                            'type'    => Column::TYPE_INTEGER,
+                            'notNull' => true,
+                        ]
+                    ),
+                    new Column(
+                        'updated_on',
+                        [
+                            'type'    => Column::TYPE_TIMESTAMP,
+                            'notNull' => true,
+                            'default' => 'CURRENT_TIMESTAMP',
+                        ]
+                    ),
+                    new Column(
+                        'notification_subscriptions',
+                        [
+                            'type'    => Column::TYPE_JSON,
+                            'notNull' => false,
+                        ]
+                    ),
+                ],
+                'indexes' => [
+                    new Index(
+                        'column_UNIQUE',
+                        [
+                            'name'
+                        ],
+                        'UNIQUE'
+                    )
+                ]
+            ];
+    }
+}
\ No newline at end of file
diff --git a/system/Base/Installer/Packages/Setup/Schema/Modules/Middlewares.php b/system/Base/Installer/Packages/Setup/Schema/Modules/Middlewares.php
index 41d5d05a4..435c3be6f 100644
--- a/system/Base/Installer/Packages/Setup/Schema/Modules/Middlewares.php
+++ b/system/Base/Installer/Packages/Setup/Schema/Modules/Middlewares.php
@@ -129,13 +129,6 @@ public function columns()
 							'notNull' => true,
 						]
 					),
-					new Column(
-						'files',
-						[
-							'type'    => Column::TYPE_MEDIUMTEXT,
-							'notNull' => false,
-						]
-					),
 					new Column(
 						'api_id',
 						[
diff --git a/system/Base/Installer/Packages/Setup/Schema/Modules/Packages.php b/system/Base/Installer/Packages/Setup/Schema/Modules/Packages.php
index 6a331bf1f..66b7a9d8d 100644
--- a/system/Base/Installer/Packages/Setup/Schema/Modules/Packages.php
+++ b/system/Base/Installer/Packages/Setup/Schema/Modules/Packages.php
@@ -129,13 +129,6 @@ public function columns()
 							'notNull' => true,
 						]
 					),
-					new Column(
-						'files',
-						[
-							'type'    => Column::TYPE_MEDIUMTEXT,
-							'notNull' => false,
-						]
-					),
 					new Column(
 						'api_id',
 						[
diff --git a/system/Base/Installer/Packages/Setup/Schema/Modules/Views.php b/system/Base/Installer/Packages/Setup/Schema/Modules/Views.php
index 1d4cc8f11..80334687c 100644
--- a/system/Base/Installer/Packages/Setup/Schema/Modules/Views.php
+++ b/system/Base/Installer/Packages/Setup/Schema/Modules/Views.php
@@ -143,13 +143,6 @@ public function columns()
 							'notNull' => true,
 						]
 					),
-					new Column(
-						'files',
-						[
-							'type'    => Column::TYPE_MEDIUMTEXT,
-							'notNull' => false,
-						]
-					),
 					new Column(
 						'api_id',
 						[
diff --git a/system/Base/Installer/Packages/Setup/Schema/Providers/Apps/Types.php b/system/Base/Installer/Packages/Setup/Schema/Providers/Apps/Types.php
index 27afc465c..e26554e54 100644
--- a/system/Base/Installer/Packages/Setup/Schema/Providers/Apps/Types.php
+++ b/system/Base/Installer/Packages/Setup/Schema/Providers/Apps/Types.php
@@ -37,6 +37,13 @@ public function columns()
                         'notNull' => true
                     ]
                 ),
+                new Column(
+                    'dashboards',
+                    [
+                        'type'    => Column::TYPE_BOOLEAN,
+                        'notNull' => true
+                    ]
+                ),
                 new Column(
                     'description',
                     [
diff --git a/system/Base/Installer/Packages/Setup/Schema/TestModel.php b/system/Base/Installer/Packages/Setup/Schema/TestModel.php
deleted file mode 100644
index 847371220..000000000
--- a/system/Base/Installer/Packages/Setup/Schema/TestModel.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-namespace System\Base\Installer\Packages\Setup\Schema;
-
-use System\Base\BaseModel;
-
-class TestModel extends BaseModel
-{
-    public $id;
-
-    public $key;
-
-    public $query;
-
-    public $status;
-
-    public $bool;
-}
\ No newline at end of file
diff --git a/system/Base/Installer/Packages/Setup/Schema/TestSchema.php b/system/Base/Installer/Packages/Setup/Schema/TestSchema.php
deleted file mode 100644
index eabbe81cd..000000000
--- a/system/Base/Installer/Packages/Setup/Schema/TestSchema.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-
-namespace System\Base\Installer\Packages\Setup\Schema;
-
-use Phalcon\Db\Column;
-use Phalcon\Db\Index;
-
-class TestSchema
-{
-    public function columns()
-    {
-        return
-            [
-               'columns' => [
-                    new Column(
-                        'id',
-                        [
-                            'type'          => Column::TYPE_INTEGER,
-                            'notNull'       => true,
-                            'autoIncrement' => true,
-                            'primary'       => true,
-                        ]
-                    ),
-                    new Column(
-                        'key',
-                        [
-                            'type'    => Column::TYPE_VARCHAR,
-                            'size'    => 100,
-                            'notNull' => true,
-                        ]
-                    ),
-                    new Column(
-                        'key2',
-                        [
-                            'type'    => Column::TYPE_VARCHAR,
-                            'size'    => 100,
-                            'notNull' => true,
-                        ]
-                    ),
-                    new Column(
-                        'query',
-                        [
-                            'type'    => Column::TYPE_JSON,
-                            'notNull' => true,
-                        ]
-                    ),
-                    new Column(
-                        'status',
-                        [
-                            'type'    => Column::TYPE_TINYINTEGER,
-                            'size'    => 1,
-                            'notNull' => false,
-                        ]
-                    ),
-                    new Column(
-                        'bool',
-                        [
-                            'type'    => Column::TYPE_BOOLEAN,
-                            'notNull' => false,
-                        ]
-                    )
-                ],
-                'indexes' => [
-                    new Index(
-                        'column_UNIQUE',
-                        [
-                            'key'
-                        ],
-                        'UNIQUE'
-                    )
-                ]
-            ];
-    }
-
-    public function indexes()
-    {
-        return
-        [
-            new Index(
-                'column_INDEX',
-                [
-                    'key2'
-                ],
-                'INDEX'
-            )
-        ];
-    }
-}
\ No newline at end of file
diff --git a/system/Base/Installer/View/setup.phtml b/system/Base/Installer/View/setup.phtml
index b638e553d..05a3218fb 100644
--- a/system/Base/Installer/View/setup.phtml
+++ b/system/Base/Installer/View/setup.phtml
@@ -44,7 +44,7 @@
                                 <?php if ($onlyUpdateDb) { ?>
                                     <div class="card-header bg-primary text-white text-center font-weight-bold text-uppercase rounded-0">SP Framework Database Update</div>
                                 <?php } else { ?>
-                                    <div class="card-header bg-primary text-white text-center font-weight-bold text-uppercase rounded-0">SP Framework Core Setup</div>
+                                    <div class="card-header bg-primary text-white text-center font-weight-bold text-uppercase rounded-0">SP Framework Core Setup (<?php echo $coreJson['version'] ?>)</div>
                                 <?php } ?>
                                 <div class="card-body bg-white">
                                     <?php if (!$precheckFail) { ?>
diff --git a/system/Base/Providers/AppsServiceProvider/Apps.php b/system/Base/Providers/AppsServiceProvider/Apps.php
index 883632b71..3a0ae0caa 100644
--- a/system/Base/Providers/AppsServiceProvider/Apps.php
+++ b/system/Base/Providers/AppsServiceProvider/Apps.php
@@ -298,7 +298,7 @@ public function updateApp(array $data)
 			$this->modules->components->updateComponents($app);
 		}
 
-		if (isset($app['menus'])) {
+		if (isset($app['menus']) && $app['menus'] !== '') {
 			$this->basepackages->menus->updateMenus($app);
 		}
 
diff --git a/system/Base/Providers/AppsServiceProvider/Types.php b/system/Base/Providers/AppsServiceProvider/Types.php
index 827f82e80..35fb650c8 100644
--- a/system/Base/Providers/AppsServiceProvider/Types.php
+++ b/system/Base/Providers/AppsServiceProvider/Types.php
@@ -20,6 +20,19 @@ public function init(bool $resetCache = false)
         return $this;
     }
 
+    public function getInstalledAppTypes()
+    {
+        $types = [];
+
+        foreach($this->types as $type) {
+            if ($type['installed'] == true) {
+                array_push($types, $type);
+            }
+        }
+
+        return $types;
+    }
+
     public function getAppTypeById($id)
     {
         foreach($this->types as $type) {
diff --git a/system/Base/Providers/BasepackagesServiceProvider/Packages/ApiClientServices/ApiClientServices.php b/system/Base/Providers/BasepackagesServiceProvider/Packages/ApiClientServices/ApiClientServices.php
index 5dcecb075..a5bbc3680 100644
--- a/system/Base/Providers/BasepackagesServiceProvider/Packages/ApiClientServices/ApiClientServices.php
+++ b/system/Base/Providers/BasepackagesServiceProvider/Packages/ApiClientServices/ApiClientServices.php
@@ -155,6 +155,9 @@ protected function switchApiModel($api = null)
             $api['location'] = ucfirst($api['location']);
             $api['category'] = ucfirst($api['category']);
             $api['provider'] = ucfirst($api['provider']);
+            if ($api['provider'] === 'Github' || $api['provider'] === 'Gitea') {
+                $api['location'] = 'Basepackages';
+            }
 
             if ($api['location'] === 'Basepackages') {
                 $modelClass = 'System\\Base\\Providers\\BasepackagesServiceProvider\\Packages\\Model\\ApiClientServices\\Apis\\' . $api['category'] . '\\';
@@ -179,6 +182,9 @@ public function addApi(array $data)
         $data['location'] = strtolower($data['location']);
         $data['category'] = strtolower($data['category']);
         $data['provider'] = strtolower($data['provider']);
+        if ($data['provider'] === 'github' || $data['provider'] === 'gitea') {
+            $data['location'] = 'basepackages';
+        }
 
         $data = $this->encryptPassToken($data);
 
@@ -209,6 +215,9 @@ public function updateApi(array $data)
         $data['location'] = strtolower($data['location']);
         $data['category'] = strtolower($data['category']);
         $data['provider'] = strtolower($data['provider']);
+        if ($data['provider'] === 'github' || $data['provider'] === 'gitea') {
+            $data['location'] = 'basepackages';
+        }
 
         $data = $this->encryptPassToken($data);
 
diff --git a/system/Base/Providers/BasepackagesServiceProvider/Packages/BackupRestore.php b/system/Base/Providers/BasepackagesServiceProvider/Packages/BackupRestore.php
index 75964d015..465816452 100644
--- a/system/Base/Providers/BasepackagesServiceProvider/Packages/BackupRestore.php
+++ b/system/Base/Providers/BasepackagesServiceProvider/Packages/BackupRestore.php
@@ -28,7 +28,7 @@ class BackupRestore extends BasePackage
 
     protected $restoreProgressMethods;
 
-    public function init($process = 'backup')
+    public function init($process = null)
     {
         $this->zip = new \ZipArchive;
 
@@ -72,7 +72,7 @@ protected function withProgress($method, $arguments)
         }
     }
 
-    public function backup(array $data)
+    public function backup(array $data, $viaModuleInstaller = false)
     {
         set_time_limit(300);//5 mins
 
@@ -90,9 +90,11 @@ public function backup(array $data)
         if ($noOptions) {
             $this->addResponse('Nothing to backup!', 1, []);
 
-            $this->basepackages->progress->preCheckComplete(false);
+            if (!$viaModuleInstaller) {
+                $this->basepackages->progress->preCheckComplete(false);
 
-            $this->basepackages->progress->resetProgress();
+                $this->basepackages->progress->resetProgress();
+            }
 
             return false;
         }
@@ -119,9 +121,11 @@ public function backup(array $data)
             ) {
                 $this->addResponse('Protect password missing!', 1, []);
 
-                $this->basepackages->progress->preCheckComplete(false);
+                if (!$viaModuleInstaller) {
+                    $this->basepackages->progress->preCheckComplete(false);
 
-                $this->basepackages->progress->resetProgress();
+                    $this->basepackages->progress->resetProgress();
+                }
 
                 return false;
             }
@@ -134,99 +138,125 @@ public function backup(array $data)
             }
         }
         if ($noFilesOptions) {
-            $this->basepackages->progress->unregisterMethods(['generateStructure']);
+            if ($viaModuleInstaller) {
+                $this->basepackages->progress->unregisterMethods(['createBackup'], 'method', ['generateStructure']);
+            } else {
+                $this->basepackages->progress->unregisterMethods(['generateStructure']);
+            }
         }
 
         if (!isset($this->backupInfo['request']['database']) ||
             (isset($this->backupInfo['request']['database']) && $this->backupInfo['request']['database'] != 'true')
         ) {
-            $this->basepackages->progress->unregisterMethods(['performDbBackup']);
+            if ($viaModuleInstaller) {
+                $this->basepackages->progress->unregisterMethods(['createBackup'], 'method', ['performDbBackup']);
+            } else {
+                $this->basepackages->progress->unregisterMethods(['performDbBackup']);
+            }
         }
 
-        $this->basepackages->progress->preCheckComplete();
+        if (!$viaModuleInstaller) {
+            $this->basepackages->progress->preCheckComplete();
 
-        foreach ($this->backupProgressMethods as $method) {
-            if ($this->withProgress($method['method'], $data) === false) {
-                 return false;
-            }
+            foreach ($this->backupProgressMethods as $method) {
+                if ($this->withProgress($method['method'], $data) === false) {
+                     return false;
+                }
 
-            usleep(500);
+                usleep(500);
+            }
         }
 
         return true;
     }
 
-    protected function generateStructure(array $data)
+    public function generateStructure()
     {
-        $this->zip->open(base_path($this->backupLocation . $this->backupInfo['backupName']), $this->zip::CREATE);
+        try {
+            $this->zip->open(base_path($this->backupLocation . $this->backupInfo['backupName']), $this->zip::CREATE);
 
-        if (isset($this->backupInfo['request']['database']) && $this->backupInfo['request']['database'] == 'true') {
-            if ($this->core->core['settings']['databasetype'] != 'db') {
-                $this->getContent($this->basepackages->utils->scanDir('.ff/'));
+            if (isset($this->backupInfo['request']['database']) && $this->backupInfo['request']['database'] == 'true') {
+                if ($this->core->core['settings']['databasetype'] != 'db') {
+                    $this->getContent($this->basepackages->utils->scanDir('.ff/'));
+                }
             }
-        }
-        if (isset($this->backupInfo['request']['apps_dir']) && $this->backupInfo['request']['apps_dir'] == 'true') {
-            $this->getContent($this->basepackages->utils->scanDir('apps/'));
-        }
-        if (isset($this->backupInfo['request']['systems_dir']) && $this->backupInfo['request']['systems_dir'] == 'true') {
-            $this->getContent($this->basepackages->utils->scanDir('system/'));
-        }
-        if (isset($this->backupInfo['request']['public_dir']) && $this->backupInfo['request']['public_dir'] == 'true') {
-            $this->getContent($this->basepackages->utils->scanDir('public/'));
-        }
-        if (isset($this->backupInfo['request']['private_dir']) && $this->backupInfo['request']['private_dir'] == 'true') {
-            $this->getContent($this->basepackages->utils->scanDir('private/'));
-        }
-        if (isset($this->backupInfo['request']['var_dir']) && $this->backupInfo['request']['var_dir'] == 'true') {
-            $this->getContent($this->basepackages->utils->scanDir('var/'));
-        }
-        if (isset($this->backupInfo['request']['external_dir']) && $this->backupInfo['request']['external_dir'] == 'true') {
-            if (isset($this->backupInfo['request']['external_vendor_dir']) && $this->backupInfo['request']['external_vendor_dir'] == 'true') {
-                $this->getContent($this->basepackages->utils->scanDir('external/'));
-            } else {
-                $this->getContent($this->basepackages->utils->scanDir('external/', false));
+            if (isset($this->backupInfo['request']['apps_dir']) && $this->backupInfo['request']['apps_dir'] == 'true') {
+                $this->getContent($this->basepackages->utils->scanDir('apps/'));
+            }
+            if (isset($this->backupInfo['request']['systems_dir']) && $this->backupInfo['request']['systems_dir'] == 'true') {
+                $this->getContent($this->basepackages->utils->scanDir('system/'));
+            }
+            if (isset($this->backupInfo['request']['public_dir']) && $this->backupInfo['request']['public_dir'] == 'true') {
+                $this->getContent($this->basepackages->utils->scanDir('public/'));
+            }
+            if (isset($this->backupInfo['request']['private_dir']) && $this->backupInfo['request']['private_dir'] == 'true') {
+                $this->getContent($this->basepackages->utils->scanDir('private/'));
+            }
+            if (isset($this->backupInfo['request']['var_dir']) && $this->backupInfo['request']['var_dir'] == 'true') {
+                $this->getContent($this->basepackages->utils->scanDir('var/'));
+            }
+            if (isset($this->backupInfo['request']['external_dir']) && $this->backupInfo['request']['external_dir'] == 'true') {
+                if (isset($this->backupInfo['request']['external_vendor_dir']) && $this->backupInfo['request']['external_vendor_dir'] == 'true') {
+                    $this->getContent($this->basepackages->utils->scanDir('external/'));
+                } else {
+                    $this->getContent($this->basepackages->utils->scanDir('external/', false));
+                }
             }
-        }
 
-        if (isset($this->backupInfo['request']['old_backups_dir']) && $this->backupInfo['request']['old_backups_dir'] == 'true') {
-            $this->getContent($this->basepackages->utils->scanDir('.backups/'));
-            $this->getContent($this->basepackages->utils->scanDir('.backupsdb/'));
-            $this->getContent($this->basepackages->utils->scanDir('.backupsff/'));
-        }
+            if (isset($this->backupInfo['request']['old_backups_dir']) && $this->backupInfo['request']['old_backups_dir'] == 'true') {
+                $this->getContent($this->basepackages->utils->scanDir('.backups/'));
+                $this->getContent($this->basepackages->utils->scanDir('.backupsdb/'));
+                $this->getContent($this->basepackages->utils->scanDir('.backupsff/'));
+            }
 
-        return true;
+            return true;
+        } catch (\Exception | \throwable $e) {
+            $this->addResponse('Backup Error: ' . $e->getMessage(), 1);
+
+            $this->basepackages->progress->resetProgress();
+
+            return false;
+        }
     }
 
-    protected function zipBackupFiles(array $data)
+    public function zipBackupFiles()
     {
-        foreach ($this->backupInfo['files'] as $file) {
-            if (!$this->addToZip(base_path($file), $file)) {
+        try {
+            foreach ($this->backupInfo['files'] as $file) {
+                if (!$this->addToZip(base_path($file), $file)) {
+                    return false;
+                }
+            }
+
+            if (isset($this->backupInfo['request']['password_protect']) && $this->backupInfo['request']['password_protect'] !== '') {
+                $this->backupInfo['request']['password_protect'] =
+                    $this->secTools->hashPassword($this->backupInfo['request']['password_protect'], 4);
+            }
+
+            try {
+                $this->localContent->write('var/tmp/backupInfo.json' , $this->helper->encode($this->backupInfo));
+            } catch (\ErrorException | FilesystemException | UnableToWriteFile $exception) {
+                throw $exception;
+            }
+
+            //Dont Encrypt info file as we need to know if encryption is applied or not during restore. We can encrypt the content in case we want to hide something (like we are encrypting the password_protect password)
+            if (!$this->addToZip(base_path('var/tmp/backupInfo.json'), 'backupInfo.json', false)) {
                 return false;
             }
-        }
 
-        if (isset($this->backupInfo['request']['password_protect']) && $this->backupInfo['request']['password_protect'] !== '') {
-            $this->backupInfo['request']['password_protect'] =
-                $this->secTools->hashPassword($this->backupInfo['request']['password_protect'], 4);
-        }
+            $this->zip->close();
 
-        try {
-            $this->localContent->write('var/tmp/backupInfo.json' , $this->helper->encode($this->backupInfo));
-        } catch (\ErrorException | FilesystemException | UnableToWriteFile $exception) {
-            throw $exception;
-        }
+            return true;
+        } catch (\Exception | \throwable $e) {
+            $this->addResponse('Backup Error: ' . $e->getMessage(), 1);
+
+            $this->basepackages->progress->resetProgress();
 
-        //Dont Encrypt info file as we need to know if encryption is applied or not during restore. We can encrypt the content in case we want to hide something (like we are encrypting the password_protect password)
-        if (!$this->addToZip(base_path('var/tmp/backupInfo.json'), 'backupInfo.json', false)) {
             return false;
         }
-
-        $this->zip->close();
-
-        return true;
     }
 
-    protected function performDbBackup(array $data)
+    public function performDbBackup()
     {
         foreach ($this->core->core['settings']['dbs'] as $dbKey => $db) {
             try {
@@ -266,35 +296,41 @@ protected function performDbBackup(array $data)
         return true;
     }
 
-    protected function finishBackup(array $data)
+    public function finishBackup(array $data)
     {
-        if ($this->basepackages->storages->storeFile(
-                'private',
-                '.backups',
-                null,
-                $this->backupInfo['backupName'],
-                filesize(base_path('.backups/' . $this->backupInfo['backupName'])),
-                'application/zip',
-                true
-            )
-        ) {
-            $this->basepackages->storages->changeOrphanStatus(
-                null,
-                null,
-                false,
-                null,
-                $this->backupInfo['backupName']
-            );
-
-            $this->addResponse('Generated backup ' . $this->backupInfo['backupName'] . '.',
-                               0,
-                               ['filename'  => $this->backupInfo['backupName'],
-                                'uuid'      => $this->basepackages->storages->packagesData->responseData['uuid'],
-                                'request'   => $data
-                               ]
-            );
+        try {
+            if ($this->basepackages->storages->storeFile(
+                    'private',
+                    '.backups',
+                    null,
+                    $this->backupInfo['backupName'],
+                    filesize(base_path('.backups/' . $this->backupInfo['backupName'])),
+                    'application/zip',
+                    true
+                )
+            ) {
+                $this->basepackages->storages->changeOrphanStatus(
+                    null,
+                    null,
+                    false,
+                    null,
+                    $this->backupInfo['backupName']
+                );
+
+                $this->addResponse('Generated backup ' . $this->backupInfo['backupName'] . '.',
+                                   0,
+                                   ['filename'  => $this->backupInfo['backupName'],
+                                    'uuid'      => $this->basepackages->storages->packagesData->responseData['uuid'],
+                                    'request'   => $data
+                                   ]
+                );
+
+                return true;
+            }
+        } catch (\Exception | \throwable $e) {
+            $this->addResponse('Backup Error: ' . $e->getMessage(), 1);
 
-            return true;
+            $this->basepackages->progress->resetProgress();
         }
 
         return false;
@@ -718,7 +754,7 @@ private function getDbKey($dbConfig = null)
         }
     }
 
-    protected function registerBackupProgressMethods()
+    public function getBackupProgressMethods()
     {
         $this->backupProgressMethods =
             [
@@ -740,10 +776,17 @@ protected function registerBackupProgressMethods()
                 ]
             ];
 
+        return $this->backupProgressMethods;
+    }
+
+    protected function registerBackupProgressMethods()
+    {
+        $this->getBackupProgressMethods();
+
         $this->basepackages->progress->registerMethods($this->backupProgressMethods);
     }
 
-    protected function registerRestoreProgressMethods()
+    public function getRestoreProgressMethods()
     {
         $this->restoreProgressMethods =
             [
@@ -761,6 +804,13 @@ protected function registerRestoreProgressMethods()
                 ]
             ];
 
+        return $this->restoreProgressMethods;
+    }
+
+    protected function registerRestoreProgressMethods()
+    {
+        $this->getRestoreProgressMethods();
+
         $this->basepackages->progress->registerMethods($this->restoreProgressMethods);
     }
 }
\ No newline at end of file
diff --git a/system/Base/Providers/BasepackagesServiceProvider/Packages/Dashboards.php b/system/Base/Providers/BasepackagesServiceProvider/Packages/Dashboards.php
index 617fc53c0..c739790ee 100644
--- a/system/Base/Providers/BasepackagesServiceProvider/Packages/Dashboards.php
+++ b/system/Base/Providers/BasepackagesServiceProvider/Packages/Dashboards.php
@@ -56,9 +56,27 @@ public function getDashboardById(int $id, $getwidgets = true, $getContent = fals
         return false;
     }
 
+    public function getDashboardsByAppType($appType)
+    {
+        $dashboards = [];
+
+        foreach($this->dashboards as $dashboard) {
+            if ($dashboard['app_type'] == $appType) {
+                array_push($dashboards, $dashboard);
+            }
+        }
+
+        $this->addResponse('Ok', 0, ['dashboards' => $dashboards]);
+
+        return $dashboards;
+    }
+
     public function addDashboard(array $data)
     {
-        $data['app_id'] = $this->apps->getAppInfo()['id'];
+        $data['app_default'] = 0;
+        if (!isset($data['app_type'])) {
+            $data['app_type'] = $this->apps->app['app_type'];
+        }
 
         $data['created_by'] = 0;
         if ($this->access->auth->account()) {
@@ -67,8 +85,12 @@ public function addDashboard(array $data)
 
         $data['settings']['maxWidgetsPerDashboard'] = $this->maxWidgetsPerDashboard;
 
-        if (isset($data['is_default']) && $data['is_default'] == true) {
-            $this->checkDefaultDashboard($data);
+        if (isset($data['user_default']) && $data['user_default'] == true) {
+            if ($this->access->auth->account()) {
+                $data['user_default'] = [$this->access->auth->account()['id']];
+            }
+        } else {
+            $data['user_default'] = [];
         }
 
         $data = $this->getSharedIds($data);
@@ -94,11 +116,32 @@ public function updateDashboard(array $data)
             throw new PermissionDeniedException;
         }
 
-        $data = array_merge($dashboard, $data);
+        if (is_string($dashboard['user_default'])) {
+            $dashboard['user_default'] = $this->helper->decode($dashboard['user_default'], true);
+        }
+        if (isset($data['user_default'])) {
+            if ($data['user_default'] == true) {
+                if ($this->access->auth->account()) {
+                    if ($dashboard['user_default'] && !in_array($this->access->auth->account()['id'], $dashboard['user_default'])) {
+                        array_push($dashboard['user_default'], $this->access->auth->account()['id']);
+                    } else {
+                        $dashboard['user_default'] = [$this->access->auth->account()['id']];
+                    }
+                }
+            } else if ($data['user_default'] == false) {
+                if ($this->access->auth->account()) {
+                    if ($dashboard['user_default'] && in_array($this->access->auth->account()['id'], $dashboard['user_default'])) {
+                        $key = array_search($this->access->auth->account()['id'], $dashboard['user_default']);
 
-        if (isset($data['is_default']) && $data['is_default'] == true) {
-            $this->checkDefaultDashboard($data);
+                        if ($key !== false) {
+                            unset($dashboard['user_default'][$key]);
+                        }
+                    }
+                }
+            }
         }
+        unset($data['user_default']);
+        $data = array_merge($dashboard, $data);
 
         $data = $this->getSharedIds($data);
 
@@ -109,25 +152,6 @@ public function updateDashboard(array $data)
         }
     }
 
-    protected function checkDefaultDashboard($data)
-    {
-        $dashboards = $this->basepackages->dashboards->dashboards;
-
-        foreach ($dashboards as $dashboard) {
-            if ($data['id'] == $dashboard['id']) {
-                continue;
-            }
-
-            if (isset($dashboard['is_default']) && $dashboard['is_default'] == true) {
-                $dashboard['is_default'] = null;
-
-                $this->update($dashboard);
-
-                break;
-            }
-        }
-    }
-
     protected function getSharedIds($data)
     {
         if (isset($data['shared']) && is_string($data['shared'])) {
@@ -140,6 +164,8 @@ protected function getSharedIds($data)
             } catch (\throwable $e) {
                 $data['shared'] = null;
             }
+        } else {
+            $data['shared'] = null;
         }
 
         return $data;
diff --git a/system/Base/Providers/BasepackagesServiceProvider/Packages/Filters.php b/system/Base/Providers/BasepackagesServiceProvider/Packages/Filters.php
index 098c7e26a..88bb46ab7 100644
--- a/system/Base/Providers/BasepackagesServiceProvider/Packages/Filters.php
+++ b/system/Base/Providers/BasepackagesServiceProvider/Packages/Filters.php
@@ -141,7 +141,7 @@ protected function getFilters(int $componentId, array $account = null)
                                 count($filter['shared_ids']['aids']) > 0
                             ) {
                                 foreach ($filter['shared_ids']['aids'] as $sharingAidKey => $sharingAid) {
-                                    $sharingAccount = $this->accounts->getById($sharingAid);
+                                    $sharingAccount = $this->basepackages->accounts->getById($sharingAid);
 
                                     if ($sharingAccount) {
                                         $filter['shared_ids']['aids'][$sharingAidKey] =
@@ -215,7 +215,7 @@ protected function getFilters(int $componentId, array $account = null)
                                     //         $filter['employee_full_name'] = $employee['full_name'];
                                     //     }
                                     // } else {
-                                        $sharedBy = $this->accounts->getById($filter['account_id']);
+                                        $sharedBy = $this->basepackages->accounts->getById($filter['account_id']);
 
                                         if ($sharedBy) {
                                             $filter['account_email'] = $sharedBy['email'];
@@ -243,7 +243,7 @@ protected function getFilters(int $componentId, array $account = null)
                                     //         $filter['employee_full_name'] = $employee['full_name'];
                                     //     }
                                     // } else {
-                                        $sharedBy = $this->accounts->getById($filter['account_id']);
+                                        $sharedBy = $this->basepackages->accounts->getById($filter['account_id']);
 
                                         if ($sharedBy) {
                                             $filter['account_email'] = $sharedBy['email'];
diff --git a/system/Base/Providers/BasepackagesServiceProvider/Packages/Menus.php b/system/Base/Providers/BasepackagesServiceProvider/Packages/Menus.php
index 99681ee7a..8f5786be4 100644
--- a/system/Base/Providers/BasepackagesServiceProvider/Packages/Menus.php
+++ b/system/Base/Providers/BasepackagesServiceProvider/Packages/Menus.php
@@ -9,7 +9,7 @@ class Menus extends BasePackage
 {
     protected $modelToUse = BasepackagesMenus::class;
 
-    protected $packageNameS = 'Menu';
+    protected $packageName = 'menus';
 
     public $menus;
 
@@ -38,7 +38,11 @@ public function buildMenus($menus = null)
         $buildMenu = [];
 
         foreach (msort($menus, 'sequence') as $key => $menu) {
-            $menu = $this->helper->decode($menu['menu'], true);
+            if (is_string($menu['menu'])) {
+                $menu['menu'] = $this->helper->decode($menu['menu'], true);
+            }
+
+            $menu = $menu['menu'];
 
             if ($menu) {
                 $buildMenu = array_replace_recursive($buildMenu, $menu);
@@ -81,9 +85,28 @@ public function getMenusForAppType($appType)
         return $this->buildMenus($menus);
     }
 
-    public function updateMenus($data)
+    public function getMenusByRouteForAppType($route, $appType)
     {
-        $menus = $this->helper->decode($data['menus'], true);
+        $menus = [];
+
+        foreach($this->menus as $menu) {
+            if ($menu['route'] === strtolower($route)) {
+                if ($menu['app_type'] === $appType) {
+                    return $menu;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    public function updateMenus(array $data)
+    {
+        $menus = $data['menus'];
+
+        if (is_string($menus)) {
+            $menus = $this->helper->decode($menus, true);
+        }
 
         if (count($menus) > 0) {
             foreach ($menus as $menuId => $value) {
@@ -105,8 +128,10 @@ public function updateMenus($data)
         $this->init(true);
     }
 
-    public function addMenu($appType, array $menu)
+    public function addMenu(array $componentJsonFile)
     {
+        $menu = $componentJsonFile['menu'];
+
         if (isset($menu['seq'])) {
             $sequence = $menu['seq'];
             unset($menu['seq']);
@@ -119,7 +144,8 @@ public function addMenu($appType, array $menu)
         $insertMenu = $this->add([
                 'menu'                  => $this->helper->encode($menu),
                 'apps'                  => $this->helper->encode([]),
-                'app_type'              => $appType,
+                'app_type'              => $componentJsonFile['app_type'],
+                'route'                 => $componentJsonFile['route'],
                 'sequence'              => $sequence
             ]
         );
@@ -131,8 +157,19 @@ public function addMenu($appType, array $menu)
         }
     }
 
-    public function updateMenu($id, $appType, array $menu)
+    public function updateMenu($id, array $componentJsonFile)
     {
+        $menu = $this->getById($id);
+
+        if (is_string($menu['menu'])) {
+            $menu['menu'] = $this->helper->decode($menu['menu'], true);
+        }
+        if ($menu) {
+            $menu = array_merge($menu['menu'], $componentJsonFile['menu']);
+        } else {
+            $menu = $componentJsonFile['menu'];
+        }
+
         if (isset($menu['seq'])) {
             $sequence = $menu['seq'];
             unset($menu['seq']);
@@ -146,7 +183,8 @@ public function updateMenu($id, $appType, array $menu)
                 'id'                    => $id,
                 'menu'                  => $this->helper->encode($menu),
                 'apps'                  => $this->helper->encode([]),
-                'app_type'              => $appType,
+                'app_type'              => $componentJsonFile['app_type'],
+                'route'                 => $componentJsonFile['route'],
                 'sequence'              => $sequence
             ]
         );
diff --git a/system/Base/Providers/BasepackagesServiceProvider/Packages/Model/BasepackagesDashboards.php b/system/Base/Providers/BasepackagesServiceProvider/Packages/Model/BasepackagesDashboards.php
index 028b3e8d1..29d5c737b 100644
--- a/system/Base/Providers/BasepackagesServiceProvider/Packages/Model/BasepackagesDashboards.php
+++ b/system/Base/Providers/BasepackagesServiceProvider/Packages/Model/BasepackagesDashboards.php
@@ -13,15 +13,13 @@ class BasepackagesDashboards extends BaseModel
 
     public $name;
 
-    public $app_id;
-
-    public $app_default;
+    public $app_type;
 
     public $created_by;
 
     public $shared;
 
-    public $is_default;
+    public $user_default;
 
     public $settings;
 
diff --git a/system/Base/Providers/BasepackagesServiceProvider/Packages/Model/BasepackagesMenus.php b/system/Base/Providers/BasepackagesServiceProvider/Packages/Model/BasepackagesMenus.php
index 9e44ac5ce..d5e30d14b 100644
--- a/system/Base/Providers/BasepackagesServiceProvider/Packages/Model/BasepackagesMenus.php
+++ b/system/Base/Providers/BasepackagesServiceProvider/Packages/Model/BasepackagesMenus.php
@@ -14,5 +14,7 @@ class BasepackagesMenus extends BaseModel
 
     public $app_type;
 
+    public $route;
+
     public $sequence;
 }
\ No newline at end of file
diff --git a/system/Base/Providers/BasepackagesServiceProvider/Packages/Progress.php b/system/Base/Providers/BasepackagesServiceProvider/Packages/Progress.php
index 59b3f3e32..ba2c8dda4 100644
--- a/system/Base/Providers/BasepackagesServiceProvider/Packages/Progress.php
+++ b/system/Base/Providers/BasepackagesServiceProvider/Packages/Progress.php
@@ -51,6 +51,11 @@ public function checkProgressFile($fileName = null)
         return false;
     }
 
+    public function getProgressFile()
+    {
+        return $this->readProgressFile();
+    }
+
     public function registerMethods(array $methods)
     {
         foreach ($methods as $key => $method) {
@@ -81,19 +86,28 @@ public function registerMethods(array $methods)
         return false;
     }
 
-    public function unregisterMethods(array $methods, $using = 'method')//Either Method or Text as identifier in case of duplicate methods.
+    public function unregisterMethods(array $methods, $using = 'method', array $childs = [])//Either Method or Text as identifier in case of duplicate methods.
     {
         $progressFile = $this->readProgressFile();
 
+        if ($using !== 'method' && $using !== 'text') {
+            $using = 'method';
+        }
+
         if (isset($progressFile['processes']) && count($progressFile['processes']) > 0) {
             foreach ($methods as $method) {
                 foreach ($progressFile['processes'] as $progressFileKey => $progressFileMethod) {
-                    if ($using === 'method') {
-                        if ($progressFileMethod['method'] === $method) {
-                            unset($progressFile['processes'][$progressFileKey]);
-                        }
-                    } else if ($using === 'text') {
-                        if ($progressFileMethod['text'] === $method) {
+                    if ($progressFileMethod[$using] === $method) {
+                        if (count($childs) > 0 &&
+                            isset($progressFile['processes'][$progressFileKey]['childs']) &&
+                            count($progressFile['processes'][$progressFileKey]['childs']) > 0
+                        ) {
+                            foreach ($progressFile['processes'][$progressFileKey]['childs'] as $childKey => $child) {
+                                if (in_array($child[$using], $childs)) {
+                                    unset($progressFile['processes'][$progressFileKey]['childs'][$childKey]);
+                                }
+                            }
+                        } else {
                             unset($progressFile['processes'][$progressFileKey]);
                         }
                     }
diff --git a/system/Base/Providers/CoreServiceProvider/Install/Install.php b/system/Base/Providers/CoreServiceProvider/Install/Install.php
new file mode 100644
index 000000000..29a458661
--- /dev/null
+++ b/system/Base/Providers/CoreServiceProvider/Install/Install.php
@@ -0,0 +1,77 @@
+<?php
+
+namespace System\Base\Providers\CoreServiceProvider\Install;
+
+use System\Base\BasePackage;
+use System\Base\Installer\Packages\Setup\Schema;
+use System\Base\Providers\ModulesServiceProvider\DbInstaller;
+
+class Install extends BasePackage
+{
+    protected $databases;
+
+    protected $dbInstaller;
+
+    public function init($schemaNames = [])
+    {
+        $databases = (new Schema)->getSchema();
+
+        $this->databases = $databases;
+
+        //Only update 1 database
+        if (count($schemaNames) > 0) {
+            $schemaNamesDatabase = [];
+            foreach ($schemaNames as $schemaName) {
+                if (isset($databases[$schemaName])) {
+                    $schemaNamesDatabase[$schemaName] = $databases[$schemaName];
+                }
+            }
+
+            $this->databases = $schemaNamesDatabase;
+        }
+
+        $this->dbInstaller = new DbInstaller;
+
+        return $this;
+    }
+
+    public function install()
+    {
+        $this->preInstall();
+
+        $this->installDb();
+
+        $this->postInstall();
+
+        return true;
+    }
+
+    public function preInstall()
+    {
+        //Do version specific update for any future version upgrades.
+        // if ($this->core->core['version'] === 'x.x.x') {
+            //Do something
+        // }
+
+        return true;
+    }
+
+    public function installDb()
+    {
+        $this->dbInstaller->installDb($this->databases);
+
+        return true;
+    }
+
+    public function postInstall()
+    {
+        //Do anything after installation.
+
+        return true;
+    }
+
+    public function truncate()
+    {
+        $this->dbInstaller->truncate($this->databases);
+    }
+}
\ No newline at end of file
diff --git a/system/Base/Providers/DatabaseServiceProvider/Ff.php b/system/Base/Providers/DatabaseServiceProvider/Ff.php
index 37a72a2e5..01e7f8716 100644
--- a/system/Base/Providers/DatabaseServiceProvider/Ff.php
+++ b/system/Base/Providers/DatabaseServiceProvider/Ff.php
@@ -615,11 +615,15 @@ public function reSync()
                         if (is_array($storeDataValue)) {
                             $storeDataValue = $this->helper->encode($storeDataValue);
                         }
+                        if (is_int($storeDataValue)) {
+                            $storeDataValue = (string) $storeDataValue;
+                        }
+                        if (is_bool($storeDataValue)) {
+                            $storeDataValue = $storeDataValue ? 1 : 0;
+                        }
                     }
 
-                    $model->assign($storeData);
-
-                    $model->create();
+                    $this->db->insertAsDict($model->getSource(), $storeData);
                 }
 
                 return true;
diff --git a/system/Base/Providers/DatabaseServiceProvider/Ff/Store.php b/system/Base/Providers/DatabaseServiceProvider/Ff/Store.php
index a5eeaf694..971107a36 100644
--- a/system/Base/Providers/DatabaseServiceProvider/Ff/Store.php
+++ b/system/Base/Providers/DatabaseServiceProvider/Ff/Store.php
@@ -1568,12 +1568,26 @@ protected function normalizeData(array $data, $jsonToArray = false): array
                             continue;
                         }
 
-                        if ($type === 'boolean' || $type === 'integer') {
+                        if ($type === 'integer') {
                             if (is_string($data[$propertyKey])) {
                                 $data[$propertyKey] = (int) $data[$propertyKey];
                             }
+                        }
+
+                        if ($type === 'boolean') {
+                            if (is_string($data[$propertyKey])) {
+                                if ($data[$propertyKey] === 'false' ||
+                                    $data[$propertyKey] === '0'
+                                ) {
+                                    $data[$propertyKey] = false;
+                                } else if ($data[$propertyKey] === 'false' ||
+                                           $data[$propertyKey] === '1'
+                                ) {
+                                    $data[$propertyKey] = true;
+                                }
+                            }
 
-                            if (is_int($data[$propertyKey]) && $type === 'boolean') {
+                            if (is_int($data[$propertyKey])) {
                                 $data[$propertyKey] = $data[$propertyKey] === 0 ? false : true;
                             }
                         }
diff --git a/system/Base/Providers/ErrorServiceProvider/Error.php b/system/Base/Providers/ErrorServiceProvider/Error.php
index 587fb7902..e8a56b2b1 100644
--- a/system/Base/Providers/ErrorServiceProvider/Error.php
+++ b/system/Base/Providers/ErrorServiceProvider/Error.php
@@ -250,8 +250,8 @@ protected function buildMessageNoDebug($message)
 
 		$userId = 0;
 
-		if ($this->auth->account()) {
-			$userId = $this->auth->account()['id'];
+		if ($this->access->auth->account()) {
+			$userId = $this->access->auth->account()['id'];
 		}
 
 		return '<style type="text/css">
diff --git a/system/Base/Providers/CoreServiceProvider/Install/Package.php b/system/Base/Providers/ModulesServiceProvider/DbInstaller.php
similarity index 83%
rename from system/Base/Providers/CoreServiceProvider/Install/Package.php
rename to system/Base/Providers/ModulesServiceProvider/DbInstaller.php
index d673a8f62..f81cfda92 100644
--- a/system/Base/Providers/CoreServiceProvider/Install/Package.php
+++ b/system/Base/Providers/ModulesServiceProvider/DbInstaller.php
@@ -1,47 +1,15 @@
 <?php
 
-namespace System\Base\Providers\CoreServiceProvider\Install;
+namespace System\Base\Providers\ModulesServiceProvider;
 
 use System\Base\BasePackage;
-use System\Base\Installer\Packages\Setup\Schema;
 
-class Package extends BasePackage
+class DbInstaller extends BasePackage
 {
-    protected $installer;
-
-    protected $databases;
-
-    public function install($installer)
-    {
-        $this->installer = $installer;
-
-        $this->databases = (new Schema)->getSchema();
-
-        $this->preInstall();
-
-        $this->installDb();
-
-        $this->postInstall();
-
-        return true;
-    }
-
-    protected function preInstall()
-    {
-        //Do version specific update for any future version upgrades.
-        // if ($this->core->core['version'] === 'x.x.x') {
-            //Do something
-        // }
-
-        return true;
-    }
-
-    protected function installDb()
+    public function installDb($databases)
     {
         if (isset($this->config['databasetype']) && $this->config['databasetype'] !== 'ff') {
-            $dbTablesList = $this->describe();
-
-            foreach ($this->databases as $tableName => $tableClass) {
+            foreach ($databases as $tableName => $tableClass) {
                 if ($tableClass['model'] && $tableClass['model']->getSource()) {
                     $tableName = $tableClass['model']->getSource();
                 }
@@ -143,7 +111,7 @@ protected function installDb()
         if (isset($this->config['databasetype']) && $this->config['databasetype'] !== 'db') {
             $storesToIndex = [];
 
-            foreach ($this->databases as $tableName => $tableClass) {
+            foreach ($databases as $tableName => $tableClass) {
                 if ($tableClass['model'] && $tableClass['model']->getSource()) {
                     $tableName = $tableClass['model']->getSource();
                 }
@@ -168,9 +136,30 @@ protected function installDb()
         return true;
     }
 
-    protected function postInstall()
+    public function truncate($databases)
     {
-        //Do anything after installation.
+        if (isset($this->config['databasetype']) && $this->config['databasetype'] !== 'ff') {
+            foreach ($databases as $tableName => $tableClass) {
+                if ($tableClass['model'] && $tableClass['model']->getSource()) {
+                    $tableName = $tableClass['model']->getSource();
+
+                    $this->dropTable($tableName);
+                }
+            }
+
+        }
+
+        if (isset($this->config['databasetype']) && $this->config['databasetype'] !== 'db') {
+            foreach ($databases as $tableName => $tableClass) {
+                if ($tableClass['model'] && $tableClass['model']->getSource()) {
+                    $tableName = $tableClass['model']->getSource();
+
+                    $this->ff->store($tableName)->deleteStore();
+                }
+            }
+        }
+
+        $this->installDb($databases);
 
         return true;
     }
diff --git a/system/Base/Providers/ModulesServiceProvider/Installer.php b/system/Base/Providers/ModulesServiceProvider/Installer.php
index ee2865f8d..9121493ad 100644
--- a/system/Base/Providers/ModulesServiceProvider/Installer.php
+++ b/system/Base/Providers/ModulesServiceProvider/Installer.php
@@ -5,15 +5,17 @@
 use League\Flysystem\FilesystemException;
 use League\Flysystem\UnableToCheckExistence;
 use League\Flysystem\UnableToCopyFile;
+use League\Flysystem\UnableToCreateDirectory;
 use League\Flysystem\UnableToDeleteDirectory;
 use League\Flysystem\UnableToDeleteFile;
+use League\Flysystem\UnableToListContents;
 use League\Flysystem\UnableToMoveFile;
 use League\Flysystem\UnableToReadFile;
 use League\Flysystem\UnableToRetrieveMetadata;
 use League\Flysystem\UnableToWriteFile;
 use System\Base\BasePackage;
 use System\Base\Installer\Packages\Setup\Schema;
-use System\Base\Providers\CoreServiceProvider\Install\Package as CorePackage;
+use System\Base\Providers\CoreServiceProvider\Install\Install as CoreInstall;
 use xobotyi\rsync\Rsync;
 use z4kn4fein\SemVer\Version;
 
@@ -41,7 +43,7 @@ class Installer extends BasePackage
 
     protected $preCheckResult = [];
 
-    protected $modulesToInstallOrUpdate;
+    public $modulesToInstallOrUpdate;
 
     protected $runPrecheckProgressMethods;
 
@@ -51,6 +53,8 @@ class Installer extends BasePackage
 
     protected $storesToIndex = [];
 
+    protected $progressFileName = 'modulesinstaller';
+
     public function init($process = 'precheck')
     {
         $this->queue = $this->modules->queues->getActiveQueue();
@@ -73,7 +77,7 @@ public function init($process = 'precheck')
             throw $e;
         }
 
-        $this->basepackages->progress->init(null, 'modulesinstaller');
+        $this->basepackages->progress->init(null, $this->progressFileName);
 
         if ($this->basepackages->progress->checkProgressFile()) {
             $this->basepackages->progress->deleteProgressFile();
@@ -128,37 +132,142 @@ public function runProcess(array $data)
             return false;
         }
 
-        set_time_limit(300);//5 mins
+        set_time_limit(600);//10 mins
 
         if ($this->process === 'runprecheck') {
             $this->basepackages->progress->preCheckComplete();
 
+            $this->queue['results'] = arrayReplace($this->queue['results'], 'precheck_progress_logs', []);
+            $this->modules->queues->update($this->queue);
+
             foreach ($this->runPrecheckProgressMethods as $method) {
                 if ($this->withProgress($method['method'], $method['args'] ?? []) === false) {
+                    if ($this->basepackages->progress->checkProgressFile()) {
+                        $this->addProgressToResult(true);
+                    }
+
                     $this->modules->queues->update($this->queue);
 
                     return false;
                 }
-                // usleep(500);
             }
 
             $this->queue['status'] = 1;
+            $this->queue['prechecked_at'] = date('c');
+            $this->queue['prechecked_by'] = '-';
+
+            if ($this->access->auth->account() && isset($this->access->auth->account()['id'])) {
+                $this->queue['prechecked_by'] = $this->access->auth->account()['id'];
+            }
+
+            if ($this->basepackages->progress->checkProgressFile()) {
+                $this->addProgressToResult();
+            }
 
             $this->modules->queues->update($this->queue);
 
+            $this->queue['prechecked_by'] = $this->access->auth->account()['email'];
+
             $this->addResponse('Precheck complete', 0, ['queue' => $this->queue]);
         } else if ($this->process === 'runprocess') {
             $this->basepackages->progress->preCheckComplete();
 
+            $this->queue['results'] = arrayReplace($this->queue['results'], 'progress_progress_logs', []);
+            $this->modules->queues->update($this->queue);
+
             foreach ($this->runProcessProgressMethods as $method) {
                 if ($this->withProgress($method['method'], $method['args'] ?? []) === false) {
+                    if ($this->basepackages->progress->checkProgressFile()) {
+                        $this->addProgressToResult(true);
+                    }
+
                     $this->modules->queues->update($this->queue);
 
                     return false;
                 }
-                // usleep(500);
             }
-            //
+
+            $this->queue['status'] = 2;
+            $this->queue['processed_at'] = date('c');
+            $this->queue['processed_by'] = '-';
+
+            if ($this->access->auth->account() && isset($this->access->auth->account()['id'])) {
+                $this->queue['processed_by'] = $this->access->auth->account()['id'];
+            }
+
+            if ($this->basepackages->progress->checkProgressFile()) {
+                $this->addProgressToResult();
+            }
+
+            $this->modules->queues->update($this->queue);
+
+            $emailReport = false;
+            if ($this->queue['settings']['emailReport'] !== '') {
+                $emailReport = $this->emailReport();
+            }
+
+            $this->queue['processed_by'] = $this->access->auth->account()['email'];
+
+            $this->addResponse('Process complete', 0, ['queue' => $this->queue, 'emailReport' => $emailReport]);
+        }
+    }
+
+    protected function addProgressToResult($failed = false)
+    {
+        $progressFile = $this->basepackages->progress->getProgressFile();
+
+        if (!$progressFile ||
+            ($progressFile && !isset($progressFile['allProcesses']))
+        ) {
+            return;
+        }
+
+        if ($this->process === 'runprecheck') {
+            foreach ($progressFile['allProcesses'] as $key => $progress) {
+                if ($failed &&
+                    (!isset($progress['callResult']) ||
+                     isset($progress['callResult']) && $progress['callResult'] === false)
+                ) {
+                    return;
+                }
+
+                if (!isset($progress['args'])) {
+                    continue;
+                }
+
+                if (!isset($this->queue['results'][$progress['args'][0]][$progress['args'][1]['module_type']][$progress['args'][1]['id']])) {
+                    continue;
+                }
+
+                $progressResultResult = &$this->queue['results'][$progress['args'][0]][$progress['args'][1]['module_type']][$progress['args'][1]['id']];
+
+                $progressResultResult['precheck_progress_logs'][$key]['progressTask'] = $progress['text'];
+                $progressResultResult['precheck_progress_logs'][$key]['progressResult'] = $progress['callResult'] == true ? 'Pass' : 'Fail';
+                $progressResultResult['precheck_progress_logs'][$key]['progressExecTime'] = $progress['callExecTime'];
+            }
+        } else if ($this->process === 'runprocess') {
+            foreach ($progressFile['allProcesses'] as $key => $progress) {
+                if ($failed &&
+                    (!isset($progress['callResult']) ||
+                     isset($progress['callResult']) && $progress['callResult'] === false)
+                ) {
+                    return;
+                }
+
+                if (!isset($progress['args'])) {
+                    continue;
+                }
+
+                if (!isset($this->queue['results'][$progress['args'][0]][$progress['args'][1]['module_type']][$progress['args'][1]['id']])) {
+                    continue;
+                }
+
+                $progressResultResult = &$this->queue['results'][$progress['args'][0]][$progress['args'][1]['module_type']][$progress['args'][1]['id']];
+
+                $progressResultResult['process_progress_logs'][$key]['progressTask'] = $progress['text'];
+                $progressResultResult['process_progress_logs'][$key]['progressResult'] = $progress['callResult'] == true ? 'Pass' : 'Fail';
+                $progressResultResult['process_progress_logs'][$key]['progressExecTime'] = $progress['callExecTime'];
+            }
         }
     }
 
@@ -204,7 +313,8 @@ protected function precheckQueueData($args)
 
             return $this->queueHasErrors(
                 $this->modules->manager->packagesData->responseMessage ?? 'Could not retrieve repository information for module: ' . $module['name'],
-                $preCheckQueueLogs
+                $preCheckQueueLogs,
+                true
             );
         } else {
             $this->queue['results'][$taskName][$module['module_type']][$module['id']]['precheck'] = 'fail';
@@ -213,7 +323,8 @@ protected function precheckQueueData($args)
 
             return $this->queueHasErrors(
                 $this->modules->manager->packagesData->responseMessage ?? 'Could not retrieve repository information for module: ' . $module['name'],
-                $preCheckQueueLogs
+                $preCheckQueueLogs,
+                true
             );
         }
 
@@ -226,17 +337,30 @@ protected function processExternalPackages($args)
         $precheck = $args[2];
 
         if ($module['module_type'] === 'external') {
-            $this->queue['results']['first']['external'][explode('/', $module['name'])[1]]['precheck'] = 'fail';
-            $preCheckQueueLogs = &$this->queue['results']['first']['external'][explode('/', $module['name'])[1]]['precheck_logs'];
+            if ($precheck) {
+                $this->queue['results']['first']['external'][explode('/', $module['name'])[1]]['precheck'] = 'fail';
+                $preCheckQueueLogs = &$this->queue['results']['first']['external'][explode('/', $module['name'])[1]]['precheck_logs'];
+            } else {
+                $this->queue['results']['first']['external'][explode('/', $module['name'])[1]]['result'] = 'fail';
+                $resultQueueLogs = &$this->queue['results']['first']['external'][explode('/', $module['name'])[1]]['result_logs'];
+            }
 
             if (isset($module['hasPatch']) && $module['hasPatch'] === true) {
                 if (!isset($module['composerJsonFile']['extra']['patches'][$module['name']])) {
                     $this->cleanup(['composer']);
 
-                    return $this->queueHasErrors(
-                        'External packages should have package defined, but are missing from the composer json file for : ' . $module['name'],
-                        $preCheckQueueLogs
-                    );
+                    if ($precheck) {
+                        return $this->queueHasErrors(
+                            'External packages should have package defined, but are missing from the composer json file for : ' . $module['name'],
+                            $preCheckQueueLogs
+                        );
+                    } else {
+                        return $this->queueHasErrors(
+                            'External packages should have package defined, but are missing from the composer json file for : ' . $module['name'],
+                            $resultQueueLogs,
+                            false
+                        );
+                    }
                 }
 
                 $patches = $this->basepackages->utils->scanDir($this->downloadLocation .
@@ -252,10 +376,18 @@ protected function processExternalPackages($args)
                 if (count($patches['files']) === 0) {
                     $this->cleanup(['composer']);
 
-                    return $this->queueHasErrors(
-                        'External package requires a patch which is missing from the repository : ' . $module['root_module']['repo'],
-                        $preCheckQueueLogs
-                    );
+                    if ($precheck) {
+                        return $this->queueHasErrors(
+                            'External package requires a patch which is missing from the repository : ' . $module['root_module']['repo'],
+                            $preCheckQueueLogs
+                        );
+                    } else {
+                        return $this->queueHasErrors(
+                            'External package requires a patch which is missing from the repository : ' . $module['root_module']['repo'],
+                            $resultQueueLogs,
+                            false
+                        );
+                    }
                 }
 
                 $modulePatchName = str_replace(['/','-'], ['_','_'], $module['name']);
@@ -264,10 +396,18 @@ protected function processExternalPackages($args)
                 if (count($patches['files']) !== count($module['composerJsonFile']['extra']['patches'][$module['name']])) {
                     $this->cleanup(['composer']);
 
-                    return $this->queueHasErrors(
-                        'External package number of patches do not match what is defined in the composer json file for repository : ' . $module['root_module']['repo'],
-                        $preCheckQueueLogs
-                    );
+                    if ($precheck) {
+                        return $this->queueHasErrors(
+                            'External package number of patches do not match what is defined in the composer json file for repository : ' . $module['root_module']['repo'],
+                            $preCheckQueueLogs
+                        );
+                    } else {
+                        return $this->queueHasErrors(
+                            'External package number of patches do not match what is defined in the composer json file for repository : ' . $module['root_module']['repo'],
+                            $resultQueueLogs,
+                            false
+                        );
+                    }
                 }
 
                 $foundAll = [];
@@ -284,10 +424,18 @@ protected function processExternalPackages($args)
                 if (in_array('false', $foundAll)) {
                     $this->cleanup(['composer']);
 
-                    return $this->queueHasErrors(
-                        'External package all patches not found in the external/patches directory as per the  composer json file for repository : ' . $module['root_module']['repo'],
-                        $preCheckQueueLogs
-                    );
+                    if ($precheck) {
+                        return $this->queueHasErrors(
+                            'External package all patches not found in the external/patches directory as per the  composer json file for repository : ' . $module['root_module']['repo'],
+                            $preCheckQueueLogs
+                        );
+                    } else {
+                        return $this->queueHasErrors(
+                            'External package all patches not found in the external/patches directory as per the  composer json file for repository : ' . $module['root_module']['repo'],
+                            $resultQueueLogs,
+                            false
+                        );
+                    }
                 }
 
                 try {
@@ -310,10 +458,18 @@ protected function processExternalPackages($args)
             } catch (FilesystemException | UnableToWriteFile $e) {
                 $this->cleanup(['composer']);
 
-                return $this->queueHasErrors(
-                    'Error writing file external package composer file : ' . $externalComposerFileName,
-                    $preCheckQueueLogs
-                );
+                if ($precheck) {
+                    return $this->queueHasErrors(
+                        'Error writing file external package composer file : ' . $externalComposerFileName,
+                        $preCheckQueueLogs
+                    );
+                } else {
+                    return $this->queueHasErrors(
+                        'Error writing file external package composer file : ' . $externalComposerFileName,
+                        $resultQueueLogs,
+                        false
+                    );
+                }
             }
 
             try {
@@ -321,7 +477,11 @@ protected function processExternalPackages($args)
                 putenv('COMPOSER=' . $externalComposerFileName);
 
                 $stream = fopen(base_path('external/' . $externalComposerFileName . '.install'), 'w');
-                $input = new \Symfony\Component\Console\Input\StringInput('install --dry-run -d ' . base_path('external/'));
+                if ($precheck) {
+                    $input = new \Symfony\Component\Console\Input\StringInput('install --dry-run -d ' . base_path('external/'));
+                } else {
+                    $input = new \Symfony\Component\Console\Input\StringInput('install -d ' . base_path('external/'));
+                }
                 $output = new \Symfony\Component\Console\Output\StreamOutput($stream);
 
                 $application = new \Composer\Console\Application();
@@ -329,30 +489,170 @@ protected function processExternalPackages($args)
 
                 $app = $application->run($input, $output);
 
-                $precheckLog = $this->localContent->read('external/' . $externalComposerFileName . '.install');
-
-                $this->queue['results']['first']['external'][explode('/', $module['name'])[1]]['precheck'] = 'pass';
-                $this->queue['results']['first']['external'][explode('/', $module['name'])[1]]['precheck_logs'] = $precheckLog;
+                $installLogs = $this->localContent->read('external/' . $externalComposerFileName . '.install');
             } catch (\throwable | UnableToReadFile $e) {
                 $this->cleanup(['composer']);
 
-                return $this->queueHasErrors($e->getMessage(), $preCheckQueueLogs);
+                return $this->queueHasErrors($e->getMessage(), $preCheckQueueLogs, $precheck);
             }
 
             if ($app !== 0) {
                 $this->cleanup(['composer']);
 
-                return $this->queueHasErrors('Precheck for composer package failed : ' . $module['name'], $preCheckQueueLogs);
+                if ($precheck) {
+                    return $this->queueHasErrors('Precheck for composer package failed : ' . $module['name'] . '<br>' . $installLogs, $preCheckQueueLogs);
+                } else {
+                    return $this->queueHasErrors('Precheck for composer package failed : ' . $module['name'] . '<br>' . $installLogs, $resultQueueLogs, false);
+                }
+            }
+
+            if ($precheck) {
+                $this->queue['results']['first']['external'][explode('/', $module['name'])[1]]['precheck'] = 'pass';
+                $this->queue['results']['first']['external'][explode('/', $module['name'])[1]]['precheck_logs'] = $installLogs;
+            } else {
+                $this->queue['results']['first']['external'][explode('/', $module['name'])[1]]['result'] = 'pass';
+                $this->queue['results']['first']['external'][explode('/', $module['name'])[1]]['result_logs'] = $installLogs;
+
+                //Merge package information to composer.json
+                try {
+                    $this->localContent->write('external/composer.json', $this->helper->encode(array_replace($this->getComposerJsonFile(), $module['composerJsonFile'])));
+                } catch (FilesystemException | UnableToWriteFile $e) {
+                    return $this->queueHasErrors('Could not rewrite the composer.json file with new package information: ' . $module['name'], $resultQueueLogs, false);
+                }
+
+                //add to externals DB
+                $installedComposerPackages = $this->getComposerPackageInfo();
+                try {
+                    $installedComposerPackages = $this->helper->decode($installedComposerPackages, true);
+                } catch (\throwable $e) {
+                    //Do nothing.
+                }
+                $externalPackageNameArr = explode('/', $module['name']);
+
+                $externalPackage = $this->modules->externals->getExternalByName($externalPackageNameArr[1]);
+                foreach ($installedComposerPackages['installed'] as $installedComposerPackagesKey => $installedComposerPackage) {
+                    $installedComposerPackages[$installedComposerPackage['name']] = $installedComposerPackage;
+                }
+                unset($installedComposerPackages['installed']);
+
+                if ($externalPackage) {
+                    $externalPackage['version'] =
+                        (isset($installedComposerPackages[$module['name']]['version'])) ? $installedComposerPackages[$module['name']]['version'] : '';
+                    $externalPackage['description'] =
+                        (isset($installedComposerPackages[$module['name']]['description'])) ? $installedComposerPackages[$module['name']]['description'] : '';
+                    $externalPackage['patches'] =
+                        (isset($module['composerJsonFile']['extra']['patches'][$module['name']])) ?
+                            $this->helper->encode($module['composerJsonFile']['extra']['patches'][$module['name']]) :
+                            $this->helper->encode([]);
+                    $externalPackage['abandoned'] =
+                        (isset($installedComposerPackages[$module['name']]['abandoned'])) ? (($installedComposerPackages[$module['name']]['abandoned'] == true) ? 1 : 0) : 0;
+
+                    if (isset($externalPackage['required_by'])) {
+                        if (is_string($externalPackage['required_by'])) {
+                            $externalPackage['required_by'] = $this->helper->decode($externalPackage['required_by'], true);
+                        }
+
+                        if (isset($externalPackage['required_by'][$module['root_module']['module_type']])) {
+                            if (is_array($externalPackage['required_by'][$module['root_module']['module_type']]) &&
+                                count($externalPackage['required_by'][$module['root_module']['module_type']]) > 0
+                            ) {
+                                if (!in_array($module['root_module']['id'], $externalPackage['required_by'][$module['root_module']['module_type']])) {
+                                    array_push($externalPackage['required_by'][$module['root_module']['module_type']], $module['root_module']['id']);
+                                }
+                            } else {
+                                $externalPackage['required_by'] = $this->helper->encode(['packages' => [$module['root_module']['id']]]);
+                            }
+                        } else {
+                            $externalPackage['required_by'] = $this->helper->encode(['packages' => [$module['root_module']['id']]]);
+                        }
+                    } else {
+                        $externalPackage['required_by'] = $this->helper->encode(['packages' => [$module['root_module']['id']]]);
+                    }
+
+                    $this->modules->externals->update($externalPackage);
+                } else {
+                    $externalPackage =
+                        [
+                            'developer'             => $externalPackageNameArr[0],
+                            'name'                  => $externalPackageNameArr[1],
+                            'display_name'          => $module['name'],
+                            'description'           =>
+                                (isset($installedComposerPackages[$module['name']]['description'])) ? $installedComposerPackages[$module['name']]['description'] : '',
+                            'module_type'           => 'externals',
+                            'app_type'              => 'core',
+                            'version'               =>
+                                (isset($installedComposerPackages[$module['name']]['version'])) ? $installedComposerPackages[$module['name']]['version'] : '',
+                            'patches'               =>
+                                (isset($module['composerJsonFile']['extra']['patches'][$module['name']])) ?
+                                    $this->helper->encode($module['composerJsonFile']['extra']['patches'][$module['name']]) :
+                                    $this->helper->encode([]),
+                            'abandoned'             =>
+                                (isset($installedComposerPackages[$module['name']]['abandoned'])) ? (($installedComposerPackages[$module['name']]['abandoned'] == true) ? 1 : 0) : 0,
+                            'installed'             => 1,
+                            'required_by'           => $this->helper->encode(['packages' => [$module['root_module']['id']]]),
+                            'updated_by'            => 0
+                        ];
+
+                        if ($this->access->auth->account() && isset($this->access->auth->account()['id'])) {
+                            $externalPackage['updated_by'] = $this->access->auth->account()['id'];
+                        }
+
+                    $this->modules->externals->add($externalPackage);
+                }
+
+                $this->cleanup(['composer']);
             }
         } else {
             $this->cleanup(['composer']);
 
-            return $this->queueHasErrors('Incorrect external package type: ' . $module['name'], $preCheckQueueLogs);
+            if ($precheck) {
+                return $this->queueHasErrors('Incorrect external package type: ' . $module['name'], $preCheckQueueLogs);
+            } else {
+                return $this->queueHasErrors('Incorrect external package type: ' . $module['name'], $resultQueueLogs, false);
+            }
         }
 
         return true;
     }
 
+    protected function getComposerPackageInfo()
+    {
+        try {
+            putenv('COMPOSER_HOME=' . base_path('external/'));
+
+            $stream = fopen(base_path('external/composer.info'), 'w');
+            $input = new \Symfony\Component\Console\Input\StringInput('show -f json -d ' . base_path('external/'));
+            $output = new \Symfony\Component\Console\Output\StreamOutput($stream);
+
+            $application = new \Composer\Console\Application();
+            $application->setAutoExit(false); // prevent `$application->run` method from exiting the script
+
+            $app = $application->run($input, $output);
+        } catch (\throwable $e) {
+            throw $e;
+        }
+
+        if ($app !== 0) {
+            return false;
+        }
+
+        $file = '';
+
+        $handle = fopen(base_path('external/composer.info'), "r");
+
+        if ($handle) {
+            while (($line = fgets($handle)) !== false) {
+                if (!str_contains($line, '<warning>')) {
+                    $file .= $line;
+                }
+            }
+
+            fclose($handle);
+        }
+
+        return $file;
+    }
+
     protected function queueHasErrors($errorMessage, &$queueLogs, $precheck = true)
     {
         $queueLogs = $errorMessage;
@@ -625,12 +925,81 @@ protected function runRsync($args)
         );
 
         $this->zipFile['name'] = $this->modulesToInstallOrUpdate['repo_details']['details']['name'] . '-' .
-                        $this->modulesToInstallOrUpdate['repo_details']['latestRelease']['name'];
+                                 ($this->modulesToInstallOrUpdate['repo_details']['latestRelease']['name'] !== '' ? $this->modulesToInstallOrUpdate['repo_details']['latestRelease']['name'] : $this->modulesToInstallOrUpdate['repo_details']['latestRelease']['tag_name']);
 
         try {
+            if ($module['module_type'] === 'packages' &&
+                $module['name'] === 'Core'
+            ) {
+                $destDir = '';
+            } else {
+                if ($module['module_type'] === 'apptype') {
+                    $destDir = 'apps/' . ucfirst($module['name']) . '/';
+                } else if ($module['module_type'] === 'components') {
+                    $destDir = 'apps/' . ucfirst($module['app_type']) . '/Components/';
+
+                    $routeArr = explode('/', $module['route']);
+
+                    foreach ($routeArr as &$path) {
+                        $path = ucfirst($path);
+                    }
+
+                    $destDir .= implode('/', $routeArr) . '/';
+                } else if ($module['module_type'] === 'middlewares') {
+                    $destDir = 'apps/' . ucfirst($module['app_type']) . '/Middlewares/' . ucfirst($module['name']) . '/';
+                } else if ($module['module_type'] === 'packages') {
+                    $destDir = 'apps/' . ucfirst($module['app_type']) . '/Packages/';
+
+                    $pathArr = preg_split('/(?=[A-Z])/', ucfirst($module['name']), -1, PREG_SPLIT_NO_EMPTY);
+
+                    $destDir .= implode('/', $pathArr) . '/';
+                } else if ($module['module_type'] === 'views') {
+                    //for view check if the main view is installed before adding to queue.
+                    if (isset($module['is_public']) &&
+                        $module['is_public'] == true
+                    ) {
+                        $destDir = 'public/' . strtolower($module['app_type']) . '/' . strtolower($module['name']) . '/';
+
+                        $this->zipFile['name'] = $this->modulesToInstallOrUpdate['repo_details']['details']['name'] .
+                                                 '-public-' .
+                                                 $this->modulesToInstallOrUpdate['repo_details']['latestRelease']['name'];
+                    } else if (isset($module['is_subview']) &&
+                        $module['is_subview'] == true
+                    ) {
+                        $destDir = 'apps/' . ucfirst($module['app_type']) . '/' . ucfirst($module['module_type']) . '/' . ucfirst($module['base_view_name']) . '/html/';
+
+                        $pathArr = preg_split('/(?=[A-Z])/', ucfirst($module['name']), -1, PREG_SPLIT_NO_EMPTY);
+
+                        if (count($pathArr) > 1) {
+                            foreach ($pathArr as &$path) {
+                                $path = strtolower($path);
+                            }
+                        } else {
+                            $pathArr[0] = strtolower($pathArr[0]);
+                        }
+
+                        $destDir .= implode('/', $pathArr) . '/';
+                    } else {
+                        $destDir = 'apps/' . ucfirst($module['app_type']) . '/Views/' . ucfirst($module['name']) . '/';
+                    }
+                }
+
+                if (!$precheck) {
+                    try {
+                        if (!$this->localContent->directoryExists($destDir)) {
+                            $this->localContent->createDirectory($destDir);
+                        }
+                    } catch (FilesystemException | UnableToCheckExistence | UnableToCreateDirectory | \throwable $e) {
+                        throw $e;
+                    }
+                }
+            }
+
+            $srcDir = 'var/tmp/installer/' . $this->zipFile['name'] . '/' . $this->zipFile['name'];
+
             $rsyncSettings =
                 [
-                    Rsync::CONF_CWD        => base_path('var/tmp/installer/' . $this->zipFile['name'] . '/' . $this->zipFile['name']),
+                    Rsync::CONF_CWD        => base_path($srcDir),
                     Rsync::CONF_OPTIONS    =>
                         [
                             Rsync::OPT_DRY_RUN           => $precheck,
@@ -643,75 +1012,103 @@ protected function runRsync($args)
                         ]
                 ];
 
-            if ($this->queue['settings']['rsync']['deleteDestinationFiles']) {
+            if ($this->queue['settings']['files']['deleteDestinationFiles']) {
                 $rsyncSettings[Rsync::CONF_OPTIONS][Rsync::OPT_DELETE_AFTER] = true;
             }
 
             $rsync = new Rsync($rsyncSettings);
 
-            if ($module['module_type'] === 'packages' &&
-                $module['name'] === 'Core'
-            ) {
-                $rsync->sync(
-                    '.',
-                    base_path('')
-                );
-            } else {
-                $rsync->sync(
-                    '.',
-                    base_path('apps/' . ucfirst($module['app_type']) . '/' . ucfirst($module['module_type']) . '/' . ucfirst($module['name']) . '/')
-                );
-            }
+            $rsync->sync('.', base_path($destDir));
 
             if ($rsync->getExitCode() == 0) {
                 $outputArr = explode(PHP_EOL, $rsync->getStdout());
                 $modifiedFiles = [];
                 $deleteFiles = [];
 
-                array_walk($outputArr, function($output) use (&$modifiedFiles, &$deleteFiles) {
-                    if (str_starts_with($output, 'apps') ||
-                        str_starts_with($output, 'system') ||
-                        str_starts_with($output, 'public') ||
-                        str_starts_with($output, 'external')
-                    ) {
-                        if (!str_ends_with($output, '/') &&
-                            !str_ends_with($output, '.git')
+                if ($module['module_type'] === 'packages' &&
+                    $module['name'] === 'Core'
+                ) {
+                    array_walk($outputArr, function($output) use (&$modifiedFiles, &$deleteFiles) {
+                        if (str_starts_with($output, 'apps') ||
+                            str_starts_with($output, 'system') ||
+                            str_starts_with($output, 'public') ||
+                            str_starts_with($output, 'external')
+                        ) {
+                            if (!str_ends_with($output, '/') &&
+                                !str_ends_with($output, '.git')
+                            ) {
+                                array_push($modifiedFiles, $output);
+                            }
+                        }
+
+                        if ($this->queue['settings']['files']['deleteDestinationFiles']) {
+                            if (str_starts_with($output, 'deleting')) {
+                                if (!str_ends_with($output, '/') &&
+                                    !str_ends_with($output, '.git') &&
+                                    !str_ends_with($output, 'keys')
+                                ) {
+                                    $output = str_replace('deleting ', '', $output);
+
+                                    array_push($deleteFiles, $output);
+                                }
+                            }
+                        }
+                    });
+                } else {
+                    array_walk($outputArr, function($output) use (&$modifiedFiles, &$deleteFiles) {
+                        if (!str_starts_with($output, 'sending') &&
+                            !str_starts_with($output, 'created') &&
+                            !str_ends_with($output, '/') &&
+                            !str_starts_with($output, 'sent ') &&
+                            !str_starts_with($output, 'total ') &&
+                            $output !== ''
                         ) {
                             array_push($modifiedFiles, $output);
                         }
-                    }
 
-                    if ($this->queue['settings']['rsync']['deleteDestinationFiles']) {
-                        if (str_starts_with($output, 'deleting')) {
-                            if (!str_ends_with($output, '/') &&
-                                !str_ends_with($output, '.git') &&
-                                !str_ends_with($output, 'keys')
-                            ) {
+                        if ($this->queue['settings']['files']['deleteDestinationFiles']) {
+                            if (str_starts_with($output, 'deleting')) {
                                 $output = str_replace('deleting ', '', $output);
+
                                 array_push($deleteFiles, $output);
                             }
                         }
-                    }
-                });
-            }
+                    });
+                }
 
-            if ($precheck) {
-                $this->queue['results'][$taskName][$module['module_type']][$module['id']]['precheck'] = 'pass';
-                if ($this->queue['settings']['rsync']['deleteDestinationFiles']) {
-                    $preCheckQueueLogs = $this->helper->encode(['modifiedFiles' => $modifiedFiles, 'deleteFiles' => $deleteFiles]);
-                } else {
-                    $preCheckQueueLogs = $this->helper->encode(['modifiedFiles' => $modifiedFiles]);
+                $rsyncResults = [];
+                if (count($deleteFiles) > 0) {
+                    $rsyncResults['deleteFiles'] = $deleteFiles;
                 }
-            } else {
-                $this->queue['results'][$taskName][$module['module_type']][$module['id']]['result'] = 'pass';
-                if ($this->queue['settings']['rsync']['deleteDestinationFiles']) {
-                    $resultQueueLogs = $this->helper->encode(['modifiedFiles' => $modifiedFiles, 'deleteFiles' => $deleteFiles]);
+
+                if ($precheck) {
+                    $this->queue['results'][$taskName][$module['module_type']][$module['id']]['precheck'] = 'pass';
+
+                    if (count($modifiedFiles) > 0) {
+                        $rsyncResults['modifyFiles'] = $modifiedFiles;
+                    }
+
+                    if (count($rsyncResults) === 0) {
+                        $preCheckQueueLogs = '-';
+                    } else {
+                        $preCheckQueueLogs = $this->helper->encode($rsyncResults);
+                    }
                 } else {
-                    $resultQueueLogs = $this->helper->encode(['modifiedFiles' => $modifiedFiles]);
+                    $this->queue['results'][$taskName][$module['module_type']][$module['id']]['result'] = 'pass';
+
+                    if (count($modifiedFiles) > 0) {
+                        $rsyncResults['modifiedFiles'] = $modifiedFiles;
+                    }
+
+                    if (count($rsyncResults) === 0) {
+                        $resultQueueLogs = '-';
+                    } else {
+                        $resultQueueLogs = $this->helper->encode($rsyncResults);
+                    }
                 }
-            }
 
-            return true;
+                return true;
+            }
         } catch (\throwable $e) {
             if (str_contains($e->getMessage(), 'No such file or directory')) {
                 $rsyncError = 'Incorrect directory : ' . $rsync->getCWD();
@@ -746,13 +1143,10 @@ protected function runModuleInstallScripts($args)
         $this->queue['results'][$taskName][$module['module_type']][$module['id']]['result'] = 'pass';
         $resultQueueLogs = &$this->queue['results'][$taskName][$module['module_type']][$module['id']]['result_logs'];
 
-        if ($module['module_type'] === 'packages' &&
-            $module['name'] === 'Core'
-        ) {
+        if ($module['name'] === 'Core') {
             try {
-                (new CorePackage)->install($this);
+                (new CoreInstall)->init()->install();
             } catch (\throwable $e) {
-                trace([$e]);
                 $this->queue['results'][$taskName][$module['module_type']][$module['id']]['result'] = 'fail';
 
                 return $this->queueHasErrors(
@@ -762,7 +1156,38 @@ protected function runModuleInstallScripts($args)
                 );
             }
         } else {
-            //
+            try {
+                $this->modulesToInstallOrUpdate = $this->modules->manager->getModuleInfo(
+                    [
+                        'module_type'   => $module['module_type'],
+                        'module_id'     => $module['id']
+                    ]
+                );
+
+                $classArr = explode('\\', $this->modulesToInstallOrUpdate['class']);
+
+                $classArr = array_slice($classArr, 0, -1);
+
+                $class = implode('\\', $classArr) . '\\Install\\Install';
+
+                $path = lcfirst(str_replace('\\', '/', $class) . '.php');
+
+                try {
+                    if ($this->localContent->fileExists($path)) {
+                        (new $class)->init()->install();
+                    }
+                } catch (FilesystemException | UnableToCheckExistence | \throwable $e) {
+                    return true;
+                }
+            } catch (\throwable $e) {
+                $this->queue['results'][$taskName][$module['module_type']][$module['id']]['result'] = 'fail';
+
+                return $this->queueHasErrors(
+                    $e->getMessage(),
+                    $resultQueueLogs,
+                    false
+                );
+            }
         }
 
         return true;
@@ -776,63 +1201,81 @@ protected function updateVersion($args)
         $this->queue['results'][$taskName][$module['module_type']][$module['id']]['result'] = 'pass';
         $resultQueueLogs = &$this->queue['results'][$taskName][$module['module_type']][$module['id']]['result_logs'];
 
-        if ($module['module_type'] === 'packages' &&
-            $module['name'] === 'Core'
-        ) {
-            try {
-                $versionArr = explode(' -> ', $module['version']);
+        if ($taskName === 'update') {
+            $versionArr = explode(' -> ', $module['version']);
 
-                if (count($versionArr) !== 2) {
-                    return $this->queueHasErrors(
-                        'Incorrect number of versions for Core. Please contact developer.',
-                        $resultQueueLogs,
-                        false
-                    );
-                }
-
-                $package = $this->modules->packages->getPackageById($module['id']);
-
-                if (!$package) {
-                    return $this->queueHasErrors(
-                        'Package core not found with the ID provided. Please contact developer.',
-                        $resultQueueLogs,
-                        false
-                    );
-                }
-
-                if ($package['version'] !== $versionArr[0] &&
-                    $package['update_version'] !== $versionArr[1]
-                ) {
-                    return $this->queueHasErrors(
-                        'Module information received by installer is incorrect. Please contact developer.',
-                        $resultQueueLogs,
-                        false
-                    );
-                }
-
-                $package['version'] = $package['update_version'];
-                $package['updated_on'] = date('c');
+            if (count($versionArr) !== 2) {
+                return $this->queueHasErrors(
+                    'Incorrect number of versions for module. Please contact developer.',
+                    $resultQueueLogs,
+                    false
+                );
+            }
+        }
 
-                if ($this->access->auth->account() && isset($this->access->auth->account()['id'])) {
-                    $package['updated_by'] = $this->access->auth->account()['id'];
-                }
+        try {
+            if (str_contains($module['module_type'], 'apptype')) {
+                $moduleArr = $this->apps->types->getAppTypeById($module['id']);
+            } else {
+                $moduleMethod = 'get' . ucfirst(substr($module['module_type'], 0, -1)) . 'ById';
+                $moduleArr = $this->modules->{$module['module_type']}->$moduleMethod($module['id']);
+            }
 
-                $this->modules->packages->update($package);
-            } catch (\throwable $e) {
-                trace([$e]);
-                $this->queue['results'][$taskName][$module['module_type']][$module['id']]['result'] = 'fail';
+            if (!$moduleArr) {
+                return $this->queueHasErrors(
+                    'Module not found with the ID provided. Please contact developer.',
+                    $resultQueueLogs,
+                    false
+                );
+            }
 
+            if ($taskName === 'update' &&
+                $moduleArr['version'] !== $versionArr[0] &&
+                $moduleArr['update_version'] !== $versionArr[1]
+            ) {
                 return $this->queueHasErrors(
-                    $e->getMessage(),
+                    'Module information received by installer is incorrect. Please contact developer.',
                     $resultQueueLogs,
                     false
                 );
             }
-        } else {
-            //
-        }
 
-        return true;
+            if ($taskName === 'update') {
+                $moduleArr['version'] = $moduleArr['update_version'];
+            }
+
+            $moduleArr['installed'] = 1;
+            $moduleArr['updated_on'] = date('c');
+            $moduleArr['update_available'] = 0;
+            $moduleArr['update_version'] = '';
+
+            if ($this->access->auth->account() && isset($this->access->auth->account()['id'])) {
+                $moduleArr['updated_by'] = $this->access->auth->account()['id'];
+            }
+            if (str_contains($module['module_type'], 'apptype')) {
+                $this->apps->types->update($moduleArr);
+            } else {
+                $this->modules->{$module['module_type']}->update($moduleArr);
+            }
+
+            if ($module['module_type'] === 'packages' &&
+                $module['name'] === 'Core'
+            ) {
+                $this->core->core['version'] = $moduleArr['version'];
+
+                $this->core->update($this->core->core);
+            }
+
+            return true;
+        } catch (\throwable $e) {
+            $this->queue['results'][$taskName][$module['module_type']][$module['id']]['result'] = 'fail';
+
+            return $this->queueHasErrors(
+                $e->getMessage(),
+                $resultQueueLogs,
+                false
+            );
+        }
     }
 
     public function cleanup(array $what)
@@ -841,11 +1284,19 @@ public function cleanup(array $what)
             $files = $this->basepackages->utils->scanDir('external', false);
 
             foreach ($files['files'] as $file) {
-                if ($file === 'external/composer.json' || $file === 'external/composer.install') {
+                if ($file === 'external/composer.json' ||
+                    $file === 'external/composer.install' ||
+                    $file === 'external/composer.info' ||
+                    $file === 'external/composer.lock'
+                ) {
                     continue;
                 }
 
-                if (str_contains($file, '.json') || str_contains($file, '.install')) {
+                if (str_contains($file, '.json') ||
+                    str_contains($file, '.install') ||
+                    str_contains($file, '.info') ||
+                    str_contains($file, '.lock')
+                ) {
                     try {
                         $this->localContent->delete($file);
                     } catch (UnableToDeleteFile | FilesystemException | \throwable $e) {
@@ -868,26 +1319,103 @@ public function cleanup(array $what)
 
     protected function createBackup()
     {
-        if ((bool) $this->queue['settings']['backupSettings']['backup'] === false) {
-            return true;
-        }
-
         if ($this->queue['settings']['backupSettings']['notes'] === '') {
             $this->queue['settings']['backupSettings']['notes'] = 'Backup taken while processing module installer queue with ID: ' . $this->queue['id'];
         }
 
-        return $this->basepackages->backuprestore->init()->backup($this->queue['settings']['backupSettings']);
-    }
+        $backupInit = $this->basepackages->backuprestore->init()->backup($this->queue['settings']['backupSettings'], true);
 
-    protected function rollBack()
-    {
-        //
+        if (!$backupInit) {
+            $this->basepackages->progress->resetProgress();
+
+            $this->addResponse('Error initializing backup! Contact developer', 1);
+
+            return false;
+        }
+
+        $progress = $this->basepackages->progress->getProgress();
+
+        if (is_string($progress)) {
+            $progress = $this->helper->decode($progress, true);
+        }
+
+        if ($progress['runners']['running']['method'] === 'createBackup') {
+            if (isset($progress['runners']['running']['childs']) &&
+                is_array($progress['runners']['running']['childs']) &&
+                count($progress['runners']['running']['childs']) > 0
+            ) {
+                foreach ($progress['runners']['running']['childs'] as $child) {
+                    $method = $child['method'];
+
+                    $this->basepackages->progress->updateProgress('createBackup', null, false, $method);
+
+                    if ($method === 'finishBackup') {
+                        $call = $this->basepackages->backuprestore->$method($this->queue['settings']['backupSettings']);
+                    } else {
+                        $call = $this->basepackages->backuprestore->$method();
+                    }
+
+                    if ($call === false) {
+                        $this->basepackages->progress->resetProgress();
+
+                        $this->addResponse($this->basepackages->backuprestore->packagesData->responseMessage, 1);
+
+                        return false;
+                    }
+
+                    if ($call !== false) {
+                        $call = true;
+                    }
+
+                    $this->basepackages->progress->updateProgress('createBackup', $call, false, $method);
+                }
+            }
+
+            return true;
+        }
+
+        $this->basepackages->progress->resetProgress();
+
+        $this->addResponse('Progress Error! Contact developer.', 1);
+
+        return false;
     }
 
     protected function registerRunPrecheckProgressMethods()
     {
         $this->runPrecheckProgressMethods = [];
 
+        if (isset($this->queue['tasks']['analysed']['first']) &&
+            count($this->queue['tasks']['analysed']['first']) > 0
+        ) {
+            foreach ($this->queue['tasks']['analysed']['first'] as $moduleType => $modulesTypes) {
+                if ((is_array($modulesTypes) && count($modulesTypes) === 0) ||
+                    !is_array($modulesTypes)
+                ) {
+                    continue;
+                }
+
+                //External First
+                foreach ($modulesTypes as $module) {
+                    if ($moduleType === 'external') {
+                        if (isset($module['hasPatch']) && $module['hasPatch'] === true) {
+                            $this->addProgressMethods($this->runPrecheckProgressMethods, $module, 'first', 'first_external', true);
+                        }
+
+                        array_push($this->runPrecheckProgressMethods,
+                            [
+                                'method'    => 'processExternalPackages-' . $module['id'] . '-' . strtolower(str_replace(' ', '', $module['name'])),
+                                'text'      => 'Perform precheck for external package ' . $module['name'] . ' (' . ucfirst($module['module_type']) . ') ...',
+                                'args'      => ['first', $module, true],
+                            ]
+                        );
+                    } else {
+                        continue;
+                    }
+                }
+            }
+        }
+
         foreach ($this->queue['tasks']['analysed'] as $taskName => $modulesTypes) {
             if (($taskName === 'first' || $taskName === 'install' || $taskName === 'update') &&
                 count($modulesTypes) > 0
@@ -899,76 +1427,43 @@ protected function registerRunPrecheckProgressMethods()
                         continue;
                     }
 
+                    //For Views
                     foreach ($modules as $module) {
                         if ($taskName === 'first' && $moduleType === 'external') {
-                            if (isset($module['hasPatch']) && $module['hasPatch'] === true) {
-                                array_push($this->runPrecheckProgressMethods,
-                                    [
-                                        'method'    => 'precheckQueueData-' . $module['root_module']['id'] . '-' . strtolower(str_replace(' ', '', $module['root_module']['name'])),
-                                        'text'      => 'Perform precheck for module ' . $module['root_module']['name'] . ' (' . ucfirst($module['root_module']['module_type']) . ') ...',
-                                        'args'      => [$taskName, $module['root_module']],
-                                    ]
-                                );
-                                array_push($this->runPrecheckProgressMethods,
-                                    [
-                                        'method'    => 'downloadModulesFromRepo-' . $module['root_module']['id'] . '-' . strtolower(str_replace(' ', '', $module['root_module']['name'])),
-                                        'text'      => 'Download module ' . $module['root_module']['name'] . ' (' . ucfirst($module['root_module']['module_type']) . ') files from repository...',
-                                        'args'      => [$taskName, $module['root_module']],
-                                        'remoteWeb' => true
-                                    ]
-                                );
-                                array_push($this->runPrecheckProgressMethods,
-                                    [
-                                        'method'    => 'extractModulesDownloadedFromRepo-' . $module['root_module']['id'] . '-' . strtolower(str_replace(' ', '', $module['root_module']['name'])),
-                                        'text'      => 'Extracting downloaded module ' . $module['root_module']['name'] . ' (' . ucfirst($module['root_module']['module_type']) . ')...'
-                                    ]
-                                );
-                            }
+                            continue;
+                        }
+
+                        if ($module['module_type'] === 'views' && $module['is_subview'] == false) {
+                            $this->addProgressMethods($this->runPrecheckProgressMethods, $module, $taskName, 'for_main_view', true);
+
                             array_push($this->runPrecheckProgressMethods,
                                 [
-                                    'method'    => 'processExternalPackages-' . $module['id'] . '-' . strtolower(str_replace(' ', '', $module['name'])),
-                                    'text'      => 'Perform precheck for external package ' . $module['name'] . ' (' . ucfirst($module['module_type']) . ') ...',
+                                    'method'    => 'runRsync-' . $module['id'] . '-' . strtolower(str_replace(' ', '', $module['name'])),
+                                    'text'      => 'Running rsync --dry-run for ' . $module['name'] . ' (' . ucfirst($module['module_type']) . ')...',
                                     'args'      => [$taskName, $module, true],
                                 ]
                             );
-                        } else {
-                            continue;
                         }
                     }
 
                     foreach ($modules as $module) {
                         if ($taskName === 'first' && $moduleType === 'external') {
                             continue;
-                        } else {
-                            array_push($this->runPrecheckProgressMethods,
-                                [
-                                    'method'    => 'precheckQueueData-' . $module['id'] . '-' . strtolower(str_replace(' ', '', $module['name'])),
-                                    'text'      => 'Perform precheck for module ' . $module['name'] . ' (' . ucfirst($module['module_type']) . ') ...',
-                                    'args'      => [$taskName, $module],
-                                ]
-                            );
-                            array_push($this->runPrecheckProgressMethods,
-                                [
-                                    'method'    => 'downloadModulesFromRepo-' . $module['id'] . '-' . strtolower(str_replace(' ', '', $module['name'])),
-                                    'text'      => 'Download module ' . $module['name'] . ' (' . ucfirst($module['module_type']) . ') files from repository...',
-                                    'args'      => [$taskName, $module],
-                                    'remoteWeb' => true
-                                ]
-                            );
-                            array_push($this->runPrecheckProgressMethods,
-                                [
-                                    'method'    => 'extractModulesDownloadedFromRepo-' . $module['id'] . '-' . strtolower(str_replace(' ', '', $module['name'])),
-                                    'text'      => 'Extracting downloaded module ' . $module['name'] . ' (' . ucfirst($module['module_type']) . ')...'
-                                ]
-                            );
-                            array_push($this->runPrecheckProgressMethods,
-                                [
-                                    'method'    => 'runRsync-' . $module['id'] . '-' . strtolower(str_replace(' ', '', $module['name'])),
-                                    'text'      => 'Running rsync --dry-run for ' . $module['name'] . ' (' . ucfirst($module['module_type']) . ')...',
-                                    'args'      => [$taskName, $module, true],
-                                ]
-                            );
                         }
+
+                        if ($module['module_type'] === 'views' && $module['is_subview'] == false) {
+                            continue;
+                        }
+
+                        $this->addProgressMethods($this->runPrecheckProgressMethods, $module, $taskName, 'everything_else', true);
+
+                        array_push($this->runPrecheckProgressMethods,
+                            [
+                                'method'    => 'runRsync-' . $module['id'] . '-' . strtolower(str_replace(' ', '', $module['name'])),
+                                'text'      => 'Running rsync --dry-run for ' . $module['name'] . ' (' . ucfirst($module['module_type']) . ')...',
+                                'args'      => [$taskName, $module, true],
+                            ]
+                        );
                     }
                 }
             }
@@ -977,10 +1472,114 @@ protected function registerRunPrecheckProgressMethods()
         $this->basepackages->progress->registerMethods($this->runPrecheckProgressMethods);
     }
 
+    protected function addProgressMethods(&$methods, $module, $taskName, $forTask, $precheck)
+    {
+        if ($precheck) {
+            if ($forTask === 'first_external') {
+                $module = $module['root_module'];
+            }
+
+            array_push($methods,
+                [
+                    'method'    => 'precheckQueueData-' . $module['id'] . '-' . strtolower(str_replace(' ', '', $module['name'])),
+                    'text'      => 'Perform precheck for module ' . $module['name'] . ' (' . ucfirst($module['module_type']) . ') ...',
+                    'args'      => [$taskName, $module],
+                ]
+            );
+            array_push($methods,
+                [
+                    'method'    => 'downloadModulesFromRepo-' . $module['id'] . '-' . strtolower(str_replace(' ', '', $module['name'])),
+                    'text'      => 'Download module ' . $module['name'] . ' (' . ucfirst($module['module_type']) . ') files from repository...',
+                    'args'      => [$taskName, $module],
+                    'remoteWeb' => true
+                ]
+            );
+            array_push($methods,
+                [
+                    'method'    => 'extractModulesDownloadedFromRepo-' . $module['id'] . '-' . strtolower(str_replace(' ', '', $module['name'])),
+                    'text'      => 'Extracting downloaded module ' . $module['name'] . ' (' . ucfirst($module['module_type']) . ')...',
+                    'args'      => [$taskName, $module]
+                ]
+            );
+        } else {
+            array_push($methods,
+                [
+                    'method'    => 'runRsync-' . $module['id'] . '-' . strtolower(str_replace(' ', '', $module['name'])),
+                    'text'      => 'Running rsync for ' . $module['name'] . ' (' . ucfirst($module['module_type']) . ')...',
+                    'args'      => [$taskName, $module, $precheck],
+                ]
+            );
+            if ($module['module_type'] !== 'views' &&
+                $module['module_type'] !== 'apptype'
+            ) {
+                array_push($methods,
+                    [
+                        'method'    => 'runModuleInstallScripts-' . $module['id'] . '-' . strtolower(str_replace(' ', '', $module['name'])),
+                        'text'      => 'Running module install scripts for ' . $module['name'] . ' (' . ucfirst($module['module_type']) . ')...',
+                        'args'      => [$taskName, $module],
+                    ]
+                );
+            }
+            if (!isset($module['is_public'])) {
+                array_push($methods,
+                    [
+                        'method'    => 'updateVersion-' . $module['id'] . '-' . strtolower(str_replace(' ', '', $module['name'])),
+                        'text'      => 'Updating version for ' . $module['name'] . ' (' . ucfirst($module['module_type']) . ')...',
+                        'args'      => [$taskName, $module],
+                    ]
+                );
+            }
+            array_push($methods,
+                [
+                    'method'    => 'deleteSourceFiles-' . $module['id'] . '-' . strtolower(str_replace(' ', '', $module['name'])),
+                    'text'      => 'Deleting Source files for ' . $module['name'] . ' (' . ucfirst($module['module_type']) . ')...',
+                    'args'      => [$taskName, $module],
+                ]
+            );
+        }
+    }
+
     protected function registerRunProcessProgressMethods()
     {
         $this->runProcessProgressMethods = [];
 
+        if ((bool) $this->queue['settings']['backupSettings']['backup'] === true) {
+            array_push($this->runProcessProgressMethods,
+                [
+                    'method'    => 'createBackup',
+                    'text'      => 'Creating filesystem and database backup...',
+                    'childs'    => $this->basepackages->backuprestore->getBackupProgressMethods()
+                ]
+            );
+        }
+
+        if (isset($this->queue['tasks']['analysed']['first']) &&
+            count($this->queue['tasks']['analysed']['first']) > 0
+        ) {
+            foreach ($this->queue['tasks']['analysed']['first'] as $moduleType => $modulesTypes) {
+                if ((is_array($modulesTypes) && count($modulesTypes) === 0) ||
+                    !is_array($modulesTypes)
+                ) {
+                    continue;
+                }
+
+                //First we process external or first (core or other dependencies)
+                foreach ($modulesTypes as $module) {
+                    if ($moduleType === 'external') {
+                        array_push($this->runProcessProgressMethods,
+                            [
+                                'method'    => 'processExternalPackages-' . $module['id'] . '-' . strtolower(str_replace(' ', '', $module['name'])),
+                                'text'      => 'Process external package ' . $module['name'] . ' (' . ucfirst($module['module_type']) . ') ...',
+                                'args'      => ['first', $module, false],
+                            ]
+                        );
+                    } else {
+                        continue;
+                    }
+                }
+            }
+        }
+
         foreach ($this->queue['tasks']['analysed'] as $taskName => $modulesTypes) {
             if (($taskName === 'first' || $taskName === 'install' || $taskName === 'update') &&
                 count($modulesTypes) > 0
@@ -992,52 +1591,64 @@ protected function registerRunProcessProgressMethods()
                         continue;
                     }
 
+                    //For Views
                     foreach ($modules as $module) {
                         if ($taskName === 'first' && $moduleType === 'external') {
-                            array_push($this->runProcessProgressMethods,
-                                [
-                                    'method'    => 'processExternalPackages-' . $module['id'] . '-' . strtolower(str_replace(' ', '', $module['name'])),
-                                    'text'      => 'Perform precheck for external package ' . $module['name'] . ' (' . ucfirst($module['module_type']) . ') ...',
-                                    'args'      => [$taskName, $module],
-                                ]
-                            );
-                        } else {
                             continue;
                         }
+
+                        if ($module['module_type'] === 'views' && $module['is_subview'] == false) {
+                            $this->addProgressMethods($this->runProcessProgressMethods, $module, $taskName, 'for_main_view', false);
+                        }
                     }
 
+                    //Then we process all other modules.
                     foreach ($modules as $module) {
                         if ($taskName === 'first' && $moduleType === 'external') {
                             continue;
-                        } else {
-                            array_push($this->runProcessProgressMethods,
-                                [
-                                    'method'    => 'createBackup',
-                                    'text'      => 'Creating filesystem and database backup...'
-                                ]
-                            );
-                            array_push($this->runProcessProgressMethods,
-                                [
-                                    'method'    => 'runRsync-' . $module['id'] . '-' . strtolower(str_replace(' ', '', $module['name'])),
-                                    'text'      => 'Running rsync for ' . $module['name'] . ' (' . ucfirst($module['module_type']) . ')...',
-                                    'args'      => [$taskName, $module, false],
-                                ]
-                            );
-                            array_push($this->runProcessProgressMethods,
-                                [
-                                    'method'    => 'runModuleInstallScripts-' . $module['id'] . '-' . strtolower(str_replace(' ', '', $module['name'])),
-                                    'text'      => 'Running module install scripts for ' . $module['name'] . ' (' . ucfirst($module['module_type']) . ')...',
-                                    'args'      => [$taskName, $module],
-                                ]
-                            );
-                            array_push($this->runProcessProgressMethods,
-                                [
-                                    'method'    => 'updateVersion-' . $module['id'] . '-' . strtolower(str_replace(' ', '', $module['name'])),
-                                    'text'      => 'Updating version for ' . $module['name'] . ' (' . ucfirst($module['module_type']) . ')...',
-                                    'args'      => [$taskName, $module],
-                                ]
-                            );
                         }
+
+                        if ($module['module_type'] === 'views' && $module['is_subview'] == false) {
+                            continue;
+                        }
+
+                        $this->addProgressMethods($this->runProcessProgressMethods, $module, $taskName, 'everything_else', false);
+                    }
+                }
+            } else if ($taskName === 'uninstall' && count($modulesTypes) > 0) {
+                foreach ($modulesTypes as $moduleType => $modules) {
+                    if ((is_array($modules) && count($modules) === 0) ||
+                        !is_array($modules)
+                    ) {
+                        continue;
+                    }
+
+                    foreach ($modules as $module) {
+                        array_push($this->runProcessProgressMethods,
+                            [
+                                'method'    => 'uninstallModule-' . $module['id'] . '-' . strtolower(str_replace(' ', '', $module['name'])),
+                                'text'      => 'Uninstalling module ' . $module['name'] . ' (' . ucfirst($module['module_type']) . ')...',
+                                'args'      => [$taskName, $module],
+                            ]
+                        );
+                    }
+                }
+            } else if ($taskName === 'remove' && count($modulesTypes) > 0) {
+                foreach ($modulesTypes as $moduleType => $modules) {
+                    if ((is_array($modules) && count($modules) === 0) ||
+                        !is_array($modules)
+                    ) {
+                        continue;
+                    }
+
+                    foreach ($modules as $module) {
+                        array_push($this->runProcessProgressMethods,
+                            [
+                                'method'    => 'removeModule-' . $module['id'] . '-' . strtolower(str_replace(' ', '', $module['name'])),
+                                'text'      => 'Removing module ' . $module['name'] . ' (' . ucfirst($module['module_type']) . ')...',
+                                'args'      => [$taskName, $module],
+                            ]
+                        );
                     }
                 }
             }
@@ -1046,6 +1657,16 @@ protected function registerRunProcessProgressMethods()
         $this->basepackages->progress->registerMethods($this->runProcessProgressMethods);
     }
 
+    protected function uninstallModule($args)
+    {
+        //
+    }
+
+    protected function removeModule($args)
+    {
+        //
+    }
+
     protected function initApi($data, $sink = null, $method = null)
     {
         if ($this->apiClient && $this->apiClientConfig) {
@@ -1171,454 +1792,90 @@ protected function getComposerJsonFile()
         }
     }
 
-    // protected function checkDependencies()
-    // {
-    //     if (count($this->modulesToProcess) === 0) {
-    //         return true;
-    //     }
-
-    //     // var_dump($this->modulesToProcess);die();
-    //     foreach ($this->modulesToProcess as $moduleName => $module) {
-    //         $this->preCheckResult[$moduleName] = [];
-    //         $this->preCheckResult[$moduleName]['module'] = $module['module'];
-    //         $this->preCheckResult[$moduleName]['result'] = 'success';
-    //         $this->preCheckResult[$moduleName]['logs'] = '';
-
-    //         $names = explode('-', $moduleName);
-
-    //         try {
-    //             $jsonFile = $this->helper->decode($this->localContent->read($module['location'] . 'Install/' . substr($names[1], 0, -1) . '.json'), true);
-    //         } catch (\throwable $e) {
-    //             $this->preCheckResult[$moduleName]['result'] = 'error';
-    //             $this->preCheckResult[$moduleName]['logs'] .= 'Reading module ' . $moduleName . ' install JSON file resulted in error. ';
-
-    //             continue;//move onto the next one.
-    //         }
-
-    //         // Make sure we have an entry for all module dependencies. Even if there are no dependencies, we need to make sure we have empty array for them.
-    //         if (!isset($jsonFile['dependencies']) ||
-    //             (isset($jsonFile['dependencies']) &&
-    //              (!isset($jsonFile['dependencies']['core']) ||
-    //               !isset($jsonFile['dependencies']['components']) ||
-    //               !isset($jsonFile['dependencies']['packages']) ||
-    //               !isset($jsonFile['dependencies']['middlewares']) ||
-    //               !isset($jsonFile['dependencies']['views'])))
-    //         ) {
-    //             $this->preCheckResult[$moduleName]['result'] = 'error';
-    //             $this->preCheckResult[$moduleName]['logs'] .= 'Reading module ' . $moduleName . ' dependencies resulted in error. ';
-
-    //             continue;//move onto the next one.
-    //         }
-
-    //         //Check Core dependency
-    //         if (Version::greaterThan($jsonFile['dependencies']['core']['version'], $this->core->getVersion())) {
-    //             //Lets check for latest release on Core as required version is greater than installed version.
-    //             $core = $this->modules->packages->getPackageByName('core');
-    //             $core = $this->modules->manager->updateModuleRepoDetails($core);
-
-    //             if ($core) {
-    //                 $this->preCheckResult[$moduleName]['result'] = 'warning';
-    //                 $this->preCheckResult[$moduleName]['logs'] .= 'Module ' . $moduleName . ' needs core version : ' . $core['update_version'] . '. Installed version of core is : ' . $core['version'] . '. Adding Core to list of updates. ';
-
-    //                 $this->preCheckResult['core'] = [];
-    //                 $this->preCheckResult['core']['module'] = $core;
-    //                 $this->preCheckResult['core']['result'] = 'warning';
-    //                 $name = $module['module']['name'];
-    //                 if (isset($module['module']['display_name'])) {
-    //                     $name = $module['module']['display_name'];
-    //                 }
-    //                 $this->preCheckResult['core']['logs'] = 'Added to queue as required by module : ' . $name . '. ';
-    //             }
-    //         }
-
-    //         //
-    //     }
-
-    //     var_dump($this->preCheckResult);die();
-    //     // $this->getLatestRepositoryModulesData();
-
-    //     ${$this->postData()['type']} =
-    //         $this->{$this->postData()['type']}->getById($this->postData()['id'])->getAllArr();
-
-    //     $dependencies =
-    //         json_decode(${$this->postData()['type']}['dependencies'], true);
-
-    //     $checkForDependencies = $this->checkRegisteredDependencies($dependencies);
-
-    //     if (is_array($checkForDependencies)) {
-    //         $this->packagesData->responseCode = 1;
-
-    //         $this->packagesData->responseMessage =
-    //             'Dependency ' . $checkForDependencies['name'] . ' not found!<br>' .
-    //             'Check repository ' . $checkForDependencies['repo'] . ' for further details.';
-
-    //         return $this->packagesData;
-    //     }
-
-    //     return true;
-    // }
-
-    // protected function checkRegisteredDependencies($dependencies)
-    // {
-    //     $found = true;
-
-    //     $this->dependenciesToDownload = [];
-
-    //     foreach ($dependencies as $dependencyKey => $dependencyValue) {
-    //         if ($dependencyKey === 'app') {
-    //             $dependencyKey = $dependencyKey . 's';
-    //         }
-
-    //         if (!isset($dependencyValue['name'])) { //if dependency is an array
-    //             foreach ($dependencyValue as $multiDependencyKey => $multiDependencyValue) {
-
-    //                 $thisDependency =
-    //                     $this->{$dependencyKey}->getAll(
-    //                         [
-    //                             'name' => $multiDependencyValue['name'],
-    //                             'repo' => $multiDependencyValue['repo'],
-    //                             'version' => $multiDependencyValue['version']
-    //                         ]
-    //                     );
-
-    //                 if (!$thisDependency) {
-
-    //                     $thisDependency =
-    //                         $this->{$dependencyKey}->getAll(
-    //                             [
-    //                                 'name' => $multiDependencyValue['name'],
-    //                                 'repo' => $multiDependencyValue['repo'],
-    //                                 'update_version' => $multiDependencyValue['version'],
-    //                             ]
-    //                         );
-
-    //                     if ($thisDependency) {
-
-    //                         if ($thisDependency[0]->get('update_available') === 1) {
-
-    //                             $multiDependencyValue['type'] = $dependencyKey;
-    //                             $multiDependencyValue['id'] = $thisDependency[0]->get('id');
-    //                             array_push($this->dependenciesToDownload, $multiDependencyValue);
-    //                         }
-
-    //                         $found = true;
-
-    //                     } else {
-    //                         $found = $multiDependencyValue;
-
-    //                         return $found;
-    //                     }
-    //                 } else {
-    //                     if ($thisDependency[0]->get('installed') === 0) {
-
-    //                         $multiDependencyValue['type'] = $dependencyKey;
-    //                         $multiDependencyValue['id'] = $thisDependency[0]->get('id');
-    //                         array_push($this->dependenciesToDownload, $multiDependencyValue);
-    //                     }
-
-    //                     $found = true;
-    //                 }
-    //             }
-    //         } else {
-
-    //             $thisDependency =
-    //                 $this->{$dependencyKey}->getAll(
-    //                     [
-    //                         'name' => $dependencyValue['name'],
-    //                         'repo' => $dependencyValue['repo'],
-    //                         'version' => $dependencyValue['version'],
-    //                     ]
-    //                 );
-
-    //             if (!$thisDependency) {
-
-    //                 $thisDependency =
-    //                     $this->{$dependencyKey}->getAll(
-    //                         [
-    //                             'name' => $dependencyValue['name'],
-    //                             'repo' => $dependencyValue['repo'],
-    //                             'update_version' => $dependencyValue['version'],
-    //                         ]
-    //                     );
-
-    //                     if ($thisDependency) {
-
-    //                         if ($thisDependency[0]->get('update_available') === 1) {
-
-    //                             $dependencyValue['type'] = $dependencyKey;
-    //                             $dependencyValue['id'] = $thisDependency[0]->get('id');
-    //                             array_push($this->dependenciesToDownload, $dependencyValue);
-
-    //                         }
-
-    //                         $found = true;
-
-    //                     } else {
-    //                         $found = $dependencyValue;
-
-    //                         return $found;
-    //                     }
-
-    //             } else {
-    //                 if ($thisDependency[0]->get('installed') === 0) {
-
-    //                     $dependencyValue['type'] = $dependencyKey;
-    //                     $dependencyValue['id'] = $thisDependency[0]->get('id');
-    //                     array_push($this->dependenciesToDownload, $dependencyValue);
-
-    //                 }
+    protected function deleteSourceFiles($args)
+    {
+        if ((bool) $this->queue['settings']['files']['deleteSourceFiles'] === false) {
+            return true;
+        }
 
-    //                 $found = true;
-    //             }
-    //         }
-    //     }
+        $taskName = $args[0];
+        $module = $args[1];
 
-    //     return $found;
-    // }
+        try {
+            $this->queue['results'][$taskName][$module['module_type']][$module['id']]['result'] = 'fail';
+            $resultQueueLogs = &$this->queue['results'][$taskName][$module['module_type']][$module['id']]['result_logs'];
 
+            $modulesToInstallOrUpdate = $this->modules->manager->getModuleInfo(
+                [
+                    'module_type'   => $module['module_type'],
+                    'module_id'     => $module['id']
+                ]
+            );
 
+            $scanDirs = [
+                'var/tmp/installer/' . $modulesToInstallOrUpdate['repo_details']['details']['name'] . '-' .
+                ($modulesToInstallOrUpdate['repo_details']['latestRelease']['name'] !== '' ? $modulesToInstallOrUpdate['repo_details']['latestRelease']['name'] : $modulesToInstallOrUpdate['repo_details']['latestRelease']['tag_name'])
+            ];
 
-    // protected function getLatestRepositoryModulesData()
-    // {
-    //     $repositories = getAllArr($this->repositories->getAll());
+            if (isset($module['is_public']) && $module['is_public'] == true) {
+                array_push($scanDirs,
+                    'var/tmp/installer/' . $modulesToInstallOrUpdate['repo_details']['details']['name'] . '-public-' .
+                    ($modulesToInstallOrUpdate['repo_details']['latestRelease']['name'] !== '' ? $modulesToInstallOrUpdate['repo_details']['latestRelease']['name'] : $modulesToInstallOrUpdate['repo_details']['latestRelease']['tag_name']));
+            }
 
-    //     if (count($repositories) > 0) {
-    //         $modules = $this->packages->use(Modules::class);
+            foreach ($scanDirs as $scanDir) {
+                $files = $this->basepackages->utils->scanDir($scanDir);
 
-    //         foreach ($repositories as $repositoryKey => $repositoryValue) {
-    //             $sync = $modules->syncRemoteWithLocal($repositoryValue['id']);
+                if (count($files['files']) > 0) {
+                    foreach ($files['files'] as $file) {
+                        $this->localContent->delete($file);
+                    }
+                }
 
-    //             if ($sync->packagesData['responseCode'] === 1) {
-    //                 $this->packagesData->responseCode = 1;
+                if (count($files['dirs']) > 0) {
+                    foreach ($files['dirs'] as $dir) {
+                        $this->localContent->deleteDirectory($dir);
+                    }
+                }
 
-    //                 $this->packagesData->responseMessage = 'Error Syncing with repository ' . $repositoryValue['name'];
+                $this->localContent->deleteDirectory($scanDir);
+            }
 
-    //                 return $this->packagesData;
-    //             }
-    //         }
-    //     }
-    // }
+            $this->queue['results'][$taskName][$module['module_type']][$module['id']]['result'] = 'pass';
+        } catch (UnableToListContents | UnableToDeleteDirectory | UnableToDeleteFile | \throwable $e) {
+            return $this->queueHasErrors(
+                $e->getMessage(),
+                $resultQueueLogs
+            );
+        }
 
-    // protected function createBackup()
-    // {
-    //     trace([$this->queue]);
-    //     $this->basepackages->backuprestore->init()->backup();
+        return true;
+    }
 
-        //
-        // $this->backupLocation = '.backups/';
-
-        // $now = new \DateTime('now');
-
-        // $this->zip->open(base_path($this->backupLocation . '/' . $now->format('Y_m_d_H_i_s') . '.zip'), $this->zip::CREATE);
-
-        // $framework = [];
-        // $framework['dir'] = [];
-        // $framework['file'] = [];
-
-        // $rootContents = $this->localContent->listContents('/');
-
-        // foreach ($rootContents as $rootKey => $rootValue) {
-        //     if ($rootValue['type'] === 'dir') {
-        //         if ($rootValue['path'] !== '.backups' &&
-        //             $rootValue['path'] !== '.git' &&
-        //             $rootValue['path'] !== 'vendor'
-        //         ) {
-        //             array_push($framework['dir'], $rootValue['path']);
-        //         }
-        //     } else if ($rootValue['type'] === 'file') {
-        //         if ($rootValue['path'] !== '.gitignore' &&
-        //             $rootValue['path'] !== '.htaccess.example'
-        //         ) {
-        //             array_push($framework['file'], $rootValue['path']);
-        //         }
-        //     }
-        // }
+    protected function emailReport()
+    {
+        //If Email is not configured, we cannot send report.
+        if (!$this->basepackages->email->setup()) {
+            return true;
+        }
 
-        // foreach ($framework['dir'] as $dirKey => $dirValue) {
-        //     $rootDirContents[$dirValue] = $this->localContent->listContents($dirValue, true);
-        // }
+        $addresses = explode(',', $this->queue['settings']['emailReport']);
 
-        // foreach ($rootDirContents as $rootDirContentsKey => $rootDirContentsValue) {
-        //     if (count($rootDirContentsValue) > 0) {
-        //         foreach ($rootDirContentsValue as $subDirectoryKey => $subDirectory) {
-        //             if ($subDirectory['type'] === 'dir') {
-        //                 $this->zip->addEmptyDir($subDirectory['dirname']);
-        //             } else if ($subDirectory['type'] === 'file') {
-        //                 $this->zip->addFile($subDirectory['path']);
-        //             }
-        //         }
-        //     } else {
-        //         $this->zip->addEmptyDir($rootDirContentsKey);
-        //     }
-        // };
-
-        // foreach ($framework['file'] as $fileKey => $fileValue) {
-        //     $this->zip->addFile($fileValue);
-        // }
+        return $this->addEmailToQueue($addresses);
+    }
 
-        // $this->zip->close();
-
-        // $this->packagesData->backupFile = $now->format('Y_m_d_H_i_s') . '.zip';
-
-        // $this->packagesData->responseCode = 0;
-    // }
-
-    // protected function processInstall()
-    // {
-    //     foreach ($this->modulesToInstall as $moduleToInstallKey => $moduleToInstall) {
-
-    //         $repoNameArr = explode('/', $moduleToInstall['repo']);
-    //         $repoName = end($repoNameArr);
-
-    //         $this->downloadPackagesAndDependencies($moduleToInstall);
-
-    //         $contents = $this->extractDownloadedPackagesAndDependencies(
-    //             $moduleToInstall['name'],
-    //             $repoName,
-    //             $moduleToInstall['type']
-    //         );
-
-    //         if ($contents) {
-    //             $files = $this->copyFilesToDestination(
-    //                 $contents,
-    //                 $moduleToInstall['name'],
-    //                 $repoName,
-    //                 $moduleToInstall['type']
-    //             );
-    //         }
-
-
-    //         $this->{$moduleToInstall['type']}->update(
-    //             [
-    //                 'id'        => $moduleToInstall['id'],
-    //                 'installed' => 1,
-    //                 'files'     => json_encode($files),
-    //             ]
-    //         );
-    //     }
-    // }
-
-    // protected function processUpdate()
-    // {
-    //     $files = [];
-
-    //     foreach ($this->modulesToInstall as $moduleToInstallKey => $moduleToInstall) {
-    //         //
-    //         //Delete only files first
-    //         //Check if directory is empty, then delete directory
-    //         //check if directory is html_compiled, if so, then scan directory, delete all files first and then all directories.
-    //         //Copy all files.
-    //         //
-    //         var_dump(json_decode($this->{$moduleToInstall['type']}->getById($moduleToInstall['id'])->getAllArr()['files'], true));
-    //         // $repoNameArr = explode('/', $moduleToInstall['repo']);
-    //         // $repoName = end($repoNameArr);
-
-    //         // $this->downloadPackagesAndDependencies($moduleToInstall);
-
-    //         // $contents = $this->extractDownloadedPackagesAndDependencies(
-    //         //  $moduleToInstall['name'],
-    //         //  $repoName,
-    //         //  $moduleToInstall['type']
-    //         // );
-
-    //         // if ($contents) {
-    //         //  $files = $this->copyFilesToDestination(
-    //         //      $contents,
-    //         //      $moduleToInstall['name'],
-    //         //      $repoName,
-    //         //      $moduleToInstall['type']
-    //         //  );
-    //         // }
-
-
-    //         // $this->{$moduleToInstall['type']}->update(
-    //         //  [
-    //         //      'id'        => $moduleToInstall['id'],
-    //         //      'installed' => 1,
-    //         //      'files'     => json_encode($files),
-    //         //  ]
-    //         // );
-    //     }
-    // }
-
-    // protected function copyFilesToDestination($contents, $name, $repoName, $type)
-    // {
-    //     $installedFiles = [];
-    //     $installedFiles['dir'] = [];
-    //     $installedFiles['files'] = [];
-
-    //     foreach ($contents as $contentKey => $content) {
-    //         $destDir =
-    //             str_replace(
-    //                 $this->downloadLocation . '/' . strtolower($repoName) . '-master/',
-    //                 '',
-    //                 $content['dirname']
-    //             );
-
-    //         if ($content['type'] === 'dir') {
-
-    //             $this->localContent->createDirectory($destDir . '/' . $content['basename']);
-
-    //             array_push($installedFiles['dir'], $destDir . '/' . $content['basename']);
-
-    //         } else if ($content['type'] === 'file') {
-
-    //             if ($content['basename'] !== '.gitkeep') {
-
-    //                 $this->localContent->copy($content['path'], $destDir . '/' . $content['basename']);
-
-    //                 array_push($installedFiles['files'], $destDir . '/' . $content['basename']);
-    //             }
-
-    //         }
-    //     }
-
-    //     return $installedFiles;
-    //     // if ($type === 'components' || $type === 'packages' || $type === 'middlewares') {
-    //     //  if ($type === 'components') {
-    //     //      $this->localContent->write(
-    //     //          $type . '/'. $this->appName . '/Install/' . $this->componentName . '/files.info', json_encode($installedFiles)
-    //     //      );
-    //     //  } else if ($type === 'packages') {
-    //     //      $this->localContent->write(
-    //     //          $type . '/'. $this->appName . '/Install/' . $this->packageName . '/files.info', json_encode($installedFiles)
-    //     //      );
-    //     //  } else if ($type === 'middlewares') {
-    //     //      $this->localContent->write(
-    //     //          $type . '/'. $this->appName . '/Install/' . $this->middlewareName . '/files.info', json_encode($installedFiles)
-    //     //      );
-    //     //  }
-    //     // } else {
-    //     //  $this->localContent->write($type . '/'. $this->appName . '/files.info', json_encode($installedFiles));
-    //     // }
-    // }
-
-    // protected function deleteDownloads()
-    // {
-    //     $downloadsToDelete = $this->localContent->listContents('.downloads', true);
-
-    //     $downloadedFiles = [];
-    //     $downloadedFiles['dir'] = [];
-    //     $downloadedFiles['files'] = [];
-
-    //     foreach ($downloadsToDelete as $key => $value) {
-    //         if ($value['type'] === 'dir') {
-    //             array_push($downloadedFiles['dir'], $value['path']);
-    //         } else if ($value['type'] === 'file') {
-    //             array_push($downloadedFiles['files'], $value['path']);
-    //         }
-    //     }
-
-    //     if (count($downloadedFiles['files']) > 0) {
-    //         foreach ($downloadedFiles['files'] as $fileKey => $file) {
-    //             $this->localContent->delete($file);
-    //         }
-    //     }
-
-    //     if (count($downloadedFiles['dir']) > 0) {
-    //         foreach ($downloadedFiles['dir'] as $dirKey => $dir) {
-    //             $this->localContent->deleteDir($dir);
-    //         }
-    //     }
-    // }
+    protected function addEmailToQueue(array $addresses)
+    {
+        $emailData['app_id'] = $this->apps->getAppInfo()['id'];
+        $emailData['domain_id'] = $this->domains->getDomain()['id'];
+        $emailData['status'] = 1;
+        $emailData['priority'] = 1;
+        $emailData['confidential'] = 0;
+        $emailData['to_addresses'] = $addresses;
+        $emailData['subject'] = 'Queue Report for Queue ID: ' . $this->queue['id'];
+        //Move this to template in future.
+        $emailData['body'] = printArrayList($this->queue);
+
+        return $this->basepackages->emailqueue->addToQueue($emailData);
+    }
 }
\ No newline at end of file
diff --git a/system/Base/Providers/ModulesServiceProvider/Manager.php b/system/Base/Providers/ModulesServiceProvider/Manager.php
index f7ea240cd..76f292a63 100644
--- a/system/Base/Providers/ModulesServiceProvider/Manager.php
+++ b/system/Base/Providers/ModulesServiceProvider/Manager.php
@@ -68,12 +68,15 @@ public function saveModuleSettings($data)
 
     public function getModuleInfo($data)
     {
-        $moduleId = $data['module_id'];
-
-        if ($data['module_type'] === 'apptype') {
-            $module = $this->apps->types->getAppTypeById($data['module_id']);
-            $module['module_type'] = 'apptypes';
+        if (str_contains($data['module_type'], 'apptype')) {
+            if (is_int($data['module_id'])) {
+                $module = $this->apps->types->getAppTypeById($data['module_id']);
+            } else if (is_string($data['module_id'])) {
+                $module = $this->apps->types->getAppTypeByType($data['module_id']);
+            }
         } else {
+            $moduleId = $data['module_id'];
+
             if ($data['module_type'] === 'views' &&
                 str_contains($data['module_id'], '-public')
             ) {
@@ -115,7 +118,7 @@ public function getModuleInfo($data)
                 }
             }
 
-            if ($module['repo_details']) {
+            if (isset($module['repo_details'])) {
                 if (is_string($module['repo_details'])) {
                     try {
                         $module['repo_details'] = $this->helper->decode($module['repo_details'], true);
@@ -125,6 +128,39 @@ public function getModuleInfo($data)
                 }
             }
 
+            if (isset($module['required_by'])) {
+                if (is_string($module['required_by'])) {
+                    try {
+                        $module['required_by'] = $this->helper->decode($module['required_by'], true);
+
+                    } catch (\Exception $e) {
+                        $module['required_by'] = [];
+                    }
+                }
+
+                if (count($module['required_by']) > 0) {
+                    $requiredModules = [];
+                    foreach ($module['required_by'] as $requiredModuleType => $requiredModuleArr) {
+                        if (!isset($requiredModules[$requiredModuleType])) {
+                            $requiredModules[$requiredModuleType] = [];
+                        }
+
+                        if (count($requiredModuleArr) > 0) {
+                            foreach ($requiredModuleArr as $requiredModuleKey => $requiredModuleId) {
+                                $requiredModuleMethod = 'get' . ucfirst(substr($requiredModuleType, 0, -1)) . 'ById';
+                                $requiredModule = $this->modules->{$requiredModuleType}->$requiredModuleMethod($requiredModuleId);
+
+                                if ($requiredModule) {
+                                    array_push($requiredModules[$requiredModuleType], $requiredModule['display_name'] ?? $requiredModule['name']);
+                                }
+                            }
+                        }
+                    }
+
+                    $module['required_by'] = $requiredModules;
+                }
+            }
+
             $this->addResponse('Module information success.',0, ['module' => $module]);
 
             return $module;
@@ -177,6 +213,15 @@ public function updateModuleRepoDetails($module, $data = null)
 
                 $module['repo_details']['details'] = $responseArr;
 
+                $repoArr = explode('/', $module['repo']);
+                $names = explode('-', $this->helper->last($repoArr));
+
+                if (count($names) === 1) {
+                    if (!isset($module['module_type'])) {
+                        $module['module_type'] = 'apptypes';
+                    }
+                }
+
                 $this->remoteModules[$module['module_type']] = [$responseArr];
 
                 $latestRelease = $this->moduleNeedsUpgrade($responseArr, $module);
@@ -185,9 +230,14 @@ public function updateModuleRepoDetails($module, $data = null)
                     $module['repo_details']['latestRelease'] = $latestRelease;
                     $module['update_available'] = '1';
                     $module['update_version'] = $module['repo_details']['latestRelease']['name'];
+                    $latestReleaseJson = $this->getRemoteModuleJson($module['module_type'], $module, true);
+
+                    if ($latestReleaseJson) {
+                        $module['repo_details']['latestRelease']['moduleJson'] = $this->remoteModulesJson[$module['module_type']][$module['name']];
+                    }
                 }
 
-                if ($module['module_type'] === 'apptypes') {
+                if (str_contains($module['module_type'], 'apptype')) {
                     $this->apps->types->update($module);
                 } else {
                     $this->modules->{$module['module_type']}->update($module);
@@ -303,22 +353,27 @@ public function getRepositoryModules($data = [])
         }
 
         if (isset($data['api_id'])) {
-            $localModules['components'] = $this->modules->components->init(true)->getComponentsByApiId($data['api_id']);
-            $localModules['middlewares'] = $this->modules->middlewares->init(true)->getMiddlewaresByApiId($data['api_id']);
-            $localModules['packages'] = $this->modules->packages->init(true)->getPackagesByApiId($data['api_id']);
-            $localModules['views'] = $this->modules->views->init(true)->getViewsByApiId($data['api_id']);
-            $localModules['bundles'] = $this->modules->bundles->init(true)->getBundlesByApiId($data['api_id']);
+            $localModules['components'] = msort($this->modules->components->init(true)->getComponentsByApiId($data['api_id']), 'name');
+            $localModules['middlewares'] = msort($this->modules->middlewares->init(true)->getMiddlewaresByApiId($data['api_id']), 'name');
+            $localModules['packages'] = msort($this->modules->packages->init(true)->getPackagesByApiId($data['api_id']), 'name');
+            $localModules['views'] = msort($this->modules->views->init(true)->getViewsByApiId($data['api_id']), 'name');
+            $localModules['bundles'] = msort($this->modules->bundles->init(true)->getBundlesByApiId($data['api_id']), 'name');
         } else {
-            $localModules['components'] = $this->modules->components->init(true)->components;
-            $localModules['middlewares'] = $this->modules->middlewares->init(true)->middlewares;
-            $localModules['packages'] = $this->modules->packages->init(true)->packages;
-            $localModules['views'] = $this->modules->views->init(true)->views;
-            $localModules['bundles'] = $this->modules->bundles->init(true)->bundles;
+            $localModules['components'] = msort($this->modules->components->init(true)->components, 'name');
+            $localModules['middlewares'] = msort($this->modules->middlewares->init(true)->middlewares, 'name');
+            $localModules['packages'] = msort($this->modules->packages->init(true)->packages, 'name');
+            $localModules['views'] = msort($this->modules->views->init(true)->views, 'name');
+            $localModules['bundles'] = msort($this->modules->bundles->init(true)->bundles, 'name');
         }
+        $localModules['externals'] = msort($this->modules->externals->init(true)->externals, 'developer');
 
         foreach ($localModules as $moduleType => $modulesArr) {
             if (count($modulesArr) > 0) {
                 foreach ($modulesArr as $moduleArr) {
+                    if ($moduleArr['module_type'] === 'externals') {
+                        $moduleArr['api_id'] = 1;
+                    }
+
                     if (!isset($sortedModules[$moduleArr['api_id']])) {
                         continue;
                     }
@@ -326,7 +381,7 @@ public function getRepositoryModules($data = [])
                     if (!isset($sortedModules[$moduleArr['api_id']]['childs'][$moduleArr['app_type']])) {
                         $sortedModules[$moduleArr['api_id']]['childs'][$moduleArr['app_type']] = [];
                         $sortedModules[$moduleArr['api_id']]['childs'][$moduleArr['app_type']]['name'] = $moduleArr['app_type'];
-                        $sortedModules[$moduleArr['api_id']]['childs'][$moduleArr['app_type']]['data']['type'] = 'app';
+                        $sortedModules[$moduleArr['api_id']]['childs'][$moduleArr['app_type']]['data']['type'] = 'apptype';
                     }
 
                     if (!isset($sortedModules[$moduleArr['api_id']]['childs'][$moduleArr['app_type']]['childs'][$moduleArr['module_type']])) {
@@ -341,6 +396,12 @@ public function getRepositoryModules($data = [])
                         $sortedModules[$moduleArr['api_id']]['childs'][$moduleArr['app_type']]['childs'][$moduleArr['module_type']]['childs'][$moduleArr['category']] = [];
                         $sortedModules[$moduleArr['api_id']]['childs'][$moduleArr['app_type']]['childs'][$moduleArr['module_type']]['childs'][$moduleArr['category']]['name'] = $moduleArr['category'];
                         $sortedModules[$moduleArr['api_id']]['childs'][$moduleArr['app_type']]['childs'][$moduleArr['module_type']]['childs'][$moduleArr['category']]['data']['type'] = 'category';
+                    } else if (isset($moduleArr['developer']) &&
+                               !isset($sortedModules[$moduleArr['api_id']]['childs'][$moduleArr['app_type']]['childs'][$moduleArr['module_type']]['childs'][$moduleArr['developer']])
+                    ) {
+                        $sortedModules[$moduleArr['api_id']]['childs'][$moduleArr['app_type']]['childs'][$moduleArr['module_type']]['childs'][$moduleArr['developer']] = [];
+                        $sortedModules[$moduleArr['api_id']]['childs'][$moduleArr['app_type']]['childs'][$moduleArr['module_type']]['childs'][$moduleArr['developer']]['name'] = $moduleArr['developer'];
+                        $sortedModules[$moduleArr['api_id']]['childs'][$moduleArr['app_type']]['childs'][$moduleArr['module_type']]['childs'][$moduleArr['developer']]['data']['type'] = 'developer';
                     }
 
                     $module['id'] = $moduleArr['id'];
@@ -351,7 +412,11 @@ public function getRepositoryModules($data = [])
                     $module['data']['apiid'] = $moduleArr['api_id'];
                     $module['data']['apptype'] = $moduleArr['app_type'];
                     $module['data']['moduletype'] = $moduleArr['module_type'];
-                    $module['data']['modulecategory'] = $moduleArr['category'] ?? '-';
+                    if ($moduleArr['module_type'] === 'externals') {
+                        $module['data']['modulecategory'] = $moduleArr['developer'] ?? '-';
+                    } else {
+                        $module['data']['modulecategory'] = $moduleArr['category'] ?? '-';
+                    }
                     $module['data']['moduleid'] = $moduleArr['module_type'] . '-' . $moduleArr['id'];
                     $module['data']['installed'] = $moduleArr['installed'] ?? 0;
                     $module['data']['update_available'] = $moduleArr['update_available'];
@@ -377,6 +442,8 @@ public function getRepositoryModules($data = [])
 
                     if (isset($moduleArr['category'])) {
                         $sortedModules[$moduleArr['api_id']]['childs'][$moduleArr['app_type']]['childs'][$moduleArr['module_type']]['childs'][$moduleArr['category']]['childs'][$module['data']['moduleid']] = $module;
+                    } else if ($moduleArr['module_type'] === 'externals') {
+                        $sortedModules[$moduleArr['api_id']]['childs'][$moduleArr['app_type']]['childs'][$moduleArr['module_type']]['childs'][$moduleArr['developer']]['childs'][$module['data']['moduleid']] = $module;
                     } else {
                         $sortedModules[$moduleArr['api_id']]['childs'][$moduleArr['app_type']]['childs'][$moduleArr['module_type']]['childs'][$module['data']['moduleid']] = $module;
                     }
@@ -463,6 +530,8 @@ public function syncRemoteWithLocal($data)
                 return true;
             }
         } catch (ClientException | \throwable $e) {
+            //To troubleshoot sync errors
+            // trace([$e]);
             $this->addResponse($e->getMessage(), 1);
 
             return false;
@@ -578,7 +647,7 @@ protected function getRemoteModules()
             return true;
         }
 
-        $this->addResponse('Unable to Sync with remote server', 1);
+        $this->addResponse('Unable to sync with remote or remote has no repositories!', 1);
 
         return false;
     }
@@ -636,7 +705,7 @@ protected function getRemoteModule($moduleName)
 
     protected function getRemoteModuleJson($moduleType, $module, $onlyJson = false)
     {
-        if ($moduleType === 'apptypes') {
+        if (str_contains($moduleType, 'apptype')) {
             $jsonFileName = 'Install/type.json';
         } else {
             if ($moduleType === 'views' || $moduleType === 'bundles') {//remove "s" from the name
@@ -647,6 +716,8 @@ protected function getRemoteModuleJson($moduleType, $module, $onlyJson = false)
                 }
 
                 $jsonFileName = substr($moduleType, 0, -1) . '.json';
+            } else if ($moduleType === 'packages' && $module['name'] === 'Core') {
+                $jsonFileName = 'system/Base/Installer/Packages/Setup/Register/Modules/Packages/Providers/Core/package.json';
             } else {
                 $jsonFileName = 'Install/' . substr($moduleType, 0, -1) . '.json';
             }
@@ -662,10 +733,18 @@ protected function getRemoteModuleJson($moduleType, $module, $onlyJson = false)
             $method = 'reposGetContent';
         }
 
+        if (isset($module['html_url'])) {
+            $moduleRepoArr = explode('/', $module['html_url']);
+        } else if (isset($module['repo'])) {
+            $moduleRepoArr = explode('/', $module['repo']);
+        } else {
+            return true;
+        }
+
         $args =
             [
                 $this->apiClientConfig['org_user'],
-                $module['name'],
+                $this->helper->last($moduleRepoArr),
                 $jsonFileName,
                 $this->apiClientConfig['branch']
             ];
@@ -718,7 +797,7 @@ protected function updateRemoteModulesToDB()
                         $this->counter['updates']['count'] = 0;
                     }
 
-                    if ($remoteModulesType === 'apptypes') {
+                    if (str_contains($remoteModulesType, 'apptype')) {
                         $this->apps->types->update($updateRemotePackage);
                     } else {
                         $this->modules->{$remoteModulesType}->update($updateRemotePackage);
@@ -770,7 +849,7 @@ protected function updateRemoteModulesToDB()
 
                     $registerRemotePackage['api_id'] = $this->apiClientConfig['id'];
 
-                    if ($remoteModulesType === 'apptypes') {
+                    if (str_contains($remoteModulesType, 'apptype')) {
                         $this->apps->types->add($registerRemotePackage);
                     } else {
                         if ($registerRemotePackage['module_type'] === 'components') {
@@ -825,7 +904,7 @@ protected function findRemoteInLocal($remoteModules, $remoteModulesType)
                 $repoUrl = $remoteModule['html_url'];
             }
 
-            if ($remoteModulesType === 'apptypes') {
+            if (str_contains($remoteModulesType, 'apptype')) {
                 $localModule = $this->apps->types->getAppTypeByRepo($repoUrl);
             } else {
                 $moduleMethod = 'get' . ucfirst(substr($remoteModulesType, 0, -1)) . 'ByRepo';
@@ -839,14 +918,17 @@ protected function findRemoteInLocal($remoteModules, $remoteModulesType)
                 $moduleNeedsUpgrade = $this->moduleNeedsUpgrade($remoteModule, $localModule);
 
                 if ($moduleNeedsUpgrade) {
+                    $localModule['repo_details']['latestRelease'] = $moduleNeedsUpgrade;
+
                     if ($this->getRemoteModuleJson($remoteModulesType, $localModule, true)) {
                         if (isset($this->remoteModulesJson[$remoteModulesType][$remoteModule['name']])) {
+                            $localModuleVersion = $localModule['version'];
                             $localModule = array_merge($localModule, $this->remoteModulesJson[$remoteModulesType][$remoteModule['name']]);
+                            $localModule['version'] = $localModuleVersion;
+                            $localModule['repo_details']['latestRelease']['moduleJson'] = $this->remoteModulesJson[$remoteModulesType][$remoteModule['name']];
                         }
                     }
 
-                    $localModule['repo_details']['latestRelease'] = $moduleNeedsUpgrade;
-
                     if (isset($localModule['installed']) && $localModule['installed'] == '0') {
                         $localModule['version'] = $moduleNeedsUpgrade['name'];
                     } else if (isset($localModule['installed']) && $localModule['installed'] == '1') {
diff --git a/system/Base/Providers/ModulesServiceProvider/MenuInstaller.php b/system/Base/Providers/ModulesServiceProvider/MenuInstaller.php
new file mode 100644
index 000000000..1dbdf239a
--- /dev/null
+++ b/system/Base/Providers/ModulesServiceProvider/MenuInstaller.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace System\Base\Providers\ModulesServiceProvider;
+
+use League\Flysystem\FilesystemException;
+use League\Flysystem\UnableToCheckExistence;
+use League\Flysystem\UnableToReadFile;
+use System\Base\BasePackage;
+
+class MenuInstaller extends BasePackage
+{
+    public function installMenu($componentClass)
+    {
+        try {
+            $file = 'apps/' . implode('/', array_slice(explode('\\', get_class($componentClass)), 1, -1)) . '/component.json';
+
+            if ($this->localContent->fileExists($file)) {
+                $installComponentJsonFile = $this->helper->decode($this->localContent->read($file), true);
+
+                if (!isset($installComponentJsonFile['menu']) ||
+                    (isset($installComponentJsonFile['menu']) && (bool) $installComponentJsonFile['menu'] === false)
+                ) {
+                    return true;
+                }
+
+                $menu = $this->basepackages->menus->getMenusByRouteForAppType($installComponentJsonFile['route'], $installComponentJsonFile['app_type']);
+
+                if ($menu) {
+                    $this->basepackages->menus->updateMenu($menu['id'], $installComponentJsonFile);
+                } else {
+                    $this->basepackages->menus->addMenu($installComponentJsonFile);
+                }
+            }
+        } catch (FilesystemException | UnableToCheckExistence | UnableToReadFile | \throwable $e) {
+            trace([$e]);
+            throw $e;
+        }
+
+        return true;
+    }
+}
\ No newline at end of file
diff --git a/system/Base/Providers/ModulesServiceProvider/Modules.php b/system/Base/Providers/ModulesServiceProvider/Modules.php
index 4bed3efee..eb3844e33 100644
--- a/system/Base/Providers/ModulesServiceProvider/Modules.php
+++ b/system/Base/Providers/ModulesServiceProvider/Modules.php
@@ -4,14 +4,15 @@
 
 use System\Base\Providers\ModulesServiceProvider\Installer;
 use System\Base\Providers\ModulesServiceProvider\Manager;
-use System\Base\Providers\ModulesServiceProvider\Queues;
 use System\Base\Providers\ModulesServiceProvider\Modules\Bundles;
 use System\Base\Providers\ModulesServiceProvider\Modules\Components;
+use System\Base\Providers\ModulesServiceProvider\Modules\Externals;
 use System\Base\Providers\ModulesServiceProvider\Modules\Middlewares;
 use System\Base\Providers\ModulesServiceProvider\Modules\Packages;
 use System\Base\Providers\ModulesServiceProvider\Modules\Repositories;
 use System\Base\Providers\ModulesServiceProvider\Modules\Views;
 use System\Base\Providers\ModulesServiceProvider\Modules\Views\ViewsSettings;
+use System\Base\Providers\ModulesServiceProvider\Queues;
 
 class Modules
 {
@@ -29,6 +30,8 @@ class Modules
 
 	protected $bundles;
 
+	protected $externals;
+
 	protected $manager;
 
 	protected $installer;
@@ -99,6 +102,13 @@ protected function initBundles()
 		return $this->bundles;
 	}
 
+	protected function initExternals()
+	{
+		$this->externals = (new Externals())->init();
+
+		return $this->externals;
+	}
+
 	protected function initManager()
 	{
 		$this->manager = (new Manager())->init();
diff --git a/system/Base/Providers/ModulesServiceProvider/Modules/Externals.php b/system/Base/Providers/ModulesServiceProvider/Modules/Externals.php
new file mode 100644
index 000000000..f6139f0e7
--- /dev/null
+++ b/system/Base/Providers/ModulesServiceProvider/Modules/Externals.php
@@ -0,0 +1,42 @@
+<?php
+
+namespace System\Base\Providers\ModulesServiceProvider\Modules;
+
+use System\Base\BasePackage;
+use System\Base\Providers\ModulesServiceProvider\Modules\Model\ModulesExternals;
+
+class Externals extends BasePackage
+{
+    protected $modelToUse = ModulesExternals::class;
+
+    public $externals;
+
+    public function init(bool $resetCache = false)
+    {
+        $this->getAll($resetCache);
+
+        return $this;
+    }
+
+    public function getExternalById($id)
+    {
+        foreach($this->externals as $external) {
+            if ($external['id'] == $id) {
+                return $external;
+            }
+        }
+
+        return false;
+    }
+
+    public function getExternalByName($name)
+    {
+        foreach($this->externals as $external) {
+            if ($external['name'] == $name) {
+                return $external;
+            }
+        }
+
+        return false;
+    }
+}
\ No newline at end of file
diff --git a/system/Base/Providers/ModulesServiceProvider/Modules/Model/ModulesExternals.php b/system/Base/Providers/ModulesServiceProvider/Modules/Model/ModulesExternals.php
new file mode 100644
index 000000000..d65fc0734
--- /dev/null
+++ b/system/Base/Providers/ModulesServiceProvider/Modules/Model/ModulesExternals.php
@@ -0,0 +1,42 @@
+<?php
+
+namespace System\Base\Providers\ModulesServiceProvider\Modules\Model;
+
+use System\Base\BaseModel;
+
+class ModulesExternals extends BaseModel
+{
+    public $id;
+
+    public $developer;
+
+    public $name;
+
+    public $display_name;
+
+    public $description;
+
+    public $module_type;
+
+    public $app_type;
+
+    public $abandoned;
+
+    public $version;
+
+    public $patches;
+
+    public $installed;
+
+    public $required_by;
+
+    public $update_available;
+
+    public $update_version;
+
+    public $updated_by;
+
+    public $updated_on;
+
+    public $notification_subscriptions;
+}
\ No newline at end of file
diff --git a/system/Base/Providers/ModulesServiceProvider/Modules/Views.php b/system/Base/Providers/ModulesServiceProvider/Modules/Views.php
index 4956386bf..fb375db0b 100644
--- a/system/Base/Providers/ModulesServiceProvider/Modules/Views.php
+++ b/system/Base/Providers/ModulesServiceProvider/Modules/Views.php
@@ -406,12 +406,16 @@ public function getViewsForCategory($category)
         return $views;
     }
 
-    public function getViewsForAppType($appType)
+    public function getViewsForAppType($appType, $includeSubViews = true)
     {
         $views = [];
 
         foreach($this->views as $view) {
             if ($view['app_type'] === $appType) {
+                if ($view['is_subview'] && !$includeSubViews) {
+                    continue;
+                }
+
                 $views[$view['id']] = $view;
             }
         }
diff --git a/system/Base/Providers/ModulesServiceProvider/Queues.php b/system/Base/Providers/ModulesServiceProvider/Queues.php
index 6618cc1eb..9a32e3fac 100644
--- a/system/Base/Providers/ModulesServiceProvider/Queues.php
+++ b/system/Base/Providers/ModulesServiceProvider/Queues.php
@@ -36,6 +36,19 @@ public function getActiveQueue()
 
         $queue = $queue->toArray();
 
+        if (isset($queue['prechecked_by']) && $queue['prechecked_by'] !== 0) {
+            $account = $this->basepackages->accounts->getAccountById($queue['prechecked_by']);
+            if ($account) {
+                $queue['prechecked_by'] = $account['email'];
+            }
+        }
+        if (isset($queue['processed_by']) && $queue['processed_by'] !== 0) {
+            $account = $this->basepackages->accounts->getAccountById($queue['processed_by']);
+            if ($account) {
+                $queue['processed_by'] = $account['email'];
+            }
+        }
+
         return $queue;
     }
 
@@ -71,8 +84,9 @@ protected function addActiveQueue()
                             'password_protect'          => $this->basepackages->utils->generateNewPassword()['password'],
                             'notes'                     => '',
                         ],
-                    'rsync'                             =>
+                    'files'                             =>
                         [
+                            'deleteSourceFiles'         => false,
                             'deleteDestinationFiles'    => false
                         ],
                     'emailReport'                       => $this->access->auth->account()['email']
@@ -216,40 +230,18 @@ public function saveQueueSettings($data)
             return false;
         }
 
-        $noOptions = true;
-        array_walk($data['settings']['backupSettings'], function(&$setting, $index) use (&$noOptions) {
-            if ($index === 'notes' ||
-                $index === 'password_protect'
+        if ($data['settings']['backupSettings']['backup'] == 'true') {
+            if ($data['settings']['backupSettings']['keys'] === true &&
+                $data['settings']['backupSettings']['password_protect'] === ''
             ) {
-                return;
-            }
+                $this->addResponse('Password is required if keys are being backed up!', 1);
 
-            if ($setting !== '') {
-                if ($setting == 'true') {
-                    $setting = true;
-                    $noOptions = false;
-                } else {
-                    $setting = false;
-                }
-            } else {
-                $setting = false;
+                return false;
             }
-        });
-
-        if ($data['settings']['backupSettings']['keys'] === true &&
-            $data['settings']['backupSettings']['password_protect'] === ''
-        ) {
-            $this->addResponse('Password is required if keys are being backed up!', 1);
-
-            return false;
-        }
 
-        if ($noOptions) {//No option selected disables backup.
-            $data['settings']['backupSettings']['backup'] = false;
-            $data['settings']['backupSettings']['password_protect'] = '';
-            $data['settings']['backupSettings']['notes'] = '';
-        } else {
             $data['settings']['backupSettings']['backup'] = true;
+        } else {
+            $data['settings']['backupSettings']['backup'] = false;
         }
 
         if ($data['settings']['emailReport'] !== '') {
@@ -278,7 +270,7 @@ public function saveQueueSettings($data)
             }
         }
 
-        array_walk($data['settings']['rsync'], function(&$setting, $index) {
+        array_walk($data['settings']['files'], function(&$setting, $index) {
             if ($setting !== '') {
                 if ($setting == 'true') {
                     $setting = true;
@@ -410,8 +402,12 @@ public function analyseQueue(&$queue = null, $reAnalyse = false)
                 }
 
                 foreach ($moduleIds as $moduleIdKey => $moduleId) {
-                    $moduleMethod = 'get' . ucfirst(substr($moduleType, 0, -1)) . 'ById';
-                    $module = $this->modules->$moduleType->$moduleMethod($moduleId);
+                    if ($moduleType === 'apptype') {
+                        $module = $this->apps->types->getAppTypeById($moduleId);
+                    } else {
+                        $moduleMethod = 'get' . ucfirst(substr($moduleType, 0, -1)) . 'ById';
+                        $module = $this->modules->$moduleType->$moduleMethod($moduleId);
+                    }
 
                     if (!$module) {
                         unset($queue['tasks'][$taskName][$moduleType][$moduleIdKey]);
@@ -439,7 +435,6 @@ public function analyseQueue(&$queue = null, $reAnalyse = false)
 
                                             if ($bundleModule) {
                                                 $this->compareAndAddToQueue($bundles, $bundleModule, $taskName, $bundleType);
-                                                // $this->addToQueueTasksAndResults($taskName, $bundleType, $bundleModule);
                                             } else {
                                                 $this->addToQueueTasksAndResults($taskName, $bundleType, $bundles, null, 'fail', $this->getApiClientServices($bundles, true));
                                             }
@@ -472,61 +467,69 @@ public function analyseQueue(&$queue = null, $reAnalyse = false)
                             }
                         }
                     } else {
-                        if (isset($module['dependencies']) && is_string($module['dependencies'])) {
-                            $module['dependencies'] = $this->helper->decode($module['dependencies'], true);
+                        if ($taskName === 'update' &&
+                            isset($module['repo_details']['latestRelease']['moduleJson']['dependencies'])
+                        ) {
+                            $module['dependencies'] = $module['repo_details']['latestRelease']['moduleJson']['dependencies'];
                         }
 
-                        foreach ($module['dependencies'] as $dependencyType => $dependencies) {
-                            if (count($dependencies) === 0) {
-                                continue;
+                        if (isset($module['dependencies'])) {
+                            if (is_string($module['dependencies'])) {
+                                $module['dependencies'] = $this->helper->decode($module['dependencies'], true);
                             }
 
-                            if ($taskName === 'uninstall' || $taskName === 'remove') {
-                                continue;//we dont process dependencies for anything other than install/update
-                            }
+                            foreach ($module['dependencies'] as $dependencyType => $dependencies) {
+                                if (count($dependencies) === 0) {
+                                    continue;
+                                }
+
+                                if ($taskName === 'uninstall' || $taskName === 'remove') {
+                                    continue;//we dont process dependencies for anything other than install/update
+                                }
 
-                            if ($dependencyType === 'composer' || $dependencyType === 'external') {
-                                $this->checkComposerAndAddToQueue($dependencies, $module);
+                                if ($dependencyType === 'composer' || $dependencyType === 'external') {
+                                    $this->checkComposerAndAddToQueue($dependencies, $module);
 
-                                continue;
-                            }
+                                    continue;
+                                }
 
-                            if ($dependencyType === 'core') {
-                                $core = $this->modules->packages->getPackageByRepo($dependencies['repo']);
+                                if ($dependencyType === 'core') {
+                                    $core = $this->modules->packages->getPackageByRepo($dependencies['repo']);
 
-                                $this->compareAndAddToQueue($dependencies, $core, 'first', 'packages');
-                            } else if ($dependencyType === 'apptype') {
-                                $appType = $this->apps->types->getAppTypeByRepo($dependencies['repo']);
+                                    $this->compareAndAddToQueue($dependencies, $core, 'first', 'packages');
+                                } else if ($dependencyType === 'apptype') {
+                                    $appType = $this->apps->types->getAppTypeByRepo($dependencies['repo']);
 
-                                if ($appType) {
-                                    $this->compareAndAddToQueue($dependencies, $appType, $taskName, $dependencyType);
+                                    if ($appType) {
+                                        $this->compareAndAddToQueue($dependencies, $appType, $taskName, $dependencyType);
+                                    } else {
+                                        $this->addToQueueTasksAndResults($taskName, $dependencyType, $dependencies, null, 'fail', $this->getApiClientServices($dependencies, true));
+                                    }
                                 } else {
-                                    $this->addToQueueTasksAndResults($taskName, $dependencyType, $dependencies, null, 'fail', $this->getApiClientServices($dependencies, true));
-                                }
-                            } else {
-                                if (count($dependencies) > 0) {
-                                    foreach ($dependencies as $dependency) {
-                                        if (!isset($this->queueTasks[$taskName][$dependencyType])) {
-                                            $this->queueTasks[$taskName][$dependencyType] = [];
-                                        }
+                                    if (count($dependencies) > 0) {
+                                        foreach ($dependencies as $dependency) {
+                                            if (!isset($this->queueTasks[$taskName][$dependencyType])) {
+                                                $this->queueTasks[$taskName][$dependencyType] = [];
+                                            }
 
-                                        $dependencyModuleMethod = 'get' . ucfirst(substr($dependencyType, 0, -1)) . 'ByRepo';
-                                        $dependencyModule = $this->modules->$dependencyType->$dependencyModuleMethod($dependency['repo']);
+                                            $dependencyModuleMethod = 'get' . ucfirst(substr($dependencyType, 0, -1)) . 'ByRepo';
+                                            $dependencyModule = $this->modules->$dependencyType->$dependencyModuleMethod($dependency['repo']);
 
-                                        if ($dependencyModule) {
-                                            $removeUninstallArr = ['remove', 'uninstall'];
+                                            if ($dependencyModule) {
+                                                $removeUninstallArr = ['remove', 'uninstall'];
 
-                                            foreach ($removeUninstallArr as $removeUninstall) {
-                                                if (isset($queue['tasks'][$removeUninstall][$dependencyType]) && in_array($dependencyModule['id'], $queue['tasks'][$removeUninstall][$dependencyType])) {
-                                                    $this->addToQueueTasksAndResults($taskName, $dependencyType, $dependencyModule, null, 'fail', 'Dependency is in ' . $removeUninstall . ' task, but is also required by module <strong>' . ($module['display_name'] ?? $module['name']) . '</strong>');
+                                                foreach ($removeUninstallArr as $removeUninstall) {
+                                                    if (isset($queue['tasks'][$removeUninstall][$dependencyType]) && in_array($dependencyModule['id'], $queue['tasks'][$removeUninstall][$dependencyType])) {
+                                                        $this->addToQueueTasksAndResults($taskName, $dependencyType, $dependencyModule, null, 'fail', 'Dependency is in ' . $removeUninstall . ' task, but is also required by module <strong>' . ($module['display_name'] ?? $module['name']) . '</strong>');
 
-                                                    continue 2;
+                                                        continue 2;
+                                                    }
                                                 }
-                                            }
 
-                                            $this->compareAndAddToQueue($dependency, $dependencyModule, $taskName, $dependencyType);
-                                        } else {
-                                            $this->addToQueueTasksAndResults($taskName, $dependencyType, $dependency, null, 'fail', $this->getApiClientServices($dependency, true));
+                                                $this->compareAndAddToQueue($dependency, $dependencyModule, $taskName, $dependencyType);
+                                            } else {
+                                                $this->addToQueueTasksAndResults($taskName, $dependencyType, $dependency, null, 'fail', $this->getApiClientServices($dependency, true));
+                                            }
                                         }
                                     }
                                 }
@@ -546,7 +549,7 @@ public function analyseQueue(&$queue = null, $reAnalyse = false)
                         ) {
                             $module['id'] = $module['id'] . '-public';
                             $module['display_name'] = $module['display_name'] . ' (Public)';
-                            // $module['name'] = ($module['display_name'] ?? $module['name']) . ' (Public)';
+                            $module['is_public'] = true;
                             $module['repo'] = $module['repo'] . '-public';
 
                             $this->addToQueueTasksAndResults($taskName, $moduleType, $module);
@@ -638,7 +641,7 @@ protected function compareAndAddToQueue($requestedModule, $installedModule, $tas
                     ) {
                         $installedModule['id'] = $installedModule['id'] . '-public';
                         $installedModule['display_name'] = $installedModule['display_name'] . ' (Public)';
-                        // $installedModule['name'] = ($installedModule['display_name'] ?? $installedModule['name']) . ' (Public)';
+                        $installedModule['is_public'] = true;
                         $installedModule['repo'] = $installedModule['repo'] . '-public';
 
                         if ($installedModule['installed'] != '1') {
@@ -671,7 +674,7 @@ protected function compareAndAddToQueue($requestedModule, $installedModule, $tas
                 ) {
                     $installedModule['id'] = $installedModule['id'] . '-public';
                     $installedModule['display_name'] = $installedModule['display_name'] . ' (Public)';
-                    // $installedModule['name'] = ($installedModule['display_name'] ?? $installedModule['name']) . ' (Public)';
+                    $installedModule['is_public'] = true;
                     $installedModule['repo'] = $installedModule['repo'] . '-public';
 
                     $this->addToQueueTasksAndResults('install', $moduleType, $installedModule);
@@ -710,7 +713,10 @@ protected function checkComposerAndAddToQueue($composerPackages, $module)
             $hasPatch = false;
 
             if ($composerJsonFile && isset($composerJsonFile['require'])) {
-                if (!isset($composerJsonFile['require'][$composerPackage])) {
+                if (!isset($composerJsonFile['require'][$composerPackage]) ||
+                    (isset($composerJsonFile['require'][$composerPackage]) &&
+                     $composerJsonFile['require'][$composerPackage] !== $version)
+                ) {
                     $composerJsonFile['require'][$composerPackage] = $version;
                     $installExternal = true;
                 }
@@ -773,7 +779,26 @@ protected function addToQueueTasksAndResults($taskName, $moduleType, $module, $v
             $this->queueTasks[$taskName][$moduleType][$module['id']]['name'] = $module['name'];
             $this->queueTasks[$taskName][$moduleType][$module['id']]['display_name'] = $module['display_name'] ?? $module['name'];
             $this->queueTasks[$taskName][$moduleType][$module['id']]['module_type'] = $moduleType;
-            $this->queueTasks[$taskName][$moduleType][$module['id']]['app_type'] = $module['app_type'];
+            if ($moduleType === 'components') {
+                $this->queueTasks[$taskName][$moduleType][$module['id']]['route'] = $module['route'];
+            }
+            if ($moduleType === 'views' && array_key_exists('is_subview', $module)) {
+                $this->queueTasks[$taskName][$moduleType][$module['id']]['is_subview'] = $module['is_subview'];
+                if ($module['is_subview']) {
+                    $repo = strtolower($this->helper->last(explode('/', $module['repo'])));
+                    $names = explode('-', $repo);
+                    array_pop($names);
+                    $this->queueTasks[$taskName][$moduleType][$module['id']]['base_view_name'] = $this->helper->last($names);
+                }
+            }
+            if ($moduleType === 'views' && array_key_exists('is_public', $module)) {
+                $this->queueTasks[$taskName][$moduleType][$module['id']]['is_public'] = $module['is_public'];
+            }
+            if ($moduleType !== 'external') {
+                if (array_key_exists('app_type', $module)) {
+                    $this->queueTasks[$taskName][$moduleType][$module['id']]['app_type'] = $module['app_type'];
+                }
+            }
             if (!$version) {
                 $this->queueTasks[$taskName][$moduleType][$module['id']]['version'] =
                     (($taskName === 'update' || $taskName === 'first') && $module['update_version'] && $module['update_version'] !== '') ? $module['version'] . ' -> ' . $module['update_version'] : $module['version'];