diff --git a/CHANGELOG.md b/CHANGELOG.md
index 259196fb6..0c1768e3e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,21 @@
 # Release Notes
 
 
+## Version 0.28.0
+**Release Date**: 20th October 2021
+### Features
+1. User / Groups View added
+    1. Allow the creation / definition of local Users
+    2. Allow the creation / definition of OCI Groups
+2. Bastion as a Service functionality added to main design canvas.
+3. Update cache functionality to store based on Configuration & Region.
+4. Add "OKIT Reference" Tag to all resources created via OKIT to allow for future expansion / reference.
+### Bug Fixes
+1. Add missing policy documentation to export to markdown.
+2. Fix Save As Template to add .json if not specified.
+3. Resolve issue where the default dhcp option would generate terraform with an empty search_domain_names if the server type was changed and then changed back.
+
+
 ## Version 0.27.1
 **Release Date**: 1st October 2021
 ### Bug Fixes
diff --git a/Dockerfile b/Dockerfile
index b8e3e3e88..5ee5a4768 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,10 +5,10 @@
 FROM oraclelinux:7-slim
 LABEL "provider"="Oracle" \
       "issues"="https://github.com/oracle/oci-designer-toolkit/issues" \
-      "version"="0.27.1" \
+      "version"="0.28.0" \
       "description"="OKIT Web Server Container." \
       "copyright"="Copyright (c) 2020, 2021, Oracle and/or its affiliates."
-SHELL ["/bin/bash", "-c"]
+# SHELL ["/bin/bash", "-c"]
 ENV PYTHONIOENCODING=utf8 \
     PYTHONPATH=":/okit/visualiser:/okit/okitweb:/okit" \
     FLASK_APP=okitweb \
diff --git a/README.md b/README.md
index 7e1019510..c29ef49f1 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Oracle Cloud Infrastructure Designer and Visualisation Toolkit [0.27.1](CHANGELOG.md#version-0.27.1)
+# Oracle Cloud Infrastructure Designer and Visualisation Toolkit [0.28.0](CHANGELOG.md#version-0.28.0)
 
 OCI designer and visualisation toolKIT (OKIT) is a browser based tool that allows the user to [design](https://www.ateam-oracle.com/introduction-to-okit-the-oci-designer-toolkit), 
 [deploy](https://www.ateam-oracle.com/introduction-to-okit-the-oci-designer-toolkit) and visualise ([introspect/query](https://www.ateam-oracle.com/the-oci-designer-toolkit-query-feature)) 
@@ -33,7 +33,7 @@ OCI environments through a graphical web based interface.
 
 ## Changes
 
-[Changes for the current release (0.27.1) are documented here.](CHANGELOG.md#version-0.27.1)
+[Changes for the current release (0.28.0) are documented here.](CHANGELOG.md#version-0.28.0)
 
 
 ## Releases
@@ -141,7 +141,7 @@ docker run -d --rm -p 80:80 --volume <USER HOME DIR>/.oci:/root/.oci --volume <U
 
 ##### Mount User Templates and Git Directories
 ```bash
-docker run -d --rm -p 80:80 --volume <USER HOME DIR>/.oci:/root/.oci --volume <USER HOME DIR>/.ssh:/root/.ssh --volume <PATH TO USER TEMPLATES DIR>:/okit/instance/user --volume <PATH TO GIT DIR>:/okit/instance/git --volume <PATH TO LOCAL DIR>:/okit/instance/local --name okit okit
+docker run -d --rm -p 80:80 --volume <USER HOME DIR>/.oci:/root/.oci --volume <USER HOME DIR>/.ssh:/root/.ssh --volume <PATH TO USER TEMPLATES DIR>:/okit/instance/templates/user --volume <PATH TO GIT DIR>:/okit/instance/git --volume <PATH TO LOCAL DIR>:/okit/instance/local --name okit okit
 ```
 
 Once started the Designer BUI can be accessed on [http://localhost/okit/designer](http://localhost/okit/designer)
diff --git a/containers/docker/8-slim/Dockerfile b/containers/docker/8-slim/Dockerfile
index 528f04cb7..b2ba73db3 100644
--- a/containers/docker/8-slim/Dockerfile
+++ b/containers/docker/8-slim/Dockerfile
@@ -8,7 +8,7 @@ LABEL "provider"="Oracle" \
       "version"="0.20.0" \
       "description"="OKIT Web Server Container." \
       "copyright"="Copyright (c) 2020, 2021, Oracle and/or its affiliates."
-SHELL ["/bin/bash", "-c"]
+# SHELL ["/bin/bash", "-c"]
 ENV PYTHONIOENCODING=utf8 \
     PYTHONPATH=":/okit/visualiser:/okit/okitweb:/okit" \
     FLASK_APP=okitweb \
diff --git a/containers/docker/Dockerfile b/containers/docker/Dockerfile
index 584982154..a80425a83 100644
--- a/containers/docker/Dockerfile
+++ b/containers/docker/Dockerfile
@@ -5,10 +5,10 @@
 FROM oraclelinux:7-slim
 LABEL "provider"="Oracle" \
       "issues"="https://github.com/oracle/oci-designer-toolkit/issues" \
-      "version"="0.27.1" \
+      "version"="0.28.0" \
       "description"="OKIT Web Server Container." \
       "copyright"="Copyright (c) 2020, 2021, Oracle and/or its affiliates."
-SHELL ["/bin/bash", "-c"]
+# SHELL ["/bin/bash", "-c"]
 ENV PYTHONIOENCODING=utf8 \
     PYTHONPATH=":/okit/visualiser:/okit/okitweb:/okit" \
     FLASK_APP=okitweb \
diff --git a/okitweb/okitOci.py b/okitweb/okitOci.py
index 4b69ce755..bbffd711d 100644
--- a/okitweb/okitOci.py
+++ b/okitweb/okitOci.py
@@ -426,11 +426,11 @@ def resourceTypes(profile):
         return 'Unknown Method', 500
 
 
-@bp.route('/dropdown/<string:profile>', methods=(['GET']))
-def dropdownQuery(profile):
+@bp.route('/dropdown/<string:profile>/<string:region>', methods=(['GET']))
+def dropdownQuery(profile, region):
     if request.method == 'GET':
         dropdown_query = OCIDropdownQuery(profile=profile)
-        dropdown_json = dropdown_query.executeQuery()
+        dropdown_json = dropdown_query.executeQuery([region])
         return dropdown_json
     else:
         return 'Unknown Method', 500
diff --git a/okitweb/okitWebDesigner.py b/okitweb/okitWebDesigner.py
index ee2b9ff6a..9c8d945f0 100644
--- a/okitweb/okitWebDesigner.py
+++ b/okitweb/okitWebDesigner.py
@@ -379,10 +379,12 @@ def template_save():
         instance_path = current_app.instance_path
         root_dir = request.json["root_dir"].strip('/')
         template_filename = request.json["template_file"].strip('/')
+        if not template_filename.endswith('.json'):
+            template_filename = f'{template_filename}.json'
         okit_json = request.json["okit_json"]
         git = request.json.get('git', False)
         git_commit_msg = request.json.get('git_commit_msg', '')
-        logger.info(f'Save Template : {root_dir}')
+        logger.info(f'Save Template : {root_dir} {template_filename}')
 
         template_dir = os.path.dirname(template_filename)
         full_dir = os.path.join(instance_path, root_dir, template_dir)
@@ -577,13 +579,13 @@ def saveas(savetype):
             return str(e), 500
 
 
-@bp.route('/dropdown/data/<string:profile>', methods=(['GET', 'POST']))
-def dropdownData(profile):
+@bp.route('/dropdown/data/<string:profile>/<string:region>', methods=(['GET', 'POST']))
+def dropdownData(profile, region):
     dropdown_dir = os.path.abspath(os.path.join(bp.static_folder, 'json', 'dropdown'))
     shipped_dropdown_file = os.path.abspath(os.path.join(dropdown_dir, 'dropdown.json'))
     # shipped_dropdown_file = os.path.abspath(os.path.join(bp.static_folder, 'json', 'dropdown', 'dropdown.json'))
     profile_dropdown_dir = os.path.abspath(os.path.join(dropdown_dir, 'profiles'))
-    profile_dropdown_file = os.path.abspath(os.path.join(profile_dropdown_dir, f'{profile}.json'))
+    profile_dropdown_file = os.path.abspath(os.path.join(profile_dropdown_dir, profile, f'{region}.json'))
     # Check if profile specific dropdown file exists if not use the default
     if request.method == 'GET':
         if os.path.exists(profile_dropdown_file):
diff --git a/okitweb/package.json b/okitweb/package.json
index 9ebcf759e..1c1299ea0 100644
--- a/okitweb/package.json
+++ b/okitweb/package.json
@@ -1,6 +1,6 @@
 {
   "name": "okitweb",
-  "version": "0.27.1",
+  "version": "0.28.0",
   "description": "OKIT Web application",
   "scripts": {},
   "author": "Oracle",
diff --git a/okitweb/static/okit/css/okit_console.css b/okitweb/static/okit/css/okit_console.css
index 6d20c8021..9e1b36fe4 100644
--- a/okitweb/static/okit/css/okit_console.css
+++ b/okitweb/static/okit/css/okit_console.css
@@ -108,9 +108,11 @@ summary:focus {
 }
 
 .hidden {
-    visibility: hidden;
+    position: absolute;
     display: none;
+    visibility: hidden;
     max-height: 0;
+    max-width: 0;
 }
 
 .okit-pointer-cursor {
@@ -137,7 +139,19 @@ summary:focus {
     background-position: center;
     background-repeat: no-repeat;
     background-size: 1em;
-    width: 2em;
+    width: 1em;
+    height: 1em;
+}
+
+.action-button-column {
+    min-width: 2em;
+}
+
+.cancel-overlay {
+    position: absolute;
+    right: 2px;
+    top: 2px;
+    z-index: 10;
 }
 
 /*
@@ -458,7 +472,7 @@ summary:focus {
  */
 
 .context-menu {
-    z-index:102;
+    z-index: 102;
     position: absolute;
     border: 1px rgba(37, 49, 65, 0.1) solid;
     padding: 2px;
@@ -607,7 +621,7 @@ li a.parent-item:hover {
     overflow: auto;
 }
 
-.okit-table .td > input[type="text"] {
+.okit-table .td > input[type="text"], input[type="email"], input[type="password"] {
     width: 100%;
 }
 
@@ -706,7 +720,7 @@ li a.parent-item:hover {
     right: 0;
     bottom: 0;
     left: 0;
-    z-index: 100;
+    z-index: 1000;
     padding: 15px 15px;
     background: rgba(0, 0, 0, 0.6);
     width: 100%;
@@ -716,7 +730,7 @@ li a.parent-item:hover {
 .okit-modal-dialog {
     display: flex;
     flex-direction: column;
-    z-index:1000;
+    z-index: 1000;
     position: absolute;
     left: 30%;
     top: 20%;
@@ -936,12 +950,12 @@ li a.parent-item:hover {
 }
 
 .okit-slide-hide-right {
-    /* padding: 0 !important;
+    padding: 0 !important;
     margin: 0 !important;;
     overflow: hidden !important;
     width: 0 !important;
     min-width: 0 !important;
-    max-width: 0!important; */
+    max-width: 0!important;
     transition: transform 0.25s;
     transform: translateX(100%);
 }
diff --git a/okitweb/static/okit/js/okit.js b/okitweb/static/okit/js/okit.js
index 6734aa5b5..04dac675d 100644
--- a/okitweb/static/okit/js/okit.js
+++ b/okitweb/static/okit/js/okit.js
@@ -75,65 +75,71 @@ class OkitGITConfig {
 class OkitOCIData {
     key = "OkitDropdownCache";
     day_milliseconds = 86400000;
-    constructor(profile) {
+    constructor(profile, region='uk-london-1') {
         this.compartments = [];
         this.dropdown_data = {}
-        this.load(profile);
+        this.load(profile, region);
     }
 
     clearLocalStorage() {localStorage.removeItem(this.key)}
 
-    storeLocal(profile) {
+    getCache() {
+        const local_data = localStorage.getItem(this.key)
+        return local_data ? JSON.parse(local_data) : {}
+    }
+
+    storeLocal(profile, region='') {
         console.info(`Storing Local Dropdown data for ${profile}`);
         const local_data = localStorage.getItem(this.key)
         let cache = {}
         if (local_data) cache = JSON.parse(local_data)
-        if (profile) cache[profile] = this.dropdown_data
+        if (profile && !cache.hasOwnProperty(profile)) cache[profile] = {}
+        if (profile) cache[profile][region] = this.dropdown_data
         localStorage.setItem(this.key, JSON.stringify(cache))
     }
 
-    loadLocal(profile) {
+    loadLocal(profile, region='') {
         const local_data = localStorage.getItem(this.key)
         console.info(`Loading Local Dropdown data for ${profile}`);
         let cache = {}
         if (local_data) cache = JSON.parse(local_data)
-        if (profile && cache[profile]) {
+        if (profile && region && cache[profile] && cache[profile][region]) {
             // Add test for stale cache  && cache[profile].cache_date && ((Date.now() - cache[profile].cache_date) / this.day_milliseconds) <= 7
-            console.info(`Found Local Dropdown Data for ${profile}`);
-            this.dropdown_data = cache[profile]
+            console.info(`Found Local Dropdown Data for ${profile} ${region}`);
+            this.dropdown_data = cache[profile][region]
             return true;
         } else {
             return false;
         }
     }
 
-    load(profile) {
+    load(profile, region='') {
         console.info('Loading Dropdown data for', profile);
         this.compartments = [];
         const self = this;
-        if (!this.loadLocal(profile)) {
+        if (!this.loadLocal(profile, region)) {
             const start = new Date().getTime()
-            $.getJSON(`dropdown/data/${String(profile)}`, (resp) => {
+            $.getJSON(`dropdown/data/${String(profile)}/${String(region)}`, (resp) => {
                 const end = new Date().getTime()
                 console.info('Load Dropdown Data took', end - start, 'ms')
                 // $.extend(true, self, resp);
                 self.dropdown_data = resp;
-                self.storeLocal(profile);
+                self.storeLocal(profile, region);
                 if (resp.shipped && profile !== undefined) {
-                    self.refresh(profile);
+                    self.refresh(profile, region);
                 }
             });
         }
     }
 
-    refresh(profile) {
+    refresh(profile, region='') {
         console.info('Refreshing Dropdown data for', profile);
-        this.query(profile, false)
+        this.query(profile, false, region)
     }
 
-    save(profile) {
+    save(profile, region='') {
         console.info('Saving Dropdown data for', profile);
-        this.storeLocal(profile);
+        this.storeLocal(profile, region);
         $.ajax({
             type: 'post',
             url: `dropdown/data/${String(profile)}`,
@@ -148,17 +154,17 @@ class OkitOCIData {
         });
     }
 
-    cloneForSave(profile) {
+    cloneForSave(profile, region='') {
         let clone = JSON.clone(this);
         clone.compartments = [];
         return clone;
     }
 
-    query(profile, save=false) {
-        console.info('Querying Dropdown data for', profile);
+    query(profile, save=false, region='') {
+        console.info('Querying Dropdown data for', profile, region);
         const self = this;
         const start = new Date().getTime()
-        $.getJSON(`oci/dropdown/${profile}`, (resp) => {
+        $.getJSON(`oci/dropdown/${profile}/${region}`, (resp) => {
             // Merge with base dropdown overwriting where appropriate with new data
             self.dropdown_data = {...self.dropdown_data, ...resp};
             delete self.dropdown_data.default
@@ -166,8 +172,8 @@ class OkitOCIData {
             self.dropdown_data.cache_date = Date.now()
             const end = new Date().getTime()
             console.info('Queried Dropdown Data for', profile, 'took', end - start, 'ms')
-            if (save) this.save(profile)
-            else this.storeLocal(profile)
+            if (save) this.save(profile, region)
+            else this.storeLocal(profile, region)
             });
     }
 
@@ -394,7 +400,7 @@ class OkitSettings {
         this.is_vcn_defaults = true;
         this.is_timestamp_files = false;
         this.profile = 'DEFAULT';
-        this.region = ''
+        this.region = 'uk-london-1'
         this.is_always_free = false;
         this.is_optional_expanded = true;
         this.is_display_grid = false;
@@ -406,7 +412,7 @@ class OkitSettings {
         this.highlight_association = true;
         this.show_label = 'none';
         this.tooltip_type = 'simple';
-        this.name_prefix = 'okit-';
+        this.name_prefix = 'okit';
         this.auto_save = false;
         this.show_ocids = false;
         this.validate_markdown = true;
diff --git a/okitweb/static/okit/js/okit_console.js b/okitweb/static/okit/js/okit_console.js
index 3a0e34913..b911c9d37 100644
--- a/okitweb/static/okit/js/okit_console.js
+++ b/okitweb/static/okit/js/okit_console.js
@@ -4,8 +4,10 @@
 */
 console.info('Loaded Console Javascript');
 
-const okitVersion = '0.27.1';
-const okitReleaseDate = '1st October 2021';
+
+const okitVersion = '0.28.0';
+const okitReleaseDate = '20th October 2021';
+
 // Validation
 const validate_error_colour = "#ff4d4d";
 const validate_warning_colour = "#ffd633";
@@ -115,7 +117,8 @@ function handleConfigChanged(event) {
     console_header_region_select.empty()
     console_header_region_select.append($('<option>').attr('value', '').text('Retrieving....'))
     okitRegions.load(okitSettings.profile)
-    okitOciData.load(okitSettings.profile)
+    okitOciData.load(okitSettings.profile, okitSettings.region)
+    setOCILink()
 }
 
 function loadHeaderRegionsDropDown() {
@@ -139,6 +142,7 @@ function handleRegionChanged(event) {
     event.stopPropagation()
     okitSettings.region = $('#console_header_region_select').val()
     okitSettings.save()
+    okitOciData.load(okitSettings.profile, okitSettings.region)
     setOCILink()
 }
 
diff --git a/okitweb/static/okit/js/okit_designer.js b/okitweb/static/okit/js/okit_designer.js
index 379695acf..e7dfd09da 100644
--- a/okitweb/static/okit/js/okit_designer.js
+++ b/okitweb/static/okit/js/okit_designer.js
@@ -33,7 +33,7 @@ let right_drag_bar_start_x = 0;
 let ociRegions = [];
 
 function resetDesigner() {
-    $("#console_header_view_select").val('designer');
+    $("#toolbar_view_select").val('designer');
     handleSwitchToCompartmentView();
     newModel();
     newDesignerView();
@@ -303,6 +303,7 @@ function displaySaveAsTemplateDialog(title, callback, root_dir='templates/user')
         .attr('id', 'template_file_name')
         .attr('name', 'template_file_name')
         .attr('type', 'text')
+        .attr('placeholder', '<Directory Path>/<Filename>.json')
         .on('keydown', (e) => {
             if (d3.event.keyCode == 220) {
                 d3.event.preventDefault()
@@ -1011,7 +1012,7 @@ function displayQueryDialog() {
 }
 function handleQueryOci(e) {
     hideNavMenu();
-    $("#console_header_view_select").val('designer');
+    $("#toolbar_view_select").val('designer');
     handleSwitchToCompartmentView();
     // Display Dialog
     displayQueryDialog();
@@ -1837,5 +1838,5 @@ function handleRefreshDropdownData(event) {
     okitRegions.clearLocalStorage()
     okitOciData.clearLocalStorage()
     okitRegions.load(okitSettings.profile)
-    okitOciData.load(okitSettings.profile)
+    okitOciData.load(okitSettings.profile, okitSettings.region)
 }
diff --git a/okitweb/static/okit/js/okit_designer_generation.js b/okitweb/static/okit/js/okit_designer_generation.js
index 4447938f3..eb0a6d2f7 100644
--- a/okitweb/static/okit/js/okit_designer_generation.js
+++ b/okitweb/static/okit/js/okit_designer_generation.js
@@ -444,7 +444,7 @@ function exportToResourceManager() {
         create_or_update: $('input[name=create_update_toggle]:checked').val(),
         plan_or_apply: $('input[name=plan_apply_toggle]:checked').val()
     };
-    console.info('Resource Manager Options : ' + JSON.stringify(request_json));
+    // console.info('Resource Manager Options : ' + JSON.stringify(request_json));
     hideNavMenu();
     setBusyIcon();
     $(jqId('modal_dialog_progress')).removeClass('hidden');
diff --git a/okitweb/static/okit/js/okit_designer_ready.js b/okitweb/static/okit/js/okit_designer_ready.js
index 587e5f6ad..bbd8f53af 100644
--- a/okitweb/static/okit/js/okit_designer_ready.js
+++ b/okitweb/static/okit/js/okit_designer_ready.js
@@ -25,7 +25,7 @@ $(document).ready(function() {
     okitSettings = new OkitSettings();
     okitOciConfig = new OkitOCIConfig(loadHeaderConfigDropDown);
     okitRegions = new OkitRegions(loadHeaderRegionsDropDown);
-    okitOciData = new OkitOCIData(okitSettings.profile);
+    okitOciData = new OkitOCIData(okitSettings.profile, okitSettings.region);
     okitGitConfig = new OkitGITConfig();
     okitJsonModel = new OkitJson();
     okitJsonView = new OkitDesignerJsonView(okitJsonModel);
diff --git a/okitweb/static/okit/js/okit_view_layout.js b/okitweb/static/okit/js/okit_view_layout.js
index 4b39cabbb..3441b06d8 100644
--- a/okitweb/static/okit/js/okit_view_layout.js
+++ b/okitweb/static/okit/js/okit_view_layout.js
@@ -23,6 +23,8 @@ function handleViewSelect(e) {
     else if (selected === 'tabular') handleSwitchToTabularView(e)
     else if (selected === 'relationship') handleSwitchToRelationshipView(e)
     else if (selected === 'json') handleSwitchToTextJsonView(e)
+    else if (selected === 'cache') handleSwitchToTextCacheView(e)
+    else if (selected === 'identity') handleSwitchToIdentityView(e)
     else console.warn('Unknown View', selected)
 }
 
@@ -52,6 +54,14 @@ function handleSwitchToTabularView(e) {
     okitTabularView.draw();
 }
 
+function handleSwitchToIdentityView(e) {
+    hideAllViewDivs();
+    $("#identity-div").removeClass('hidden');
+    hideSideBars();
+    okitIdentityView = new OkitIdentityView(okitJsonModel, okitOciData);
+    okitIdentityView.draw();
+}
+
 function handleSwitchToNetworkView(e) {
     hideAllViewDivs();
     $("#network-div").removeClass('hidden');
@@ -79,3 +89,11 @@ function handleSwitchToTextJsonView(e) {
     okitTextJsonView = new OkitTextJsonView(okitJsonModel, okitOciData, resource_icons);
     okitTextJsonView.draw();
 }
+
+function handleSwitchToTextCacheView(e) {
+    hideAllViewDivs();
+    $("#json-text-div").removeClass('hidden');
+    hideSideBars();
+    okitCacheJsonView = new OkitCacheJsonView(okitOciData.getCache(), okitOciData, resource_icons);
+    okitCacheJsonView.draw();
+}
diff --git a/okitweb/static/okit/json/release.json b/okitweb/static/okit/json/release.json
index f4de2a409..e9730d6be 100644
--- a/okitweb/static/okit/json/release.json
+++ b/okitweb/static/okit/json/release.json
@@ -1,4 +1,4 @@
 {
-  "release": "0.27.1",
-  "tag": "v0.27.1"
+  "release": "0.28.0",
+  "tag": "v0.28.0"
 }
\ No newline at end of file
diff --git a/okitweb/static/okit/model/js/artefacts/analytics_instance.js b/okitweb/static/okit/model/js/artefacts/analytics_instance.js
index 7a23b37e1..60107e8cd 100644
--- a/okitweb/static/okit/model/js/artefacts/analytics_instance.js
+++ b/okitweb/static/okit/model/js/artefacts/analytics_instance.js
@@ -81,12 +81,6 @@ OkitJson.prototype.getAnalyticsInstance = function(id='') {
 return undefined;
 }
 OkitJson.prototype.deleteAnalyticsInstance = function(id) {
-    for (let i = 0; i < this.analytics_instances.length; i++) {
-        if (this.analytics_instances[i].id === id) {
-            this.analytics_instances[i].delete();
-            this.analytics_instances.splice(i, 1);
-            break;
-        }
-    }
+    this.analytics_instances = this.analytics_instances ? this.analytics_instances.filter((r) => r.id !== id) : []
 }
 
diff --git a/okitweb/static/okit/model/js/artefacts/bastion.js b/okitweb/static/okit/model/js/artefacts/bastion.js
new file mode 100644
index 000000000..dd5a5eeda
--- /dev/null
+++ b/okitweb/static/okit/model/js/artefacts/bastion.js
@@ -0,0 +1,76 @@
+/*
+** Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+*/
+console.info('Loaded Bastion Javascript');
+
+/*
+** Define Bastion Class
+*/
+class Bastion extends OkitArtifact {
+    /*
+    ** Create
+    */
+    constructor (data={}, okitjson={}) {
+        super(okitjson);
+        // Configure default values
+        // # Required
+        this.display_name = this.generateDefaultName(okitjson.bastions.length + 1);
+        this.compartment_id = '';
+        this.bastion_type = 'STANDARD';
+        this.target_subnet_id = '';
+        // # Optional
+        this.client_cidr_block_allow_list = [];
+        this.max_session_ttl_in_seconds = 180 * 60;
+        this.phone_book_entry = '';
+        this.static_jump_host_ip_addresses = '';
+        // Update with any passed data
+        this.merge(data);
+        this.convert();
+        // Expose subnet_id at the top level
+        Object.defineProperty(this, 'subnet_id', {get: function() {return this.target_subnet_id;}, set: function(id) {this.target_subnet_id = id;}, enumerable: false });
+    }
+    /*
+    ** Clone Functionality
+    */
+    clone() {
+        return new Bastion(JSON.clone(this), this.getOkitJson());
+    }
+    /*
+    ** Name Generation
+    */
+    getNamePrefix() {
+        return super.getNamePrefix() + 'b';
+    }
+    /*
+    ** Static Functionality
+    */
+    static getArtifactReference() {
+        return 'Bastion';
+    }
+}
+/*
+** Dynamically Add Model Functions
+*/
+OkitJson.prototype.newBastion = function(data) {
+    this.getBastions().push(new Bastion(data, this));
+    return this.getBastions()[this.getBastions().length - 1];
+}
+OkitJson.prototype.getBastions = function() {
+    if (!this.bastions) {
+        this.bastions = [];
+    }
+    return this.bastions;
+}
+OkitJson.prototype.getBastion = function(id='') {
+    for (let artefact of this.getBastions()) {
+        if (artefact.id === id) {
+            return artefact;
+        }
+    }
+return undefined;
+}
+OkitJson.prototype.deleteBastion = function(id) {
+    this.bastions = this.bastions ? this.bastions.filter((r) => r.id !== id) : []
+}
+
diff --git a/okitweb/static/okit/model/js/artefacts/data_integration_workspace.js b/okitweb/static/okit/model/js/artefacts/data_integration_workspace.js
index 61abdd59d..26f1f44b8 100644
--- a/okitweb/static/okit/model/js/artefacts/data_integration_workspace.js
+++ b/okitweb/static/okit/model/js/artefacts/data_integration_workspace.js
@@ -67,12 +67,6 @@ OkitJson.prototype.getDataIntegrationWorkspace = function(id='') {
 return undefined;
 }
 OkitJson.prototype.deleteDataIntegrationWorkspace = function(id) {
-    for (let i = 0; i < this.data_integration_workspaces.length; i++) {
-        if (this.data_integration_workspaces[i].id === id) {
-            this.data_integration_workspaces[i].delete();
-            this.data_integration_workspaces.splice(i, 1);
-            break;
-        }
-    }
+    this.data_integration_workspaces = this.data_integration_workspaces ? this.data_integration_workspaces.filter((r) => r.id !== id) : []
 }
 
diff --git a/okitweb/static/okit/model/js/artefacts/database.js b/okitweb/static/okit/model/js/artefacts/database.js
index e521cc1e5..159c91892 100644
--- a/okitweb/static/okit/model/js/artefacts/database.js
+++ b/okitweb/static/okit/model/js/artefacts/database.js
@@ -69,12 +69,6 @@ OkitJson.prototype.getDatabase = function(id='') {
 return undefined;
 }
 OkitJson.prototype.deleteDatabase = function(id) {
-    for (let i = 0; i < this.databases.length; i++) {
-        if (this.databases[i].id === id) {
-            this.databases[i].delete();
-            this.databases.splice(i, 1);
-            break;
-        }
-    }
+    this.databases = this.databases ? this.databases.filter((r) => r.id !== id) : []
 }
 
diff --git a/okitweb/static/okit/model/js/artefacts/db_home.js b/okitweb/static/okit/model/js/artefacts/db_home.js
index e36fcbb42..321ac26cf 100644
--- a/okitweb/static/okit/model/js/artefacts/db_home.js
+++ b/okitweb/static/okit/model/js/artefacts/db_home.js
@@ -68,12 +68,6 @@ OkitJson.prototype.getDbHome = function(id='') {
 return undefined;
 }
 OkitJson.prototype.deleteDbHome = function(id) {
-    for (let i = 0; i < this.db_homes.length; i++) {
-        if (this.db_homes[i].id === id) {
-            this.db_homes[i].delete();
-            this.db_homes.splice(i, 1);
-            break;
-        }
-    }
+    this.db_homes = this.db_homes ? this.db_homes.filter((r) => r.id !== id) : []
 }
 
diff --git a/okitweb/static/okit/model/js/artefacts/db_node.js b/okitweb/static/okit/model/js/artefacts/db_node.js
index 63b862ca9..3ec52abda 100644
--- a/okitweb/static/okit/model/js/artefacts/db_node.js
+++ b/okitweb/static/okit/model/js/artefacts/db_node.js
@@ -69,12 +69,6 @@ OkitJson.prototype.getDbNode = function(id='') {
 return undefined;
 }
 OkitJson.prototype.deleteDbNode = function(id) {
-    for (let i = 0; i < this.db_nodes.length; i++) {
-        if (this.db_nodes[i].id === id) {
-            this.db_nodes[i].delete();
-            this.db_nodes.splice(i, 1);
-            break;
-        }
-    }
+    this.db_nodes = this.db_nodes ? this.db_nodes.filter((r) => r.id !== id) : []
 }
 
diff --git a/okitweb/static/okit/model/js/artefacts/dynamic_group.js b/okitweb/static/okit/model/js/artefacts/dynamic_group.js
index bda3e010d..5bc90d990 100644
--- a/okitweb/static/okit/model/js/artefacts/dynamic_group.js
+++ b/okitweb/static/okit/model/js/artefacts/dynamic_group.js
@@ -67,12 +67,6 @@ OkitJson.prototype.getDynamicGroup = function(id='') {
 return undefined;
 }
 OkitJson.prototype.deleteDynamicGroup = function(id) {
-    for (let i = 0; i < this.dynamic_groups.length; i++) {
-        if (this.dynamic_groups[i].id === id) {
-            this.dynamic_groups[i].delete();
-            this.dynamic_groups.splice(i, 1);
-            break;
-        }
-    }
+    this.dynamic_groups = this.dynamic_groups ? this.dynamic_groups.filter((r) => r.id !== id) : []
 }
 
diff --git a/okitweb/static/okit/model/js/artefacts/exadata_infrastructure.js b/okitweb/static/okit/model/js/artefacts/exadata_infrastructure.js
index 2e2a7f3b9..d9d0af267 100644
--- a/okitweb/static/okit/model/js/artefacts/exadata_infrastructure.js
+++ b/okitweb/static/okit/model/js/artefacts/exadata_infrastructure.js
@@ -68,12 +68,6 @@ OkitJson.prototype.getExadataInfrastructure = function(id='') {
 return undefined;
 }
 OkitJson.prototype.deleteExadataInfrastructure = function(id) {
-    for (let i = 0; i < this.exadata_infrastructures.length; i++) {
-        if (this.exadata_infrastructures[i].id === id) {
-            this.exadata_infrastructures[i].delete();
-            this.exadata_infrastructures.splice(i, 1);
-            break;
-        }
-    }
+    this.exadata_infrastructures = this.exadata_infrastructures ? this.exadata_infrastructures.filter((r) => r.id !== id) : []
 }
 
diff --git a/okitweb/static/okit/model/js/artefacts/file_storage_system.js b/okitweb/static/okit/model/js/artefacts/file_storage_system.js
index d01836186..d6279918b 100644
--- a/okitweb/static/okit/model/js/artefacts/file_storage_system.js
+++ b/okitweb/static/okit/model/js/artefacts/file_storage_system.js
@@ -62,6 +62,17 @@ class FileStorageSystem extends OkitArtifact {
                 }
             })
         }
+
+        // Updated Structure
+        // this.mount_targets = [
+        //     {
+        //         subnet_id: this.subnet_id ? this.subnet_id : '', 
+        //         hostname_label: this.display_name.toLowerCase(), 
+        //         nsg_ids: [], 
+        //         file_systems: [{}]
+        //     }
+        // ]
+
         this.convert();
         // Expose subnet_id for the first Mount target at the top level
         delete this.subnet_id;
diff --git a/okitweb/static/okit/model/js/artefacts/file_system.js b/okitweb/static/okit/model/js/artefacts/file_system.js
new file mode 100644
index 000000000..11c69309f
--- /dev/null
+++ b/okitweb/static/okit/model/js/artefacts/file_system.js
@@ -0,0 +1,72 @@
+/*
+** Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+*/
+console.info('Loaded File System Javascript');
+
+/*
+** Define File System Class
+*/
+class FileSystem extends OkitArtifact {
+    /*
+    ** Create
+    */
+    constructor (data={}, okitjson={}) {
+        super(okitjson);
+        // Configure default values
+        this.display_name = this.generateDefaultName(okitjson.file_systems.length + 1);
+        this.compartment_id = data.parent_id;
+        /*
+        ** TODO: Add Resource / Artefact specific parameters and default
+        */
+        // Update with any passed data
+        this.merge(data);
+        this.convert();
+        // TODO: If the Resource is within a Subnet but the subnet_iss is not at the top level then raise it with the following functions if not required delete them.
+        // Expose subnet_id at the top level
+        Object.defineProperty(this, 'subnet_id', {get: function() {return this.primary_mount_target.subnet_id;}, set: function(id) {this.primary_mount_target.subnet_id = id;}, enumerable: false });
+    }
+    /*
+    ** Clone Functionality
+    */
+    clone() {
+        return new FileSystem(JSON.clone(this), this.getOkitJson());
+    }
+    /*
+    ** Name Generation
+    */
+    getNamePrefix() {
+        return super.getNamePrefix() + 'fs';
+    }
+    /*
+    ** Static Functionality
+    */
+    static getArtifactReference() {
+        return 'File System';
+    }
+}
+/*
+** Dynamically Add Model Functions
+*/
+OkitJson.prototype.newFileSystem = function(data) {
+    this.getFileSystems().push(new FileSystem(data, this));
+    return this.getFileSystems()[this.getFileSystems().length - 1];
+}
+OkitJson.prototype.getFileSystems = function() {
+    if (!this.file_systems) {
+        this.file_systems = [];
+    }
+    return this.file_systems;
+}
+OkitJson.prototype.getFileSystem = function(id='') {
+    for (let artefact of this.getFileSystems()) {
+        if (artefact.id === id) {
+            return artefact;
+        }
+    }
+return undefined;
+}
+OkitJson.prototype.deleteFileSystem = function(id) {
+    this.file_systems = this.file_systems ? this.file_systems.filter((r) => r.id !== id) : []
+}
+
diff --git a/okitweb/static/okit/model/js/artefacts/group.js b/okitweb/static/okit/model/js/artefacts/group.js
index 7cfdcd3c8..ea04bb307 100644
--- a/okitweb/static/okit/model/js/artefacts/group.js
+++ b/okitweb/static/okit/model/js/artefacts/group.js
@@ -15,16 +15,12 @@ class Group extends OkitArtifact {
         super(okitjson);
         // Configure default values
         this.display_name = this.generateDefaultName(okitjson.groups.length + 1);
-        this.compartment_id = data.parent_id;
-        /*
-        ** TODO: Add Resource / Artefact specific parameters and default
-        */
+        this.compartment_id = null;
+        this.description = ''
+        this.user_ids = []
         // Update with any passed data
         this.merge(data);
         this.convert();
-        // TODO: If the Resource is within a Subnet but the subnet_iss is not at the top level then raise it with the following functions if not required delete them.
-        // Expose subnet_id at the top level
-        Object.defineProperty(this, 'subnet_id', {get: function() {return this.primary_mount_target.subnet_id;}, set: function(id) {this.primary_mount_target.subnet_id = id;}, enumerable: false });
     }
     /*
     ** Clone Functionality
@@ -36,7 +32,7 @@ class Group extends OkitArtifact {
     ** Name Generation
     */
     getNamePrefix() {
-        return super.getNamePrefix() + 'g';
+        return super.getNamePrefix() + 'grp';
     }
     /*
     ** Static Functionality
@@ -67,12 +63,6 @@ OkitJson.prototype.getGroup = function(id='') {
 return undefined;
 }
 OkitJson.prototype.deleteGroup = function(id) {
-    for (let i = 0; i < this.groups.length; i++) {
-        if (this.groups[i].id === id) {
-            this.groups[i].delete();
-            this.groups.splice(i, 1);
-            break;
-        }
-    }
+    this.groups = this.groups ? this.groups.filter((r) => r.id !== id) : []
 }
 
diff --git a/okitweb/static/okit/model/js/artefacts/integration_instance.js b/okitweb/static/okit/model/js/artefacts/integration_instance.js
index 8a3b03353..f481e164e 100644
--- a/okitweb/static/okit/model/js/artefacts/integration_instance.js
+++ b/okitweb/static/okit/model/js/artefacts/integration_instance.js
@@ -67,12 +67,6 @@ OkitJson.prototype.getIntegrationInstance = function(id='') {
 return undefined;
 }
 OkitJson.prototype.deleteIntegrationInstance = function(id) {
-    for (let i = 0; i < this.integration_instances.length; i++) {
-        if (this.integration_instances[i].id === id) {
-            this.integration_instances[i].delete();
-            this.integration_instances.splice(i, 1);
-            break;
-        }
-    }
+    this.integration_instances = this.integration_instances ? this.integration_instances.filter((r) => r.id !== id) : []
 }
 
diff --git a/okitweb/static/okit/model/js/artefacts/key.js b/okitweb/static/okit/model/js/artefacts/key.js
new file mode 100644
index 000000000..c427e1f54
--- /dev/null
+++ b/okitweb/static/okit/model/js/artefacts/key.js
@@ -0,0 +1,72 @@
+/*
+** Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+*/
+console.info('Loaded Key Javascript');
+
+/*
+** Define Key Class
+*/
+class Key extends OkitArtifact {
+    /*
+    ** Create
+    */
+    constructor (data={}, okitjson={}) {
+        super(okitjson);
+        // Configure default values
+        this.display_name = this.generateDefaultName(okitjson.keys.length + 1);
+        this.compartment_id = data.parent_id;
+        /*
+        ** TODO: Add Resource / Artefact specific parameters and default
+        */
+        // Update with any passed data
+        this.merge(data);
+        this.convert();
+        // TODO: If the Resource is within a Subnet but the subnet_iss is not at the top level then raise it with the following functions if not required delete them.
+        // Expose subnet_id at the top level
+        Object.defineProperty(this, 'subnet_id', {get: function() {return this.primary_mount_target.subnet_id;}, set: function(id) {this.primary_mount_target.subnet_id = id;}, enumerable: false });
+    }
+    /*
+    ** Clone Functionality
+    */
+    clone() {
+        return new Key(JSON.clone(this), this.getOkitJson());
+    }
+    /*
+    ** Name Generation
+    */
+    getNamePrefix() {
+        return super.getNamePrefix() + 'k';
+    }
+    /*
+    ** Static Functionality
+    */
+    static getArtifactReference() {
+        return 'Key';
+    }
+}
+/*
+** Dynamically Add Model Functions
+*/
+OkitJson.prototype.newKey = function(data) {
+    this.getKeys().push(new Key(data, this));
+    return this.getKeys()[this.getKeys().length - 1];
+}
+OkitJson.prototype.getKeys = function() {
+    if (!this.keys) {
+        this.keys = [];
+    }
+    return this.keys;
+}
+OkitJson.prototype.getKey = function(id='') {
+    for (let artefact of this.getKeys()) {
+        if (artefact.id === id) {
+            return artefact;
+        }
+    }
+return undefined;
+}
+OkitJson.prototype.deleteKey = function(id) {
+    this.keys = this.keys ? this.keys.filter((r) => r.id !== id) : []
+}
+
diff --git a/okitweb/static/okit/model/js/artefacts/mount_target.js b/okitweb/static/okit/model/js/artefacts/mount_target.js
new file mode 100644
index 000000000..ba145d4ca
--- /dev/null
+++ b/okitweb/static/okit/model/js/artefacts/mount_target.js
@@ -0,0 +1,72 @@
+/*
+** Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+*/
+console.info('Loaded Mount Target Javascript');
+
+/*
+** Define Mount Target Class
+*/
+class MountTarget extends OkitArtifact {
+    /*
+    ** Create
+    */
+    constructor (data={}, okitjson={}) {
+        super(okitjson);
+        // Configure default values
+        this.display_name = this.generateDefaultName(okitjson.mount_targets.length + 1);
+        this.compartment_id = data.parent_id;
+        /*
+        ** TODO: Add Resource / Artefact specific parameters and default
+        */
+        // Update with any passed data
+        this.merge(data);
+        this.convert();
+        // TODO: If the Resource is within a Subnet but the subnet_iss is not at the top level then raise it with the following functions if not required delete them.
+        // Expose subnet_id at the top level
+        Object.defineProperty(this, 'subnet_id', {get: function() {return this.primary_mount_target.subnet_id;}, set: function(id) {this.primary_mount_target.subnet_id = id;}, enumerable: false });
+    }
+    /*
+    ** Clone Functionality
+    */
+    clone() {
+        return new MountTarget(JSON.clone(this), this.getOkitJson());
+    }
+    /*
+    ** Name Generation
+    */
+    getNamePrefix() {
+        return super.getNamePrefix() + 'mt';
+    }
+    /*
+    ** Static Functionality
+    */
+    static getArtifactReference() {
+        return 'Mount Target';
+    }
+}
+/*
+** Dynamically Add Model Functions
+*/
+OkitJson.prototype.newMountTarget = function(data) {
+    this.getMountTargets().push(new MountTarget(data, this));
+    return this.getMountTargets()[this.getMountTargets().length - 1];
+}
+OkitJson.prototype.getMountTargets = function() {
+    if (!this.mount_targets) {
+        this.mount_targets = [];
+    }
+    return this.mount_targets;
+}
+OkitJson.prototype.getMountTarget = function(id='') {
+    for (let artefact of this.getMountTargets()) {
+        if (artefact.id === id) {
+            return artefact;
+        }
+    }
+return undefined;
+}
+OkitJson.prototype.deleteMountTarget = function(id) {
+    this.mount_targets = this.mount_targets ? this.mount_targets.filter((r) => r.id !== id) : []
+}
+
diff --git a/okitweb/static/okit/model/js/artefacts/network_load_balancer.js b/okitweb/static/okit/model/js/artefacts/network_load_balancer.js
new file mode 100644
index 000000000..3f51fb7d8
--- /dev/null
+++ b/okitweb/static/okit/model/js/artefacts/network_load_balancer.js
@@ -0,0 +1,72 @@
+/*
+** Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+*/
+console.info('Loaded Network Load Balancer Javascript');
+
+/*
+** Define Network Load Balancer Class
+*/
+class NetworkLoadBalancer extends OkitArtifact {
+    /*
+    ** Create
+    */
+    constructor (data={}, okitjson={}) {
+        super(okitjson);
+        // Configure default values
+        this.display_name = this.generateDefaultName(okitjson.network_load_balancers.length + 1);
+        this.compartment_id = data.parent_id;
+        /*
+        ** TODO: Add Resource / Artefact specific parameters and default
+        */
+        // Update with any passed data
+        this.merge(data);
+        this.convert();
+        // TODO: If the Resource is within a Subnet but the subnet_iss is not at the top level then raise it with the following functions if not required delete them.
+        // Expose subnet_id at the top level
+        Object.defineProperty(this, 'subnet_id', {get: function() {return this.primary_mount_target.subnet_id;}, set: function(id) {this.primary_mount_target.subnet_id = id;}, enumerable: false });
+    }
+    /*
+    ** Clone Functionality
+    */
+    clone() {
+        return new NetworkLoadBalancer(JSON.clone(this), this.getOkitJson());
+    }
+    /*
+    ** Name Generation
+    */
+    getNamePrefix() {
+        return super.getNamePrefix() + 'nlb';
+    }
+    /*
+    ** Static Functionality
+    */
+    static getArtifactReference() {
+        return 'Network Load Balancer';
+    }
+}
+/*
+** Dynamically Add Model Functions
+*/
+OkitJson.prototype.newNetworkLoadBalancer = function(data) {
+    this.getNetworkLoadBalancers().push(new NetworkLoadBalancer(data, this));
+    return this.getNetworkLoadBalancers()[this.getNetworkLoadBalancers().length - 1];
+}
+OkitJson.prototype.getNetworkLoadBalancers = function() {
+    if (!this.network_load_balancers) {
+        this.network_load_balancers = [];
+    }
+    return this.network_load_balancers;
+}
+OkitJson.prototype.getNetworkLoadBalancer = function(id='') {
+    for (let artefact of this.getNetworkLoadBalancers()) {
+        if (artefact.id === id) {
+            return artefact;
+        }
+    }
+return undefined;
+}
+OkitJson.prototype.deleteNetworkLoadBalancer = function(id) {
+    this.network_load_balancers = this.network_load_balancers ? this.network_load_balancers.filter((r) => r.id !== id) : []
+}
+
diff --git a/okitweb/static/okit/model/js/artefacts/nosql_database.js b/okitweb/static/okit/model/js/artefacts/nosql_database.js
new file mode 100644
index 000000000..07354c27d
--- /dev/null
+++ b/okitweb/static/okit/model/js/artefacts/nosql_database.js
@@ -0,0 +1,72 @@
+/*
+** Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+*/
+console.info('Loaded NoSQL Database Javascript');
+
+/*
+** Define NoSQL Database Class
+*/
+class NoSQLDatabase extends OkitArtifact {
+    /*
+    ** Create
+    */
+    constructor (data={}, okitjson={}) {
+        super(okitjson);
+        // Configure default values
+        this.display_name = this.generateDefaultName(okitjson.nosql_databases.length + 1);
+        this.compartment_id = data.parent_id;
+        /*
+        ** TODO: Add Resource / Artefact specific parameters and default
+        */
+        // Update with any passed data
+        this.merge(data);
+        this.convert();
+        // TODO: If the Resource is within a Subnet but the subnet_iss is not at the top level then raise it with the following functions if not required delete them.
+        // Expose subnet_id at the top level
+        Object.defineProperty(this, 'subnet_id', {get: function() {return this.primary_mount_target.subnet_id;}, set: function(id) {this.primary_mount_target.subnet_id = id;}, enumerable: false });
+    }
+    /*
+    ** Clone Functionality
+    */
+    clone() {
+        return new NoSQLDatabase(JSON.clone(this), this.getOkitJson());
+    }
+    /*
+    ** Name Generation
+    */
+    getNamePrefix() {
+        return super.getNamePrefix() + 'nd';
+    }
+    /*
+    ** Static Functionality
+    */
+    static getArtifactReference() {
+        return 'NoSQL Database';
+    }
+}
+/*
+** Dynamically Add Model Functions
+*/
+OkitJson.prototype.newNoSQLDatabase = function(data) {
+    this.getNoSQLDatabases().push(new NoSQLDatabase(data, this));
+    return this.getNoSQLDatabases()[this.getNoSQLDatabases().length - 1];
+}
+OkitJson.prototype.getNoSQLDatabases = function() {
+    if (!this.nosql_databases) {
+        this.nosql_databases = [];
+    }
+    return this.nosql_databases;
+}
+OkitJson.prototype.getNoSQLDatabase = function(id='') {
+    for (let artefact of this.getNoSQLDatabases()) {
+        if (artefact.id === id) {
+            return artefact;
+        }
+    }
+return undefined;
+}
+OkitJson.prototype.deleteNoSQLDatabase = function(id) {
+    this.nosql_databases = this.nosql_databases ? this.nosql_databases.filter((r) => r.id !== id) : []
+}
+
diff --git a/okitweb/static/okit/model/js/artefacts/policy.js b/okitweb/static/okit/model/js/artefacts/policy.js
index 5e8c9bbb9..33839a832 100644
--- a/okitweb/static/okit/model/js/artefacts/policy.js
+++ b/okitweb/static/okit/model/js/artefacts/policy.js
@@ -64,12 +64,6 @@ OkitJson.prototype.getPolicy = function(id='') {
 return undefined;
 }
 OkitJson.prototype.deletePolicy = function(id) {
-    for (let i = 0; i < this.policys.length; i++) {
-        if (this.policys[i].id === id) {
-            this.policys[i].delete();
-            this.policys.splice(i, 1);
-            break;
-        }
-    }
+    this.policys = this.policys ? this.policys.filter((r) => r.id !== id) : []
 }
 
diff --git a/okitweb/static/okit/model/js/artefacts/user.js b/okitweb/static/okit/model/js/artefacts/user.js
index 2a308a2d2..b32022610 100644
--- a/okitweb/static/okit/model/js/artefacts/user.js
+++ b/okitweb/static/okit/model/js/artefacts/user.js
@@ -14,17 +14,14 @@ class User extends OkitArtifact {
     constructor (data={}, okitjson={}) {
         super(okitjson);
         // Configure default values
+        // const array_pos = okitjson.users ? okitjson.users.length + 1 : 0;
         this.display_name = this.generateDefaultName(okitjson.users.length + 1);
-        this.compartment_id = data.parent_id;
-        /*
-        ** TODO: Add Resource / Artefact specific parameters and default
-        */
+        this.compartment_id = null;
+        this.description = ''
+        this.email = ''
         // Update with any passed data
         this.merge(data);
         this.convert();
-        // TODO: If the Resource is within a Subnet but the subnet_iss is not at the top level then raise it with the following functions if not required delete them.
-        // Expose subnet_id at the top level
-        Object.defineProperty(this, 'subnet_id', {get: function() {return this.primary_mount_target.subnet_id;}, set: function(id) {this.primary_mount_target.subnet_id = id;}, enumerable: false });
     }
     /*
     ** Clone Functionality
@@ -36,7 +33,7 @@ class User extends OkitArtifact {
     ** Name Generation
     */
     getNamePrefix() {
-        return super.getNamePrefix() + 'u';
+        return super.getNamePrefix() + 'usr';
     }
     /*
     ** Static Functionality
@@ -67,12 +64,6 @@ OkitJson.prototype.getUser = function(id='') {
 return undefined;
 }
 OkitJson.prototype.deleteUser = function(id) {
-    for (let i = 0; i < this.users.length; i++) {
-        if (this.users[i].id === id) {
-            this.users[i].delete();
-            this.users.splice(i, 1);
-            break;
-        }
-    }
+    this.users = this.users ? this.users.filter((u) => u.id !== id) : []
 }
 
diff --git a/okitweb/static/okit/model/js/artefacts/vault.js b/okitweb/static/okit/model/js/artefacts/vault.js
new file mode 100644
index 000000000..46c4691a8
--- /dev/null
+++ b/okitweb/static/okit/model/js/artefacts/vault.js
@@ -0,0 +1,72 @@
+/*
+** Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+*/
+console.info('Loaded Vault Javascript');
+
+/*
+** Define Vault Class
+*/
+class Vault extends OkitArtifact {
+    /*
+    ** Create
+    */
+    constructor (data={}, okitjson={}) {
+        super(okitjson);
+        // Configure default values
+        this.display_name = this.generateDefaultName(okitjson.vaults.length + 1);
+        this.compartment_id = data.parent_id;
+        /*
+        ** TODO: Add Resource / Artefact specific parameters and default
+        */
+        // Update with any passed data
+        this.merge(data);
+        this.convert();
+        // TODO: If the Resource is within a Subnet but the subnet_iss is not at the top level then raise it with the following functions if not required delete them.
+        // Expose subnet_id at the top level
+        Object.defineProperty(this, 'subnet_id', {get: function() {return this.primary_mount_target.subnet_id;}, set: function(id) {this.primary_mount_target.subnet_id = id;}, enumerable: false });
+    }
+    /*
+    ** Clone Functionality
+    */
+    clone() {
+        return new Vault(JSON.clone(this), this.getOkitJson());
+    }
+    /*
+    ** Name Generation
+    */
+    getNamePrefix() {
+        return super.getNamePrefix() + 'v';
+    }
+    /*
+    ** Static Functionality
+    */
+    static getArtifactReference() {
+        return 'Vault';
+    }
+}
+/*
+** Dynamically Add Model Functions
+*/
+OkitJson.prototype.newVault = function(data) {
+    this.getVaults().push(new Vault(data, this));
+    return this.getVaults()[this.getVaults().length - 1];
+}
+OkitJson.prototype.getVaults = function() {
+    if (!this.vaults) {
+        this.vaults = [];
+    }
+    return this.vaults;
+}
+OkitJson.prototype.getVault = function(id='') {
+    for (let artefact of this.getVaults()) {
+        if (artefact.id === id) {
+            return artefact;
+        }
+    }
+return undefined;
+}
+OkitJson.prototype.deleteVault = function(id) {
+    this.vaults = this.vaults ? this.vaults.filter((r) => r.id !== id) : []
+}
+
diff --git a/okitweb/static/okit/model/js/artefacts/virtual_cloud_network.js b/okitweb/static/okit/model/js/artefacts/virtual_cloud_network.js
index 7000f5051..d487338f6 100644
--- a/okitweb/static/okit/model/js/artefacts/virtual_cloud_network.js
+++ b/okitweb/static/okit/model/js/artefacts/virtual_cloud_network.js
@@ -130,6 +130,8 @@ class VirtualCloudNetwork extends OkitArtifact {
             }
             return true;
         }, this);
+        // DHCP Options
+        this.getOkitJson().getDhcpOptions().filter((d) => d.vcn_id === this.id).forEach((c) => c.delete())
         console.log();
     }
 
diff --git a/okitweb/static/okit/model/js/artefacts/vm_cluster.js b/okitweb/static/okit/model/js/artefacts/vm_cluster.js
index 912069580..d768d2bdd 100644
--- a/okitweb/static/okit/model/js/artefacts/vm_cluster.js
+++ b/okitweb/static/okit/model/js/artefacts/vm_cluster.js
@@ -68,12 +68,6 @@ OkitJson.prototype.getVmCluster = function(id='') {
 return undefined;
 }
 OkitJson.prototype.deleteVmCluster = function(id) {
-    for (let i = 0; i < this.vm_clusters.length; i++) {
-        if (this.vm_clusters[i].id === id) {
-            this.vm_clusters[i].delete();
-            this.vm_clusters.splice(i, 1);
-            break;
-        }
-    }
+    this.vm_clusters = this.vm_clusters ? this.vm_clusters.filter((r) => r.id !== id) : []
 }
 
diff --git a/okitweb/static/okit/model/js/artefacts/vm_cluster_network.js b/okitweb/static/okit/model/js/artefacts/vm_cluster_network.js
index dccdfc4f3..1d06977e7 100644
--- a/okitweb/static/okit/model/js/artefacts/vm_cluster_network.js
+++ b/okitweb/static/okit/model/js/artefacts/vm_cluster_network.js
@@ -68,12 +68,6 @@ OkitJson.prototype.getVmClusterNetwork = function(id='') {
 return undefined;
 }
 OkitJson.prototype.deleteVmClusterNetwork = function(id) {
-    for (let i = 0; i < this.vm_cluster_networks.length; i++) {
-        if (this.vm_cluster_networks[i].id === id) {
-            this.vm_cluster_networks[i].delete();
-            this.vm_cluster_networks.splice(i, 1);
-            break;
-        }
-    }
+    this.vm_cluster_networks = this.vm_cluster_networks ? this.vm_cluster_networks.filter((r) => r.id !== id) : []
 }
 
diff --git a/okitweb/static/okit/model/js/okit_model.js b/okitweb/static/okit/model/js/okit_model.js
index ad584132e..fb3bbb9ba 100644
--- a/okitweb/static/okit/model/js/okit_model.js
+++ b/okitweb/static/okit/model/js/okit_model.js
@@ -353,13 +353,14 @@ class OkitJson {
         return undefined;
     }
     deleteAutonomousDatabase(id) {
-        for (let i = 0; i < this.autonomous_databases.length; i++) {
-            if (this.autonomous_databases[i].id === id) {
-                this.autonomous_databases[i].delete();
-                this.autonomous_databases.splice(i, 1);
-                break;
-            }
-        }
+        // for (let i = 0; i < this.autonomous_databases.length; i++) {
+        //     if (this.autonomous_databases[i].id === id) {
+        //         this.autonomous_databases[i].delete();
+        //         this.autonomous_databases.splice(i, 1);
+        //         break;
+        //     }
+        // }
+        this.autonomous_databases = this.autonomous_databases ? this.autonomous_databases.filter((r) => r.id !== id) : []
     }
 
     // Block Storage Volume
@@ -380,13 +381,14 @@ class OkitJson {
         return undefined;
     }
     deleteBlockStorageVolume(id) {
-        for (let i = 0; i < this.block_storage_volumes.length; i++) {
-            if (this.block_storage_volumes[i].id === id) {
-                this.block_storage_volumes[i].delete();
-                this.block_storage_volumes.splice(i, 1);
-                break;
-            }
-        }
+        // for (let i = 0; i < this.block_storage_volumes.length; i++) {
+        //     if (this.block_storage_volumes[i].id === id) {
+        //         this.block_storage_volumes[i].delete();
+        //         this.block_storage_volumes.splice(i, 1);
+        //         break;
+        //     }
+        // }
+        this.block_storage_volumes = this.block_storage_volumes ? this.block_storage_volumes.filter((r) => r.id !== id) : []
     }
 
     // Compartment
@@ -405,13 +407,14 @@ class OkitJson {
         return undefined;
     }
     deleteCompartment(id) {
-        for (let i = 0; i < this.compartments.length; i++) {
-            if (this.compartments[i].id === id) {
-                this.compartments[i].delete();
-                this.compartments.splice(i, 1);
-                break;
-            }
-        }
+        // for (let i = 0; i < this.compartments.length; i++) {
+        //     if (this.compartments[i].id === id) {
+        //         this.compartments[i].delete();
+        //         this.compartments.splice(i, 1);
+        //         break;
+        //     }
+        // }
+        this.compartments = this.compartments ? this.compartments.filter((r) => r.id !== id) : []
     }
 
     // Customer Premise Equipment
@@ -430,13 +433,14 @@ class OkitJson {
         return undefined;
     }
     deleteCustomerPremiseEquipment(id) {
-        for (let i = 0; i < this.customer_premise_equipments.length; i++) {
-            if (this.customer_premise_equipments[i].id === id) {
-                this.customer_premise_equipments[i].delete();
-                this.customer_premise_equipments.splice(i, 1);
-                break;
-            }
-        }
+        // for (let i = 0; i < this.customer_premise_equipments.length; i++) {
+        //     if (this.customer_premise_equipments[i].id === id) {
+        //         this.customer_premise_equipments[i].delete();
+        //         this.customer_premise_equipments.splice(i, 1);
+        //         break;
+        //     }
+        // }
+        this.customer_premise_equipments = this.customer_premise_equipments ? this.customer_premise_equipments.filter((r) => r.id !== id) : []
     }
 
     // Database System
@@ -457,13 +461,14 @@ class OkitJson {
         return undefined;
     }
     deleteDatabaseSystem(id) {
-        for (let i = 0; i < this.database_systems.length; i++) {
-            if (this.database_systems[i].id === id) {
-                this.database_systems[i].delete();
-                this.database_systems.splice(i, 1);
-                break;
-            }
-        }
+        // for (let i = 0; i < this.database_systems.length; i++) {
+        //     if (this.database_systems[i].id === id) {
+        //         this.database_systems[i].delete();
+        //         this.database_systems.splice(i, 1);
+        //         break;
+        //     }
+        // }
+        this.database_systems = this.database_systems ? this.database_systems.filter((r) => r.id !== id) : []
     }
 
     // Dynamic Routing Gateway
@@ -484,13 +489,14 @@ class OkitJson {
         return undefined;
     }
     deleteDynamicRoutingGateway(id) {
-        for (let i = 0; i < this.dynamic_routing_gateways.length; i++) {
-            if (this.dynamic_routing_gateways[i].id === id) {
-                this.dynamic_routing_gateways[i].delete();
-                this.dynamic_routing_gateways.splice(i, 1);
-                break;
-            }
-        }
+        // for (let i = 0; i < this.dynamic_routing_gateways.length; i++) {
+        //     if (this.dynamic_routing_gateways[i].id === id) {
+        //         this.dynamic_routing_gateways[i].delete();
+        //         this.dynamic_routing_gateways.splice(i, 1);
+        //         break;
+        //     }
+        // }
+        this.dynamic_routing_gateways = this.dynamic_routing_gateways ? this.dynamic_routing_gateways.filter((r) => r.id !== id) : []
     }
 
     // FastConnect
@@ -511,13 +517,14 @@ class OkitJson {
         return undefined;
     }
     deleteFastConnect(id) {
-        for (let i = 0; i < this.fast_connects.length; i++) {
-            if (this.fast_connects[i].id === id) {
-                this.fast_connects[i].delete();
-                this.fast_connects.splice(i, 1);
-                break;
-            }
-        }
+        // for (let i = 0; i < this.fast_connects.length; i++) {
+        //     if (this.fast_connects[i].id === id) {
+        //         this.fast_connects[i].delete();
+        //         this.fast_connects.splice(i, 1);
+        //         break;
+        //     }
+        // }
+        this.fast_connects = this.fast_connects ? this.fast_connects.filter((r) => r.id !== id) : []
     }
 
     // File Storage System
@@ -538,13 +545,14 @@ class OkitJson {
         return undefined;
     }
     deleteFileStorageSystem(id) {
-        for (let i = 0; i < this.file_storage_systems.length; i++) {
-            if (this.file_storage_systems[i].id === id) {
-                this.file_storage_systems[i].delete();
-                this.file_storage_systems.splice(i, 1);
-                break;
-            }
-        }
+        // for (let i = 0; i < this.file_storage_systems.length; i++) {
+        //     if (this.file_storage_systems[i].id === id) {
+        //         this.file_storage_systems[i].delete();
+        //         this.file_storage_systems.splice(i, 1);
+        //         break;
+        //     }
+        // }
+        this.file_storage_systems = this.file_storage_systems ? this.file_storage_systems.filter((r) => r.id !== id) : []
     }
 
     // All Instance Resources
@@ -570,13 +578,14 @@ class OkitJson {
         return undefined;
     }
     deleteInstance(id) {
-        for (let i = 0; i < this.instances.length; i++) {
-            if (this.instances[i].id === id) {
-                this.instances[i].delete();
-                this.instances.splice(i, 1);
-                break;
-            }
-        }
+        // for (let i = 0; i < this.instances.length; i++) {
+        //     if (this.instances[i].id === id) {
+        //         this.instances[i].delete();
+        //         this.instances.splice(i, 1);
+        //         break;
+        //     }
+        // }
+        this.instances = this.instances ? this.instances.filter((r) => r.id !== id) : []
     }
     getInstanceByBlockVolumeId(id) {
         return this.getInstances().filter(i => i.block_storage_volume_ids.includes(id));
@@ -600,13 +609,14 @@ class OkitJson {
         return undefined;
     }
     deleteInstancePool(id) {
-        for (let i = 0; i < this.instance_pools.length; i++) {
-            if (this.instance_pools[i].id === id) {
-                this.instance_pools[i].delete();
-                this.instance_pools.splice(i, 1);
-                break;
-            }
-        }
+        // for (let i = 0; i < this.instance_pools.length; i++) {
+        //     if (this.instance_pools[i].id === id) {
+        //         this.instance_pools[i].delete();
+        //         this.instance_pools.splice(i, 1);
+        //         break;
+        //     }
+        // }
+        this.instance_pools = this.instance_pools ? this.instance_pools.filter((r) => r.id !== id) : []
     }
 
     // Internet Gateway
@@ -627,13 +637,14 @@ class OkitJson {
         return undefined;
     }
     deleteInternetGateway(id) {
-        for (let i = 0; i < this.internet_gateways.length; i++) {
-            if (this.internet_gateways[i].id === id) {
-                this.internet_gateways[i].delete();
-                this.internet_gateways.splice(i, 1);
-                break;
-            }
-        }
+        // for (let i = 0; i < this.internet_gateways.length; i++) {
+        //     if (this.internet_gateways[i].id === id) {
+        //         this.internet_gateways[i].delete();
+        //         this.internet_gateways.splice(i, 1);
+        //         break;
+        //     }
+        // }
+        this.internet_gateways = this.internet_gateways ? this.internet_gateways.filter((r) => r.id !== id) : []
     }
 
     // IPSec Connection
@@ -652,13 +663,14 @@ class OkitJson {
         return undefined;
     }
     deleteIpsecConnection(id) {
-        for (let i = 0; i < this.ipsec_connections.length; i++) {
-            if (this.ipsec_connections[i].id === id) {
-                this.ipsec_connections[i].delete();
-                this.ipsec_connections.splice(i, 1);
-                break;
-            }
-        }
+        // for (let i = 0; i < this.ipsec_connections.length; i++) {
+        //     if (this.ipsec_connections[i].id === id) {
+        //         this.ipsec_connections[i].delete();
+        //         this.ipsec_connections.splice(i, 1);
+        //         break;
+        //     }
+        // }
+        this.ipsec_connections = this.ipsec_connections ? this.ipsec_connections.filter((r) => r.id !== id) : []
     }
 
     // Load Balancer
@@ -679,13 +691,14 @@ class OkitJson {
         return undefined;
     }
     deleteLoadBalancer(id) {
-        for (let i = 0; i < this.load_balancers.length; i++) {
-            if (this.load_balancers[i].id === id) {
-                this.load_balancers[i].delete();
-                this.load_balancers.splice(i, 1);
-                break;
-            }
-        }
+        // for (let i = 0; i < this.load_balancers.length; i++) {
+        //     if (this.load_balancers[i].id === id) {
+        //         this.load_balancers[i].delete();
+        //         this.load_balancers.splice(i, 1);
+        //         break;
+        //     }
+        // }
+        this.load_balancers = this.load_balancers ? this.load_balancers.filter((r) => r.id !== id) : []
     }
 
     // Local Peering Gateway
@@ -706,13 +719,14 @@ class OkitJson {
         return undefined;
     }
     deleteLocalPeeringGateway(id) {
-        for (let i = 0; i < this.local_peering_gateways.length; i++) {
-            if (this.local_peering_gateways[i].id === id) {
-                this.local_peering_gateways[i].delete();
-                this.local_peering_gateways.splice(i, 1);
-                break;
-            }
-        }
+        // for (let i = 0; i < this.local_peering_gateways.length; i++) {
+        //     if (this.local_peering_gateways[i].id === id) {
+        //         this.local_peering_gateways[i].delete();
+        //         this.local_peering_gateways.splice(i, 1);
+        //         break;
+        //     }
+        // }
+        this.local_peering_gateways = this.local_peering_gateways ? this.local_peering_gateways.filter((r) => r.id !== id) : []
     }
 
     // MySQL Database System
@@ -731,13 +745,14 @@ class OkitJson {
         return undefined;
     }
     deleteMysqlDatabaseSystem(id) {
-        for (let i = 0; i < this.mysql_database_systems.length; i++) {
-            if (this.mysql_database_systems[i].id === id) {
-                this.mysql_database_systems[i].delete();
-                this.mysql_database_systems.splice(i, 1);
-                break;
-            }
-        }
+        // for (let i = 0; i < this.mysql_database_systems.length; i++) {
+        //     if (this.mysql_database_systems[i].id === id) {
+        //         this.mysql_database_systems[i].delete();
+        //         this.mysql_database_systems.splice(i, 1);
+        //         break;
+        //     }
+        // }
+        this.mysql_database_systems = this.mysql_database_systems ? this.mysql_database_systems.filter((r) => r.id !== id) : []
     }
 
     // NAT Gateway
@@ -756,13 +771,14 @@ class OkitJson {
         return undefined;
     }
     deleteNatGateway(id) {
-        for (let i = 0; i < this.nat_gateways.length; i++) {
-            if (this.nat_gateways[i].id === id) {
-                this.nat_gateways[i].delete();
-                this.nat_gateways.splice(i, 1);
-                break;
-            }
-        }
+        // for (let i = 0; i < this.nat_gateways.length; i++) {
+        //     if (this.nat_gateways[i].id === id) {
+        //         this.nat_gateways[i].delete();
+        //         this.nat_gateways.splice(i, 1);
+        //         break;
+        //     }
+        // }
+        this.nat_gateways = this.nat_gateways ? this.nat_gateways.filter((r) => r.id !== id) : []
     }
 
     // Network Security Group
@@ -783,13 +799,14 @@ class OkitJson {
         return undefined;
     }
     deleteNetworkSecurityGroup(id) {
-        for (let i = 0; i < this.network_security_groups.length; i++) {
-            if (this.network_security_groups[i].id === id) {
-                this.network_security_groups[i].delete();
-                this.network_security_groups.splice(i, 1);
-                break;
-            }
-        }
+        // for (let i = 0; i < this.network_security_groups.length; i++) {
+        //     if (this.network_security_groups[i].id === id) {
+        //         this.network_security_groups[i].delete();
+        //         this.network_security_groups.splice(i, 1);
+        //         break;
+        //     }
+        // }
+        this.network_security_groups = this.network_security_groups ? this.network_security_groups.filter((r) => r.id !== id) : []
     }
 
     // Object Storage Bucket
@@ -810,13 +827,14 @@ class OkitJson {
         return undefined;
     }
     deleteObjectStorageBucket(id) {
-        for (let i = 0; i < this.object_storage_buckets.length; i++) {
-            if (this.object_storage_buckets[i].id === id) {
-                this.object_storage_buckets[i].delete();
-                this.object_storage_buckets.splice(i, 1);
-                break;
-            }
-        }
+        // for (let i = 0; i < this.object_storage_buckets.length; i++) {
+        //     if (this.object_storage_buckets[i].id === id) {
+        //         this.object_storage_buckets[i].delete();
+        //         this.object_storage_buckets.splice(i, 1);
+        //         break;
+        //     }
+        // }
+        this.object_storage_buckets = this.object_storage_buckets ? this.object_storage_buckets.filter((r) => r.id !== id) : []
     }
 
     // OkeCluster
@@ -837,13 +855,14 @@ class OkitJson {
         return undefined;
     }
     deleteOkeCluster(id) {
-        for (let i = 0; i < this.oke_clusters.length; i++) {
-            if (this.oke_clusters[i].id === id) {
-                this.oke_clusters[i].delete();
-                this.oke_clusters.splice(i, 1);
-                break;
-            }
-        }
+        // for (let i = 0; i < this.oke_clusters.length; i++) {
+        //     if (this.oke_clusters[i].id === id) {
+        //         this.oke_clusters[i].delete();
+        //         this.oke_clusters.splice(i, 1);
+        //         break;
+        //     }
+        // }
+        this.oke_clusters = this.oke_clusters ? this.oke_clusters.filter((r) => r.id !== id) : []
     }
 
     // RemotePeeringConnection
@@ -862,13 +881,14 @@ class OkitJson {
         return undefined;
     }
     deleteRemotePeeringConnection(id) {
-        for (let i = 0; i < this.remote_peering_connections.length; i++) {
-            if (this.remote_peering_connections[i].id === id) {
-                this.remote_peering_connections[i].delete();
-                this.remote_peering_connections.splice(i, 1);
-                break;
-            }
-        }
+        // for (let i = 0; i < this.remote_peering_connections.length; i++) {
+        //     if (this.remote_peering_connections[i].id === id) {
+        //         this.remote_peering_connections[i].delete();
+        //         this.remote_peering_connections.splice(i, 1);
+        //         break;
+        //     }
+        // }
+        this.remote_peering_connections = this.remote_peering_connections ? this.remote_peering_connections.filter((r) => r.id !== id) : []
     }
 
     // Route Table
@@ -889,13 +909,14 @@ class OkitJson {
         return undefined;
     }
     deleteRouteTable(id) {
-        for (let i = 0; i < this.route_tables.length; i++) {
-            if (this.route_tables[i].id === id) {
-                this.route_tables[i].delete();
-                this.route_tables.splice(i, 1);
-                break;
-            }
-        }
+        // for (let i = 0; i < this.route_tables.length; i++) {
+        //     if (this.route_tables[i].id === id) {
+        //         this.route_tables[i].delete();
+        //         this.route_tables.splice(i, 1);
+        //         break;
+        //     }
+        // }
+        this.route_tables = this.route_tables ? this.route_tables.filter((r) => r.id !== id) : []
     }
 
     // Security List
@@ -916,13 +937,14 @@ class OkitJson {
         return undefined;
     }
     deleteSecurityList(id) {
-        for (let i = 0; i < this.security_lists.length; i++) {
-            if (this.security_lists[i].id === id) {
-                this.security_lists[i].delete();
-                this.security_lists.splice(i, 1);
-                break;
-            }
-        }
+        // for (let i = 0; i < this.security_lists.length; i++) {
+        //     if (this.security_lists[i].id === id) {
+        //         this.security_lists[i].delete();
+        //         this.security_lists.splice(i, 1);
+        //         break;
+        //     }
+        // }
+        this.security_lists = this.security_lists ? this.security_lists.filter((r) => r.id !== id) : []
     }
 
     // Service Gateway
@@ -943,13 +965,14 @@ class OkitJson {
         return undefined;
     }
     deleteServiceGateway(id) {
-        for (let i = 0; i < this.service_gateways.length; i++) {
-            if (this.service_gateways[i].id === id) {
-                this.service_gateways[i].delete();
-                this.service_gateways.splice(i, 1);
-                break;
-            }
-        }
+        // for (let i = 0; i < this.service_gateways.length; i++) {
+        //     if (this.service_gateways[i].id === id) {
+        //         this.service_gateways[i].delete();
+        //         this.service_gateways.splice(i, 1);
+        //         break;
+        //     }
+        // }
+        this.service_gateways = this.service_gateways ? this.service_gateways.filter((r) => r.id !== id) : []
     }
 
     // Subnet
@@ -970,13 +993,14 @@ class OkitJson {
         return undefined;
     }
     deleteSubnet(id) {
-        for (let i = 0; i < this.subnets.length; i++) {
-            if (this.subnets[i].id === id) {
-                this.subnets[i].delete();
-                this.subnets.splice(i, 1);
-                break;
-            }
-        }
+        // for (let i = 0; i < this.subnets.length; i++) {
+        //     if (this.subnets[i].id === id) {
+        //         this.subnets[i].delete();
+        //         this.subnets.splice(i, 1);
+        //         break;
+        //     }
+        // }
+        this.subnets = this.subnets ? this.subnets.filter((r) => r.id !== id) : []
     }
 
     // Virtual Cloud Network
@@ -1000,13 +1024,14 @@ class OkitJson {
         return this.getVirtualCloudNetwork(id);
     }
     deleteVirtualCloudNetwork(id) {
-        for (let i = 0; i < this.virtual_cloud_networks.length; i++) {
-            if (this.virtual_cloud_networks[i].id === id) {
-                this.virtual_cloud_networks[i].delete();
-                this.virtual_cloud_networks.splice(i, 1);
-                break;
-            }
-        }
+        // for (let i = 0; i < this.virtual_cloud_networks.length; i++) {
+        //     if (this.virtual_cloud_networks[i].id === id) {
+        //         this.virtual_cloud_networks[i].delete();
+        //         this.virtual_cloud_networks.splice(i, 1);
+        //         break;
+        //     }
+        // }
+        this.virtual_cloud_networks = this.virtual_cloud_networks ? this.virtual_cloud_networks.filter((r) => r.id !== id) : []
     }
 
     // Fragment
@@ -1085,6 +1110,7 @@ class OkitArtifact {
         this.compartment_id = '';
         this.display_name = '';
         this.definition = '';
+        this.okit_reference = `okit-${uuidv4()}`;
         // Add default for common Tag variables
         this.freeform_tags = {};
         this.defined_tags = {};
@@ -1104,6 +1130,7 @@ class OkitArtifact {
     get list_name() {return `${this.resource_name.toLowerCase().split(' ').join('_')}s`;}
     get json_model_list() {return this.okit_json[this.list_name];}
     set json_model_list(list) {this.okit_json[this.list_name] = list;}
+    get children() {return Object.values(this.getOkitJson()).filter((val) => Array.isArray(val)).reduce((a, v) => [...a, ...v], []).filter((r) => r.parent_id === this.id)}
 
     /*
     ** Clone Functionality
@@ -1187,7 +1214,7 @@ class OkitArtifact {
     }
 
     getNamePrefix() {
-        return okitSettings ? okitSettings.name_prefix : 'okit-';
+        return okitSettings ? okitSettings.name_prefix : 'okit';
     }
 
     getAvailabilityDomainNumber(availability_domain) {
diff --git a/okitweb/static/okit/palette/deprecated/compute/Analytics_Instance.svg b/okitweb/static/okit/palette/deprecated/compute/Analytics_Instance.svg
deleted file mode 100644
index 90a975465..000000000
--- a/okitweb/static/okit/palette/deprecated/compute/Analytics_Instance.svg
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 49.2 42" style="enable-background:new 0 0 49.2 42;" xml:space="preserve">
-<g>
-	<g>
-		<path style="fill:#FFFFFF;" d="M17.3,41.5v-1.8l2.4-1.2H20l0.1-0.5h-8.8V25H0.5l0.1-1.6c0.3-4,2.6-7.6,6.2-9.4
-			c0.8-0.4,1.4-1.2,1.5-2c0.6-2.8,2.5-5.2,5.1-6.4c1.1-0.5,2.3-0.7,3.6-0.7c0.3,0,0.5,0,0.8,0c0.1,0,0.2,0,0.3,0
-			c0.8,0,1.5-0.3,2-0.9c2.1-2.2,5-3.5,8-3.5c4.1,0,7.9,2.3,9.7,6c0.4,0.8,1.1,1.4,2,1.6c1.2,0.3,2.4,0.8,3.5,1.5
-			c4.9,3.1,6.6,9.6,3.9,14.7L47,25h-8.9V38h-8.8l0.1,0.5h0.5l2.4,1.2v1.8H17.3z"/>
-		<path style="fill:#FFFFFF;" d="M28.2,1c4,0,7.5,2.2,9.3,5.7c0.5,0.9,1.3,1.6,2.4,1.8c1.2,0.3,2.3,0.7,3.4,1.4
-			c4.7,3,6.3,9.1,3.7,14l-0.3,0.5h-9.1v12.9h-8.9l0.2,1.5h0.9l2,1v1h-2h-9.9h-2v-1l2-1h0.6l0.2-1.5h-8.9V24.5H1.1l0.1-1.1
-			c0.3-3.9,2.5-7.2,5.9-9c0.9-0.5,1.6-1.4,1.8-2.4c0.5-2.7,2.3-4.9,4.8-6c1.1-0.5,2.2-0.7,3.4-0.7c0.3,0,0.5,0,0.8,0
-			c0.1,0,0.2,0,0.3,0c0.9,0,1.8-0.4,2.4-1C22.6,2.2,25.3,1,28.2,1 M28.2,0c-3.2,0-6.2,1.3-8.3,3.6c-0.4,0.5-1,0.7-1.7,0.7
-			c-0.1,0-0.2,0-0.2,0c-0.3,0-0.6,0-0.9,0c-1.3,0-2.6,0.3-3.8,0.8c-2.8,1.2-4.8,3.8-5.4,6.8c-0.1,0.7-0.6,1.3-1.3,1.7
-			c-3.7,2-6.2,5.6-6.5,9.8l-0.1,1.1L0,25.5h1.1h9.7v11.9v1h1h6.9l-1.3,0.6l-0.6,0.3V40v1v1h1h2h9.9h2h1v-1v-1v-0.6l-0.6-0.3
-			l-1.3-0.6h6.6h1v-1V25.5h8.1h0.6l0.3-0.5l0.3-0.5c2.9-5.4,1.1-12.1-4-15.4c-1.1-0.7-2.4-1.2-3.7-1.5c-0.7-0.2-1.4-0.6-1.7-1.3
-			C36.5,2.4,32.6,0,28.2,0L28.2,0z"/>
-	</g>
-	<g>
-		<path style="fill:#2C5967;" d="M11.8,37.5h8.9L20.5,39h-0.6v0l-2,1v1h2v0h9.9v0h2v-1l-2-1v0h-0.9l-0.2-1.5h8.9v-20H11.8V37.5z
-			 M22.5,39l0.2-1.5h4l0.2,1.5H22.5z M13.8,19.5h21.8v12.4h-3.3v1h-2v-1h-2.4v1h-2v-1h-2.4v1h-2v-1h-2.4v1h-2v-1h-3V19.5z
-			 M13.8,33.9h21.8v1.5H13.8V33.9z"/>
-		<path style="fill:#2C5967;" d="M43.2,10c-1-0.7-2.2-1.1-3.4-1.4c-1-0.2-1.9-0.9-2.4-1.8C35.7,3.2,32.2,1,28.2,1
-			c-2.9,0-5.7,1.2-7.6,3.3c-0.7,0.7-1.7,1.1-2.7,1C16.4,5.2,15,5.4,13.7,6c-2.5,1.1-4.3,3.4-4.8,6c-0.2,1-0.9,1.9-1.8,2.4
-			c-3.4,1.8-5.6,5.2-5.9,9l-0.1,1.1h9.2v-2H3.3c0.5-2.7,2.2-5,4.7-6.3c1.5-0.8,2.5-2.2,2.8-3.8c0.4-2,1.8-3.7,3.7-4.6
-			c1-0.4,2.1-0.6,3.1-0.5c1.7,0.2,3.3-0.4,4.4-1.7C23.7,4,25.9,3,28.2,3c3.2,0,6.1,1.8,7.5,4.6c0.7,1.5,2.1,2.6,3.8,2.9
-			c1,0.2,1.9,0.6,2.7,1.1c3.6,2.3,5,7,3.3,10.8h-6.3v2h7.6l0.3-0.5C49.6,19.1,48,12.9,43.2,10z"/>
-		<polygon style="fill:#2C5967;" points="16.8,28.3 16.8,31.9 16.8,32.9 18.8,32.9 18.8,31.9 18.8,28.3 		"/>
-		<polygon style="fill:#2C5967;" points="21.3,26.3 21.3,31.9 21.3,32.9 23.3,32.9 23.3,31.9 23.3,26.3 		"/>
-		<polygon style="fill:#2C5967;" points="25.8,23.5 25.8,31.9 25.8,32.9 27.8,32.9 27.8,31.9 27.8,23.5 		"/>
-		<polygon style="fill:#2C5967;" points="30.2,21 30.2,31.9 30.2,32.9 32.3,32.9 32.3,31.9 32.3,21 		"/>
-	</g>
-</g>
-</svg>
diff --git a/okitweb/static/okit/palette/deprecated/compute/Instance.svg b/okitweb/static/okit/palette/deprecated/compute/Instance.svg
deleted file mode 100644
index c195b846a..000000000
--- a/okitweb/static/okit/palette/deprecated/compute/Instance.svg
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 42 42" style="enable-background:new 0 0 42 42;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FFFFFF;}
-	.st1{fill:#2C5967;}
-</style>
-<g>
-	<g>
-		<path class="st0" d="M2.67,41.5c-1.19,0-2.17-0.97-2.17-2.17V2.67c0-1.19,0.97-2.17,2.17-2.17h36.67c1.19,0,2.17,0.97,2.17,2.17
-			v36.67c0,1.19-0.97,2.17-2.17,2.17H2.67z"/>
-		<path class="st0" d="M39.33,1C40.25,1,41,1.75,41,2.67v36.67c0,0.92-0.75,1.67-1.67,1.67H2.67C1.75,41,1,40.25,1,39.33V2.67
-			C1,1.75,1.75,1,2.67,1H39.33 M39.33,0H2.67C1.2,0,0,1.2,0,2.67v36.67C0,40.8,1.2,42,2.67,42h36.67C40.8,42,42,40.8,42,39.33V2.67
-			C42,1.2,40.8,0,39.33,0L39.33,0z"/>
-	</g>
-	<g>
-		<path class="st1" d="M39.33,1H2.67C1.75,1,1,1.75,1,2.67v36.67C1,40.25,1.75,41,2.67,41h36.67c0.92,0,1.67-0.75,1.67-1.67V2.67
-			C41,1.75,40.25,1,39.33,1z M39.52,39.33c0,0.1-0.08,0.19-0.19,0.19H2.67c-0.1,0-0.19-0.08-0.19-0.19V2.67
-			c0-0.1,0.08-0.19,0.19-0.19h36.67c0.1,0,0.19,0.08,0.19,0.19V39.33z"/>
-		<path class="st1" d="M6.56,35.44h29.07v-8.89H6.56V35.44z M8.04,28.04h26.11v5.93H8.04V28.04z"/>
-		<circle class="st1" cx="30.81" cy="31" r="1.11"/>
-		<path class="st1" d="M15.44,6.56H6.56v8.89h8.89V6.56z M13.96,13.96H8.04V8.04h5.93V13.96z"/>
-		<path class="st1" d="M25.44,6.56h-8.89v8.89h8.89V6.56z M23.96,13.96h-5.93V8.04h5.93V13.96z"/>
-		<path class="st1" d="M15.44,16.56H6.56v8.89h8.89V16.56z M13.96,23.96H8.04v-5.93h5.93V23.96z"/>
-		<path class="st1" d="M25.44,16.56h-8.89v8.89h8.89V16.56z M23.96,23.96h-5.93v-5.93h5.93V23.96z"/>
-		<path class="st1" d="M35.44,6.56h-8.89v8.89h8.89V6.56z M33.96,13.96h-5.93V8.04h5.93V13.96z"/>
-		<path class="st1" d="M35.44,16.56h-8.89v8.89h8.89V16.56z M33.96,23.96h-5.93v-5.93h5.93V23.96z"/>
-	</g>
-</g>
-</svg>
diff --git a/okitweb/static/okit/palette/deprecated/containers/Compartment.svg b/okitweb/static/okit/palette/deprecated/containers/Compartment.svg
deleted file mode 100644
index 0a0242c82..000000000
--- a/okitweb/static/okit/palette/deprecated/containers/Compartment.svg
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 52.45 42" style="enable-background:new 0 0 52.45 42;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FFFFFF;}
-	.st1{fill:#2C5967;}
-</style>
-<g>
-	<g>
-		<g>
-			<path class="st0" d="M0.5,41.5V3.37c0-1.58,1.29-2.87,2.87-2.87h13.09c0.9,0,1.76,0.43,2.3,1.16l2.68,3.6h27.66
-				c1.58,0,2.87,1.29,2.87,2.87V41.5H0.5z"/>
-			<path class="st0" d="M16.46,1c0.74,0,1.45,0.36,1.9,0.95l2.83,3.8h27.91c1.3,0,2.37,1.06,2.37,2.37V41H1V3.37
-				C1,2.06,2.06,1,3.37,1H16.46 M16.46,0H3.37C1.51,0,0,1.51,0,3.37V41v1h1h50.45h1v-1V8.12c0-1.86-1.51-3.37-3.37-3.37h-27.4
-				l-2.53-3.4C18.53,0.51,17.52,0,16.46,0L16.46,0z"/>
-		</g>
-		<g>
-			<path class="st1" d="M49.09,5.76H21.18l-2.83-3.8C17.91,1.36,17.2,1,16.46,1H3.37C2.06,1,1,2.06,1,3.37V41h50.45V8.12
-				C51.45,6.82,50.39,5.76,49.09,5.76z M49.35,38.9H3.1V3.37c0-0.14,0.12-0.26,0.26-0.26h13.09c0.08,0,0.16,0.04,0.21,0.11
-				l3.46,4.65h28.96c0.14,0,0.26,0.12,0.26,0.26V38.9z"/>
-			<polygon class="st1" points="9.15,13.64 11.25,13.64 11.25,10.49 14.4,10.49 14.4,8.39 11.25,8.39 11.25,5.23 9.15,5.23 
-				9.15,8.39 5.99,8.39 5.99,10.49 9.15,10.49 			"/>
-			<path class="st1" d="M40.93,22.32l-1.84-3.3l-1.83,3.3l-2.78,5.02l-1.73,3.12h3.57h5.58h3.58l-1.75-3.13L40.93,22.32z
-				 M36.31,28.36l2.78-5.02l2.8,5.02H36.31z"/>
-			<path class="st1" d="M29.56,20.23c-0.88-0.54-1.88-0.83-2.9-0.83h0c-0.43,0-0.86,0.05-1.27,0.15c-2.96,0.7-4.8,3.68-4.1,6.64
-				c0.59,2.5,2.8,4.25,5.37,4.25c0.42,0,0.85-0.05,1.26-0.15c1.44-0.34,2.65-1.22,3.43-2.47c0.77-1.25,1.01-2.73,0.68-4.17
-				C31.69,22.22,30.81,21,29.56,20.23z M29.56,26.72c-0.48,0.78-1.23,1.32-2.12,1.53c-0.26,0.06-0.52,0.09-0.78,0.09
-				c-1.55,0-2.95-1.06-3.33-2.63c-0.43-1.83,0.71-3.68,2.54-4.11c0.26-0.06,0.53-0.09,0.79-0.09c0.63,0,1.24,0.17,1.79,0.51
-				c0.78,0.48,1.32,1.23,1.53,2.12C30.19,25.02,30.04,25.94,29.56,26.72z"/>
-			<path class="st1" d="M16.83,20.73l-0.61-1.04h-1.21H11.2H9.99l-0.61,1.04l-1.92,3.28l-0.62,1.06l0.62,1.06l1.92,3.29l0.61,1.04
-				h1.21h3.82h1.21l0.61-1.04l1.92-3.29l0.62-1.06l-0.62-1.06L16.83,20.73z M15.02,28.36H11.2l-1.92-3.29l1.92-3.28h3.82l1.92,3.28
-				L15.02,28.36z"/>
-		</g>
-	</g>
-</g>
-</svg>
diff --git a/okitweb/static/okit/palette/deprecated/containers/Oke_Cluster.svg b/okitweb/static/okit/palette/deprecated/containers/Oke_Cluster.svg
deleted file mode 100644
index 8d2275b6e..000000000
--- a/okitweb/static/okit/palette/deprecated/containers/Oke_Cluster.svg
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 42 42" style="enable-background:new 0 0 42 42;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FFFFFF;}
-	.st1{fill:#2C5967;}
-</style>
-<g>
-	<g>
-		<path class="st0" d="M2.67,41.5c-1.19,0-2.17-0.97-2.17-2.17V2.67c0-1.19,0.97-2.17,2.17-2.17h36.67c1.19,0,2.17,0.97,2.17,2.17
-			v36.67c0,1.19-0.97,2.17-2.17,2.17H2.67z"/>
-		<path class="st0" d="M39.33,1C40.25,1,41,1.75,41,2.67v36.67c0,0.92-0.75,1.67-1.67,1.67H2.67C1.75,41,1,40.25,1,39.33V2.67
-			C1,1.75,1.75,1,2.67,1H39.33 M39.33,0H2.67C1.2,0,0,1.2,0,2.67v36.67C0,40.8,1.2,42,2.67,42h36.67C40.8,42,42,40.8,42,39.33V2.67
-			C42,1.2,40.8,0,39.33,0L39.33,0z"/>
-	</g>
-	<g>
-		<path class="st1" d="M39.33,1H2.67C1.75,1,1,1.75,1,2.67v36.67C1,40.25,1.75,41,2.67,41h36.67c0.92,0,1.67-0.75,1.67-1.67V2.67
-			C41,1.75,40.25,1,39.33,1z M39.52,39.33c0,0.1-0.08,0.19-0.19,0.19H2.67c-0.1,0-0.19-0.08-0.19-0.19V2.67
-			c0-0.1,0.08-0.19,0.19-0.19h36.67c0.1,0,0.19,0.08,0.19,0.19V39.33z"/>
-		<path class="st1" d="M20.35,5.44h-8.89v8.89h8.89V5.44z M18.87,12.85h-5.93V6.93h5.93V12.85z"/>
-		<path class="st1" d="M30.35,5.44h-8.89v8.89h8.89V5.44z M28.87,12.85h-5.93V6.93h5.93V12.85z"/>
-		<polygon class="st1" points="18.04,16.93 23.96,16.93 23.96,19.27 25.44,19.64 25.44,15.44 16.56,15.44 16.56,19.64 18.04,19.27 
-					"/>
-		<polygon class="st1" points="28.04,16.93 33.96,16.93 33.96,21.75 35.44,22.12 35.44,15.44 26.56,15.44 26.56,19.92 28.04,20.28 
-					"/>
-		<polygon class="st1" points="8.04,16.93 13.96,16.93 13.96,20.28 15.44,19.92 15.44,15.44 6.56,15.44 6.56,22.12 8.04,21.75 		"/>
-		<path class="st1" d="M21,19.68L5.18,23.61l0.18,0.72c1.78,7.2,8.21,12.23,15.64,12.23s13.86-5.03,15.64-12.23l0.18-0.72L21,19.68z
-			 M20.26,21.39v13.66C14.08,34.75,8.78,30.6,6.99,24.68L20.26,21.39z M21,35.63L21,35.63L21,35.63z M21.74,35.05V21.39l13.27,3.29
-			C33.22,30.6,27.92,34.75,21.74,35.05z"/>
-	</g>
-</g>
-</svg>
diff --git a/okitweb/static/okit/palette/deprecated/database/Autonomous_Database.svg b/okitweb/static/okit/palette/deprecated/database/Autonomous_Database.svg
deleted file mode 100644
index 7b2024747..000000000
--- a/okitweb/static/okit/palette/deprecated/database/Autonomous_Database.svg
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 48.47 42.02" style="enable-background:new 0 0 48.47 42.02;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FFFFFF;}
-	.st1{fill:#2C5967;}
-</style>
-<g>
-	<g>
-		<path class="st0" d="M22.5,41.52c-3.12,0-6.07-0.29-8.29-0.83c-2.95-0.71-4.39-1.78-4.39-3.29V22.9H0.54l0.11-1.52
-			c0.27-3.67,2.39-6.89,5.65-8.61c0.71-0.38,1.21-1.04,1.36-1.81c0.51-2.6,2.26-4.78,4.68-5.85c1.02-0.45,2.15-0.68,3.26-0.68
-			c0.25,0,0.5,0.01,0.75,0.03c0.09,0.01,0.17,0.01,0.26,0.01c0.71,0,1.36-0.28,1.82-0.78c1.72-1.85,4.01-2.96,6.51-3.15V0.54l1-0.02
-			l0,0.01c3.69,0.08,6.99,2.17,8.65,5.49c0.12,0.24,0.29,0.47,0.48,0.67c0.24,0.35,0.56,0.8,0.84,1.2c3,0.1,5.73,1.67,7.33,4.24
-			l0.04,0.07l0.35,1.53l4.12,4.12l-2.01,2.01l-1.3-1.3c-0.79,4.19-4.49,7.34-8.85,7.34c-0.14,0-0.28,0-0.42-0.01v11.53
-			c0,1.5-1.44,2.58-4.39,3.29C28.57,41.23,25.62,41.52,22.5,41.52z"/>
-		<path class="st0" d="M25.72,1.02c3.59,0,6.83,2,8.43,5.22c0.15,0.3,0.35,0.57,0.58,0.8c0.22,0.34,0.62,0.9,0.93,1.34
-			c2.98,0.02,5.66,1.59,7.16,4.01l0.37,1.58l3.87,3.87l-1.3,1.3l-1.67-1.67c-0.3,4.42-3.99,7.92-8.48,7.92
-			c-0.31,0-0.62-0.03-0.92-0.06v12.08c0,1.24-1.31,2.16-4,2.8c-2.2,0.53-5.1,0.81-8.18,0.81s-5.98-0.29-8.18-0.81
-			c-2.69-0.64-4-1.56-4-2.8V22.4H1.08l0.07-0.99c0.26-3.5,2.27-6.56,5.39-8.2c0.85-0.45,1.44-1.23,1.62-2.16
-			c0.48-2.44,2.12-4.49,4.39-5.49c0.97-0.42,2.01-0.64,3.06-0.64c0.24,0,0.47,0.01,0.7,0.03c0.1,0.01,0.2,0.01,0.31,0.01
-			c0.84,0,1.63-0.33,2.19-0.94c1.74-1.87,4.1-2.94,6.65-3.01l0.02,0.92l-0.02-0.92C25.55,1.02,25.63,1.02,25.72,1.02 M26.44,0
-			l-1,0.03c-0.01,0-0.01,0-0.02,0l-0.98,0.03l0,0.05C22,0.4,19.77,1.53,18.08,3.36c-0.37,0.4-0.89,0.62-1.46,0.62
-			c-0.07,0-0.14,0-0.21-0.01c-0.27-0.02-0.53-0.04-0.8-0.04c-1.18,0-2.38,0.25-3.46,0.73c-2.57,1.13-4.43,3.45-4.97,6.21
-			c-0.12,0.63-0.53,1.16-1.11,1.46c-3.42,1.8-5.63,5.17-5.92,9.01l-0.07,0.99L0,23.4h1.08h8.24v14.01c0,2.63,3.59,3.49,4.77,3.77
-			c2.27,0.54,5.26,0.84,8.41,0.84c3.16,0,6.14-0.3,8.41-0.84c1.18-0.28,4.77-1.14,4.77-3.77V26.39c4.25-0.04,7.9-2.91,9.05-6.86
-			l0.32,0.32l0.71,0.71l0.71-0.71l1.3-1.3l0.71-0.71l-0.71-0.71l-3.67-3.67l-0.3-1.31L43.76,12l-0.09-0.14
-			c-1.64-2.63-4.41-4.27-7.48-4.46c-0.23-0.33-0.47-0.68-0.63-0.91l-0.05-0.08l-0.07-0.07c-0.16-0.17-0.3-0.35-0.39-0.55
-			c-1.67-3.34-4.92-5.5-8.61-5.75L26.44,0L26.44,0z"/>
-	</g>
-	<path class="st1" d="M3.12,20.56h5.82v1.84H1.08l0.07-0.99c0.26-3.5,2.27-6.56,5.39-8.2c0.85-0.45,1.44-1.23,1.62-2.16
-		c0.48-2.44,2.12-4.49,4.39-5.49c1.18-0.52,2.48-0.73,3.76-0.61c0.96,0.09,1.87-0.25,2.5-0.93c1.74-1.87,4.1-2.94,6.65-3.01h0
-		c0.08,0,0.17,0,0.25,0c3.59,0,6.83,2,8.43,5.22c0.15,0.3,0.35,0.57,0.58,0.8c-0.69,0.06-1.37,0.19-2.01,0.39
-		c-0.07-0.12-0.14-0.24-0.21-0.37c-1.29-2.59-3.9-4.2-6.79-4.2c-0.07,0-0.14,0-0.21,0c-2.05,0.05-3.96,0.92-5.36,2.42
-		c-1.02,1.1-2.49,1.65-4.02,1.51c-0.97-0.09-1.95,0.07-2.85,0.46c-1.72,0.76-2.96,2.31-3.33,4.16c-0.29,1.47-1.23,2.72-2.57,3.43
-		C5.14,16.02,3.59,18.12,3.12,20.56 M34.69,12h1.82l2.55,8.86h-1.96L36.66,19h-2.21l-0.43,1.86h-1.9L34.69,12z M34.8,17.49h1.52
-		l-0.76-3.31L34.8,17.49z M27.12,16.3l-1.67-1.67l-1.3,1.3l3.87,3.87l3.87-3.87l-1.3-1.3l-1.62,1.62c0.32-3.38,3.18-6.02,6.63-6.02
-		c2.5,0,4.74,1.4,5.88,3.52l1.34-1.34c-1.52-2.43-4.22-4.01-7.22-4.01C31.11,8.38,27.42,11.88,27.12,16.3 M47.06,17.84l-3.87-3.87
-		l-3.87,3.87l1.3,1.3l1.62-1.62c-0.32,3.38-3.18,6.02-6.63,6.02c-2.5,0-4.74-1.4-5.88-3.52l-1.34,1.34
-		c1.52,2.43,4.22,4.01,7.22,4.01c4.49,0,8.18-3.5,8.48-7.92l1.67,1.67L47.06,17.84z M32.85,26.58c0.59,0.18,1.21,0.3,1.84,0.36
-		v10.46c0,1.24-1.31,2.16-4,2.8c-2.2,0.53-5.1,0.81-8.18,0.81s-5.98-0.29-8.18-0.81c-2.69-0.64-4-1.56-4-2.8V17.8
-		c0-1.25,1.32-2.14,4.02-2.73c2.13-0.46,5.03-0.72,8.16-0.72c0.15,0,0.31,0,0.46,0v1.84c-0.15,0-0.3,0-0.46,0
-		c-6.55,0-9.93,1.07-10.34,1.67v0.11c0.44,0.67,4.19,1.84,10.34,1.84c1.27,0,2.44-0.05,3.5-0.13c0.18,0.62,0.41,1.22,0.7,1.78
-		c-1.32,0.12-2.74,0.19-4.2,0.19c-3.08,0-5.98-0.29-8.18-0.81c-0.86-0.21-1.58-0.44-2.17-0.71v4.28c0.44,0.67,4.19,1.84,10.34,1.84
-		c3.41,0,6.07-0.36,7.85-0.79c0.76,0.48,1.59,0.86,2.47,1.12c-0.58,0.26-1.29,0.49-2.14,0.69c-2.2,0.53-5.1,0.81-8.18,0.81
-		s-5.98-0.29-8.18-0.81c-0.86-0.21-1.58-0.44-2.17-0.71v4.33c0.44,0.67,4.19,1.84,10.34,1.84s9.91-1.17,10.34-1.84V26.58z
-		 M32.85,33.06c-0.58,0.26-1.3,0.5-2.17,0.71c-2.2,0.53-5.1,0.81-8.18,0.81s-5.98-0.29-8.18-0.81c-0.86-0.21-1.58-0.44-2.17-0.71
-		v4.29c0.39,0.56,3.79,1.84,10.34,1.84s9.96-1.27,10.34-1.84V33.06z"/>
-</g>
-</svg>
diff --git a/okitweb/static/okit/palette/deprecated/database/Database_System.svg b/okitweb/static/okit/palette/deprecated/database/Database_System.svg
deleted file mode 100644
index 0a64f4080..000000000
--- a/okitweb/static/okit/palette/deprecated/database/Database_System.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 42 42" style="enable-background:new 0 0 42 42;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FFFFFF;}
-	.st1{fill:#2C5967;}
-</style>
-<g>
-	<g>
-		<g>
-			<path class="st0" d="M29.66,41.5v-4.49h-9.72V26.92h-4.86v-4.67h-2.74v4.67H7.67v2.74h4.67V41.5H0.5V29.66h4.67v-2.74H0.5V15.08
-				h11.84v4.67h2.74v-4.67h4.86v-2.74h-4.86V0.5h11.84v11.84h-4.49v2.74h4.49v4.67h2.74v-4.67H41.5v11.84h-4.67v2.74h4.67V41.5
-				H29.66z M29.66,34.52v-4.86h4.67v-2.74h-4.67v-4.67h-2.74v4.67h-4.49v7.6H29.66z"/>
-			<path class="st0" d="M26.42,1v10.84h-4.49v3.74h4.49v4.67h3.74v-4.67H41v10.84h-4.67v3.74H41V41H30.16v-4.49h-9.72V26.42h-4.86
-				v-4.67h-3.74v4.67H7.17v3.74h4.67V41H1V30.16h4.67v-3.74H1V15.58h10.84v4.67h3.74v-4.67h4.86v-3.74h-4.86V1H26.42 M21.93,35.02
-				h8.22v-4.86h4.67v-3.74h-4.67v-4.67h-3.74v4.67h-4.49V35.02 M27.42,0h-1H15.58h-1v1v10.84v1h1h3.86v1.74h-3.86h-1v1v3.67h-1.74
-				v-3.67v-1h-1H1H0v1v10.84v1h1h3.67v1.74H1H0v1V41v1h1h10.84h1v-1V30.16v-1h-1H8.17v-1.74h3.67h1v-1v-3.67h1.74v3.67v1h1h3.86
-				v9.09v1h1h8.72V41v1h1H41h1v-1V30.16v-1h-1h-3.67v-1.74H41h1v-1V15.58v-1h-1H30.16h-1v1v3.67h-1.74v-3.67v-1h-1h-3.49v-1.74h3.49
-				h1v-1V1V0L27.42,0z M27.42,22.75h1.74v3.67v1h1h3.67v1.74h-3.67h-1v1v3.86h-6.22v-6.6h3.49h1v-1V22.75L27.42,22.75z"/>
-		</g>
-		<path class="st1" d="M41,26.42V15.58H30.16v4.67h-3.74v-4.67h-4.49v-3.74h4.49V1H15.58v10.84h4.86v3.74h-4.86v4.67h-3.74v-4.67H1
-			v10.84h4.67v3.74H1V41h10.84V30.16H7.17v-3.74h4.67v-4.67h3.74v4.67h4.86v10.09h9.72V41H41V30.16h-4.67v-3.74H41z M17.07,2.5h7.85
-			v7.85h-7.85V2.5z M10.35,39.5H2.5v-7.85h7.85V39.5z M10.35,24.93H2.5v-7.85h7.85V24.93z M31.65,17.07h7.85v7.85h-7.85V17.07z
-			 M17.07,17.07h7.85v7.85h-7.85V17.07z M39.5,39.5h-7.85v-7.85h7.85V39.5z M34.83,30.16h-4.67v4.86h-8.22v-8.6h4.49v-4.67h3.74
-			v4.67h4.67V30.16z"/>
-	</g>
-</g>
-</svg>
diff --git a/okitweb/static/okit/palette/deprecated/database/MySQL_Database_System.svg b/okitweb/static/okit/palette/deprecated/database/MySQL_Database_System.svg
deleted file mode 100644
index d97286ca7..000000000
--- a/okitweb/static/okit/palette/deprecated/database/MySQL_Database_System.svg
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 37.13 42" style="enable-background:new 0 0 37.13 42;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FFFFFF;}
-	.st1{fill:none;}
-	.st2{fill:#2C5967;}
-</style>
-<g>
-	<g>
-		<path class="st0" d="M27.54,41.5c-6.45,0-8.17-1.69-8.45-2.03l-0.27-0.33v-4.4H7.04c-2.23-0.16-3.91-0.95-5.05-2.35
-			c-1.86-2.27-1.45-5.2-1.45-5.23c0.53-3.09,2.29-4.65,3.68-5.43c0.65-0.36,1.35-0.62,2.07-0.79c1.22-3.15,3.66-3.86,4.14-3.97
-			c0.62-0.19,1.29-0.29,1.96-0.29c0.76,0,1.51,0.12,2.21,0.36c-0.2-0.17-0.39-0.39-0.58-0.64c-1.19-1.6-1.07-3.66-0.76-5.09
-			c0.07-0.36,0.17-0.72,0.29-1.07c0.05-0.12,0.09-0.21,0.14-0.3c0.02-0.03,0.03-0.05,0.04-0.08c-0.11-0.09-0.17-0.15-0.23-0.22
-			c-0.28-0.34-0.52-0.69-0.73-1.05c-0.3-0.53-0.56-1.08-0.77-1.65L11.8,6.5c-0.06-0.15-0.12-0.31-0.16-0.47
-			c-0.03-0.11-0.07-0.22-0.11-0.32c-0.15-0.24-0.36-0.52-0.6-0.76c-0.11-0.12-0.17-0.18-0.23-0.26c-0.05-0.06-0.11-0.13-0.18-0.2
-			C9.92,3.84,8.93,2.79,9.5,1.61c0.21-0.47,0.62-0.83,1.12-0.99c0.24-0.08,0.51-0.12,0.8-0.12c1.18,0,2.54,0.64,3.24,1.02
-			c0.15,0.09,0.28,0.18,0.41,0.28c0.09,0.07,0.18,0.13,0.28,0.19c1.47,0.02,2.95,0.38,4.27,1.02c2.6,1.31,4.86,3.25,6.55,5.61
-			c0.26,0.38,0.47,0.78,0.65,1.19c0.09,0.19,0.18,0.4,0.29,0.61c0.54,1.07,1.01,1.93,1.44,2.63c0.08,0.13,0.14,0.25,0.2,0.37
-			c0.13,0.25,0.27,0.48,0.45,0.69c0.24,0.17,0.5,0.28,0.78,0.34c0.24,0.07,0.42,0.13,0.57,0.19c0.63,0.26,1.19,0.52,1.72,0.81
-			c1.17,0.59,2.23,1.38,3.14,2.32c0.36,0.36,0.31,0.7,0.25,0.88c-0.15,0.46-0.67,0.54-1.01,0.6l-0.22,0.04
-			c-0.31,0.06-0.63,0.11-0.95,0.13c-0.28,0.02-0.55,0.06-0.82,0.11l-0.07,0.02c0.17,0.09,0.33,0.17,0.46,0.24l0.17,0.09
-			c0.18,0.09,0.34,0.17,0.47,0.25c0.74,0.44,1.4,0.99,1.98,1.64l0.48,0.38c0.25,0.21,0.31,0.32,0.33,0.36
-			c0.1,0.18,0.13,0.43,0.14,0.51c0.01,0.28-0.09,0.71-0.1,0.76c-0.06,0.25-0.27,0.82-0.35,1.04v14.5l-0.48,0.36
-			C35.6,39.74,33.18,41.5,27.54,41.5z M18.56,18.75c0.93,0,1.79,0.2,2.57,0.59v-0.02c-0.67-0.29-1.3-0.8-1.82-1.22l-0.08-0.07
-			c-0.67-0.5-1.23-1.09-1.67-1.79c0,0,0,0,0-0.01c-0.11,0.51-0.34,1.04-1.03,1.27c-0.19,0.07-0.39,0.1-0.59,0.1
-			c-0.03,0-0.07,0-0.1,0c0.58,0.33,1.11,0.75,1.58,1.24C17.81,18.78,18.19,18.75,18.56,18.75z"/>
-		<path class="st0" d="M11.42,1c1.09,0,2.41,0.64,3,0.96c0.11,0.07,0.22,0.14,0.33,0.23c0.14,0.12,0.3,0.22,0.47,0.3
-			c1.45,0.01,2.87,0.34,4.17,0.97c2.53,1.27,4.71,3.15,6.36,5.46c0.23,0.35,0.43,0.71,0.6,1.1c0.1,0.21,0.2,0.43,0.31,0.65
-			c0.51,1.01,1,1.91,1.46,2.66c0.07,0.11,0.13,0.23,0.19,0.34c0.14,0.3,0.33,0.58,0.55,0.82c0.3,0.23,0.65,0.38,1.02,0.46
-			c0.18,0.05,0.35,0.1,0.48,0.16c0.62,0.26,1.16,0.51,1.68,0.79c1.12,0.57,2.15,1.32,3.02,2.23c0.14,0.14,0.18,0.26,0.14,0.36
-			c-0.06,0.19-0.37,0.23-0.64,0.27l-0.21,0.04c-0.3,0.06-0.6,0.1-0.9,0.12c-0.3,0.02-0.59,0.06-0.88,0.12l-0.1,0.02
-			c-0.34,0.09-0.68,0.16-1.02,0.21c0.2,0.37,0.89,0.71,1.44,0.98c0.2,0.1,0.4,0.2,0.55,0.29c0.7,0.42,1.33,0.94,1.87,1.55l0.26,0.21
-			c0.1,0.07,0.27,0.22,0.27,0.22s0.18,0.15,0.22,0.22c0.04,0.06,0.07,0.21,0.07,0.29c0.01,0.16-0.05,0.47-0.09,0.62
-			c-0.07,0.27-0.36,1.07-0.36,1.07v14.34l-0.27,0.21C35.31,39.34,33,41,27.54,41c-6.34,0-7.9-1.66-8.06-1.85l-0.16-0.19v-4.72H7.04
-			c-2.05-0.15-3.62-0.88-4.67-2.16c-1.67-2.05-1.36-4.73-1.34-4.84V27.2c0.5-2.86,2.14-4.31,3.43-5.03c0.69-0.38,1.43-0.65,2.2-0.8
-			c1.1-3.16,3.51-3.83,3.88-3.91c0.61-0.18,1.23-0.27,1.85-0.27c1.83,0,3.6,0.78,4.84,2.19c0.48-0.09,0.92-0.14,1.33-0.14
-			c1.3,0,2.3,0.42,3.07,0.98v-1.26c-0.74-0.22-1.48-0.84-2.08-1.32l-0.04-0.03c-0.61-0.45-1.13-1.01-1.54-1.65
-			c-0.18-0.32-0.36-0.62-0.55-0.94L17.3,14.8c-0.01,0.03-0.01,0.07-0.02,0.1c-0.01,0.06-0.02,0.13-0.04,0.19
-			c-0.05,0.21-0.09,0.43-0.11,0.65c-0.08,0.56-0.16,1.09-0.77,1.3c-0.14,0.05-0.29,0.08-0.43,0.08c-0.52,0-1.02-0.34-1.52-1
-			c-1.08-1.45-0.96-3.35-0.68-4.69c0.07-0.34,0.16-0.68,0.27-1.02c0.03-0.07,0.06-0.14,0.1-0.21c0.08-0.12,0.13-0.26,0.17-0.4
-			c-0.04-0.14-0.13-0.25-0.25-0.33c-0.06-0.05-0.12-0.1-0.18-0.16c-0.25-0.3-0.47-0.62-0.66-0.96c-0.28-0.5-0.53-1.03-0.73-1.57
-			l-0.2-0.49c-0.06-0.13-0.11-0.27-0.14-0.41c-0.04-0.14-0.08-0.27-0.14-0.4c-0.2-0.33-0.43-0.63-0.69-0.9
-			c-0.07-0.08-0.13-0.14-0.2-0.23c-0.07-0.09-0.16-0.18-0.26-0.29C10.31,3.52,9.53,2.7,9.95,1.82c0.16-0.35,0.46-0.61,0.82-0.73
-			C10.98,1.03,11.19,1,11.42,1 M11.42,0c-0.35,0-0.67,0.05-0.96,0.14C9.84,0.34,9.32,0.8,9.04,1.41c-0.71,1.47,0.47,2.73,1.04,3.34
-			l0.07,0.08c0.06,0.06,0.11,0.12,0.15,0.17c0.08,0.09,0.15,0.17,0.22,0.25l0.01,0.01l0.03,0.04c0.2,0.21,0.37,0.43,0.53,0.67
-			c0.03,0.06,0.05,0.13,0.07,0.19c0.05,0.18,0.11,0.37,0.19,0.55l0.19,0.47c0.21,0.56,0.48,1.13,0.78,1.68
-			c0.23,0.39,0.48,0.76,0.77,1.1l0.02,0.02l0.01,0.01c-0.01,0.01-0.01,0.03-0.02,0.04l-0.01,0.03l-0.01,0.03
-			c-0.12,0.37-0.23,0.75-0.31,1.13c-0.3,1.4-0.43,3.36,0.55,5.03c-0.3-0.04-0.61-0.06-0.92-0.06c-0.71,0-1.43,0.1-2.11,0.31
-			c-0.59,0.14-3.05,0.92-4.36,4.03c-0.67,0.18-1.32,0.44-1.94,0.78c-1.48,0.83-3.36,2.49-3.93,5.73l-0.01,0.09v0.07
-			c-0.05,0.54-0.24,3.32,1.57,5.53c1.23,1.5,3.04,2.36,5.37,2.53l0.04,0h0.04h11.28v3.72v0.36l0.23,0.28l0.16,0.19
-			c0.43,0.52,2.33,2.21,8.83,2.21c5.7,0,8.2-1.73,8.46-1.93l0.28-0.21l0.4-0.3v-0.5V24.9c0.11-0.29,0.28-0.77,0.34-1.02
-			c0.03-0.13,0.13-0.58,0.11-0.91c0-0.04-0.03-0.42-0.2-0.72c-0.04-0.07-0.13-0.22-0.44-0.49c-0.01-0.01-0.2-0.17-0.31-0.25
-			L36,21.37c-0.53-0.59-1.14-1.1-1.81-1.53c0.12-0.02,0.24-0.04,0.36-0.06l0.19-0.03c0.38-0.06,1.16-0.18,1.41-0.94
-			c0.08-0.22,0.2-0.81-0.39-1.39c-0.93-0.97-2.04-1.79-3.27-2.41c-0.52-0.28-1.1-0.55-1.75-0.82c-0.17-0.07-0.37-0.13-0.58-0.19
-			l-0.04-0.01l-0.04-0.01c-0.19-0.04-0.38-0.12-0.54-0.23c-0.13-0.16-0.24-0.33-0.33-0.52c-0.08-0.16-0.15-0.28-0.22-0.41
-			c-0.43-0.7-0.9-1.55-1.43-2.6c-0.12-0.22-0.21-0.42-0.3-0.61c-0.18-0.42-0.41-0.85-0.68-1.24c-1.75-2.45-4.07-4.45-6.74-5.79
-			c-1.36-0.66-2.86-1.03-4.36-1.08c-0.03-0.02-0.07-0.05-0.1-0.07c-0.15-0.12-0.3-0.23-0.46-0.32C14.16,0.68,12.71,0,11.42,0
-			L11.42,0z M17.05,17.83c0.28-0.15,0.49-0.35,0.64-0.57c0.3,0.36,0.64,0.7,1.02,1c-0.04,0-0.09,0-0.13,0
-			c-0.32,0-0.64,0.02-0.97,0.06C17.42,18.14,17.24,17.98,17.05,17.83L17.05,17.83z"/>
-	</g>
-	<g>
-		<path class="st1" d="M20.7,31.03v3.05c0.49,0.33,2.26,1.24,6.84,1.24c3.89,0,6-0.89,6.77-1.3v-3.08
-			c-1.26,0.53-3.43,1.13-6.77,1.13C23.86,32.06,21.8,31.51,20.7,31.03z"/>
-		<path class="st1" d="M27.52,26.52c4.67,0,6.79-1.22,6.79-1.59c0-0.37-2.12-1.6-6.79-1.6s-6.79,1.22-6.79,1.6
-			C20.73,25.3,22.86,26.52,27.52,26.52z"/>
-		<path class="st1" d="M27.53,27.91c-1.85,0.03-3.7-0.21-5.49-0.7c-0.46-0.14-0.91-0.32-1.34-0.55v2.82
-			c0.49,0.32,2.26,1.21,6.84,1.21c4.13,0,6.27-0.99,6.77-1.27l0.01-2.73c-0.42,0.21-0.85,0.39-1.3,0.52
-			C31.23,27.7,29.38,27.94,27.53,27.91z"/>
-		<path class="st1" d="M20.7,35.64v2.76c0.49,0.33,2.26,1.24,6.84,1.24c3.89,0,6-0.89,6.77-1.3v-2.79
-			c-1.26,0.54-3.43,1.15-6.77,1.15C23.86,36.69,21.8,36.14,20.7,35.64z"/>
-		<path class="st2" d="M7.27,22.82l0.53-0.04l0.15-0.51c0.82-2.84,2.83-3.31,2.91-3.33l0.07-0.02c3.39-1,5.3,1.63,5.38,1.74
-			l0.3,0.43l0.51-0.13c1.95-0.5,3.21,0.04,4.01,0.76c0.17-0.06,0.35-0.13,0.55-0.19c0.33-0.1,0.68-0.19,1.05-0.27
-			c-0.96-1.19-2.67-2.44-5.49-1.88c-1.66-1.9-4.28-2.65-6.7-1.92c-0.37,0.09-2.78,0.75-3.88,3.91c-0.77,0.15-1.51,0.42-2.2,0.8
-			c-1.29,0.72-2.93,2.17-3.43,5.03v0.04c-0.02,0.11-0.33,2.8,1.34,4.84c1.05,1.28,2.62,2.01,4.67,2.16h11.21v-1.51H7.12
-			c-1.6-0.12-2.8-0.66-3.57-1.6c-1.21-1.47-1.04-3.51-1.02-3.7C3.28,23.18,7.11,22.83,7.27,22.82z"/>
-		<path class="st2" d="M16.18,5.06c-0.1-0.08-0.21-0.14-0.34-0.17c-0.24-0.04-0.49-0.03-0.72,0.04v0.03h0.04
-			c0.18,0.17,0.34,0.35,0.48,0.55c0.18,0.24,0.34,0.49,0.49,0.75c0.31-0.14,0.47-0.48,0.38-0.8C16.43,5.31,16.32,5.17,16.18,5.06z"
-			/>
-		<path class="st2" d="M36.13,23.03c-0.06-0.07-0.1-0.15-0.14-0.23c-0.04-0.1-0.09-0.19-0.15-0.27c-0.09-0.08-0.18-0.15-0.27-0.22
-			l-0.26-0.21c-0.54-0.61-1.17-1.13-1.87-1.55c-0.15-0.09-0.35-0.19-0.55-0.29c-0.55-0.27-1.24-0.61-1.44-0.98
-			c0.34-0.05,0.69-0.12,1.02-0.21l0.1-0.02c0.29-0.06,0.58-0.1,0.88-0.12c0.3-0.02,0.6-0.06,0.9-0.12l0.21-0.04
-			c0.27-0.04,0.58-0.09,0.64-0.27c0.04-0.1,0-0.22-0.14-0.36c-0.87-0.91-1.9-1.66-3.02-2.23c-0.51-0.27-1.06-0.53-1.68-0.79
-			c-0.13-0.05-0.3-0.11-0.48-0.16c-0.37-0.08-0.72-0.23-1.02-0.46c-0.22-0.25-0.4-0.53-0.55-0.82c-0.06-0.12-0.12-0.23-0.19-0.34
-			c-0.46-0.75-0.95-1.65-1.46-2.66c-0.12-0.21-0.22-0.43-0.31-0.65c-0.16-0.38-0.36-0.75-0.6-1.1c-1.64-2.31-3.83-4.18-6.36-5.46
-			c-1.3-0.63-2.73-0.97-4.17-0.97c-0.17-0.08-0.33-0.18-0.47-0.3c-0.1-0.08-0.21-0.16-0.33-0.23c-0.71-0.39-2.5-1.24-3.65-0.87
-			c-0.37,0.12-0.66,0.38-0.82,0.73c-0.42,0.88,0.35,1.7,0.87,2.25c0.1,0.11,0.19,0.21,0.26,0.29c0.07,0.09,0.13,0.15,0.2,0.23
-			c0.26,0.27,0.5,0.58,0.69,0.9c0.06,0.13,0.11,0.26,0.14,0.4c0.04,0.14,0.09,0.28,0.14,0.41l0.2,0.49c0.2,0.54,0.45,1.07,0.73,1.57
-			c0.19,0.34,0.42,0.66,0.66,0.96c0.05,0.06,0.11,0.11,0.18,0.16c0.12,0.07,0.21,0.19,0.25,0.33c-0.04,0.14-0.09,0.27-0.17,0.4
-			c-0.04,0.07-0.07,0.14-0.1,0.21c-0.11,0.33-0.2,0.67-0.27,1.02c-0.29,1.34-0.4,3.24,0.68,4.69c0.63,0.85,1.28,1.16,1.95,0.92
-			c0.61-0.21,0.69-0.74,0.77-1.3c0.02-0.22,0.06-0.43,0.11-0.65c0.02-0.06,0.03-0.12,0.04-0.19c0-0.03,0.01-0.07,0.02-0.1l0.13,0.23
-			c0.19,0.32,0.37,0.62,0.55,0.94c0.41,0.64,0.93,1.2,1.54,1.65l0.04,0.03c0.6,0.48,1.34,1.1,2.08,1.32L21.72,19V18.8h-0.07
-			c-0.08-0.08-0.16-0.15-0.26-0.2c-0.05-0.03-0.1-0.06-0.14-0.09c-0.33-0.28-0.64-0.58-0.92-0.91c-0.75-0.86-1.41-1.79-2-2.78
-			c-0.27-0.43-0.49-0.89-0.71-1.34l-0.06-0.12c-0.03-0.07-0.06-0.14-0.08-0.21c-0.02-0.15-0.11-0.28-0.23-0.37l-0.05-0.02
-			l-0.04,0.04c-0.09,0.12-0.19,0.23-0.3,0.33c-0.22,0.21-0.4,0.45-0.55,0.71c-0.25,0.57-0.39,1.18-0.43,1.8
-			c-0.02,0.16-0.04,0.32-0.07,0.48H15.8c-0.46-0.11-0.65-0.51-0.84-0.89l-0.06-0.12c-0.55-1.1-0.6-2.82-0.16-4.02
-			c0.02-0.06,0.06-0.15,0.11-0.25c0.27-0.59,0.51-1.18,0.33-1.44c-0.1-0.19-0.24-0.34-0.41-0.46c-0.09-0.07-0.18-0.15-0.26-0.23
-			c-0.24-0.3-0.45-0.62-0.63-0.97c-0.19-0.4-0.36-0.81-0.51-1.24c-0.17-0.49-0.37-0.97-0.6-1.42c-0.21-0.35-0.45-0.68-0.72-0.98
-			L11.88,3.9c-0.08-0.1-0.19-0.21-0.31-0.33c-0.39-0.39-0.88-0.88-0.76-1.33c0.03-0.13,0.12-0.23,0.25-0.27
-			c0.57-0.23,1.92,0.43,2.56,0.82c0.08,0.05,0.15,0.09,0.23,0.14c0.2,0.13,0.4,0.24,0.61,0.35c0.33,0.13,0.69,0.19,1.04,0.17
-			c0.16,0,0.32,0,0.48,0.03c0.52,0.06,1.03,0.16,1.53,0.31c1.05,0.33,2.05,0.81,2.96,1.42c1.81,1.19,3.33,2.77,4.45,4.62
-			c0.11,0.18,0.2,0.37,0.27,0.57c0.06,0.15,0.13,0.3,0.22,0.46c0.2,0.4,0.42,0.8,0.64,1.2c0.19,0.35,0.39,0.71,0.57,1.05l0.1,0.19
-			c0.31,0.67,0.71,1.3,1.18,1.87c0.2,0.24,0.79,0.39,1.3,0.52c0.21,0.05,0.4,0.1,0.55,0.15c0.78,0.27,1.54,0.61,2.26,1
-			c0.37,0.2,0.74,0.42,1.1,0.65c0.05,0.03,0.12,0.07,0.2,0.12c0.23,0.1,0.44,0.25,0.6,0.44c-1.42-0.02-2.5,0.12-3.38,0.43
-			c-0.07,0.02-0.14,0.04-0.22,0.05c-0.25,0.05-0.53,0.12-0.55,0.38v0.04l0.03,0.02c0.07,0.07,0.12,0.15,0.15,0.24
-			c0.03,0.08,0.07,0.16,0.13,0.24c0.26,0.37,0.58,0.69,0.94,0.95c0.35,0.23,0.74,0.49,1.15,0.71c0.35,0.18,0.71,0.34,1.07,0.47
-			c0.37,0.14,0.73,0.3,1.08,0.47c0.22,0.12,0.45,0.27,0.67,0.41c0.17,0.11,0.33,0.21,0.5,0.31c0.07,0.05,0.13,0.1,0.19,0.15
-			c0.11,0.11,0.25,0.2,0.4,0.25l0.09,0.03v-0.16L36.13,23.03z"/>
-		<path class="st2" d="M33.01,22.66c-1.79-0.49-3.64-0.73-5.49-0.7c-1.85-0.03-3.7,0.21-5.49,0.7c-2.2,0.68-2.67,1.61-2.67,2.28
-			h-0.04v14.02l0.16,0.19C19.64,39.34,21.2,41,27.54,41c5.46,0,7.77-1.66,7.87-1.74l0.27-0.21V24.72h-0.02
-			C35.58,24.11,35.02,23.27,33.01,22.66z M27.52,23.33c4.67,0,6.79,1.22,6.79,1.6c0,0.37-2.12,1.59-6.79,1.59
-			c-4.67,0-6.79-1.22-6.79-1.59C20.73,24.56,22.85,23.33,27.52,23.33z M34.31,38.33c-0.77,0.41-2.88,1.3-6.77,1.3
-			c-4.59,0-6.36-0.91-6.84-1.24v-2.76c1.1,0.49,3.17,1.05,6.84,1.05c3.34,0,5.51-0.61,6.77-1.15V38.33z M34.31,34.01
-			c-0.77,0.41-2.88,1.3-6.77,1.3c-4.59,0-6.36-0.91-6.84-1.24v-3.05c1.1,0.49,3.17,1.03,6.84,1.03c3.34,0,5.51-0.6,6.77-1.13V34.01z
-			 M34.31,29.42c-0.5,0.27-2.64,1.27-6.77,1.27c-4.58,0-6.36-0.89-6.84-1.21v-2.82c0.43,0.23,0.87,0.41,1.34,0.55
-			c1.79,0.49,3.64,0.73,5.49,0.7c1.85,0.03,3.7-0.21,5.49-0.7c0.45-0.13,0.89-0.3,1.3-0.52L34.31,29.42z"/>
-	</g>
-</g>
-</svg>
diff --git a/okitweb/static/okit/palette/deprecated/gateways/Dynamic_Routing_Gateway.svg b/okitweb/static/okit/palette/deprecated/gateways/Dynamic_Routing_Gateway.svg
deleted file mode 100644
index c83b97e95..000000000
--- a/okitweb/static/okit/palette/deprecated/gateways/Dynamic_Routing_Gateway.svg
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 42.72 42" style="enable-background:new 0 0 42.72 42;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FFFFFF;}
-	.st1{fill:#2C5967;}
-</style>
-<g>
-	<g>
-		<g>
-			<path class="st0" d="M21.34,41.5c-2.31,0-4.3-2.08-5.73-6.01l-0.11-0.38c-2.13,1.04-3.97,1.56-5.47,1.56
-				c-1.33,0-2.39-0.4-3.18-1.18c-2.26-2.26-1.2-6.97,2.91-12.92l0.25-0.33H5.47l1.95,1.95l-1.76,1.76L0.71,21l4.95-4.95l1.76,1.76
-				l-1.95,1.95h4.56l-0.25-0.29c-0.09-0.13-0.18-0.26-0.26-0.37l0,0l-0.29-0.42C5.56,13.1,4.69,8.66,6.84,6.5
-				c0.78-0.78,1.86-1.18,3.19-1.18c1.44,0,3.16,0.46,5.11,1.37l0.34,0.19c0.34-0.98,0.71-1.84,1.1-2.59
-				c1.65-3.14,3.5-3.79,4.76-3.79c2.31,0,4.3,2.08,5.73,6.01l0.11,0.37c2.12-1.03,3.96-1.56,5.48-1.56c1.32,0,2.39,0.4,3.17,1.18
-				c2.33,2.33,1.19,7.12-3.12,13.22l4.52,0.02L35.3,17.8l1.76-1.76L42.01,21l-4.95,4.95L35.3,24.2l1.95-1.95h-4.54
-				c0.32,0.45,0.62,0.89,0.9,1.32c3.53,5.46,4.35,9.81,2.23,11.93c-0.78,0.78-1.85,1.18-3.19,1.18c-1.43,0-3.15-0.46-5.11-1.37
-				l-0.33-0.19c-0.26,0.75-0.53,1.43-0.82,2.04C24.67,40.75,22.69,41.5,21.34,41.5z"/>
-			<path class="st0" d="M21.34,1c2.1,0,3.93,2.04,5.26,5.68l0.26,0.92c2.15-1.11,4.16-1.77,5.8-1.77c1.14,0,2.11,0.32,2.82,1.03
-				c2.46,2.46,0.27,7.93-3.74,13.36l6.71,0.03L36,17.81l1.05-1.05L41.3,21l-4.25,4.25L36,24.19l2.45-2.45h-6.72
-				c0.52,0.7,1.01,1.4,1.46,2.09c3.4,5.25,4.23,9.37,2.3,11.3c-0.69,0.69-1.65,1.03-2.84,1.03c-1.36,0-3.02-0.45-4.9-1.33
-				l-0.83-0.46c-0.3,0.94-0.63,1.8-0.99,2.56v0C24.33,40.3,22.55,41,21.34,41c-2.09,0-3.93-2.05-5.26-5.68l-0.26-0.92
-				c-2.15,1.11-4.15,1.78-5.79,1.78c-1.15,0-2.11-0.32-2.83-1.04c-2.3-2.3-0.54-7.22,2.96-12.28l0.86-1.12H4.26l1.12,1.12l1.33,1.33
-				l-1.05,1.05L1.41,21l4.25-4.25l1.05,1.05l-1.33,1.33l-1.12,1.12h6.86l-0.96-1.12c-0.17-0.25-0.34-0.49-0.5-0.74l-0.01,0.01
-				C6.12,13.04,5.23,8.83,7.2,6.86c0.69-0.69,1.65-1.03,2.84-1.03c1.36,0,3.01,0.45,4.9,1.33l0.83,0.46
-				c0.37-1.16,0.79-2.21,1.26-3.09C18.56,1.61,20.22,1,21.34,1 M21.34,0c-1.4,0-3.44,0.7-5.2,4.06c-0.33,0.62-0.64,1.33-0.93,2.11
-				c-1.96-0.9-3.7-1.35-5.17-1.35c-1.47,0-2.67,0.45-3.55,1.33c-2.2,2.2-1.65,6.28,1.54,11.56L7.42,17.1l-1.05-1.05l-0.71-0.71
-				l-0.71,0.71l-4.25,4.25L0,21l0.71,0.71l4.25,4.25l0.71,0.71l0.71-0.71l1.05-1.05l0.63-0.63c-3.22,5.29-3.78,9.36-1.56,11.58
-				c0.88,0.88,2.07,1.33,3.53,1.33c1.46,0,3.19-0.46,5.17-1.37C17.1,40.92,19.58,42,21.34,42c1.5,0,3.67-0.8,5.49-4.63
-				c0.23-0.48,0.44-0.99,0.65-1.55c1.96,0.9,3.7,1.35,5.17,1.35c1.47,0,2.67-0.45,3.54-1.32c2.33-2.33,1.56-6.79-2.16-12.55
-				c-0.12-0.18-0.24-0.37-0.36-0.55h2.38l-0.74,0.74l-0.71,0.71l0.71,0.71l1.05,1.05l0.71,0.71l0.71-0.71l4.25-4.25L42.72,21
-				l-0.71-0.71l-4.25-4.25l-0.71-0.71l-0.71,0.71L35.3,17.1l-0.71,0.71l0.71,0.71l0.73,0.73l-2.36-0.01
-				c4.01-5.95,4.93-10.67,2.52-13.08c-0.88-0.88-2.07-1.33-3.53-1.33c-1.47,0-3.21,0.46-5.18,1.36C25.58,1.08,23.1,0,21.34,0
-				L21.34,0z M6.68,19.26l0.74-0.74l0.68-0.68c0.23,0.37,0.46,0.75,0.71,1.13l0.2,0.3H6.68L6.68,19.26z M6.68,22.74h2.35
-				c-0.33,0.49-0.63,0.96-0.92,1.43l-0.69-0.69L6.68,22.74L6.68,22.74z"/>
-		</g>
-		<g>
-			<path class="st1" d="M32.44,21.13c0.06,0.08,0.12,0.16,0.17,0.24c0.09,0.12,0.18,0.24,0.26,0.36c0,0,0,0.01,0.01,0.01h5.57
-				L36,24.19l1.05,1.05L41.3,21l-4.25-4.25L36,17.81l2.45,2.45h-5.57c-0.18,0.25-0.36,0.5-0.54,0.74
-				C32.37,21.04,32.4,21.09,32.44,21.13z"/>
-			<path class="st1" d="M21.34,41c1.21,0,2.99-0.7,4.58-4.06v0c0.93-1.96,1.68-4.6,2.17-7.61c0.35-2.2,0.56-4.53,0.62-6.95
-				c-0.58-0.74-1.2-1.48-1.85-2.22c0,0.28,0.01,0.56,0.01,0.84c0,2.82-0.21,5.52-0.61,8.04v0c-0.46,2.84-1.15,5.3-2.01,7.1l0,0
-				c-0.91,1.9-1.96,3-2.9,3c-1.1,0-2.49-1.51-3.61-4.72c-0.56,0.33-1.11,0.63-1.65,0.9C17.41,38.95,19.25,41,21.34,41z"/>
-			<path class="st1" d="M23.83,15.73L23.83,15.73C23.83,15.73,23.83,15.73,23.83,15.73z"/>
-			<path class="st1" d="M12.15,18.72c-0.33-0.46-0.64-0.91-0.93-1.35l-0.01,0.01c-3.26-4.96-3.71-8.2-2.7-9.21
-				c0.78-0.78,2.81-0.7,5.89,0.79c0.16-0.63,0.34-1.23,0.53-1.81C11.41,5.5,8.68,5.37,7.2,6.86c-1.97,1.97-1.08,6.18,2.46,11.55
-				l0.01-0.01c0.16,0.25,0.33,0.49,0.5,0.74h1.64C11.92,19,12.03,18.86,12.15,18.72z"/>
-			<path class="st1" d="M13.99,22.86c0.07,2.16,0.26,4.25,0.56,6.23c0.14,0.91,0.3,1.76,0.48,2.58c0.55-0.3,1.12-0.63,1.69-0.99
-				c-0.12-0.59-0.23-1.21-0.33-1.87l0,0c-0.29-1.89-0.47-3.88-0.54-5.94H13.99z"/>
-			<path class="st1" d="M33.18,23.84c-1.73-2.67-4.02-5.46-6.62-8.06c-0.48-0.48-0.98-0.96-1.46-1.41l0,0
-				c-1.92-1.79-3.89-3.37-5.83-4.7C18.93,9.43,18.59,9.21,18.26,9c-0.18,0.6-0.34,1.23-0.49,1.9c0.15,0.1,0.3,0.2,0.46,0.31
-				c1.86,1.27,3.75,2.79,5.61,4.52l0,0c0.47,0.44,0.95,0.9,1.41,1.37c2.52,2.52,4.72,5.2,6.38,7.76c3.13,4.83,3.53,7.99,2.54,8.98
-				c-0.77,0.77-2.81,0.7-5.9-0.79c-0.16,0.63-0.34,1.23-0.53,1.81c1.89,0.88,3.54,1.33,4.9,1.33c1.19,0,2.15-0.34,2.84-1.03
-				C37.42,33.21,36.58,29.09,33.18,23.84z"/>
-			<path class="st1" d="M23.56,29.01c0.68-0.59,1.36-1.2,2.02-1.82c0.11-0.94,0.2-1.9,0.26-2.88c-0.19,0.2-0.39,0.4-0.59,0.6
-				c-1.06,1.06-2.13,2.04-3.18,2.94C22.56,28.25,23.06,28.64,23.56,29.01z"/>
-			<path class="st1" d="M10.16,22.86c-3.5,5.07-5.26,9.99-2.96,12.28c0.71,0.71,1.68,1.04,2.83,1.04c2.8,0,6.68-1.93,10.54-4.77
-				c-0.5-0.39-1-0.79-1.5-1.21c-4.99,3.58-9.23,4.95-10.55,3.64c-1.36-1.36,0.14-5.79,3.94-10.97H10.16z"/>
-			<path class="st1" d="M22.12,10.6c0.5,0.39,1,0.79,1.5,1.21c3.74-2.68,7.06-4.13,9.04-4.13c0.66,0,1.18,0.16,1.51,0.49
-				c1.32,1.32-0.06,5.56-3.64,10.55c0.42,0.5,0.82,1,1.21,1.5c4-5.43,6.2-10.9,3.74-13.36C33.02,4.4,27.55,6.59,22.12,10.6z"/>
-			<path class="st1" d="M15.49,19.14c0.61-0.68,1.26-1.36,1.94-2.05c1.06-1.06,2.13-2.04,3.18-2.94c-0.5-0.41-1-0.8-1.49-1.17
-				c-1.03,0.89-2.04,1.82-3,2.79c-1.08,1.08-2.12,2.21-3.09,3.36H15.49z"/>
-			<path class="st1" d="M21.34,1c-1.12,0-2.78,0.61-4.32,3.53l0,0c-1.06,2.02-1.9,4.83-2.44,8.14l0,0c-0.2,1.23-0.35,2.51-0.46,3.82
-				c0.43-0.46,0.87-0.92,1.33-1.37c0.25-0.25,0.51-0.5,0.77-0.75c0.06-0.47,0.13-0.94,0.2-1.41c0.5-3.11,1.28-5.73,2.25-7.57l0,0v0
-				l0,0c0.86-1.63,1.81-2.53,2.67-2.53c1.1,0,2.49,1.51,3.61,4.72c0.56-0.33,1.11-0.63,1.65-0.9C25.27,3.04,23.44,1,21.34,1z"/>
-			<path class="st1" d="M28.13,12.92L28.13,12.92L28.13,12.92c-0.14-0.91-0.3-1.77-0.48-2.59c-0.55,0.3-1.12,0.63-1.69,0.99
-				c0.12,0.59,0.23,1.22,0.34,1.88h0c0.06,0.38,0.11,0.77,0.16,1.16c0.26,0.25,0.51,0.5,0.76,0.75c0.45,0.45,0.89,0.91,1.33,1.37
-				C28.45,15.27,28.31,14.08,28.13,12.92z"/>
-			<path class="st1" d="M23.67,32.51L23.67,32.51c0.25,0.17,0.51,0.33,0.76,0.49c0.18-0.6,0.34-1.23,0.49-1.9
-				c-0.07-0.05-0.14-0.09-0.21-0.14l0,0c-1.85-1.24-3.73-2.73-5.59-4.44l0,0c-0.56-0.52-1.12-1.05-1.69-1.61
-				c-0.2-0.2-0.39-0.4-0.59-0.6c0.06,0.98,0.15,1.94,0.26,2.88c0.25,0.24,0.5,0.47,0.75,0.7l0,0
-				C19.78,29.66,21.74,31.21,23.67,32.51z"/>
-			<path class="st1" d="M25.93,21.74c0-0.25,0.01-0.49,0.01-0.74c0-0.25,0-0.5-0.01-0.74H4.26l1.12-1.12l1.33-1.33l-1.05-1.05
-				L1.41,21l4.25,4.25l1.05-1.05l-1.33-1.33l-1.12-1.12H25.93z"/>
-		</g>
-	</g>
-</g>
-</svg>
diff --git a/okitweb/static/okit/palette/deprecated/gateways/Internet_Gateway.svg b/okitweb/static/okit/palette/deprecated/gateways/Internet_Gateway.svg
deleted file mode 100644
index eb1086b2f..000000000
--- a/okitweb/static/okit/palette/deprecated/gateways/Internet_Gateway.svg
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 27.74 42" style="enable-background:new 0 0 27.74 42;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FFFFFF;}
-	.st1{fill:#2C5967;}
-</style>
-<g>
-	<g>
-		<path class="st0" d="M13.91,41.5c-5.64,0-10.22-4.59-10.22-10.22c0-5.16,3.91-9.53,8.99-10.14v-3.12l-1.1,1.09l-1.75-1.76
-			l2.81-2.8H0.54l0.1-1.33c0.17-2.31,1.5-4.34,3.55-5.42C4.5,7.63,4.72,7.34,4.78,7c0.33-1.67,1.45-3.07,3-3.75
-			c0.65-0.29,1.37-0.44,2.08-0.44c0.16,0,0.32,0.01,0.48,0.02c0.04,0,0.07,0.01,0.11,0.01c0.31,0,0.58-0.12,0.78-0.33
-			c1.18-1.28,2.85-2.01,4.59-2.01c2.39,0,4.53,1.33,5.6,3.47c0.16,0.32,0.45,0.54,0.8,0.62c0.72,0.16,1.4,0.44,2.03,0.84
-			c2.83,1.79,3.81,5.51,2.22,8.46l-0.35,0.65H15.19l2.81,2.8l-1.75,1.76l-1.1-1.09v3.12c5.07,0.62,8.97,4.99,8.97,10.14
-			C24.13,36.91,19.55,41.5,13.91,41.5z"/>
-		<path class="st0" d="M15.83,1c2.2,0,4.17,1.23,5.15,3.2c0.23,0.45,0.64,0.78,1.14,0.89c0.66,0.15,1.29,0.41,1.87,0.77
-			c2.61,1.65,3.51,5.08,2.05,7.8l-0.21,0.39H14.34c-0.13,0-0.25-0.01-0.38-0.02l3.34,3.32l-1.05,1.05l-1.59-1.59v3.44v1.33
-			c5.01,0.38,8.98,4.58,8.98,9.69c0,5.36-4.36,9.72-9.72,9.72c-5.36,0-9.72-4.36-9.72-9.72c0-5.11,3.97-9.31,8.99-9.69v-1.33v-3.44
-			l-1.59,1.59l-1.05-1.05l3.32-3.3H4.39H1.08l0.06-0.8c0.16-2.14,1.39-4.01,3.28-5.01C4.87,8,5.18,7.59,5.27,7.1
-			c0.3-1.51,1.31-2.77,2.71-3.39c0.59-0.26,1.24-0.4,1.88-0.4c0.15,0,0.29,0.01,0.44,0.02c0.05,0,0.11,0.01,0.16,0.01
-			c0.44,0,0.85-0.17,1.15-0.49C12.69,1.67,14.23,1,15.83,1 M15.83,0c-1.87,0-3.68,0.79-4.96,2.17c-0.1,0.11-0.25,0.17-0.42,0.17
-			c-0.02,0-0.04,0-0.07,0c-0.18-0.02-0.35-0.03-0.53-0.03c-0.78,0-1.57,0.17-2.29,0.48c-1.7,0.75-2.93,2.29-3.28,4.11
-			C4.26,7.1,4.13,7.26,3.95,7.36c-2.2,1.16-3.63,3.34-3.81,5.82l-0.06,0.8L0,15.05h1.08h3.32h7.04l-1.6,1.59l-0.71,0.71l0.71,0.71
-			l1.05,1.05l0.71,0.71l0.6-0.59v1.04v0.44c-5.11,0.84-8.99,5.32-8.99,10.58C3.19,37.19,8,42,13.91,42
-			c5.91,0,10.72-4.81,10.72-10.72c0-5.26-3.87-9.73-8.98-10.58v-0.44v-1.04l0.6,0.59l0.71-0.71l1.05-1.05l0.71-0.71L18,16.64
-			l-1.6-1.59h9.43h0.6l0.28-0.53l0.21-0.39c1.71-3.18,0.66-7.19-2.4-9.12c-0.68-0.43-1.41-0.73-2.18-0.9
-			c-0.2-0.04-0.37-0.18-0.46-0.36C20.73,1.44,18.41,0,15.83,0L15.83,0z"/>
-	</g>
-	<g>
-		<path class="st1" d="M23.99,5.86c-0.58-0.36-1.21-0.62-1.87-0.77c-0.5-0.11-0.91-0.43-1.14-0.89C20,2.23,18.03,1,15.83,1
-			c-1.6,0-3.14,0.67-4.22,1.85C11.28,3.2,10.8,3.38,10.3,3.33C9.51,3.26,8.71,3.39,7.98,3.71C6.58,4.33,5.57,5.59,5.27,7.1
-			C5.18,7.59,4.87,8,4.42,8.24c-1.9,1-3.12,2.87-3.28,5.01l-0.06,0.8h3.32v0h7c-0.49-0.41-0.89-0.91-1.18-1.48H4.84v0h-2.1
-			c0.32-1.29,1.17-2.38,2.37-3.02C5.96,9.1,6.55,8.31,6.73,7.38c0.2-1.03,0.89-1.9,1.85-2.32c0.5-0.22,1.04-0.31,1.58-0.26
-			c0.97,0.09,1.89-0.26,2.54-0.95c0.81-0.87,1.95-1.37,3.14-1.37c1.63,0,3.1,0.91,3.83,2.38c0.43,0.86,1.21,1.47,2.15,1.67
-			c0.49,0.11,0.96,0.3,1.4,0.58c1.84,1.16,2.54,3.49,1.72,5.46H14.34c-1.29,0-2.35-1.07-2.35-2.39h-1.48c0,1.98,1.48,3.61,3.37,3.84
-			l-3.35,3.33l1.05,1.05l2.33-2.32l2.33,2.32l1.05-1.05l-3.34-3.32c0.12,0.01,0.25,0.02,0.38,0.02h11.49l0.21-0.39
-			C27.51,10.93,26.61,7.51,23.99,5.86z"/>
-		<rect x="13.18" y="17.67" class="st1" width="1.48" height="1.48"/>
-		<path class="st1" d="M14.66,21.59v-1.33h-1.48v1.33c-5.02,0.38-8.99,4.58-8.99,9.69c0,5.36,4.36,9.72,9.72,9.72
-			s9.72-4.36,9.72-9.72C23.63,26.17,19.67,21.97,14.66,21.59z M13.91,39.52c-4.26,0-7.78-3.25-8.2-7.41h3.42l-1.24,1.25l1.05,1.04
-			l2.93-2.94l-2.93-2.94l-1.05,1.04l1.06,1.06H5.7c0.33-4.24,3.89-7.59,8.21-7.59s7.88,3.35,8.21,7.59h-3.44l0.99-1l-1.05-1.04
-			l-2.79,2.81l2.93,2.94l1.05-1.04l-1.18-1.18h3.47C21.69,36.27,18.17,39.52,13.91,39.52z"/>
-		<polygon class="st1" points="14.55,35.55 14.55,27.01 15.72,28.16 16.76,27.12 13.82,24.19 10.89,27.12 11.93,28.16 13.07,27.03 
-			13.07,35.53 11.93,34.39 10.89,35.44 13.82,38.37 16.76,35.44 15.72,34.39 		"/>
-	</g>
-</g>
-</svg>
diff --git a/okitweb/static/okit/palette/deprecated/gateways/Local_Peering_Gateway.svg b/okitweb/static/okit/palette/deprecated/gateways/Local_Peering_Gateway.svg
deleted file mode 100644
index 364653bcd..000000000
--- a/okitweb/static/okit/palette/deprecated/gateways/Local_Peering_Gateway.svg
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 42 13.62" style="enable-background:new 0 0 42 13.62;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FFFFFF;}
-	.st1{fill:#2C5967;}
-</style>
-<g>
-	<g>
-		<g>
-			<path class="st0" d="M35.19,13.12c-3.06,0-5.65-2.18-6.2-5.15H13.01c-0.55,2.96-3.14,5.15-6.2,5.15c-3.48,0-6.31-2.83-6.31-6.31
-				S3.33,0.5,6.81,0.5c3.06,0,5.65,2.18,6.2,5.15h15.99c0.55-2.96,3.14-5.15,6.2-5.15c3.48,0,6.31,2.83,6.31,6.31
-				S38.67,13.12,35.19,13.12z"/>
-			<path class="st0" d="M35.19,1C38.39,1,41,3.61,41,6.81s-2.61,5.81-5.81,5.81c-2.98,0-5.44-2.26-5.77-5.15H12.58
-				c-0.33,2.89-2.79,5.15-5.77,5.15C3.61,12.62,1,10.01,1,6.81S3.61,1,6.81,1c2.98,0,5.44,2.26,5.77,5.15h16.85
-				C29.75,3.26,32.21,1,35.19,1 M35.19,0c-3.16,0-5.85,2.16-6.6,5.15H13.41C12.66,2.16,9.97,0,6.81,0C3.05,0,0,3.05,0,6.81
-				s3.05,6.81,6.81,6.81c3.16,0,5.85-2.16,6.6-5.15h15.18c0.75,2.99,3.44,5.15,6.6,5.15c3.75,0,6.81-3.05,6.81-6.81S38.95,0,35.19,0
-				L35.19,0z"/>
-		</g>
-		<g>
-			<path class="st1" d="M28.43,6.15H13.57c0.02,0.22,0.03,0.44,0.03,0.66s-0.01,0.44-0.03,0.66h14.86
-				c-0.02-0.22-0.03-0.44-0.03-0.66S28.41,6.37,28.43,6.15z"/>
-			<path class="st1" d="M12.62,6.81c0-3.2-2.61-5.81-5.81-5.81S1,3.61,1,6.81s2.61,5.81,5.81,5.81S12.62,10.01,12.62,6.81z
-				 M6.81,11.3c-2.48,0-4.49-2.01-4.49-4.49s2.01-4.49,4.49-4.49s4.49,2.01,4.49,4.49S9.28,11.3,6.81,11.3z"/>
-			<path class="st1" d="M35.19,1c-3.2,0-5.81,2.61-5.81,5.81s2.61,5.81,5.81,5.81S41,10.01,41,6.81S38.39,1,35.19,1z M35.19,11.3
-				c-2.48,0-4.49-2.01-4.49-4.49s2.01-4.49,4.49-4.49c2.48,0,4.49,2.01,4.49,4.49S37.67,11.3,35.19,11.3z"/>
-			<path class="st1" d="M7.46,4.64L6.53,3.7l-3.1,3.1l3.1,3.1l0.93-0.93L5.95,7.47h4.3c0.04-0.21,0.06-0.43,0.06-0.66
-				s-0.02-0.45-0.06-0.66h-4.3L7.46,4.64z"/>
-			<path class="st1" d="M34.38,8.98l0.93,0.93l3.1-3.1l-3.1-3.1l-0.93,0.93l1.51,1.51h-4.13c-0.04,0.21-0.06,0.43-0.06,0.66
-				s0.02,0.45,0.06,0.66h4.13L34.38,8.98z"/>
-		</g>
-	</g>
-</g>
-</svg>
diff --git a/okitweb/static/okit/palette/deprecated/gateways/NAT_Gateway.svg b/okitweb/static/okit/palette/deprecated/gateways/NAT_Gateway.svg
deleted file mode 100644
index 945c8a13a..000000000
--- a/okitweb/static/okit/palette/deprecated/gateways/NAT_Gateway.svg
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 42.37 42" style="enable-background:new 0 0 42.37 42;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FFFFFF;}
-	.st1{fill:#2C5967;}
-</style>
-<g>
-	<g>
-		<g>
-			<polygon class="st0" points="22.81,41.5 22.81,32.71 18.9,36.62 17.01,34.73 22.81,28.94 22.81,24.99 5.81,24.99 9.72,28.9 
-				7.84,30.79 0.71,23.66 7.84,16.53 9.72,18.41 5.81,22.32 16.71,22.32 16.71,14.67 22.75,14.67 22.75,13.64 16.95,7.84 
-				18.84,5.95 22.75,9.86 22.75,0.5 25.42,0.5 25.42,9.86 29.33,5.95 31.21,7.84 25.42,13.64 25.42,17.33 19.37,17.33 19.37,22.32 
-				26.76,22.32 32.56,16.53 34.44,18.41 30.53,22.32 41.87,22.32 41.87,24.99 30.53,24.99 34.44,28.9 32.56,30.79 26.76,24.99 
-				25.47,24.99 25.47,28.94 31.27,34.73 29.38,36.62 25.47,32.71 25.47,41.5 			"/>
-			<path class="st0" d="M24.92,1v10.07l4.41-4.41l1.18,1.18l-5.59,5.59v3.4h-6.04v5.99h8.09l5.59-5.59l1.18,1.18l-4.41,4.41h12.05
-				v1.67H29.32l4.41,4.41l-1.18,1.18l-5.59-5.59h-1.99v4.65l5.59,5.59l-1.18,1.18l-4.41-4.41V41h-1.67v-9.5l-4.41,4.41l-1.18-1.18
-				l5.59-5.59v-4.65H4.6l4.41,4.41l-1.18,1.18l-6.42-6.42l6.42-6.42l1.18,1.18L4.6,22.82h12.6v-7.66h6.04v-1.74l-5.59-5.59
-				l1.18-1.18l4.41,4.41V1H24.92 M25.92,0h-1h-1.67h-1v1v7.66l-2.7-2.7l-0.71-0.71l-0.71,0.71l-1.18,1.18l-0.71,0.71l0.71,0.71
-				l5.3,5.3v0.32h-5.04h-1v1v6.66H7.02l2.7-2.7l0.71-0.71l-0.71-0.71l-1.18-1.18l-0.71-0.71l-0.71,0.71l-6.42,6.42L0,23.66
-				l0.71,0.71l6.42,6.42l0.71,0.71l0.71-0.71l1.18-1.18l0.71-0.71l-0.71-0.71l-2.7-2.7h15.29v3.24l-5.3,5.3l-0.71,0.71l0.71,0.71
-				l1.18,1.18l0.71,0.71l0.71-0.71l2.7-2.7V41v1h1h1.67h1v-1v-7.08l2.7,2.7l0.71,0.71l0.71-0.71l1.18-1.18l0.71-0.71l-0.71-0.71
-				l-5.3-5.3v-3.24h0.58l5.3,5.3l0.71,0.71l0.71-0.71l1.18-1.18l0.71-0.71l-0.71-0.71l-2.7-2.7h9.64h1v-1v-1.67v-1h-1h-9.64l2.7-2.7
-				l0.71-0.71l-0.71-0.71l-1.18-1.18l-0.71-0.71l-0.71,0.71l-5.3,5.3h-6.68v-3.99h5.04h1v-1v-2.99l5.3-5.3l0.71-0.71l-0.71-0.71
-				l-1.18-1.18l-0.71-0.71l-0.71,0.71l-2.7,2.7V1V0L25.92,0z"/>
-		</g>
-		<polygon class="st1" points="41.37,22.82 29.32,22.82 33.73,18.41 32.56,17.23 26.97,22.82 18.87,22.82 18.87,16.83 24.92,16.83 
-			24.92,13.43 30.5,7.84 29.33,6.66 24.92,11.07 24.92,1 23.25,1 23.25,11.07 18.84,6.66 17.66,7.84 23.25,13.43 23.25,15.17 
-			17.21,15.17 17.21,22.82 4.6,22.82 9.02,18.41 7.84,17.23 1.41,23.66 7.84,30.08 9.02,28.9 4.6,24.49 23.31,24.49 23.31,29.14 
-			17.72,34.73 18.9,35.91 23.31,31.5 23.31,41 24.97,41 24.97,31.5 29.38,35.91 30.56,34.73 24.97,29.14 24.97,24.49 26.97,24.49 
-			32.56,30.08 33.73,28.9 29.32,24.49 41.37,24.49 		"/>
-	</g>
-</g>
-</svg>
diff --git a/okitweb/static/okit/palette/deprecated/gateways/Service_Gateway.svg b/okitweb/static/okit/palette/deprecated/gateways/Service_Gateway.svg
deleted file mode 100644
index 77d9ada7e..000000000
--- a/okitweb/static/okit/palette/deprecated/gateways/Service_Gateway.svg
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 42 42" style="enable-background:new 0 0 42 42;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FFFFFF;}
-	.st1{fill:#2C5967;}
-</style>
-<g>
-	<g>
-		<circle class="st0" cx="21" cy="21" r="20.5"/>
-		<path class="st0" d="M21,1c11.03,0,20,8.97,20,20s-8.97,20-20,20S1,32.03,1,21S9.97,1,21,1 M21,0C9.42,0,0,9.42,0,21
-			s9.42,21,21,21s21-9.42,21-21S32.58,0,21,0L21,0z"/>
-	</g>
-	<g>
-		<path class="st1" d="M21,1C9.97,1,1,9.97,1,21s8.97,20,20,20s20-8.97,20-20S32.03,1,21,1z M21,39.32
-			c-9.82,0-17.85-7.76-18.3-17.47h10.82l-2.3,2.31l1.19,1.19L16.74,21l-4.32-4.34l-1.19,1.19l2.3,2.31H2.7
-			C3.15,10.45,11.18,2.68,21,2.68s17.85,7.76,18.3,17.47H28.01l2.2-2.21l-1.19-1.19l-4.11,4.13l4.32,4.34l1.19-1.19l-2.2-2.21H39.3
-			C38.85,31.55,30.82,39.32,21,39.32z"/>
-		<polygon class="st1" points="21.63,32.68 21.63,9.32 23.96,11.64 25.15,10.45 20.81,6.13 16.47,10.45 17.66,11.64 19.95,9.37 
-			19.95,32.63 17.66,30.36 16.47,31.55 20.81,35.87 25.15,31.55 23.96,30.36 		"/>
-	</g>
-</g>
-</svg>
diff --git a/okitweb/static/okit/palette/deprecated/hidden/Auto_Scaling.svg b/okitweb/static/okit/palette/deprecated/hidden/Auto_Scaling.svg
deleted file mode 100755
index f164bd40c..000000000
--- a/okitweb/static/okit/palette/deprecated/hidden/Auto_Scaling.svg
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Auto_Scaling" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
-	 y="0px" viewBox="0 0 161.9 162" enable-background="new 0 0 161.9 162" xml:space="preserve">
-<g>
-	<g>
-		<g>
-			<rect x="106.6" y="26.6" fill="#312D2A" width="8" height="8.5"/>
-			<rect x="86.5" y="26.6" fill="#312D2A" width="8" height="8.5"/>
-			<rect x="66.5" y="26.6" fill="#312D2A" width="8" height="8.5"/>
-			<rect x="46.4" y="26.6" fill="#312D2A" width="8" height="8.5"/>
-			<rect x="26.3" y="26.6" fill="#312D2A" width="8" height="8.5"/>
-		</g>
-	</g>
-	<g>
-		<g>
-			<rect x="126.7" y="26.6" fill="#312D2A" width="8.6" height="8.5"/>
-		</g>
-	</g>
-	<g>
-		<g>
-			<rect x="126.7" y="127.2" fill="#312D2A" width="8.6" height="8"/>
-			<rect x="126.7" y="107.2" fill="#312D2A" width="8.6" height="8"/>
-			<rect x="126.7" y="87.2" fill="#312D2A" width="8.6" height="8"/>
-			<rect x="126.7" y="67.1" fill="#312D2A" width="8.6" height="8"/>
-			<rect x="126.7" y="47.1" fill="#312D2A" width="8.6" height="8"/>
-		</g>
-	</g>
-	<path fill="#312D2A" d="M103,136.9H25.3V59.3H103V136.9z M32.3,129.9H96V66.3H32.3V129.9z"/>
-	<path fill="#312D2A" d="M152.8,152.9H9V9.2h143.8V152.9z M18,143.9h125.8V18.2H18V143.9z"/>
-	<polygon fill="#312D2A" points="122.7,49.1 123.9,37.5 112.5,39.3 114.9,41.6 108.6,48.2 105.9,45.6 104.6,57.2 116.1,55.3 
-		113.7,53.1 120,46.5 	"/>
-	<path fill="#312D2A" d="M53.6,103.4H39.2V89.1h14.3L53.6,103.4L53.6,103.4z M43.2,99.4h6.3v-6.3h-6.3V99.4z M88.8,103.4H74.4V89.1
-		h14.3L88.8,103.4L88.8,103.4z M78.4,99.4h6.3v-6.3h-6.3V99.4z M71.1,103.4H56.8V89.1h14.3V103.4z M60.8,99.4h6.3v-6.3h-6.3V99.4z
-		 M88.8,86.1H74.4V71.7h14.3L88.8,86.1L88.8,86.1z M78.4,82.1h6.3v-6.3h-6.3V82.1z M71.1,86.1H56.8V71.7h14.3V86.1z M60.8,82.1h6.3
-		v-6.3h-6.3V82.1z M89.6,125.1H38.8v-18.6h50.8V125.1z M43.8,120.1h40.8v-8.6H43.8V120.1z M77.2,113.4c-1.3,0-2.4,1.1-2.4,2.4
-		s1.1,2.4,2.4,2.4s2.4-1.1,2.4-2.4C79.7,114.5,78.6,113.4,77.2,113.4z M53.6,86.1H39.2V71.7h14.3L53.6,86.1L53.6,86.1z M43.2,82.1
-		h6.3v-6.3h-6.3V82.1z"/>
-</g>
-</svg>
diff --git a/okitweb/static/okit/palette/deprecated/hidden/Availability_Domain.svg b/okitweb/static/okit/palette/deprecated/hidden/Availability_Domain.svg
deleted file mode 100755
index a92aa3fba..000000000
--- a/okitweb/static/okit/palette/deprecated/hidden/Availability_Domain.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Container" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 161.9 162" enable-background="new 0 0 161.9 162" xml:space="preserve">
-	<g>
-		<path fill="#312D2A" d="M152.8,152.9H9V9.2h143.8V152.9z M18,143.9h125.8V18.2H18V143.9z M129.1,132.3H32.9V97.4h96.3V132.3z
-			 M41.9,123.3h78.3v-16.9H41.9V123.3z M105.8,110.2c-2.6,0-4.7,2.1-4.7,4.7c0,2.6,2.1,4.7,4.7,4.7c2.6,0,4.7-2.1,4.7-4.7
-			C110.5,112.3,108.4,110.2,105.8,110.2z M33.1,90h42.6V63.9H33.1V90z M50.4,83V70.9h7.7V83H50.4z M68.7,83h-6.6V70.9h6.6V83z
-			 M40.1,70.9h6.3V83h-6.3V70.9z M33.1,57h42.6V30.8H33.1V57z M50.4,50V37.8h7.7V50H50.4z M68.7,50h-6.6V37.8h6.6V50z M40.1,37.8h6.3
-			V50h-6.3V37.8z M86.8,90h42.6V63.9H86.8V90z M104,83V70.9h7.7V83H104z M122.3,83h-6.6V70.9h6.6V83z M93.8,70.9h6.2V83h-6.2V70.9z
-			 M86.8,30.8V57h42.6V30.8H86.8z M111.7,37.8V50H104V37.8H111.7z M93.8,37.8h6.2V50h-6.2V37.8z M122.3,50h-6.6V37.8h6.6V50z"/>
-	</g>
-</svg>
diff --git a/okitweb/static/okit/palette/deprecated/hidden/Bare_Metal_Instance.svg b/okitweb/static/okit/palette/deprecated/hidden/Bare_Metal_Instance.svg
deleted file mode 100644
index 7a28dbbae..000000000
--- a/okitweb/static/okit/palette/deprecated/hidden/Bare_Metal_Instance.svg
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 42 42" style="enable-background:new 0 0 42 42;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FFFFFF;}
-	.st1{fill:#2C5967;}
-</style>
-<g>
-	<g>
-		<g>
-			<path class="st0" d="M2.67,41.5c-1.19,0-2.17-0.97-2.17-2.17V2.67c0-1.19,0.97-2.17,2.17-2.17h36.67c1.19,0,2.17,0.97,2.17,2.17
-				v36.67c0,1.19-0.97,2.17-2.17,2.17H2.67z"/>
-			<path class="st0" d="M39.33,1C40.25,1,41,1.75,41,2.67v36.67c0,0.92-0.75,1.67-1.67,1.67H2.67C1.75,41,1,40.25,1,39.33V2.67
-				C1,1.75,1.75,1,2.67,1H39.33 M39.33,0H2.67C1.2,0,0,1.2,0,2.67v36.67C0,40.8,1.2,42,2.67,42h36.67C40.8,42,42,40.8,42,39.33V2.67
-				C42,1.2,40.8,0,39.33,0L39.33,0z"/>
-		</g>
-		<g>
-			<path class="st1" d="M39.33,1H2.67C1.75,1,1,1.75,1,2.67v36.67C1,40.25,1.75,41,2.67,41h36.67c0.92,0,1.67-0.75,1.67-1.67V2.67
-				C41,1.75,40.25,1,39.33,1z M39.52,39.33c0,0.1-0.08,0.19-0.19,0.19H2.67c-0.1,0-0.19-0.08-0.19-0.19V2.67
-				c0-0.1,0.08-0.19,0.19-0.19h36.67c0.1,0,0.19,0.08,0.19,0.19V39.33z"/>
-			<path class="st1" d="M5.44,36.37h31.11v-8.89H5.44V36.37z M6.93,28.96h28.15v5.93H6.93V28.96z"/>
-			<circle class="st1" cx="31.74" cy="31.93" r="1.11"/>
-			<path class="st1" d="M5.44,14.33h31.11V5.44H5.44V14.33z M6.93,6.93h28.15v5.93H6.93V6.93z"/>
-			<circle class="st1" cx="31.74" cy="9.89" r="1.11"/>
-			<path class="st1" d="M5.44,25.44h31.11v-8.89H5.44V25.44z M6.93,18.04h28.15v5.93H6.93V18.04z"/>
-			<circle class="st1" cx="31.74" cy="21" r="1.11"/>
-		</g>
-	</g>
-</g>
-</svg>
diff --git a/okitweb/static/okit/palette/deprecated/hidden/BigData_Service.svg b/okitweb/static/okit/palette/deprecated/hidden/BigData_Service.svg
deleted file mode 100755
index a818f59fd..000000000
--- a/okitweb/static/okit/palette/deprecated/hidden/BigData_Service.svg
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Big_Data_Service" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
-	 y="0px" viewBox="0 0 161.9 162" enable-background="new 0 0 161.9 162" xml:space="preserve">
-	<g>
-<path fill="#312D2A" d="M150.5,98.8c-0.8-7.1-7.2-12.2-14.2-11.4c-3.4,0.4-6.5,2-8.6,4.7l-7.5-3.9c0.7-3.1,1-6.2,1-9.5
-	c0-12.5-5.2-23.7-13.6-31.8l4.6-4.7c1.9,1.2,4.1,1.9,6.4,1.9c6.6,0,11.9-5.3,11.9-11.9s-5.3-11.9-11.9-11.9s-11.9,5.3-11.9,11.9
-	c0,2.3,0.7,4.5,1.8,6.3l-5,5c-7.4-5.5-16.5-8.8-26.4-8.8c-12.1,0-23.1,4.9-31,12.9l-6.1-6.1c2.4-2.8,3.8-6.5,3.8-10.4
-	c0-8.9-7.3-16.2-16.2-16.2S11.6,22.1,11.6,31s7.3,16.2,16.2,16.2c3.1,0,6-0.9,8.4-2.4l6.6,6.6c-3,3.8-5.4,8.1-7,12.7l-7.4-2.7
-	c0-0.1,0-0.2,0-0.3c0-4.4-3.6-8-8-8s-8,3.6-8,8s3.6,8,8,8c2.4,0,4.6-1.1,6.1-2.8l7.8,2.9c-0.7,3.1-1,6.2-1,9.5
-	c0,7.4,1.9,14.4,5.1,20.6l-5.7,4.6c-1.9-1.5-4.2-2.4-6.8-2.4c-6,0-10.9,4.9-10.9,10.9c0,6,4.9,10.9,10.9,10.9s10.9-4.9,10.9-10.9
-	c0-1.5-0.3-3-0.9-4.3l5.3-4.2c7.9,11.4,21.2,18.9,36.1,18.9c2.8,0,5.6-0.3,8.2-0.8l3,9c-2.9,1.9-4.9,5.3-4.9,9
-	c0,6,4.9,10.9,10.9,10.9s10.9-4.9,10.9-10.9c0-6-4.9-10.9-10.9-10.9c-0.4,0-0.8,0-1.2,0.1l-2.8-8.5c13.2-4.2,23.6-14.4,28.2-27.3
-	l6.6,3.4c-0.5,1.6-0.6,3.3-0.4,5c0.4,3.4,2.1,6.5,4.7,8.7c2.3,1.9,5.1,2.9,8.1,2.9c0.5,0,0.9,0,1.4-0.1
-	C146.2,112.3,151.3,105.9,150.5,98.8z M118.7,26.3c3.2,0,5.9,2.6,5.9,5.9s-2.6,5.9-5.9,5.9c-3.2,0-5.9-2.6-5.9-5.9
-	S115.4,26.3,118.7,26.3z M18.6,31c0-5.1,4.1-9.2,9.2-9.2s9.2,4.1,9.2,9.2s-4.1,9.2-9.2,9.2S18.6,36.1,18.6,31z M20.5,64.1
-	c-1.6,0-3-1.3-3-3s1.3-3,3-3s3,1.3,3,3S22.1,64.1,20.5,64.1z M26,117.1c-2.7,0-4.9-2.2-4.9-4.9s2.2-4.9,4.9-4.9s4.9,2.2,4.9,4.9
-	S28.6,117.1,26,117.1z M99.3,139.8c0,2.7-2.2,4.9-4.9,4.9s-4.9-2.2-4.9-4.9s2.2-4.9,4.9-4.9S99.3,137.1,99.3,139.8z M112.1,75.6
-	H96.6c-0.7-14.1-6.5-24.8-10.8-30.9C100,48.3,110.8,60.6,112.1,75.6z M64.8,75.6C65.6,58,75,46,76.9,43.7c0.1,0,0.2,0,0.4,0
-	c1.8,1.9,12.4,14,13.3,31.9H64.8z M90.5,81.6c-0.5,5.1-2.7,17.9-13.5,30.8c-9.8-12.9-11.8-25.8-12.3-30.8H90.5z M68.7,44.8
-	c-3.9,6-9.3,16.8-9.9,30.8H42.5C43.8,60.7,54.5,48.4,68.7,44.8z M42.5,81.6h16.3c0.3,5.1,2.1,17.8,11.1,31.1
-	C55.1,109.6,43.8,97,42.5,81.6z M84.4,112.8c9.9-13.4,11.8-26.1,12.2-31.2h15.5C110.8,97.1,99.3,109.7,84.4,112.8z M142.9,104.4
-	c-1.1,1.4-2.7,2.2-4.5,2.4c-1.8,0.2-3.5-0.3-4.9-1.4c-1.4-1.1-2.2-2.7-2.4-4.5c-0.2-1.8,0.3-3.5,1.4-4.9c1.1-1.4,2.7-2.2,4.5-2.4
-	c0.2,0,0.5,0,0.7,0c3.3,0,6.2,2.5,6.6,5.9C144.5,101.3,144,103,142.9,104.4z"/>
-	</g>
-</svg>
diff --git a/okitweb/static/okit/palette/deprecated/hidden/Cloud_Guard.svg b/okitweb/static/okit/palette/deprecated/hidden/Cloud_Guard.svg
deleted file mode 100755
index a46876ed2..000000000
--- a/okitweb/static/okit/palette/deprecated/hidden/Cloud_Guard.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Cloud_Guard_ALT" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
-	 y="0px" viewBox="0 0 161.9 162" enable-background="new 0 0 161.9 162" xml:space="preserve">
-<g>
-	<path fill="#312D2A" d="M124.8,40.5c-3-6.2-12.1-20.2-32.3-16.4c-5.8-6.4-18.1-14.3-34.3-9.6c-2,0.5-14.2,4-20,19.9
-		c-2.6,0.5-6.7,1.7-10.9,4C20.8,42,12.4,49.5,9.8,64.2l0,0.2C9.7,65,8,78.8,16.7,89.4c5.4,6.6,13.5,10.4,24.1,11.2l15,0l0-9H41.2
-		c-7.9-0.6-13.8-3.3-17.6-7.8c-5.9-7.2-5.1-17.2-5-18.1c3.8-21,22.6-22.7,23.4-22.8l3.1-0.2l0.9-3c4-13.9,13.8-16.3,14.2-16.3
-		l0.4-0.1c16.6-4.9,26,8,26.4,8.5l1.8,2.6l3-0.8c19.2-5,24.9,10.8,25.5,12.6l0.9,2.9l3,0.3c22.6,1.9,22.3,19.6,22.2,21.6l0,0.1
-		c-0.3,8.1-3.8,13.9-10.5,17.5c-0.8,0.4-1.6,0.8-2.5,1.1v9.6c9.8-2.9,21.3-10.8,21.9-27.9h0C152.6,69.3,152.9,44.4,124.8,40.5z"/>
-	<path fill="#312D2A" d="M125.6,75.4L92.9,61.3L60.1,75.4l0.1,31.8l0.1,0.4c4.8,27.7,29.9,37.9,30.9,38.4l1.9,0.8l1.8-0.9
-		c30.7-15.7,30.7-39.4,30.7-40.3V75.4z M116.6,105.4c0,0.7-0.3,16-19.4,28.6V96.8h-9v37.3c-6.6-4.3-16.3-13-19-27.7l-0.1-25.1
-		l19.1-8.2v15.8h9V73l19.4,8.3V105.4z"/>
-</g>
-</svg>
diff --git a/okitweb/static/okit/palette/deprecated/hidden/Customer_Data_Center.svg b/okitweb/static/okit/palette/deprecated/hidden/Customer_Data_Center.svg
deleted file mode 100755
index 6676cf8af..000000000
--- a/okitweb/static/okit/palette/deprecated/hidden/Customer_Data_Center.svg
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Customer_Data_Center_ALT" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
-	 x="0px" y="0px" viewBox="0 0 161.9 162" enable-background="new 0 0 161.9 162" xml:space="preserve">
-<g>
-	<path fill="#312D2A" d="M114.6,33.9V19.3H30.9v26.9v8v10c2.5-1.2,5.2-2,8-2.4v-7.7h67.6v18.2H62.8c1.8,2.6,3.1,5.5,3.9,8.6h39.9
-		v18.2H64c-1.8,3.2-4.2,5.9-7.2,8h57.7V92.5h37.5V75.3v-6.4V57.6v-6V33.9H114.6z M106.6,46.1H38.9V27.3h67.6V46.1z M146.1,86.5
-		h-31.5V81v-5.7h31.5V86.5z M146.1,68.9h-31.5V57.6h31.5V68.9z M146.1,51.6h-31.5v-5.5v-6.2h31.5V51.6z"/>
-	<path fill="#312D2A" d="M97.9,90.4c0-1.8-1.5-3.3-3.3-3.3s-3.3,1.5-3.3,3.3s1.5,3.3,3.3,3.3S97.9,92.2,97.9,90.4z"/>
-	<path fill="#312D2A" d="M97.9,63.5c0-1.8-1.5-3.3-3.3-3.3s-3.3,1.5-3.3,3.3c0,1.8,1.5,3.3,3.3,3.3S97.9,65.4,97.9,63.5z"/>
-	<path fill="#312D2A" d="M94.6,40.5c1.8,0,3.3-1.5,3.3-3.3s-1.5-3.3-3.3-3.3s-3.3,1.5-3.3,3.3S92.8,40.5,94.6,40.5z"/>
-	<path fill="#312D2A" d="M138.6,83.3c1.2,0,2.2-1,2.2-2.2c0-1.2-1-2.2-2.2-2.2s-2.2,1-2.2,2.2C136.4,82.3,137.4,83.3,138.6,83.3z"/>
-	<circle fill="#312D2A" cx="138.6" cy="63.4" r="2.2"/>
-	<circle fill="#312D2A" cx="138.6" cy="46.1" r="2.2"/>
-	<path fill="#312D2A" d="M42.1,107.2c11.5,0,20.8-9.3,20.8-20.8s-9.3-20.8-20.8-20.8c-11.5,0-20.8,9.3-20.8,20.8
-		S30.6,107.2,42.1,107.2z M42.1,74.5c6.5,0,11.8,5.3,11.8,11.8c0,6.5-5.3,11.8-11.8,11.8s-11.8-5.3-11.8-11.8
-		C30.3,79.8,35.6,74.5,42.1,74.5z"/>
-	<path fill="#312D2A" d="M45,110.8h-5.8c-16.5,0-30,13.4-30,30v5.8h9v-5.8c0-11.6,9.4-21,21-21H45c11.6,0,21,9.4,21,21v5.8h9v-5.8
-		C75,124.3,61.5,110.8,45,110.8z"/>
-</g>
-</svg>
diff --git a/okitweb/static/okit/palette/deprecated/hidden/Data_Integration_Workspace.svg b/okitweb/static/okit/palette/deprecated/hidden/Data_Integration_Workspace.svg
deleted file mode 100644
index e5f77c0f7..000000000
--- a/okitweb/static/okit/palette/deprecated/hidden/Data_Integration_Workspace.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Data_Integration_Workspace" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
-     y="0px" viewBox="0 0 161.9 162" enable-background="new 0 0 161.9 162" xml:space="preserve">
-<g>
-</g>
-</svg>
diff --git a/okitweb/static/okit/palette/deprecated/hidden/Data_Science.svg b/okitweb/static/okit/palette/deprecated/hidden/Data_Science.svg
deleted file mode 100755
index eb582da9b..000000000
--- a/okitweb/static/okit/palette/deprecated/hidden/Data_Science.svg
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Science" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 161.9 162" enable-background="new 0 0 161.9 162" xml:space="preserve">
-<g>
-	<path fill="#312D2A" d="M63.6,27.7c1.2-3.6,0.9-7.5-0.8-10.9c-1.7-3.4-4.6-5.9-8.2-7.1c-3.6-1.2-7.5-0.9-10.9,0.8
-		c-3.4,1.7-5.9,4.6-7.1,8.2c-1.2,3.6-0.9,7.5,0.8,10.9c0.7,1.3,1.5,2.5,2.5,3.5L29.3,51.1c-3.2-0.7-6.5-0.3-9.4,1.2
-		c-3.4,1.7-5.9,4.6-7.1,8.2c-1.2,3.6-0.9,7.5,0.8,10.9c1.7,3.4,4.6,5.9,8.2,7.1c1.5,0.5,3,0.7,4.5,0.7c2.2,0,4.4-0.5,6.4-1.5
-		c3.4-1.7,5.9-4.6,7.1-8.2c0.2-0.5,0.3-1.1,0.4-1.6l9.6,0.1c0.5-2,1-4,1.7-6l-11.4-0.1c-0.3-1.1-0.6-2.2-1.2-3.2c-1-2-2.4-3.7-4.2-5
-		l10.1-17.1c0.2,0.1,0.5,0.2,0.7,0.3c1.5,0.5,3,0.7,4.5,0.7c1.4,0,2.7-0.2,4.1-0.6l5.9,9.4c1.3-1.6,2.7-3.2,4.1-4.7L59.4,34
-		C61.3,32.3,62.7,30.2,63.6,27.7z M29.5,71.4c-3.6,1.8-7.9,0.4-9.7-3.2c-1.8-3.6-0.4-7.9,3.2-9.7c1-0.5,2.1-0.8,3.2-0.8
-		c2.6,0,5.2,1.5,6.5,4C34.5,65.3,33,69.6,29.5,71.4z M43.6,26.5c-1.8-3.6-0.4-7.9,3.2-9.7c1-0.5,2.1-0.8,3.2-0.8
-		c2.6,0,5.2,1.5,6.5,4c1.8,3.6,0.4,7.9-3.2,9.7C49.7,31.5,45.4,30.1,43.6,26.5z"/>
-	<g>
-		<path fill="#312D2A" d="M101.9,32.5C76.1,32.5,55,53.9,55,80.1c0,14,6,26.7,15.6,35.4l-15.4,19.2l9.5,7.6l15.9-19.8
-			c6.4,3.3,13.6,5.2,21.2,5.2c25.8,0,46.9-21.3,46.9-47.5C148.8,53.9,127.7,32.5,101.9,32.5z M78,50.2l6.5,10.6
-			c-4.4,3.9-7.3,9.1-8.3,14.8l-11.9-0.1C65.5,65.3,70.6,56.3,78,50.2z M101.7,63.2c6.2,0,12.2,3.4,15.2,9.3
-			c4.2,8.4,0.8,18.6-7.5,22.8c-8.4,4.2-18.6,0.8-22.8-7.5c-4.2-8.4-0.8-18.6,7.5-22.8C96.6,63.8,99.2,63.2,101.7,63.2z M101.9,118.6
-			c-19.4,0-35.5-15-37.6-34.2l11.9,0.1c0.4,2.5,1.2,5,2.4,7.4c4.6,9.1,13.7,14.3,23.2,14.3c3.9,0,7.9-0.9,11.6-2.8
-			c12.8-6.4,18-22.1,11.5-34.9c-6.1-12.1-20.4-17.4-32.7-12.5l-6.6-10.8c4.9-2.4,10.5-3.8,16.3-3.8c20.9,0,37.9,17.3,37.9,38.5
-			S122.8,118.6,101.9,118.6z"/>
-		<polygon fill="#312D2A" points="45.7,146.5 55.2,154.1 61.6,146.5 52.1,138.8 		"/>
-	</g>
-</g>
-</svg>
diff --git a/okitweb/static/okit/palette/deprecated/hidden/Database.svg b/okitweb/static/okit/palette/deprecated/hidden/Database.svg
deleted file mode 100644
index 44c07c0f0..000000000
--- a/okitweb/static/okit/palette/deprecated/hidden/Database.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 42 42" style="enable-background:new 0 0 42 42;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FFFFFF;}
-	.st1{fill:#312D2A;}
-</style>
-<g>
-	<g>
-		<g>
-			<path class="st0" d="M29.66,41.5v-4.49h-9.72V26.92h-4.86v-4.67h-2.74v4.67H7.67v2.74h4.67V41.5H0.5V29.66h4.67v-2.74H0.5V15.08
-				h11.84v4.67h2.74v-4.67h4.86v-2.74h-4.86V0.5h11.84v11.84h-4.49v2.74h4.49v4.67h2.74v-4.67H41.5v11.84h-4.67v2.74h4.67V41.5
-				H29.66z M29.66,34.52v-4.86h4.67v-2.74h-4.67v-4.67h-2.74v4.67h-4.49v7.6H29.66z"/>
-			<path class="st0" d="M26.42,1v10.84h-4.49v3.74h4.49v4.67h3.74v-4.67H41v10.84h-4.67v3.74H41V41H30.16v-4.49h-9.72V26.42h-4.86
-				v-4.67h-3.74v4.67H7.17v3.74h4.67V41H1V30.16h4.67v-3.74H1V15.58h10.84v4.67h3.74v-4.67h4.86v-3.74h-4.86V1H26.42 M21.93,35.02
-				h8.22v-4.86h4.67v-3.74h-4.67v-4.67h-3.74v4.67h-4.49V35.02 M27.42,0h-1H15.58h-1v1v10.84v1h1h3.86v1.74h-3.86h-1v1v3.67h-1.74
-				v-3.67v-1h-1H1H0v1v10.84v1h1h3.67v1.74H1H0v1V41v1h1h10.84h1v-1V30.16v-1h-1H8.17v-1.74h3.67h1v-1v-3.67h1.74v3.67v1h1h3.86
-				v9.09v1h1h8.72V41v1h1H41h1v-1V30.16v-1h-1h-3.67v-1.74H41h1v-1V15.58v-1h-1H30.16h-1v1v3.67h-1.74v-3.67v-1h-1h-3.49v-1.74h3.49
-				h1v-1V1V0L27.42,0z M27.42,22.75h1.74v3.67v1h1h3.67v1.74h-3.67h-1v1v3.86h-6.22v-6.6h3.49h1v-1V22.75L27.42,22.75z"/>
-		</g>
-		<path class="st1" d="M41,26.42V15.58H30.16v4.67h-3.74v-4.67h-4.49v-3.74h4.49V1H15.58v10.84h4.86v3.74h-4.86v4.67h-3.74v-4.67H1
-			v10.84h4.67v3.74H1V41h10.84V30.16H7.17v-3.74h4.67v-4.67h3.74v4.67h4.86v10.09h9.72V41H41V30.16h-4.67v-3.74H41z M17.07,2.5h7.85
-			v7.85h-7.85V2.5z M10.35,39.5H2.5v-7.85h7.85V39.5z M10.35,24.93H2.5v-7.85h7.85V24.93z M31.65,17.07h7.85v7.85h-7.85V17.07z
-			 M17.07,17.07h7.85v7.85h-7.85V17.07z M39.5,39.5h-7.85v-7.85h7.85V39.5z M34.83,30.16h-4.67v4.86h-8.22v-8.6h4.49v-4.67h3.74
-			v4.67h4.67V30.16z"/>
-	</g>
-</g>
-</svg>
diff --git a/okitweb/static/okit/palette/deprecated/hidden/Db_Home.svg b/okitweb/static/okit/palette/deprecated/hidden/Db_Home.svg
deleted file mode 100644
index 44c07c0f0..000000000
--- a/okitweb/static/okit/palette/deprecated/hidden/Db_Home.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 42 42" style="enable-background:new 0 0 42 42;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FFFFFF;}
-	.st1{fill:#312D2A;}
-</style>
-<g>
-	<g>
-		<g>
-			<path class="st0" d="M29.66,41.5v-4.49h-9.72V26.92h-4.86v-4.67h-2.74v4.67H7.67v2.74h4.67V41.5H0.5V29.66h4.67v-2.74H0.5V15.08
-				h11.84v4.67h2.74v-4.67h4.86v-2.74h-4.86V0.5h11.84v11.84h-4.49v2.74h4.49v4.67h2.74v-4.67H41.5v11.84h-4.67v2.74h4.67V41.5
-				H29.66z M29.66,34.52v-4.86h4.67v-2.74h-4.67v-4.67h-2.74v4.67h-4.49v7.6H29.66z"/>
-			<path class="st0" d="M26.42,1v10.84h-4.49v3.74h4.49v4.67h3.74v-4.67H41v10.84h-4.67v3.74H41V41H30.16v-4.49h-9.72V26.42h-4.86
-				v-4.67h-3.74v4.67H7.17v3.74h4.67V41H1V30.16h4.67v-3.74H1V15.58h10.84v4.67h3.74v-4.67h4.86v-3.74h-4.86V1H26.42 M21.93,35.02
-				h8.22v-4.86h4.67v-3.74h-4.67v-4.67h-3.74v4.67h-4.49V35.02 M27.42,0h-1H15.58h-1v1v10.84v1h1h3.86v1.74h-3.86h-1v1v3.67h-1.74
-				v-3.67v-1h-1H1H0v1v10.84v1h1h3.67v1.74H1H0v1V41v1h1h10.84h1v-1V30.16v-1h-1H8.17v-1.74h3.67h1v-1v-3.67h1.74v3.67v1h1h3.86
-				v9.09v1h1h8.72V41v1h1H41h1v-1V30.16v-1h-1h-3.67v-1.74H41h1v-1V15.58v-1h-1H30.16h-1v1v3.67h-1.74v-3.67v-1h-1h-3.49v-1.74h3.49
-				h1v-1V1V0L27.42,0z M27.42,22.75h1.74v3.67v1h1h3.67v1.74h-3.67h-1v1v3.86h-6.22v-6.6h3.49h1v-1V22.75L27.42,22.75z"/>
-		</g>
-		<path class="st1" d="M41,26.42V15.58H30.16v4.67h-3.74v-4.67h-4.49v-3.74h4.49V1H15.58v10.84h4.86v3.74h-4.86v4.67h-3.74v-4.67H1
-			v10.84h4.67v3.74H1V41h10.84V30.16H7.17v-3.74h4.67v-4.67h3.74v4.67h4.86v10.09h9.72V41H41V30.16h-4.67v-3.74H41z M17.07,2.5h7.85
-			v7.85h-7.85V2.5z M10.35,39.5H2.5v-7.85h7.85V39.5z M10.35,24.93H2.5v-7.85h7.85V24.93z M31.65,17.07h7.85v7.85h-7.85V17.07z
-			 M17.07,17.07h7.85v7.85h-7.85V17.07z M39.5,39.5h-7.85v-7.85h7.85V39.5z M34.83,30.16h-4.67v4.86h-8.22v-8.6h4.49v-4.67h3.74
-			v4.67h4.67V30.16z"/>
-	</g>
-</g>
-</svg>
diff --git a/okitweb/static/okit/palette/deprecated/hidden/Db_Node.svg b/okitweb/static/okit/palette/deprecated/hidden/Db_Node.svg
deleted file mode 100644
index 058af5da3..000000000
--- a/okitweb/static/okit/palette/deprecated/hidden/Db_Node.svg
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 42 42" style="enable-background:new 0 0 42 42;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FFFFFF;}
-	.st1{fill:#2C5967;}
-</style>
-<g>
-	<g>
-		<path class="st0" d="M2.67,41.5c-1.19,0-2.17-0.97-2.17-2.17V2.67c0-1.19,0.97-2.17,2.17-2.17h36.67c1.19,0,2.17,0.97,2.17,2.17
-			v36.67c0,1.19-0.97,2.17-2.17,2.17H2.67z"/>
-		<path class="st0" d="M39.33,1C40.25,1,41,1.75,41,2.67v36.67c0,0.92-0.75,1.67-1.67,1.67H2.67C1.75,41,1,40.25,1,39.33V2.67
-			C1,1.75,1.75,1,2.67,1H39.33 M39.33,0H2.67C1.2,0,0,1.2,0,2.67v36.67C0,40.8,1.2,42,2.67,42h36.67C40.8,42,42,40.8,42,39.33V2.67
-			C42,1.2,40.8,0,39.33,0L39.33,0z"/>
-	</g>
-	<g>
-		<path class="st1" d="M39.33,41H2.67C1.75,41,1,40.25,1,39.33V2.67C1,1.75,1.75,1,2.67,1h36.67C40.25,1,41,1.75,41,2.67v36.67
-			C41,40.25,40.25,41,39.33,41z M2.67,2.48c-0.1,0-0.19,0.08-0.19,0.19v36.67c0,0.1,0.08,0.19,0.19,0.19h36.67
-			c0.1,0,0.19-0.08,0.19-0.19V2.67c0-0.1-0.08-0.19-0.19-0.19H2.67z"/>
-	</g>
-	<g>
-		<g>
-			<g>
-				<path class="st1" d="M20.35,20.44h-8.89v-8.89h8.89V20.44z M12.94,18.96h5.93v-5.93h-5.93V18.96z"/>
-			</g>
-		</g>
-		<g>
-			<g>
-				<path class="st1" d="M30.35,20.44h-8.89v-8.89h8.89V20.44z M22.94,18.96h5.93v-5.93h-5.93V18.96z"/>
-			</g>
-		</g>
-		<g>
-			<g>
-				<path class="st1" d="M25.44,30.44h-8.89v-8.89h8.89V30.44z M18.04,28.96h5.93v-5.93h-5.93V28.96z"/>
-			</g>
-		</g>
-		<g>
-			<g>
-				<path class="st1" d="M35.44,30.44h-8.89v-8.89h8.89V30.44z M28.04,28.96h5.93v-5.93h-5.93V28.96z"/>
-			</g>
-		</g>
-		<g>
-			<g>
-				<path class="st1" d="M15.44,30.44H6.56v-8.89h8.89V30.44z M8.04,28.96h5.93v-5.93H8.04V28.96z"/>
-			</g>
-		</g>
-	</g>
-</g>
-</svg>
diff --git a/okitweb/static/okit/palette/deprecated/hidden/Encryption.svg b/okitweb/static/okit/palette/deprecated/hidden/Encryption.svg
deleted file mode 100755
index 22edcef9c..000000000
--- a/okitweb/static/okit/palette/deprecated/hidden/Encryption.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Encryption" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 161.9 162" enable-background="new 0 0 161.9 162" xml:space="preserve">
-<g>
-	<path fill="#312D2A" d="M80.9,62c-9.4,0-17.1,7.7-17.1,17.1c0,5.3,2.4,10.1,6.5,13.3l-4.4,23.9H96l-4.4-24c4-3.2,6.4-8,6.5-13.1
-		l0-0.1C98.1,69.6,90.4,62,80.9,62z M85.9,87.7L83.9,89l3.7,20.3H74.3L78,89l-2.1-1.2c-3.2-1.8-5.1-5.1-5.1-8.7
-		c0-5.6,4.5-10.1,10.1-10.1c5.5,0,10.1,4.6,10.1,10.1C91,82.6,89.1,85.9,85.9,87.7z"/>
-	<path fill="#312D2A" d="M132,94.1V49.7L110.2,41v-5c0-15.1-13.1-27.5-29.2-27.5C64.8,8.5,51.7,20.8,51.7,36v5.1l-21.6,8.6l0.2,46.9
-		l0.1,0.4c7.6,41,47.4,56.2,49.1,56.8l1.8,0.7l1.7-0.8C132,130.4,132,95.5,132,94.1z M60.7,36c0-10.2,9.1-18.5,20.2-18.5
-		s20.2,8.3,20.2,18.5v1.4l-20.1-8l-20.3,8.1V36z M80.9,144.7c-7.3-3.2-35.6-17.7-41.6-48.9l-0.2-40l41.9-16.7L123,55.8l0,38.3
-		C123,94.5,123,123.9,80.9,144.7z"/>
-</g>
-</svg>
diff --git a/okitweb/static/okit/palette/deprecated/hidden/Fast_Connect.svg b/okitweb/static/okit/palette/deprecated/hidden/Fast_Connect.svg
deleted file mode 100755
index 77dfac7e5..000000000
--- a/okitweb/static/okit/palette/deprecated/hidden/Fast_Connect.svg
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Fast_Connect" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
-	 y="0px" viewBox="0 0 161.9 162" enable-background="new 0 0 161.9 162" xml:space="preserve">
-	<g>
-<path fill="#312D2A" d="M76.7,88.8h41.5v11.7H75.6c-1,2.9-2.5,5.7-4.4,8h47v11.2h-41c0.2,0.1,0.3,0.3,0.5,0.4
-	c2.3,2.2,4.3,4.7,5.9,7.6c0.1,0.2,0.2,0.3,0.3,0.4h34.3v11.2H87.6c0.2,1.4,0.3,2.8,0.3,4.3v3.7h38.3v-19.2v-8.4v-11.2v-8V80.8H74.1
-	C75.4,83.2,76.3,85.9,76.7,88.8z M93,73.4h6.7v4.4H93V73.4z M93,65.6h6.7V70H93V65.6z M112.9,133.9c0-1.3-1.1-2.4-2.4-2.4
-	s-2.4,1.1-2.4,2.4c0,1.3,1.1,2.4,2.4,2.4S112.9,135.3,112.9,133.9z M112.9,114.3c0-1.3-1.1-2.4-2.4-2.4s-2.4,1.1-2.4,2.4
-	s1.1,2.4,2.4,2.4S112.9,115.6,112.9,114.3z M112.9,95c0-1.3-1.1-2.4-2.4-2.4s-2.4,1.1-2.4,2.4s1.1,2.4,2.4,2.4S112.9,96.3,112.9,95z
-	 M114,49L96.5,25.7L79.4,49H93v5.4h6.7V49H114z M90.9,43.2l5.6-7.6l5.7,7.6H90.9z M140.2,44.5c-1,14.2-12.6,18-18.6,18H99.7v-8h21.8
-	c1.6,0,9.9-0.6,10.6-10.5c0.1-1.7-0.1-9.9-11.4-10.8L118,33l-0.8-2.6c-0.4-1.5-3.4-8.7-12.8-6.3l-2.7,0.7l-1.6-2.3
-	c-0.2-0.2-5-6.8-13.5-4.3l-0.4,0.1c-0.1,0-5,1.2-7,8.3l-0.8,2.7l-2.8,0.2c-1,0.1-10.1,1.2-12,11.8c0,0.6-0.4,5.7,2.6,9.3
-	c1.9,2.2,4.9,3.6,9,3.9H93v8H74.8C68.3,62,63.4,59.7,60,55.6c-5.3-6.5-4.3-15-4.3-15.4V40c2.1-11.8,10.7-16.7,16.7-18.1
-	C75.9,13,83,10.8,84.5,10.6c9.4-2.8,16.7,1.5,20.5,5.3c10.3-1.6,16.3,4.5,18.9,9.6C137.5,27.7,140.5,38.7,140.2,44.5z M44.4,111.4
-	c2.3,0.9,4.8,1.4,7.3,1.4c2.6,0,5.1-0.5,7.3-1.4c1.3-0.5,2.5-1.1,3.7-1.8c1.5-0.9,2.8-2,4-3.3c1.6-1.7,3-3.7,3.9-5.9
-	c1.2-2.6,1.8-5.5,1.8-8.5c0-1.1-0.1-2.1-0.3-3.2c-0.4-2.9-1.5-5.6-3-8c-3.7-5.8-10.2-9.6-17.5-9.6c-11.5,0-20.8,9.3-20.8,20.8
-	C30.9,100.8,36.5,108.4,44.4,111.4z M51.7,80.1c6.5,0,11.8,5.3,11.8,11.8s-5.3,11.8-11.8,11.8s-11.8-5.3-11.8-11.8
-	S45.2,80.1,51.7,80.1z M78.4,128.1c-0.1-0.2-0.2-0.3-0.4-0.4c-2.3-2.8-5.1-5.3-8.2-7.1c-2.2-1.3-4.6-2.3-7.1-3
-	c-1.4-0.4-2.8-0.7-4.2-0.9c-1.3-0.2-2.6-0.3-3.9-0.3h-5.8c-1.3,0-2.7,0.1-3.9,0.3c-14.7,1.9-26,14.5-26,29.7v4.7v1.2h9v-1.2v-4.7
-	c0-11.6,9.4-21,21-21h5.8c11.6,0,21,9.4,21,21v4.7v1.2h9v-1.2v-3.7v-1c0-2.4-0.3-4.8-0.8-7C82.7,135.2,80.9,131.4,78.4,128.1z"/>
-	</g>
-</svg>
diff --git a/okitweb/static/okit/palette/deprecated/hidden/Groups.svg b/okitweb/static/okit/palette/deprecated/hidden/Groups.svg
deleted file mode 100755
index b19e2c226..000000000
--- a/okitweb/static/okit/palette/deprecated/hidden/Groups.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Groups" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 161.9 162" enable-background="new 0 0 161.9 162" xml:space="preserve">
-	<g>
-<path fill="#312D2A" d="M128.1,86.5c-8.8,0-15.9-7.1-15.9-15.9s7.1-15.9,15.9-15.9c8.8,0,15.9,7.1,15.9,15.9S136.8,86.5,128.1,86.5z
-	 M128.1,62.7c-4.3,0-7.9,3.5-7.9,7.9s3.5,7.9,7.9,7.9c4.3,0,7.9-3.5,7.9-7.9S132.4,62.7,128.1,62.7z M33.7,86.9
-	c-8.8,0-15.9-7.1-15.9-15.9S25,55.2,33.7,55.2s15.9,7.1,15.9,15.9S42.5,86.9,33.7,86.9z M33.7,63.2c-4.3,0-7.9,3.5-7.9,7.9
-	s3.5,7.9,7.9,7.9s7.9-3.5,7.9-7.9S38.1,63.2,33.7,63.2z M103.4,124.8h8v0L103.4,124.8L103.4,124.8z M130.2,90.5h-4.2
-	c-5.5,0-10.6,2-14.5,5.3c1.7,2.1,3.1,4.4,4.3,6.9c2.6-2.6,6.2-4.2,10.2-4.2h4.2c8,0,14.5,6.5,14.5,14.5v11.8h8V113
-	C152.7,100.6,142.6,90.5,130.2,90.5z M35.8,90.5h-4.2c-12.4,0-22.5,10.1-22.5,22.5v11.8h8V113c0-8,6.5-14.5,14.5-14.5h4.2
-	c4.1,0,7.8,1.7,10.5,4.5c1.1-2.5,2.6-4.8,4.3-7C46.6,92.6,41.5,90.5,35.8,90.5z M50.4,124.8h8v0L50.4,124.8L50.4,124.8z M81.1,83.6
-	c-11.7,0-21.1-9.5-21.1-21.1s9.5-21.1,21.1-21.1c11.7,0,21.1,9.5,21.1,21.1S92.7,83.6,81.1,83.6z M81.1,50.3
-	c-6.7,0-12.1,5.4-12.1,12.1s5.4,12.1,12.1,12.1s12.1-5.4,12.1-12.1S87.8,50.3,81.1,50.3z M114.5,118.9c0-16.8-13.7-30.5-30.5-30.5
-	h-6c-16.8,0-30.5,13.7-30.5,30.5v6h9v-6c0-11.8,9.6-21.5,21.5-21.5h6c11.8,0,21.5,9.6,21.5,21.5v6h9V118.9z"/></g>
-</svg>
diff --git a/okitweb/static/okit/palette/deprecated/hidden/ID_Access.svg b/okitweb/static/okit/palette/deprecated/hidden/ID_Access.svg
deleted file mode 100755
index fb050cc5a..000000000
--- a/okitweb/static/okit/palette/deprecated/hidden/ID_Access.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="ID_Access" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 161.9 162" enable-background="new 0 0 161.9 162" xml:space="preserve">
-<g>
-	<path fill="#312D2A" d="M60.3,38.6c0-7.5-6.1-13.7-13.7-13.7S33,31.1,33,38.6s6.1,13.7,13.7,13.7S60.3,46.1,60.3,38.6z M40,38.6
-		c0-3.7,3-6.7,6.7-6.7s6.7,3,6.7,6.7s-3,6.7-6.7,6.7S40,42.3,40,38.6z"/>
-	<path fill="#312D2A" d="M67.8,75.8v-1.6c0-10.7-8.7-19.3-19.3-19.3h-3.6c-10.7,0-19.3,8.7-19.3,19.3v1.6h7v-1.6
-		c0-6.8,5.5-12.3,12.3-12.3h3.6c6.8,0,12.3,5.5,12.3,12.3v1.6H67.8z"/>
-	<polygon fill="#312D2A" points="18.2,82.4 18.2,18.3 115.3,18.3 115.3,63.3 120.5,61.1 124.3,62.7 124.3,9.3 9.2,9.3 9.2,91.4 
-		83,91.4 83,82.4 	"/>
-	<polygon fill="#312D2A" points="93.6,70.3 96.7,67.2 92,62.5 97,57.6 93.9,54.5 89,59.5 84.3,54.8 81.2,57.8 85.9,62.5 80.9,67.5 
-		84,70.6 89,65.6 	"/>
-	<polygon fill="#312D2A" points="84.2,35.3 80.9,38.1 87.7,46.2 100.2,32.4 97,29.5 87.8,39.6 	"/>
-	<path fill="#312D2A" d="M153,111.5v-30l-32.8-14.1L87.4,81.5l0.1,31.8l0.1,0.4c4.8,27.7,29.9,37.9,30.9,38.4l1.9,0.8l1.8-0.9
-		C153,136.2,153,112.5,153,111.5z M144,111.6c0,0.7-0.3,16-19.4,28.6v-37.2h-9v37.3c-6.6-4.3-16.3-13-19-27.7l-0.1-25.1l19.1-8.2V95
-		h9V79.1l19.4,8.3V111.6z"/>
-</g>
-</svg>
diff --git a/okitweb/static/okit/palette/deprecated/hidden/Instance_Pool.svg b/okitweb/static/okit/palette/deprecated/hidden/Instance_Pool.svg
deleted file mode 100755
index e00ddde16..000000000
--- a/okitweb/static/okit/palette/deprecated/hidden/Instance_Pool.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Instance_Pools" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
-	 y="0px" viewBox="0 0 161.9 162" enable-background="new 0 0 161.9 162" xml:space="preserve">
-<g>
-<path fill="#312D2A" d="M81.3,124.2c-43.2,0-53.7-11.8-54.8-13.1l-0.9-1.1V93.3h8v13.5c3.1,2.4,15.1,9.4,47.6,9.4
-	c27.9,0,42.6-7.1,47.1-9.8V93.7h8v16.8l-1.5,1.2C134.2,112.2,118.5,124.2,81.3,124.2z M123.5,65.7v28.7H84.4h-6.6H38.7V65.7h20.8V44
-	h45.7v21.7H123.5z M66.4,65.7h11.4h6.6h13.8V51H66.4V65.7z M77.4,72.7H59.4H45.7v14.7h31.7V72.7z M116.5,72.7h-11.4H84.8v14.7h31.7
-	V72.7z M109,83.9c2.1,0,3.7-1.7,3.7-3.7c0-2.1-1.7-3.7-3.7-3.7c-2.1,0-3.7,1.7-3.7,3.7C105.3,82.2,106.9,83.9,109,83.9z M69.8,83.9
-	c2.1,0,3.7-1.7,3.7-3.7c0-2.1-1.7-3.7-3.7-3.7s-3.7,1.7-3.7,3.7C66.1,82.2,67.8,83.9,69.8,83.9z M90.6,62.1c2.1,0,3.7-1.7,3.7-3.7
-	s-1.7-3.7-3.7-3.7c-2.1,0-3.7,1.7-3.7,3.7S88.6,62.1,90.6,62.1z M152.8,9.2H9v143.6h143.8V9.2z M18,18.2h125.8v125.6H18V18.2z"/>
-</g>
-</svg>
diff --git a/okitweb/static/okit/palette/deprecated/hidden/Integration_Instance.svg b/okitweb/static/okit/palette/deprecated/hidden/Integration_Instance.svg
deleted file mode 100644
index d210e0d24..000000000
--- a/okitweb/static/okit/palette/deprecated/hidden/Integration_Instance.svg
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 42 42" style="enable-background:new 0 0 42 42;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FFFFFF;}
-	.st1{fill:#400080;}
-</style>
-<g>
-	<g>
-		<path class="st0" d="M2.67,41.5c-1.19,0-2.17-0.97-2.17-2.17V2.67c0-1.19,0.97-2.17,2.17-2.17h36.67c1.19,0,2.17,0.97,2.17,2.17
-			v36.67c0,1.19-0.97,2.17-2.17,2.17H2.67z"/>
-		<path class="st0" d="M39.33,1C40.25,1,41,1.75,41,2.67v36.67c0,0.92-0.75,1.67-1.67,1.67H2.67C1.75,41,1,40.25,1,39.33V2.67
-			C1,1.75,1.75,1,2.67,1H39.33 M39.33,0H2.67C1.2,0,0,1.2,0,2.67v36.67C0,40.8,1.2,42,2.67,42h36.67C40.8,42,42,40.8,42,39.33V2.67
-			C42,1.2,40.8,0,39.33,0L39.33,0z"/>
-	</g>
-	<g>
-		<path class="st1" d="M39.33,1H2.67C1.75,1,1,1.75,1,2.67v36.67C1,40.25,1.75,41,2.67,41h36.67c0.92,0,1.67-0.75,1.67-1.67V2.67
-			C41,1.75,40.25,1,39.33,1z M39.52,39.33c0,0.1-0.08,0.19-0.19,0.19H2.67c-0.1,0-0.19-0.08-0.19-0.19V2.67
-			c0-0.1,0.08-0.19,0.19-0.19h36.67c0.1,0,0.19,0.08,0.19,0.19V39.33z"/>
-		<path class="st1" d="M6.56,35.44h29.07v-8.89H6.56V35.44z M8.04,28.04h26.11v5.93H8.04V28.04z"/>
-		<circle class="st1" cx="30.81" cy="31" r="1.11"/>
-		<path class="st1" d="M15.44,6.56H6.56v8.89h8.89V6.56z M13.96,13.96H8.04V8.04h5.93V13.96z"/>
-		<path class="st1" d="M25.44,6.56h-8.89v8.89h8.89V6.56z M23.96,13.96h-5.93V8.04h5.93V13.96z"/>
-		<path class="st1" d="M15.44,16.56H6.56v8.89h8.89V16.56z M13.96,23.96H8.04v-5.93h5.93V23.96z"/>
-		<path class="st1" d="M25.44,16.56h-8.89v8.89h8.89V16.56z M23.96,23.96h-5.93v-5.93h5.93V23.96z"/>
-		<path class="st1" d="M35.44,6.56h-8.89v8.89h8.89V6.56z M33.96,13.96h-5.93V8.04h5.93V13.96z"/>
-		<path class="st1" d="M35.44,16.56h-8.89v8.89h8.89V16.56z M33.96,23.96h-5.93v-5.93h5.93V23.96z"/>
-	</g>
-</g>
-</svg>
diff --git a/okitweb/static/okit/palette/deprecated/hidden/Key_Management.svg b/okitweb/static/okit/palette/deprecated/hidden/Key_Management.svg
deleted file mode 100755
index d52b8ef5d..000000000
--- a/okitweb/static/okit/palette/deprecated/hidden/Key_Management.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Cloud_Guard_ALT" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
-	 y="0px" viewBox="0 0 161.9 162" enable-background="new 0 0 161.9 162" xml:space="preserve">
-<g>
-	<path fill="#312D2A" d="M63.9,58.5c-9.3,0-16.8,7.5-16.8,16.8s7.5,16.8,16.8,16.8c8.3,0,15.3-6.1,16.6-14.1h12.1v5.6h5.9v-5.6h7.1
-		v8.3h7.5v-8.3v-1.2v-5.5H80.2C78.4,64,71.8,58.5,63.9,58.5z M63.9,84.5c-5,0-9.1-4.1-9.1-9.1c0-5,4.1-9.1,9.1-9.1
-		c5,0,9.1,4.1,9.1,9.1C73,80.4,68.9,84.5,63.9,84.5z"/>
-	<path fill="#312D2A" d="M135.1,83.5V33.1L81,9.9L27,33.1l0.2,53.2l0.1,0.4c8,46.6,50.3,63.9,52.1,64.7l1.9,0.8l1.8-0.9
-		C135,124.6,135.1,85.1,135.1,83.5z M126.1,83.5c0,1.4-0.4,34.8-45.2,58.6c-7.8-3.7-38.3-20.4-44.7-56.6L36,39.1l45-19.3l45,19.3
-		V83.5z"/>
-</g>
-</svg>
diff --git a/okitweb/static/okit/palette/deprecated/hidden/Market_Place.svg b/okitweb/static/okit/palette/deprecated/hidden/Market_Place.svg
deleted file mode 100755
index e2800eeff..000000000
--- a/okitweb/static/okit/palette/deprecated/hidden/Market_Place.svg
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Buckets" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 161.9 162" enable-background="new 0 0 161.9 162" xml:space="preserve">
-<g>
-	<path fill="#312D2A" d="M120.5,131.6c-4,0-7.3,3.3-7.3,7.3s3.3,7.3,7.3,7.3s7.3-3.3,7.3-7.3S124.6,131.6,120.5,131.6z M60,131.6
-		c-4,0-7.3,3.3-7.3,7.3s3.3,7.3,7.3,7.3c4,0,7.3-3.3,7.3-7.3S64,131.6,60,131.6z M49.3,126.7h66c18.1,0,22.4-12.8,24.3-18.2l0.1-0.2
-		c1.3-3.8,5.2-13.6,7.6-19.4c1.8-4.4,2.2-5.4,2.3-5.7l0-0.1c1.4-3.6,2-7.3,2-11.1c0-8.1-3.3-16-8.9-21.9l-0.4-0.4l0.1-0.5
-		c0.2-1.3,0.4-2.5,0.4-3.8c0-11.4-9.3-20.7-20.7-20.7c-3.5,0-7,0.9-10.1,2.7l-0.7,0.4l-0.5-0.7c-5.8-7.2-14.4-11.3-23.7-11.3
-		c-15.8,0-29.2,12.4-30.4,28.1l0,0.5l-0.5,0.3c-3.9,2.2-7.3,5.2-10,8.8l-1.3,1.7l-0.6-2.5c-1.9-8-3.4-14.2-4-16.5
-		C36,20.4,19.3,19.1,10.8,20.6l1.7,9.3c1.1-0.2,4.8-0.6,8.8,0.2c1.9,0.4,7.9,1.6,9.7,8.6c0.6,2.3,2.3,9.2,4,16.6l0,0.2
-		c1.8,7.5,3.8,15.8,5.5,22.8c0.1,0.7,0.3,1.3,0.5,1.9l0.4,1.2c3.1,9.8,11.2,17.7,20.9,20.6c2.9,0.8,5.9,1.3,8.9,1.3l50.2,0l0.4,0
-		c2.9-0.1,5.8-0.7,8.5-1.6l2-0.7l-0.7,2c-0.4,1-0.6,1.8-0.9,2.4l-0.1,0.2c-1.7,4.9-3.7,11.1-15.3,11.1h-66V126.7z M120.2,93.8h-49
-		c-2.1,0-4.2-0.3-6.2-0.9c-7-2.1-12.7-7.8-14.8-14.8l-0.5-1.9c-0.3-1.4-0.4-2.9-0.4-4.3c0-6.6,2.9-12.8,8.1-17
-		c2-1.6,4.3-2.9,6.7-3.7c-0.2-1.4-0.4-2.8-0.4-4.1C63.8,34.4,74.2,24,87,24c6.2,0,12.1,2.1,16.6,5.9c3.2,2.7,5.5,6,6.5,9.4
-		c2.3-3.5,6.5-5.9,11-5.9c6.8,0,12.3,5.5,12.3,12.3c0,2.7-0.8,5.2-2.4,7.3c2.7,1.5,5,3.6,6.9,6.1c2.8,3.8,4.2,8.2,4.2,12.9
-		c0,7-3.2,13.4-8.8,17.6C129.5,92.4,125,93.8,120.2,93.8z M74.4,69.9l20.2,16.5l21-17.2V57.8L99.8,71.6V38h-9.3v33.7L74.4,58.4V69.9
-		z"/>
-</g>
-</svg>
diff --git a/okitweb/static/okit/palette/deprecated/hidden/Max_Security_Zone.svg b/okitweb/static/okit/palette/deprecated/hidden/Max_Security_Zone.svg
deleted file mode 100755
index 23b72ac57..000000000
--- a/okitweb/static/okit/palette/deprecated/hidden/Max_Security_Zone.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="MAX_Security_Zone" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
-	 y="0px" viewBox="0 0 161.9 162" enable-background="new 0 0 161.9 162" xml:space="preserve">
-	<g>
-<path fill="#312D2A" d="M66.6,49.7h17.8V61H66.6V49.7z M38.4,61h17.8V49.7H38.4V61z M20.5,106.4H9.2v17.8h11.3V106.4z M9.2,50v11
-	v7.8h11.3V61H28V49.7H9.2V50z M20.5,78.2H9.2V96h11.3V78.2z M94.7,152.9h17.8v-11.3H94.7V152.9z M66.6,152.9h17.8v-11.3H66.6V152.9z
-	 M38.4,152.9h17.8v-11.3H38.4V152.9z M20.5,133.9H9.2v7.7h0v11.3H28v-11.3h-7.5V133.9z M122.9,105.7l-1.7-0.7
-	c-1-0.4-23.9-9.8-28.3-35.1l-0.1-0.3l-0.1-29.1l11.3-4.9V28c0-9.9,8.4-18,18.6-18s18.6,8.1,18.6,18v7.6l11.3,4.9v27.4
-	c0,0.9,0,22.5-28.1,36.9L122.9,105.7z M112,32.2l10.6-4.6l10.6,4.6V28c0-5.5-4.8-10-10.6-10S112,22.5,112,28V32.2z M122.5,96.8
-	c21.8-11.9,22.1-28.2,22.1-28.9V45.8l-21.9-9.4l-21.9,9.4l0.1,23.1C103.9,86.2,117.7,94.4,122.5,96.8z M130.3,133.9v7.7h-8.4v11.3
-	h19.8l-0.1-19H130.3z M121.9,124h8.5v5.2h11.3V124h8.4l-14.1-21.7L121.9,124z"/>
-	</g>
-</svg>
diff --git a/okitweb/static/okit/palette/deprecated/hidden/Policies.svg b/okitweb/static/okit/palette/deprecated/hidden/Policies.svg
deleted file mode 100755
index ba08ffebb..000000000
--- a/okitweb/static/okit/palette/deprecated/hidden/Policies.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Policies" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 161.9 162" enable-background="new 0 0 161.9 162" xml:space="preserve">
-	<g>
-<path fill="#312D2A" d="M9.4,152.5h94.7V123H9.4V152.5z M18.4,132h76.7v11.5H18.4V132z M94.7,74.6l20.7-30l-40-27.6L28.5,85.1
-	l40,27.6L89.6,82l41.6,28.7l5.1-7.4L94.7,74.6z M77.7,29.6L102.9,47l-6.5,9.4L71.2,39L77.7,29.6z M66.2,100.2L41,82.8l6.1-8.8
-	l25.2,17.4L66.2,100.2z M75.4,86.8L50.2,69.4l17.9-26l25.2,17.4L75.4,86.8z M152,114.1l-5.1,7.4l-11.7-8.1l5.1-7.4L152,114.1z"/></g>
-</svg>
diff --git a/okitweb/static/okit/palette/deprecated/hidden/Pseudo_Compartment.svg b/okitweb/static/okit/palette/deprecated/hidden/Pseudo_Compartment.svg
deleted file mode 100644
index fa8b6e810..000000000
--- a/okitweb/static/okit/palette/deprecated/hidden/Pseudo_Compartment.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 41.93 42"><defs><style>.cls-1{fill:#fff;}.cls-2{fill:#2c5967;}</style></defs><title>DisconnectedRegions</title><g id="Layer_2" data-name="Layer 2"><g id="Layer_1-2" data-name="Layer 1"><path class="cls-1" d="M2.58,41.5A2.08,2.08,0,0,1,.5,39.42V16.61a2.08,2.08,0,0,1,2.08-2.07H7.76l0-.06h0l.42-.76a16,16,0,0,1,3.49-4l.22-.18c.32-.26.65-.51,1-.74.09-.07.38-.25.38-.25q.38-.26.78-.48l.59-.32.41-.2c.51-.24,1-.43,1.41-.6l.21-.07A16,16,0,0,1,22,5.91c.4,0,.82,0,1.26,0a.49.49,0,0,0,.06-.17,4.27,4.27,0,0,1,4.21-3.47,2.82,2.82,0,0,1,.41,0h0a.63.63,0,0,0,.5-.19,5.14,5.14,0,0,1,8.37,1.2.69.69,0,0,0,.48.37A5.13,5.13,0,0,1,39,4.41a5.27,5.27,0,0,1,1.82,6.94l-.34.64H34.62a16.08,16.08,0,0,1-3.12,23.1v1.17a2.08,2.08,0,0,1-2.08,2.08H23.25v1.08a2.08,2.08,0,0,1-2.07,2.08Z"/><path class="cls-1" d="M32.24,1a4.61,4.61,0,0,1,4.15,2.58,1.22,1.22,0,0,0,.82.63,4.76,4.76,0,0,1,3.15,6.91l-.2.37H33.53A15.58,15.58,0,0,1,31,34.83v1.43a1.58,1.58,0,0,1-1.58,1.58H22.75v1.58A1.57,1.57,0,0,1,21.18,41H2.58A1.58,1.58,0,0,1,1,39.42V16.61A1.57,1.57,0,0,1,2.58,15H8.06c.18-.36.38-.71.59-1.06H8.6A15.71,15.71,0,0,1,12,10.06l.21-.17q.46-.37,1-.72l.37-.24c.25-.16.5-.32.75-.46l.58-.31.46-.23c.43-.2.86-.38,1.31-.55l.2-.07A15.63,15.63,0,0,1,22,6.41c.5,0,1,0,1.49.07a1.11,1.11,0,0,0,.32-.59,3.8,3.8,0,0,1,3.72-3.07H28a1.13,1.13,0,0,0,.82-.35A4.62,4.62,0,0,1,32.24,1m0-1A5.66,5.66,0,0,0,28.1,1.81a.1.1,0,0,1-.08,0,3.86,3.86,0,0,0-.47,0,4.94,4.94,0,0,0-1.93.4,4.82,4.82,0,0,0-2.71,3.21l-.89,0a16.55,16.55,0,0,0-5.53,1l-.14,0-.07,0c-.47.18-.94.38-1.39.59l-.08,0-.41.2-.61.33c-.27.15-.54.32-.8.49l-.1.06-.3.2c-.33.22-.66.47-1,.76l-.23.18a16.79,16.79,0,0,0-3.59,4.17L7.4,14H2.58A2.58,2.58,0,0,0,0,16.61V39.42A2.59,2.59,0,0,0,2.58,42h18.6a2.58,2.58,0,0,0,2.57-2.58v-.58h5.67A2.58,2.58,0,0,0,32,36.26v-.92a16.58,16.58,0,0,0,3.62-22.85h5.14L41,12l.2-.37a5.78,5.78,0,0,0-2-7.6,5.87,5.87,0,0,0-1.83-.76.19.19,0,0,1-.13-.1,5.61,5.61,0,0,0-5-3.13Z"/><path class="cls-2" d="M10.28,14A14.24,14.24,0,0,1,20.41,7.93a6,6,0,0,1,1.31-1.49A15.64,15.64,0,0,0,8.6,14Z"/><path class="cls-2" d="M32.51,12.54a14.16,14.16,0,0,1-.46,19.51V34a15.58,15.58,0,0,0,2.29-21.42Z"/><path class="cls-2" d="M31,19.77a1.58,1.58,0,0,0-1.58-1.58H23.81V19.6h5.61a.18.18,0,0,1,.18.17V36.26a.18.18,0,0,1-.18.18H23.81v1.4h5.61A1.58,1.58,0,0,0,31,36.26Z"/><polygon class="cls-2" points="23.81 22.05 27.14 22.05 27.14 23.46 23.81 23.46 23.81 24.86 28.54 24.86 28.54 20.65 23.81 20.65 23.81 22.05"/><polygon class="cls-2" points="23.81 28.72 23.81 30.12 28.54 30.12 28.54 25.91 23.81 25.91 23.81 27.32 27.14 27.32 27.14 28.72 23.81 28.72"/><polygon class="cls-2" points="28.54 31.18 23.81 31.18 23.81 32.58 27.14 32.58 27.14 33.98 23.81 33.98 23.81 35.39 28.54 35.39 28.54 31.18"/><path class="cls-2" d="M22.75,16.61A1.57,1.57,0,0,0,21.18,15H2.58A1.57,1.57,0,0,0,1,16.61V39.42A1.58,1.58,0,0,0,2.58,41h18.6a1.57,1.57,0,0,0,1.57-1.58Zm-1.57,23H2.58a.18.18,0,0,1-.18-.18V16.61a.18.18,0,0,1,.18-.17h18.6a.18.18,0,0,1,.17.17V39.42A.18.18,0,0,1,21.18,39.6Z"/><path class="cls-2" d="M20.3,23.81V17.49H3.46v6.32ZM4.86,18.89h14V22.4h-14Z"/><circle class="cls-2" cx="17.14" cy="20.65" r="0.7"/><path class="cls-2" d="M11.7,31.18h8.6V24.86H3.46v6.32ZM4.86,26.26h14v3.51h-14Z"/><circle class="cls-2" cx="17.14" cy="28.02" r="0.7"/><path class="cls-2" d="M20.3,38.54V32.23H3.46v6.31ZM4.86,33.63h14v3.51h-14Z"/><circle class="cls-2" cx="17.14" cy="35.39" r="0.7"/><path class="cls-2" d="M38.71,4.83a4.81,4.81,0,0,0-1.5-.62,1.22,1.22,0,0,1-.82-.63,4.63,4.63,0,0,0-7.55-1.09,1.11,1.11,0,0,1-.93.34,3.81,3.81,0,0,0-4.08,3.06,1.19,1.19,0,0,1-.61.81,5,5,0,0,0-2.64,4l-.06.76h7.83a4.48,4.48,0,0,1-1.11-1.41H22.12a3.56,3.56,0,0,1,1.76-2.14,2.6,2.6,0,0,0,1.33-1.78,2.42,2.42,0,0,1,1.38-1.74,2.39,2.39,0,0,1,1.18-.19,2.5,2.5,0,0,0,2.1-.79,3.2,3.2,0,0,1,2.37-1,3.24,3.24,0,0,1,2.9,1.8A2.57,2.57,0,0,0,36.9,5.58,3.18,3.18,0,0,1,38,6a3.38,3.38,0,0,1,1.34,4.06H31.07a1.74,1.74,0,0,1-1.72-1.75H27.94a3.15,3.15,0,0,0,3.13,3.16h9.09l.2-.37A4.78,4.78,0,0,0,38.71,4.83Z"/></g></g></svg>
\ No newline at end of file
diff --git a/okitweb/static/okit/palette/deprecated/hidden/Read_Only.svg b/okitweb/static/okit/palette/deprecated/hidden/Read_Only.svg
deleted file mode 100644
index 13ec94286..000000000
--- a/okitweb/static/okit/palette/deprecated/hidden/Read_Only.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Audit" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 161.9 162" enable-background="new 0 0 161.9 162" xml:space="preserve">
-	 <g>
-		<path fill="#F80000" d="M8.8,9.2V153h9V51.9h126.1v65.9h9V9.2H8.8z M17.8,42.9V18.2h126.1v24.7H17.8z M37,36.7H24.1v-12H37V36.7z
-			M34.1,69h91.5v9H34.1V69z M34.1,126.8h47.2v9H34.1V126.8z M34.1,97.9h64.1v9H34.1V97.9z"/>
-	 </g>
-</svg>
diff --git a/okitweb/static/okit/palette/deprecated/hidden/Resource_Manager.svg b/okitweb/static/okit/palette/deprecated/hidden/Resource_Manager.svg
deleted file mode 100755
index 5ef614ec4..000000000
--- a/okitweb/static/okit/palette/deprecated/hidden/Resource_Manager.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Resource_Management_ALT" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
-	 x="0px" y="0px" viewBox="0 0 161.9 162" enable-background="new 0 0 161.9 162" xml:space="preserve">
-	<g>
-<path fill="#312D2A" d="M9,77.7c5.5-1,6.6-3,6.6-12.9V41.5c0-8.5,5.6-13.2,15.9-13.2h6.7v7.1h-3.5c-7.4,0-10,2-10,7.8v19.9
-	c0,13.2-0.9,15.6-6.3,17.8c5.5,2.5,6.3,4.8,6.3,18v19.9c0,5.8,2.6,7.8,10,7.8h3.5v7.1h-6.7c-10.3,0-15.9-4.7-15.9-13.2V97.1
-	c0-9.8-1.1-11.8-6.6-12.8V77.7z M153.1,77.9c-5.5-1-6.6-3-6.6-12.9V41.7c0-8.5-5.6-13.2-15.9-13.2h-6.7v7.1h3.5c7.4,0,10,2,10,7.8
-	v19.9c0,13.2,0.9,15.6,6.3,17.8c-5.5,2.5-6.3,4.8-6.3,18v19.9c0,5.8-2.6,7.8-10,7.8h-3.5v7.1h6.7c10.3,0,15.9-4.7,15.9-13.2V97.2
-	c0-9.8,1.1-11.8,6.6-12.8V77.9z M103.3,100.4c-2.3,0-4.2,1.9-4.2,4.2c0,2.3,1.9,4.2,4.2,4.2s4.2-1.9,4.2-4.2
-	C107.4,102.2,105.6,100.4,103.3,100.4z M103.3,77.7c-2.3,0-4.2,1.9-4.2,4.2s1.9,4.2,4.2,4.2s4.2-1.9,4.2-4.2S105.6,77.7,103.3,77.7z
-	 M37.5,42.5v23.2v9v13.7v9.5v22.7h87.1V97.9v-9.5V74.7v-9V42.5H37.5z M115.6,111.5H46.5V97.9h69.1V111.5z M115.6,88.4H46.5V74.7
-	h69.1V88.4z M46.5,65.7V51.5h69.1v14.2H46.5z M103.3,54.5c-2.3,0-4.2,1.9-4.2,4.2c0,2.3,1.9,4.2,4.2,4.2s4.2-1.9,4.2-4.2
-	C107.4,56.4,105.6,54.5,103.3,54.5z"/></g>
-</svg>
diff --git a/okitweb/static/okit/palette/deprecated/hidden/Streaming.svg b/okitweb/static/okit/palette/deprecated/hidden/Streaming.svg
deleted file mode 100755
index 2bae56bc2..000000000
--- a/okitweb/static/okit/palette/deprecated/hidden/Streaming.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Stream" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 161.9 162" enable-background="new 0 0 161.9 162" xml:space="preserve">
-	<g>
-<path fill="#312D2A" d="M60.8,41.4h20.2V52H60.8h-4.5h-5.5V41.4h5.5H60.8z M91,52h10.1V41.4H91V52z M9.2,52h10.1V41.4H9.2V52z
-	 M111.2,41.4V52h10.1V41.4H111.2z M75.9,75c-3.6,0-6.4,2.9-6.4,6.4c0,3.6,2.9,6.4,6.4,6.4c3.6,0,6.4-2.9,6.4-6.4
-	C82.3,77.9,79.4,75,75.9,75z M35,40.6c-3.6,0-6.4,2.9-6.4,6.4s2.9,6.4,6.4,6.4c3.6,0,6.4-2.9,6.4-6.4S38.6,40.6,35,40.6z M131.8,35
-	v23.3l21.6-11.6L131.8,35z M131.8,69.6v23.3l21.6-11.6L131.8,69.6z M131.8,104.2v23.3l21.6-11.6L131.8,104.2z M50.7,86.8h10.1V76.1
-	H50.7V86.8z M101.1,76.1h-3.7H91v10.6h6.4h3.7h20.2V76.1H101.1z M19.4,76.1h-3.7H9.3v10.6h6.4h3.7h20.2V76.1H19.4z M56.2,110.6h-5.5
-	v10.6h5.5h4.5h20.2v-10.6H60.8H56.2z M91,121.2h10.1v-10.6H91V121.2z M9.2,121.2h10.1v-10.6H9.2V121.2z M28.6,110.6v10.6h10.1v-10.6
-	H28.6z M116.2,109.8c-3.6,0-6.4,2.9-6.4,6.4c0,3.6,2.9,6.4,6.4,6.4s6.4-2.9,6.4-6.4C122.6,112.7,119.8,109.8,116.2,109.8z"/></g>
-</svg>
diff --git a/okitweb/static/okit/palette/deprecated/hidden/Vault.svg b/okitweb/static/okit/palette/deprecated/hidden/Vault.svg
deleted file mode 100755
index cb4a956a0..000000000
--- a/okitweb/static/okit/palette/deprecated/hidden/Vault.svg
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Cloud_Guard_ALT_copy_2" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
-	 x="0px" y="0px" viewBox="0 0 161.9 162" enable-background="new 0 0 161.9 162" xml:space="preserve">
-<g>
-	<polygon fill="#312D2A" points="119.5,37.5 109.3,47 105.3,42.9 101.1,47.2 109.2,55.3 123.6,41.9 	"/>
-	<rect x="74.7" y="45.8" fill="#312D2A" width="17.8" height="6"/>
-	<polygon fill="#312D2A" points="119.9,114.8 111.3,99.3 102.8,114.8 	"/>
-	
-		<ellipse transform="matrix(0.9732 -0.2298 0.2298 0.9732 -22.4747 22.3091)" fill="#312D2A" cx="84.6" cy="107.7" rx="7.7" ry="7.7"/>
-	<path fill="#312D2A" d="M153.1,82.9V32.2L98.7,8.8L44.2,32.2l0.1,34.4h9l-0.1-28.5l45.5-19.5l45.5,19.5V83
-		c0,0.4-0.1,34.9-45.6,59.2c-7.5-3.6-36.2-19.4-44.3-53H45c9.4,44.7,50.2,61.4,52,62.2l1.9,0.8l1.8-0.9
-		C153.1,124.4,153.2,84.6,153.1,82.9z"/>
-	<path fill="#312D2A" d="M49.7,83.1v-4.8h6.1v7.1h6.4v-7.1v-1v-4.7H37.1c-1.5-6.3-7.2-11-13.9-11c-7.9,0-14.4,6.4-14.4,14.4
-		c0,7.9,6.4,14.4,14.4,14.4c7.1,0,13-5.2,14.2-12h7.4v4.8H49.7z M23.2,83.7c-4.3,0-7.8-3.5-7.8-7.8c0-4.3,3.5-7.8,7.8-7.8
-		s7.8,3.5,7.8,7.8C31,80.2,27.5,83.7,23.2,83.7z"/>
-	<path fill="#312D2A" d="M111.3,73.1c-2,0-3.7,1.7-3.7,3.7c0,2,1.7,3.7,3.7,3.7s3.7-1.7,3.7-3.7C115,74.8,113.4,73.1,111.3,73.1z"/>
-	<path fill="#312D2A" d="M68.9,92.1H127V62.3H68.9V92.1z M75.9,69.3H120v15.8H75.9V69.3z"/>
-</g>
-</svg>
diff --git a/okitweb/static/okit/palette/deprecated/hidden/Virtual_Network_Interface.svg b/okitweb/static/okit/palette/deprecated/hidden/Virtual_Network_Interface.svg
deleted file mode 100644
index 858fdfefb..000000000
--- a/okitweb/static/okit/palette/deprecated/hidden/Virtual_Network_Interface.svg
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 42 42" style="enable-background:new 0 0 42 42;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FFFFFF;}
-	.st1{fill:none;}
-	.st2{fill:#ff6600;}
-</style>
-<g>
-	<g>
-		<g>
-			<polygon class="st0" points="26.33,41.5 26.33,26.33 32.38,26.33 32.38,22.33 9.42,22.33 9.42,26.33 15.67,26.33 15.67,41.5 
-				0.5,41.5 0.5,26.33 6.75,26.33 6.75,22.33 0.5,22.33 0.5,19.67 19.67,19.67 19.67,15.67 13.31,15.67 13.31,0.5 28.48,0.5 
-				28.48,15.67 22.33,15.67 22.33,19.67 41.5,19.67 41.5,22.33 35.04,22.33 35.04,26.33 41.5,26.33 41.5,41.5 			"/>
-			<path class="st0" d="M27.98,1v14.17h-6.15v5H41v1.67h-6.46v5H41V41H26.83V26.83h6.04v-5H8.92v5h6.25V41H1V26.83h6.25v-5H1v-1.67
-				h19.17v-5h-6.35V1H27.98 M28.98,0h-1H13.81h-1v1v14.17v1h1h5.35v3H1H0v1v1.67v1h1h5.25v3H1H0v1V41v1h1h14.17h1v-1V26.83v-1h-1
-				H9.92v-3h21.96v3h-5.04h-1v1V41v1h1H41h1v-1V26.83v-1h-1h-5.46v-3H41h1v-1v-1.67v-1h-1H22.83v-3h5.15h1v-1V1V0L28.98,0z"/>
-		</g>
-		<g>
-			<rect x="15.48" y="2.67" class="st1" width="10.83" height="10.83"/>
-			<rect x="2.67" y="28.5" class="st1" width="10.83" height="10.83"/>
-			<rect x="28.5" y="28.5" class="st1" width="10.83" height="10.83"/>
-			<path class="st2" d="M41,21.83v-1.67H21.83v-5h6.15V1H13.81v14.17h6.35v5H1v1.67h6.25v5H1V41h14.17V26.83H8.92v-5h23.96v5h-6.04
-				V41H41V26.83h-6.46v-5H41z M13.5,28.5v10.83H2.67V28.5H13.5z M15.48,13.5V2.67h10.83V13.5H15.48z M39.33,28.5v10.83H28.5V28.5
-				H39.33z"/>
-		</g>
-	</g>
-</g>
-</svg>
diff --git a/okitweb/static/okit/palette/deprecated/hidden/Vm_Cluster.svg b/okitweb/static/okit/palette/deprecated/hidden/Vm_Cluster.svg
deleted file mode 100644
index 2994a6ead..000000000
--- a/okitweb/static/okit/palette/deprecated/hidden/Vm_Cluster.svg
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 45.74 42" style="enable-background:new 0 0 45.74 42;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FFFFFF;}
-	.st1{fill:#FFFFFF;stroke:#FFFFFF;stroke-miterlimit:10;}
-	.st2{fill:#2C5967;}
-</style>
-<g>
-	<g>
-		<g>
-			<g>
-				<path class="st0" d="M2.66,41.5c-1.19,0-2.16-0.97-2.16-2.16V2.66c0-1.19,0.97-2.16,2.16-2.16h15.85c1.19,0,2.16,0.97,2.16,2.16
-					v17.2h2.04l-1.19-1.19l1.75-1.75l4.18,4.18l-4.18,4.18l-1.75-1.75l1.19-1.19h-2.04v17.01c0,1.19-0.97,2.16-2.16,2.16H2.66z"/>
-				<path class="st0" d="M18.51,1c0.91,0,1.66,0.74,1.66,1.66v17.7h3.75l-1.69-1.69l1.04-1.04l3.47,3.47l-3.47,3.47l-1.04-1.04
-					l1.69-1.69h-3.75v17.51c0,0.91-0.74,1.66-1.66,1.66H2.66C1.74,41,1,40.26,1,39.34V2.66C1,1.74,1.74,1,2.66,1H18.51 M18.51,0
-					H2.66C1.19,0,0,1.19,0,2.66v36.68C0,40.81,1.19,42,2.66,42h15.85c1.47,0,2.66-1.19,2.66-2.66V23.88l0.35,0.35l1.04,1.04
-					l0.71,0.71l0.71-0.71l3.47-3.47l0.71-0.71l-0.71-0.71l-3.47-3.47l-0.71-0.71l-0.71,0.71l-1.04,1.04l-0.35,0.35V2.66
-					C21.17,1.19,19.98,0,18.51,0L18.51,0z M21.17,19.35v-0.34l0.34,0.34H21.17L21.17,19.35z M21.17,22.83h0.34l-0.34,0.34V22.83
-					L21.17,22.83z"/>
-			</g>
-			<path class="st1" d="M45.24,8V1h-7v2.58h-7.56v14.01h-2.76v7h2.76V34h-2.76v7h7v-7h-2.76v-9.4h2.76v-2.76h3.32v2.76h7v-7h-2.76V8
-				H45.24z M41,17.59h-2.76v2.76h-3.32v-2.76h-2.76V5.06h6.08V8H41V17.59z"/>
-		</g>
-		<g>
-			<path class="st2" d="M3.58,11.51h14.01V3.58H3.58V11.51z M5.06,5.06h11.06v4.98H5.06V5.06z"/>
-			<circle class="st2" cx="13.72" cy="7.64" r="0.74"/>
-			<path class="st2" d="M3.58,20.54h14.01v-7.93H3.58V20.54z M5.06,14.09h11.06v4.98H5.06V14.09z"/>
-			<circle class="st2" cx="13.72" cy="16.67" r="0.74"/>
-			<path class="st2" d="M3.58,29.57h14.01v-7.93H3.58V29.57z M5.06,23.12h11.06v4.98H5.06V23.12z"/>
-			<circle class="st2" cx="13.72" cy="25.7" r="0.74"/>
-			<path class="st2" d="M3.58,38.42h14.01v-7.74H3.58V38.42z M5.06,32.15h11.06v4.79H5.06V32.15z"/>
-			<circle class="st2" cx="13.72" cy="34.73" r="0.74"/>
-			<path class="st2" d="M45.24,8V1h-7v2.58h-7.56v14.01h-2.76v7h2.76V34h-2.76v7h7v-7h-2.76v-9.4h2.76v-2.76h3.32v2.76h7v-7h-2.76V8
-				H45.24z M33.44,39.53h-4.06v-4.06h4.06V39.53z M39.71,2.47h4.06v4.06h-4.06V2.47z M33.44,23.12h-4.06v-4.06h4.06V23.12z
-				 M43.76,23.12h-4.06v-4.06h4.06V23.12z M41,17.59h-2.76v2.76h-3.32v-2.76h-2.76V5.06h6.08V8H41V17.59z"/>
-			<path class="st2" d="M22.23,18.66l1.69,1.69h-3.75V2.66c0-0.91-0.74-1.66-1.66-1.66H2.66C1.74,1,1,1.74,1,2.66v36.68
-				C1,40.26,1.74,41,2.66,41h15.85c0.91,0,1.66-0.74,1.66-1.66V21.83h3.75l-1.69,1.69l1.04,1.04l3.47-3.47l-3.47-3.47L22.23,18.66z
-				 M18.7,39.34c0,0.1-0.08,0.18-0.18,0.18H2.66c-0.1,0-0.18-0.08-0.18-0.18V2.66c0-0.1,0.08-0.18,0.18-0.18h15.85
-				c0.1,0,0.18,0.08,0.18,0.18V39.34z"/>
-		</g>
-	</g>
-</g>
-</svg>
diff --git a/okitweb/static/okit/palette/deprecated/hidden/Vm_Cluster_Network.svg b/okitweb/static/okit/palette/deprecated/hidden/Vm_Cluster_Network.svg
deleted file mode 100644
index e82da43fb..000000000
--- a/okitweb/static/okit/palette/deprecated/hidden/Vm_Cluster_Network.svg
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 42 42" style="enable-background:new 0 0 42 42;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FFFFFF;}
-	.st1{fill:none;}
-	.st2{fill:#2C5967;}
-</style>
-<g>
-	<g>
-		<g>
-			<polygon class="st0" points="26.33,41.5 26.33,26.33 32.38,26.33 32.38,22.33 9.42,22.33 9.42,26.33 15.67,26.33 15.67,41.5 
-				0.5,41.5 0.5,26.33 6.75,26.33 6.75,22.33 0.5,22.33 0.5,19.67 19.67,19.67 19.67,15.67 13.31,15.67 13.31,0.5 28.48,0.5 
-				28.48,15.67 22.33,15.67 22.33,19.67 41.5,19.67 41.5,22.33 35.04,22.33 35.04,26.33 41.5,26.33 41.5,41.5 			"/>
-			<path class="st0" d="M27.98,1v14.17h-6.15v5H41v1.67h-6.46v5H41V41H26.83V26.83h6.04v-5H8.92v5h6.25V41H1V26.83h6.25v-5H1v-1.67
-				h19.17v-5h-6.35V1H27.98 M28.98,0h-1H13.81h-1v1v14.17v1h1h5.35v3H1H0v1v1.67v1h1h5.25v3H1H0v1V41v1h1h14.17h1v-1V26.83v-1h-1
-				H9.92v-3h21.96v3h-5.04h-1v1V41v1h1H41h1v-1V26.83v-1h-1h-5.46v-3H41h1v-1v-1.67v-1h-1H22.83v-3h5.15h1v-1V1V0L28.98,0z"/>
-		</g>
-		<g>
-			<rect x="15.48" y="2.67" class="st1" width="10.83" height="10.83"/>
-			<rect x="2.67" y="28.5" class="st1" width="10.83" height="10.83"/>
-			<rect x="28.5" y="28.5" class="st1" width="10.83" height="10.83"/>
-			<path class="st2" d="M41,21.83v-1.67H21.83v-5h6.15V1H13.81v14.17h6.35v5H1v1.67h6.25v5H1V41h14.17V26.83H8.92v-5h23.96v5h-6.04
-				V41H41V26.83h-6.46v-5H41z M13.5,28.5v10.83H2.67V28.5H13.5z M15.48,13.5V2.67h10.83V13.5H15.48z M39.33,28.5v10.83H28.5V28.5
-				H39.33z"/>
-		</g>
-	</g>
-</g>
-</svg>
diff --git a/okitweb/static/okit/palette/deprecated/hidden/Web_Application_Firewall.svg b/okitweb/static/okit/palette/deprecated/hidden/Web_Application_Firewall.svg
deleted file mode 100755
index 73edc5d52..000000000
--- a/okitweb/static/okit/palette/deprecated/hidden/Web_Application_Firewall.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="WAF" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 161.9 162" enable-background="new 0 0 161.9 162" xml:space="preserve">
-<g>
-<path fill="#312D2A" d="M142.2,46.3c-4.6-4.1-10.6-6.7-18-7.7c-3-6.2-12-20.1-32-16.3c-5.8-6.4-18-14.2-34-9.6
-	c-2,0.5-14.1,3.9-19.8,19.7C28.7,34.2,13.6,42,10,62.1l0,0.2c-0.1,0.6-1.7,14.3,6.9,24.8c5.4,6.6,13.4,10.3,23.9,11.1l0.2,0h13.8
-	l0-9H41.3c-0.2,0-0.5-0.1-0.7-0.1V78.5h14.1l0-5H19.9c-1.4-4.9-1-9.3-1-10c0.2-1.2,0.5-2.3,0.8-3.4h42.9v8.4l5-2.4v-6h12.8l12.6-5.9
-	l0,0V41.7h22.7c0.6,1.2,0.9,2.1,1,2.4l0.9,2.9l3,0.3c6.6,0.6,11.8,2.5,15.5,5.8c0.7,0.7,1.4,1.3,2,2H94.9l10.5,5h9.8v4.7l5,2.4v-7.2
-	h20.9c1.7,4.5,1.5,9.3,0.3,13.4h-10.8v5h8.7c-2.1,3.8-5.2,6.7-8.7,8.6v9.8c8.3-2.8,15.2-9.4,18.7-18.4
-	C153.8,66.5,151.1,54.2,142.2,46.3z M35.5,78.5v9.8c-5-1.2-8.9-3.5-11.6-6.9c-0.8-0.9-1.4-1.9-2-3H35.5z M35.5,55.1H21.6
-	c3.6-7.2,9.4-10.8,13.9-12.5V55.1z M60.2,21.5l0.4-0.1c0.7-0.2,1.4-0.4,2-0.5v15.8H46.4C50.5,23.7,59.8,21.5,60.2,21.5z M88.1,55.1
-	H40.6V41.7h47.5V55.1z M67.7,36.6V20.3c12-0.1,18.8,9.1,19.1,9.6l1.8,2.6l3-0.8c10.6-2.7,17.1,0.9,20.8,5H67.7z"/>
-<path fill="#312D2A" d="M125.6,106.7v-30L92.9,62.6L60.1,76.7l0.1,31.8l0.1,0.4c4.8,27.7,29.9,37.9,30.9,38.4l1.9,0.8l1.8-0.9
-	C125.6,131.3,125.6,107.6,125.6,106.7z M116.6,106.7c0,0.7-0.3,16-19.4,28.6V98.1h-9v37.3c-6.6-4.3-16.3-13-19-27.7l-0.1-25.1
-	l19.1-8.2v15.8h9V74.3l19.4,8.3V106.7z"/>
-</g>
-</svg>
diff --git a/okitweb/static/okit/palette/deprecated/networking/Customer_Premise_Equipment.svg b/okitweb/static/okit/palette/deprecated/networking/Customer_Premise_Equipment.svg
deleted file mode 100644
index 37ee54956..000000000
--- a/okitweb/static/okit/palette/deprecated/networking/Customer_Premise_Equipment.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 23.4 42" style="enable-background:new 0 0 23.4 42;" xml:space="preserve">
-<g>
-	<g>
-		<path style="fill:#FFFFFF;" d="M2.6,41.5c-1.1,0-2.1-0.9-2.1-2.1V2.6c0-1.1,0.9-2.1,2.1-2.1h18.3c1.1,0,2.1,0.9,2.1,2.1v36.9
-			c0,1.1-0.9,2.1-2.1,2.1H2.6z"/>
-		<path style="fill:#FFFFFF;" d="M20.8,1c0.9,0,1.6,0.7,1.6,1.6v36.9c0,0.9-0.7,1.6-1.6,1.6H2.6C1.7,41,1,40.3,1,39.4V2.6
-			C1,1.7,1.7,1,2.6,1H20.8 M20.8,0H2.6C1.1,0,0,1.1,0,2.6v36.9C0,40.9,1.1,42,2.6,42h18.3c1.4,0,2.6-1.1,2.6-2.6V2.6
-			C23.4,1.1,22.2,0,20.8,0L20.8,0z"/>
-	</g>
-	<g>
-		<path style="fill:#2C5967;" d="M20.8,1H2.6C1.7,1,1,1.7,1,2.6v36.9C1,40.3,1.7,41,2.6,41h18.3c0.9,0,1.6-0.7,1.6-1.6V2.6
-			C22.4,1.7,21.7,1,20.8,1z M21,39.4c0,0.1-0.1,0.2-0.2,0.2H2.6c-0.1,0-0.2-0.1-0.2-0.2V2.6c0-0.1,0.1-0.2,0.2-0.2h18.3
-			c0.1,0,0.2,0.1,0.2,0.2V39.4z"/>
-		<path style="fill:#2C5967;" d="M3.4,9.6H20V3.4H3.4V9.6z M4.8,4.8h13.8v3.4H4.8V4.8z"/>
-		<circle style="fill:#2C5967;" cx="16.9" cy="6.5" r="0.7"/>
-		<path style="fill:#2C5967;" d="M3.4,16.9H20v-6.2H3.4V16.9z M4.8,12h13.8v3.4H4.8V12z"/>
-		<circle style="fill:#2C5967;" cx="16.9" cy="13.8" r="0.7"/>
-		<path style="fill:#2C5967;" d="M3.4,24.1H20v-6.2H3.4V24.1z M4.8,19.3h13.8v3.4H4.8V19.3z"/>
-		<circle style="fill:#2C5967;" cx="16.9" cy="21" r="0.7"/>
-		<path style="fill:#2C5967;" d="M3.4,31.3H20v-6.2H3.4V31.3z M4.8,26.5h13.8V30H4.8V26.5z"/>
-		<circle style="fill:#2C5967;" cx="16.9" cy="28.2" r="0.7"/>
-		<path style="fill:#2C5967;" d="M3.4,38.6H20v-6.2H3.4V38.6z M4.8,33.8h13.8v3.4H4.8V33.8z"/>
-		<circle style="fill:#2C5967;" cx="16.9" cy="35.5" r="0.7"/>
-	</g>
-</g>
-</svg>
diff --git a/okitweb/static/okit/palette/deprecated/networking/Dhcp_Option.svg b/okitweb/static/okit/palette/deprecated/networking/Dhcp_Option.svg
deleted file mode 100644
index b8ff7a4f5..000000000
--- a/okitweb/static/okit/palette/deprecated/networking/Dhcp_Option.svg
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 42.93 42" style="enable-background:new 0 0 42.93 42;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FFFFFF;}
-	.st1{fill:#BB501C;}
-</style>
-<g>
-	<g>
-		<g>
-			<path class="st0" d="M25.54,41.5c-2.06,0-3.74-1.68-3.74-3.74c0-1.2,0.58-2.32,1.54-3.02l-0.5-1.79c-0.79,0.14-1.6,0.22-2.4,0.22
-				c-4.1,0-7.89-1.82-10.46-5l-0.84,0.56c0.09,0.32,0.13,0.65,0.13,0.98c0,2.11-1.72,3.83-3.83,3.83s-3.83-1.72-3.83-3.83
-				c0-2.11,1.72-3.83,3.83-3.83c0.85,0,1.66,0.28,2.33,0.79l0.84-0.56c-1.06-1.96-1.62-4.17-1.62-6.4c0-0.94,0.1-1.88,0.29-2.8
-				l-1.46-0.45c-0.53,0.56-1.27,0.88-2.04,0.88c-1.55,0-2.81-1.26-2.81-2.81c0-1.55,1.26-2.82,2.81-2.82c1.39,0,2.57,1.04,2.78,2.38
-				l1.46,0.45c0.47-1.13,1.09-2.19,1.86-3.16l-1.17-1.11c-0.86,0.56-1.85,0.86-2.89,0.86c-2.93,0-5.31-2.38-5.31-5.32
-				S2.88,0.5,5.82,0.5c2.93,0,5.31,2.38,5.31,5.31c0,0.94-0.25,1.85-0.71,2.66l1.17,1.11c2.46-2.16,5.59-3.34,8.86-3.34
-				c2.87,0,5.6,0.89,7.91,2.58l0.76-0.87c-0.31-0.57-0.47-1.21-0.47-1.86c0-2.17,1.76-3.93,3.93-3.93c2.17,0,3.93,1.76,3.93,3.93
-				s-1.76,3.93-3.93,3.93c-0.57,0-1.13-0.13-1.65-0.37l-0.71,0.8c2.38,2.51,3.69,5.78,3.69,9.25c0,1.13-0.14,2.25-0.42,3.35
-				l1.23,0.44c0.81-1.07,2.06-1.7,3.41-1.7c2.37,0,4.3,1.93,4.3,4.3s-1.93,4.3-4.3,4.3s-4.3-1.93-4.3-4.3c0-0.09,0-0.18,0.01-0.28
-				l-1.2-0.43c-1.48,3.17-4.15,5.65-7.41,6.89l0.48,1.74c1.98,0.09,3.56,1.73,3.56,3.74C29.28,39.82,27.6,41.5,25.54,41.5z"/>
-			<path class="st0" d="M5.81,1c2.65,0,4.81,2.16,4.81,4.81c0,1.02-0.32,1.96-0.86,2.74l1.8,1.71c2.32-2.18,5.44-3.52,8.87-3.52
-				c3.01,0,5.78,1.03,7.98,2.76l1.31-1.49c-0.37-0.55-0.59-1.21-0.59-1.91c0-1.89,1.54-3.43,3.43-3.43C34.46,2.67,36,4.2,36,6.09
-				c0,1.89-1.54,3.43-3.43,3.43c-0.65,0-1.25-0.18-1.76-0.49l-1.27,1.45c2.39,2.35,3.87,5.62,3.87,9.23c0,1.27-0.19,2.5-0.53,3.66
-				l2.03,0.73c0.67-1.08,1.86-1.8,3.22-1.8c2.09,0,3.8,1.7,3.8,3.8c0,2.09-1.7,3.8-3.8,3.8s-3.8-1.7-3.8-3.8
-				c0-0.21,0.02-0.41,0.05-0.61l-2.01-0.72c-1.43,3.37-4.26,6.01-7.75,7.21l0.71,2.56c0.07,0,0.13-0.01,0.2-0.01
-				c1.79,0,3.24,1.45,3.24,3.24c0,1.79-1.45,3.24-3.24,3.24s-3.24-1.45-3.24-3.24c0-1.2,0.66-2.24,1.62-2.8l-0.72-2.59
-				c-0.89,0.19-1.81,0.3-2.76,0.3c-4.23,0-7.98-2.03-10.35-5.17l-1.54,1.02c0.14,0.37,0.22,0.77,0.22,1.18
-				c0,1.84-1.5,3.33-3.33,3.33c-1.84,0-3.33-1.5-3.33-3.33c0-1.84,1.5-3.33,3.33-3.33c0.89,0,1.69,0.35,2.29,0.92l1.54-1.02
-				c-1.13-1.93-1.79-4.17-1.79-6.56c0-1.08,0.14-2.13,0.39-3.14l-2.22-0.69c-0.42,0.58-1.1,0.96-1.87,0.96
-				c-1.28,0-2.31-1.04-2.31-2.31c0-1.28,1.04-2.31,2.31-2.31c1.26,0,2.28,1.01,2.31,2.26l2.22,0.69c0.53-1.4,1.29-2.69,2.25-3.82
-				l-1.8-1.71c-0.81,0.63-1.83,1-2.94,1C3.16,10.63,1,8.47,1,5.81C1,3.16,3.16,1,5.81,1 M5.81,0C2.61,0,0,2.61,0,5.81
-				c0,2.44,1.51,4.53,3.64,5.39c-1.76,0.07-3.17,1.53-3.17,3.31c0,1.83,1.49,3.31,3.31,3.31c0.8,0,1.57-0.3,2.17-0.82l0.75,0.23
-				c-0.14,0.81-0.22,1.63-0.22,2.45c0,2.17,0.51,4.3,1.47,6.23l-0.18,0.12c-0.69-0.45-1.5-0.69-2.33-0.69
-				c-2.39,0-4.33,1.94-4.33,4.33s1.94,4.33,4.33,4.33s4.33-1.94,4.33-4.33c0-0.25-0.02-0.5-0.07-0.75l0.18-0.12
-				c2.66,3.08,6.46,4.83,10.56,4.83c0.68,0,1.36-0.05,2.04-0.15l0.29,1.04c-0.92,0.8-1.47,1.97-1.47,3.21c0,2.34,1.9,4.24,4.24,4.24
-				s4.24-1.9,4.24-4.24c0-2.14-1.6-3.92-3.67-4.2l-0.27-0.98c3.05-1.28,5.56-3.62,7.06-6.57l0.43,0.16c0.04,2.61,2.18,4.72,4.8,4.72
-				c2.64,0,4.8-2.15,4.8-4.8c0-2.64-2.15-4.8-4.8-4.8c-1.39,0-2.67,0.59-3.58,1.61l-0.48-0.17c0.22-1,0.33-2.01,0.33-3.03
-				c0-3.45-1.24-6.7-3.52-9.25l0.17-0.2c0.48,0.18,0.99,0.27,1.51,0.27c2.44,0,4.43-1.99,4.43-4.43s-1.99-4.43-4.43-4.43
-				c-2.44,0-4.43,1.99-4.43,4.43c0,0.62,0.13,1.22,0.37,1.78l-0.25,0.28c-2.32-1.58-5-2.41-7.83-2.41c-3.24,0-6.35,1.12-8.84,3.17
-				l-0.57-0.54c0.39-0.79,0.59-1.66,0.59-2.56C11.63,2.61,9.02,0,5.81,0L5.81,0z M5.81,11.63c1,0,1.96-0.25,2.82-0.73l0.56,0.54
-				c-0.58,0.78-1.07,1.61-1.47,2.49l-0.75-0.23c-0.23-0.89-0.83-1.64-1.63-2.08C5.51,11.62,5.66,11.63,5.81,11.63L5.81,11.63z"/>
-		</g>
-		<g>
-			<path style="fill:#BB501C;" d="M38.13,22.3c-1.36,0-2.55,0.72-3.22,1.8l-2.03-0.73c0.34-1.16,0.53-2.39,0.53-3.66
-				c0-3.61-1.48-6.88-3.87-9.23l1.27-1.45c0.52,0.31,1.12,0.49,1.76,0.49c1.89,0,3.43-1.54,3.43-3.43s-1.54-3.43-3.43-3.43
-				c-1.89,0-3.43,1.54-3.43,3.43c0,0.71,0.22,1.37,0.59,1.91L28.42,9.5c-2.2-1.73-4.97-2.76-7.98-2.76c-3.43,0-6.55,1.34-8.87,3.52
-				l-1.8-1.71c0.54-0.78,0.86-1.72,0.86-2.74C10.63,3.16,8.47,1,5.81,1S1,3.16,1,5.81s2.16,4.81,4.81,4.81c1.11,0,2.12-0.38,2.94-1
-				l1.8,1.71c-0.95,1.12-1.72,2.41-2.25,3.82l-2.22-0.69c-0.03-1.25-1.05-2.26-2.31-2.26c-1.28,0-2.31,1.04-2.31,2.31
-				s1.04,2.31,2.31,2.31c0.77,0,1.45-0.38,1.87-0.96l2.22,0.69c-0.25,1.01-0.39,2.06-0.39,3.14c0,2.39,0.65,4.63,1.79,6.56
-				l-1.54,1.02c-0.6-0.57-1.4-0.92-2.29-0.92c-1.84,0-3.33,1.5-3.33,3.33c0,1.84,1.5,3.33,3.33,3.33s3.33-1.5,3.33-3.33
-				c0-0.42-0.08-0.82-0.22-1.18l1.54-1.02c2.37,3.14,6.13,5.17,10.35,5.17c0.95,0,1.87-0.1,2.76-0.3l0.72,2.59
-				c-0.97,0.56-1.62,1.61-1.62,2.8c0,1.79,1.45,3.24,3.24,3.24c1.79,0,3.24-1.45,3.24-3.24c0-1.79-1.45-3.24-3.24-3.24
-				c-0.07,0-0.13,0.01-0.2,0.01l-0.71-2.56c3.49-1.19,6.32-3.84,7.75-7.21l2.01,0.72c-0.03,0.2-0.05,0.4-0.05,0.61
-				c0,2.09,1.7,3.8,3.8,3.8c2.09,0,3.8-1.7,3.8-3.8S40.22,22.3,38.13,22.3z M30.63,6.09c0-1.07,0.87-1.94,1.94-1.94
-				c1.07,0,1.94,0.87,1.94,1.94s-0.87,1.94-1.94,1.94C31.5,8.04,30.63,7.16,30.63,6.09z M4.61,14.52c0,0.46-0.37,0.83-0.83,0.83
-				c-0.46,0-0.83-0.37-0.83-0.83s0.37-0.83,0.83-0.83C4.24,13.69,4.61,14.06,4.61,14.52z M7.3,29.7c0,1.02-0.83,1.85-1.85,1.85
-				s-1.85-0.83-1.85-1.85s0.83-1.85,1.85-1.85S7.3,28.68,7.3,29.7z M27.3,37.76c0,0.97-0.79,1.76-1.76,1.76
-				c-0.97,0-1.76-0.79-1.76-1.76c0-0.97,0.79-1.76,1.76-1.76C26.51,36,27.3,36.79,27.3,37.76z M8.99,20.44h5.36
-				c0.15,3.88,1.51,7.53,3.9,10.53C13.2,29.99,9.33,25.69,8.99,20.44z M18.25,8.43c-2.39,3-3.75,6.65-3.9,10.53H8.99
-				C9.33,13.71,13.2,9.41,18.25,8.43z M31.9,18.96h-5.36c-0.15-3.88-1.51-7.53-3.9-10.53C27.69,9.41,31.56,13.71,31.9,18.96z
-				 M15.83,18.96c0.17-4.05,1.78-7.81,4.57-10.74c0.01,0,0.03,0,0.04,0c0.01,0,0.03,0,0.04,0c2.79,2.93,4.39,6.69,4.57,10.74H15.83z
-				 M15.83,20.44h9.22c-0.17,4.04-1.78,7.81-4.57,10.74c-0.01,0-0.03,0-0.04,0c-0.01,0-0.03,0-0.04,0
-				C17.61,28.25,16.01,24.49,15.83,20.44z M26.54,20.44h5.36c-0.34,5.25-4.21,9.55-9.26,10.53C25.03,27.97,26.39,24.33,26.54,20.44z
-				 M5.81,9.15c-1.84,0-3.33-1.5-3.33-3.33s1.5-3.33,3.33-3.33s3.33,1.5,3.33,3.33S7.65,9.15,5.81,9.15z M38.13,28.41
-				c-1.28,0-2.31-1.04-2.31-2.31c0-1.28,1.04-2.31,2.31-2.31s2.31,1.04,2.31,2.31C40.44,27.37,39.41,28.41,38.13,28.41z"/>
-		</g>
-	</g>
-</g>
-</svg>
diff --git a/okitweb/static/okit/palette/deprecated/networking/IPSec_Connection.svg b/okitweb/static/okit/palette/deprecated/networking/IPSec_Connection.svg
deleted file mode 100644
index a04c46807..000000000
--- a/okitweb/static/okit/palette/deprecated/networking/IPSec_Connection.svg
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 42.99 42" style="enable-background:new 0 0 42.99 42;" xml:space="preserve">
-<metadata><?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="Adobe XMP Core 6.0-c002 79.164352, 2020/01/30-15:50:38        ">
-   <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-      <rdf:Description rdf:about=""
-            xmlns:lr="http://ns.adobe.com/lightroom/1.0/"
-            xmlns:dc="http://purl.org/dc/elements/1.1/"
-            xmlns:xmp="http://ns.adobe.com/xap/1.0/"
-            xmlns:xmpMM="http://ns.adobe.com/xap/1.0/mm/"
-            xmlns:stEvt="http://ns.adobe.com/xap/1.0/sType/ResourceEvent#">
-         <lr:hierarchicalSubject>
-            <rdf:Bag>
-               <rdf:li>Features|arrow</rdf:li>
-               <rdf:li>Features|arrow|double</rdf:li>
-               <rdf:li>Concept|security</rdf:li>
-            </rdf:Bag>
-         </lr:hierarchicalSubject>
-         <dc:subject>
-            <rdf:Bag>
-               <rdf:li>Features|arrow</rdf:li>
-               <rdf:li>Features|arrow|double</rdf:li>
-               <rdf:li>Concept|security</rdf:li>
-            </rdf:Bag>
-         </dc:subject>
-         <xmp:MetadataDate>2021-04-02T11:21:40-07:00</xmp:MetadataDate>
-         <xmpMM:InstanceID>xmp.iid:c159b079-a2d9-2149-84ff-cc34df871587</xmpMM:InstanceID>
-         <xmpMM:DocumentID>xmp.did:35ae6f11-372e-2044-884e-c3c9a361c216</xmpMM:DocumentID>
-         <xmpMM:OriginalDocumentID>xmp.did:35ae6f11-372e-2044-884e-c3c9a361c216</xmpMM:OriginalDocumentID>
-         <xmpMM:History>
-            <rdf:Seq>
-               <rdf:li>
-                  <rdf:Description>
-                     <stEvt:action>saved</stEvt:action>
-                     <stEvt:instanceID>xmp.iid:35ae6f11-372e-2044-884e-c3c9a361c216</stEvt:instanceID>
-                     <stEvt:when>2021-04-02T11:21:18-07:00</stEvt:when>
-                     <stEvt:softwareAgent>Adobe Bridge 2020 (Windows)</stEvt:softwareAgent>
-                     <stEvt:changed>/metadata</stEvt:changed>
-                  </rdf:Description>
-               </rdf:li>
-               <rdf:li>
-                  <rdf:Description>
-                     <stEvt:action>saved</stEvt:action>
-                     <stEvt:instanceID>xmp.iid:c159b079-a2d9-2149-84ff-cc34df871587</stEvt:instanceID>
-                     <stEvt:when>2021-04-02T11:21:40-07:00</stEvt:when>
-                     <stEvt:softwareAgent>Adobe Bridge 2020 (Windows)</stEvt:softwareAgent>
-                     <stEvt:changed>/metadata</stEvt:changed>
-                  </rdf:Description>
-               </rdf:li>
-            </rdf:Seq>
-         </xmpMM:History>
-      </rdf:Description>
-   </rdf:RDF>
-</x:xmpmeta>
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                     
-<?xpacket end="w"?></metadata>
-<style type="text/css">
-	.st0{fill:#FFFFFF;}
-	.st1{fill:none;}
-	.st2{fill:#2C5967;}
-</style>
-<g>
-	<g>
-		<g>
-			<path class="st0" d="M10,41.5l-1.88-0.94l0-14.73H5.48l2.33,2.33l-1.76,1.76l-5.34-5.34l5.34-5.34l1.76,1.76l-2.33,2.33h2.65
-				V11.59h3.73v-1.31c0-5.21,4.01-9.5,9.13-9.76C21.16,0.5,21.33,0.5,21.5,0.5c2.48,0,4.83,0.94,6.63,2.65c1.94,1.84,3,4.32,3,6.99
-				v1.45h3.73v11.75h2.65l-2.33-2.33l1.76-1.76l5.34,5.34l-5.34,5.34l-1.76-1.76l2.33-2.33h-2.65l0,14.73l-1.88,0.94H10z"/>
-			<path class="st0" d="M21.5,1c2.35,0,4.57,0.88,6.28,2.51c1.84,1.74,2.85,4.1,2.85,6.63v1.95h3.73v11.75h4.35l-2.83-2.83
-				l1.06-1.06l4.63,4.63l-4.63,4.63l-1.06-1.06l2.83-2.83h-4.35v12.08h0v2.84L32.87,41l0,0H10.12v0l-1.5-0.75v-2.84h0V25.33H4.27
-				l2.83,2.83l-1.06,1.06l-4.63-4.63l4.63-4.63l1.06,1.06l-2.83,2.83h4.35V12.09h3.73v-1.81c0-4.94,3.8-9.01,8.66-9.26
-				C21.18,1,21.34,1,21.5,1 M21.5,0C21.5,0,21.5,0,21.5,0C21.5,0,21.5,0,21.5,0c-0.18,0-0.36,0-0.54,0.01
-				c-5.39,0.28-9.6,4.79-9.6,10.26v0.81H8.62h-1v1v8.03l-0.87-0.87l-0.71-0.71l-0.71,0.71l-4.63,4.63L0,24.59l0.71,0.71l4.63,4.63
-				l0.71,0.71l0.71-0.71l0.87-0.87v7.36l0,1v2.84v0.62l0.55,0.28l1.5,0.75L9.88,42h0.24l22.76,0h0.24l0.21-0.11l1.5-0.75l0.55-0.28
-				v-0.62v-2.84v-1h0v-7.36l0.87,0.87l0.71,0.71l0.71-0.71l4.63-4.63l0.71-0.71l-0.71-0.71l-4.63-4.63l-0.71-0.71l-0.71,0.71
-				l-0.87,0.87v-8.03v-1h-1h-2.73v-0.95c0-2.81-1.12-5.42-3.16-7.35C26.58,0.99,24.11,0,21.5,0L21.5,0L21.5,0z M35.37,22.84V21.9
-				l0.94,0.94H35.37L35.37,22.84z M6.68,22.84l0.94-0.94v0.94H6.68L6.68,22.84z M35.37,26.33h0.94l-0.94,0.94V26.33L35.37,26.33z
-				 M6.68,26.33h0.94v0.94L6.68,26.33L6.68,26.33z"/>
-		</g>
-		<g>
-			<path class="st1" d="M21.36,5.1c-2.7,0.07-4.9,2.39-4.9,5.16v1.82h10.07v-1.95c0-1.37-0.54-2.65-1.52-3.61
-				C24.03,5.57,22.74,5.07,21.36,5.1z"/>
-			<path class="st1" d="M14.97,10.26c0-3.58,2.85-6.57,6.36-6.66c1.78-0.05,3.46,0.61,4.73,1.85c1.27,1.24,1.97,2.9,1.97,4.68v1.95
-				h1.12v-1.95c0-2.12-0.85-4.09-2.38-5.55c-1.54-1.46-3.55-2.2-5.67-2.09c-4.06,0.21-7.24,3.62-7.24,7.77v1.81h1.12V10.26z"/>
-			<path class="st1" d="M10.12,23.84h1.49v1.49h-1.49V36.9h22.76V25.33h-1.49v-1.49h1.49V13.58H10.12V23.84z M28.77,23.84h1.49v1.49
-				h-1.49V23.84z M26.16,23.84h1.49v1.49h-1.49V23.84z M18.38,24.03c0.23-1.29,1.26-2.31,2.55-2.53c2-0.35,3.74,1.19,3.74,3.12
-				c0,1.2-0.67,2.24-1.65,2.78l0.59,4.09h-4.23l0.63-4.07C18.85,26.8,18.11,25.48,18.38,24.03z M15.34,23.84h1.49v1.49h-1.49V23.84z
-				 M12.73,23.84h1.49v1.49h-1.49V23.84z"/>
-			<path class="st2" d="M20.02,27.42l-0.63,4.07h4.23l-0.59-4.09c0.98-0.54,1.65-1.58,1.65-2.78c0-1.94-1.74-3.47-3.74-3.12
-				c-1.29,0.22-2.32,1.25-2.55,2.53C18.11,25.48,18.85,26.8,20.02,27.42z"/>
-			<path class="st2" d="M36.95,19.95l-1.06,1.06l2.83,2.83h-4.35V12.09h-3.73v-1.95c0-2.53-1.01-4.88-2.85-6.63
-				c-1.83-1.74-4.24-2.63-6.78-2.5c-4.85,0.25-8.66,4.32-8.66,9.26v1.81H8.62v11.75H4.27l2.83-2.83l-1.06-1.06l-4.63,4.63l4.63,4.63
-				l1.06-1.06l-2.83-2.83h4.35v13.06h25.74V25.33h4.35l-2.83,2.83l1.06,1.06l4.63-4.63L36.95,19.95z M13.85,10.27
-				c0-4.15,3.18-7.56,7.24-7.77c2.12-0.11,4.14,0.63,5.67,2.09c1.54,1.46,2.38,3.43,2.38,5.55v1.95h-1.12v-1.95
-				c0-1.78-0.7-3.44-1.97-4.68c-1.27-1.24-2.95-1.9-4.73-1.85c-3.51,0.09-6.36,3.08-6.36,6.66v1.82h-1.12V10.27z M26.53,10.13v1.95
-				H16.46v-1.82c0-2.78,2.2-5.1,4.9-5.16c1.38-0.03,2.67,0.47,3.65,1.43C25.99,7.48,26.53,8.76,26.53,10.13z M32.87,23.84h-1.49
-				v1.49h1.49V36.9H10.12V25.33h1.49v-1.49h-1.49V13.58h22.76V23.84z"/>
-			<polygon class="st2" points="8.62,39.51 8.62,40.25 10.12,41 10.12,41 32.87,41 32.87,41 34.37,40.25 34.37,39.51 			"/>
-			<rect x="15.34" y="23.84" class="st2" width="1.49" height="1.49"/>
-			<rect x="12.73" y="23.84" class="st2" width="1.49" height="1.49"/>
-			<rect x="28.77" y="23.84" class="st2" width="1.49" height="1.49"/>
-			<rect x="26.16" y="23.84" class="st2" width="1.49" height="1.49"/>
-		</g>
-	</g>
-</g>
-</svg>
diff --git a/okitweb/static/okit/palette/deprecated/networking/Load_Balancer.svg b/okitweb/static/okit/palette/deprecated/networking/Load_Balancer.svg
deleted file mode 100644
index 090a468ba..000000000
--- a/okitweb/static/okit/palette/deprecated/networking/Load_Balancer.svg
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 42.38 42" style="enable-background:new 0 0 42.38 42;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FFFFFF;}
-	.st1{fill:none;}
-	.st2{fill:#2C5967;}
-</style>
-<g>
-	<g>
-		<g>
-			<path class="st0" d="M34.2,41.5v-2.48h3.01L23.16,24.96c-0.37,4.76-1.46,8.95-3.17,12.18c-2.1,3.56-4.22,4.29-5.63,4.29
-				c-0.25,0-0.51-0.02-0.76-0.07c-4.03-0.74-6.46-6.79-7.4-12.21c-0.38-2.03-0.62-4.41-0.67-6.91H0.5v-2.48h5.03
-				c0.06-2.59,0.31-5.07,0.72-7.17C7.56,5.23,10.69,0.64,14.42,0.6c2.18,0,6.08,1.59,8.18,12.23c0.24,1.35,0.41,2.75,0.53,4.2
-				L37.17,2.98H34.2V0.5h7.3v7.3h-2.48V4.64L23.9,19.76h12.88l-2-1.91l1.71-1.8l5.17,4.92l-5.14,5.14l-1.75-1.75l2.12-2.13H23.95
-				l15.07,15.07V34.2h2.48v7.3H34.2z"/>
-			<path class="st0" d="M41,1v6.3h-1.48V3.44L22.79,20.17c0,0.03,0,0.06,0,0.09h15.25l-2.55-2.43l1.02-1.07l4.44,4.23l-4.43,4.43
-				l-1.05-1.05l2.62-2.62H22.79c0,0.02,0,0.03,0,0.05l16.72,16.72V34.7H41V41h-6.3v-1.48h3.72l-15.7-15.7
-				c-0.25,4.57-1.17,9.28-3.18,13.08l-0.02,0.04c-1.88,3.19-3.75,3.99-5.17,3.99c-0.24,0-0.47-0.02-0.68-0.06
-				c-3.78-0.69-6.13-6.79-6.99-11.81c-0.42-2.2-0.64-4.75-0.68-7.32H1v-1.48h5.02c0.04-2.67,0.28-5.31,0.72-7.58
-				C8,5.57,10.95,1.13,14.42,1.1c0.01,0,0.02,0,0.04,0c2,0,5.62,1.55,7.64,11.82l0,0.02c0.27,1.56,0.49,3.33,0.6,5.21L38.38,2.48
-				H34.7V1H41 M42,0h-1h-6.3h-1v1v1.48v1h1h1.26L23.53,15.92c-0.11-1.09-0.26-2.14-0.44-3.15C21.02,2.29,17.26,0.1,14.46,0.1
-				c-4.09,0.04-7.33,4.68-8.71,12.41c-0.39,1.99-0.63,4.31-0.71,6.75H1H0v1v1.48v1h1h4.04c0.08,2.34,0.31,4.58,0.67,6.51
-				c0.96,5.57,3.51,11.82,7.8,12.6c0.28,0.05,0.57,0.08,0.86,0.08c1.54,0,3.84-0.78,6.03-4.48l0-0.01l0.03-0.05
-				c1.62-3.06,2.69-6.94,3.14-11.33l12.45,12.45H34.7h-1v1V41v1h1H41h1v-1v-6.3v-1h-1h-1.48h-1v1v1.4L25.16,22.74h10.53l-0.92,0.92
-				l-0.71,0.71l0.71,0.71l1.05,1.05l0.71,0.71l0.71-0.71l4.43-4.43l0.72-0.72l-0.74-0.71l-4.44-4.23l-0.72-0.69l-0.69,0.72
-				l-1.02,1.07l-0.69,0.72l0.72,0.69l0.74,0.7H25.11L38.52,5.85V7.3v1h1H41h1v-1V1V0L42,0z"/>
-		</g>
-		<g>
-			<path class="st1" d="M14.46,2.95c-0.01,0-0.01,0-0.02,0c-1.97,0.02-4.66,3.18-5.88,10.06l0,0.02c-0.42,2.17-0.65,4.68-0.69,7.23
-				h8.88l-2.74-2.61l1.02-1.07l4.62,4.41l-4.43,4.42l-1.05-1.05l2.62-2.62H7.86c0.04,2.46,0.25,4.89,0.65,6.99
-				c0.96,5.57,3.27,9.9,5.51,10.31c0.11,0.02,0.23,0.03,0.34,0.03c1.43,0,2.71-1.63,3.56-3.06c3.29-6.25,3.56-15.92,2.36-22.75
-				C18.78,5.66,16.29,2.95,14.46,2.95z"/>
-			<path class="st2" d="M41,7.3V1h-6.3v1.48h3.67L22.71,18.15c-0.11-1.88-0.32-3.65-0.6-5.21l0-0.02C20.08,2.65,16.46,1.1,14.46,1.1
-				c-0.01,0-0.02,0-0.04,0C10.95,1.13,8,5.57,6.74,12.68c-0.44,2.27-0.68,4.91-0.72,7.58H1v1.48h5.01c0.04,2.58,0.26,5.12,0.68,7.32
-				c0.86,5.01,3.21,11.11,6.99,11.81c0.21,0.04,0.44,0.06,0.68,0.06c1.41,0,3.28-0.8,5.17-3.99l0.02-0.04
-				c2.01-3.8,2.93-8.51,3.18-13.08l15.7,15.7H34.7V41H41v-6.3h-1.48v3.81L22.79,21.79c0-0.02,0-0.03,0-0.05H38.1l-2.62,2.62
-				l1.05,1.05l4.43-4.43l-4.44-4.23l-1.02,1.07l2.55,2.43H22.79c0-0.03,0-0.06,0-0.09L39.52,3.44V7.3H41z M17.92,36.02
-				c-0.85,1.43-2.13,3.06-3.56,3.06c-0.11,0-0.23-0.01-0.34-0.03c-2.23-0.41-4.55-4.74-5.51-10.31c-0.4-2.11-0.61-4.54-0.65-6.99
-				h8.94l-2.62,2.62l1.05,1.05l4.43-4.42l-4.62-4.41l-1.02,1.07l2.74,2.61H7.86c0.04-2.55,0.27-5.06,0.69-7.23l0-0.02
-				c1.22-6.89,3.91-10.04,5.88-10.06c0.01,0,0.01,0,0.02,0c1.83,0,4.32,2.71,5.83,10.32C21.48,20.09,21.21,29.77,17.92,36.02z"/>
-		</g>
-	</g>
-</g>
-</svg>
diff --git a/okitweb/static/okit/palette/deprecated/networking/Network_Security_Group.svg b/okitweb/static/okit/palette/deprecated/networking/Network_Security_Group.svg
deleted file mode 100644
index c03d46a1a..000000000
--- a/okitweb/static/okit/palette/deprecated/networking/Network_Security_Group.svg
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 32.3 42.2" style="enable-background:new 0 0 32.3 42.2;" xml:space="preserve">
-<g>
-	<g>
-		<path style="fill:#FFFFFF;" d="M15.8,41.5C8,38.6,4.3,33.6,2.5,29.8c-2-4.3-2-7.9-2-8.1V7.3l15.7-6.7l15.6,6.7v14.5
-			c0,0.6-0.2,14.2-15.1,19.7l-0.4,0.2L15.8,41.5z"/>
-		<path style="fill:#FFFFFF;" d="M16.2,1.1l15.1,6.5v14.2c0,0.6-0.2,13.8-14.8,19.2l-0.3,0.1L16,41C8.3,38.2,4.7,33.3,3,29.6
-			c-1.9-4.1-2-7.7-2-7.8V7.6L16.2,1.1 M16.2,0l-0.4,0.2L0.6,6.7L0,6.9v0.7v14.2c0,0.2,0,3.9,2.1,8.3c1.8,3.8,5.6,9,13.6,11.9
-			l0.3,0.1l0.3,0.1l0.3-0.1l0.3-0.1c15.3-5.6,15.5-19.6,15.5-20.2V7.6V6.9l-0.6-0.3L16.6,0.2L16.2,0L16.2,0z"/>
-	</g>
-	<g>
-		<path style="fill:none;" d="M2.5,8.6v13.2c0,0.1,0,3.4,1.8,7.2c2.3,4.9,6.3,8.4,11.9,10.5c13.4-5.1,13.6-17.2,13.6-17.7V8.6
-			L16.2,2.7L2.5,8.6z M16.1,28.3H7v-1.5h9.1V28.3z M16.1,21.5H7V20h9.1V21.5z M16.1,14.2H7v-1.5h9.1V14.2z M20.2,12.7l1.2,1.2l3-3
-			l1,1l-4,4l-2.2-2.2L20.2,12.7z M24.8,22.2l-1,1l-1.5-1.5l-1.5,1.5l-1-1l1.5-1.5l-1.5-1.5l1-1l1.5,1.5l1.5-1.5l1,1l-1.5,1.5
-			L24.8,22.2z M20.2,26.8l1.2,1.2l3-3l1,1l-4,4l-2.2-2.2L20.2,26.8z"/>
-		<path style="fill:#2C5967;" d="M16.2,1.1L1,7.6v14.2c0,0.1,0,3.7,2,7.8c1.7,3.7,5.4,8.6,13,11.4l0.3,0.1l0.3-0.1
-			c14.6-5.4,14.8-18.7,14.8-19.2V7.6L16.2,1.1z M29.8,21.8c0,0.5-0.2,12.6-13.6,17.7C10.6,37.4,6.6,33.9,4.3,29
-			c-1.8-3.9-1.8-7.1-1.8-7.2V8.6l13.7-5.9l13.6,5.9V21.8z"/>
-		<rect x="7" y="12.7" style="fill:#2C5967;" width="9.1" height="1.5"/>
-		<polygon style="fill:#2C5967;" points="25.4,12 24.3,11 21.4,13.9 20.2,12.7 19.1,13.8 21.4,16 		"/>
-		<rect x="7" y="20" style="fill:#2C5967;" width="9.1" height="1.5"/>
-		<polygon style="fill:#2C5967;" points="23.8,18.1 22.3,19.7 20.7,18.1 19.7,19.2 21.2,20.7 19.7,22.2 20.7,23.3 22.3,21.8 
-			23.8,23.3 24.8,22.2 23.3,20.7 24.8,19.2 		"/>
-		<rect x="7" y="26.8" style="fill:#2C5967;" width="9.1" height="1.5"/>
-		<polygon style="fill:#2C5967;" points="25.4,26.1 24.3,25.1 21.4,28 20.2,26.8 19.1,27.9 21.4,30.1 		"/>
-	</g>
-</g>
-</svg>
diff --git a/okitweb/static/okit/palette/deprecated/networking/Remote_Peering_Connection.svg b/okitweb/static/okit/palette/deprecated/networking/Remote_Peering_Connection.svg
deleted file mode 100644
index a1d97e6d9..000000000
--- a/okitweb/static/okit/palette/deprecated/networking/Remote_Peering_Connection.svg
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 42 17.41" style="enable-background:new 0 0 42 17.41;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FFFFFF;}
-	.st1{fill:#2C5967;}
-</style>
-<g>
-	<g>
-		<g>
-			<g>
-				<path class="st0" d="M30.16,6.1c-2.58-2.12-5.86-3.29-9.23-3.29c-3.34,0-6.59,1.14-9.16,3.22l-0.34,0.27l-0.32-0.3
-					c-0.3-0.28-0.63-0.54-0.98-0.75L9.55,4.9l0.53-0.44c0.42-0.35,0.84-0.67,1.26-0.96c2.83-1.96,6.14-2.99,9.59-2.99
-					c3.45,0,6.77,1.03,9.59,2.99c0.45,0.31,0.89,0.65,1.32,1.02l0.51,0.44l-0.57,0.37c-0.34,0.22-0.67,0.48-0.97,0.77L30.5,6.39
-					L30.16,6.1z"/>
-				<path class="st0" d="M20.92,1c3.35,0,6.57,1,9.31,2.9c0.45,0.31,0.87,0.64,1.29,0.99c-0.37,0.24-0.72,0.52-1.04,0.83
-					c-2.63-2.16-5.97-3.4-9.55-3.4c-3.55,0-6.86,1.22-9.47,3.33c-0.32-0.3-0.68-0.58-1.06-0.81c0.39-0.33,0.8-0.64,1.22-0.93
-					C14.36,2,17.58,1,20.92,1 M20.92,0c-3.55,0-6.97,1.06-9.88,3.08c-0.43,0.3-0.86,0.63-1.29,0.99L8.7,4.96l1.17,0.73
-					c0.32,0.2,0.62,0.43,0.9,0.7l0.64,0.6l0.68-0.55c2.48-2.01,5.62-3.11,8.84-3.11c3.26,0,6.42,1.13,8.92,3.17l0.69,0.57l0.64-0.62
-					c0.27-0.26,0.57-0.5,0.89-0.71L33.19,5l-1.03-0.87c-0.45-0.38-0.91-0.73-1.36-1.05C27.89,1.06,24.48,0,20.92,0L20.92,0z"/>
-			</g>
-			<g>
-				<circle class="st0" cx="6.81" cy="10.6" r="6.31"/>
-				<path class="st0" d="M6.81,4.8c3.2,0,5.81,2.61,5.81,5.81s-2.61,5.81-5.81,5.81C3.61,16.41,1,13.81,1,10.6S3.61,4.8,6.81,4.8
-					 M6.81,3.8C3.05,3.8,0,6.85,0,10.6c0,3.75,3.05,6.81,6.81,6.81c3.75,0,6.81-3.05,6.81-6.81C13.62,6.85,10.56,3.8,6.81,3.8
-					L6.81,3.8z"/>
-			</g>
-			<g>
-				<circle class="st0" cx="35.19" cy="10.6" r="6.31"/>
-				<path class="st0" d="M35.19,4.8C38.39,4.8,41,7.4,41,10.6s-2.61,5.81-5.81,5.81s-5.81-2.61-5.81-5.81S31.99,4.8,35.19,4.8
-					 M35.19,3.8c-3.75,0-6.81,3.05-6.81,6.81c0,3.75,3.05,6.81,6.81,6.81S42,14.36,42,10.6C42,6.85,38.95,3.8,35.19,3.8L35.19,3.8z"
-					/>
-			</g>
-		</g>
-		<g>
-			<path class="st1" d="M30.23,3.9C27.49,2,24.27,1,20.92,1s-6.57,1-9.31,2.9c-0.42,0.29-0.83,0.61-1.22,0.93
-				c0.38,0.24,0.73,0.51,1.06,0.81c2.61-2.12,5.92-3.33,9.47-3.33c3.58,0,6.92,1.24,9.55,3.4c0.32-0.31,0.67-0.58,1.04-0.83
-				C31.11,4.54,30.68,4.21,30.23,3.9z"/>
-			<path class="st1" d="M6.81,4.8C3.61,4.8,1,7.4,1,10.6s2.61,5.81,5.81,5.81s5.81-2.61,5.81-5.81S10.01,4.8,6.81,4.8z M11.3,10.6
-				c0,2.48-2.01,4.49-4.49,4.49s-4.49-2.01-4.49-4.49s2.01-4.49,4.49-4.49S11.3,8.13,11.3,10.6z"/>
-			<path class="st1" d="M35.19,4.8c-3.2,0-5.81,2.61-5.81,5.81s2.61,5.81,5.81,5.81c3.2,0,5.81-2.61,5.81-5.81S38.39,4.8,35.19,4.8z
-				 M35.19,15.09c-2.48,0-4.49-2.01-4.49-4.49s2.01-4.49,4.49-4.49s4.49,2.01,4.49,4.49S37.67,15.09,35.19,15.09z"/>
-			<path class="st1" d="M5.1,8.81L3.91,9.36l1.81,3.89l3.89-1.81l-0.56-1.19l-1.8,0.84C7.76,9.96,8.4,8.93,9.14,8
-				C8.81,7.7,8.43,7.47,8,7.32c-0.8,1.03-1.48,2.16-2.02,3.37L5.1,8.81z"/>
-			<path class="st1" d="M32.74,10.24l-0.56,1.19l3.89,1.81l1.81-3.89l-1.19-0.56l-0.85,1.82c-0.53-1.17-1.19-2.26-1.96-3.26
-				c-0.41,0.17-0.79,0.41-1.1,0.72c0.72,0.92,1.34,1.94,1.84,3.04L32.74,10.24z"/>
-		</g>
-		<g>
-			<path class="st1" d="M30.23,3.9C27.49,2,24.27,1,20.92,1s-6.57,1-9.31,2.9c-0.42,0.29-0.83,0.61-1.22,0.93
-				c0.38,0.24,0.73,0.51,1.06,0.81c2.61-2.12,5.92-3.33,9.47-3.33c3.58,0,6.92,1.24,9.55,3.4c0.32-0.31,0.67-0.58,1.04-0.83
-				C31.11,4.54,30.68,4.21,30.23,3.9z"/>
-			<path class="st1" d="M6.81,4.8C3.61,4.8,1,7.4,1,10.6s2.61,5.81,5.81,5.81s5.81-2.61,5.81-5.81S10.01,4.8,6.81,4.8z M11.3,10.6
-				c0,2.48-2.01,4.49-4.49,4.49s-4.49-2.01-4.49-4.49s2.01-4.49,4.49-4.49S11.3,8.13,11.3,10.6z"/>
-			<path class="st1" d="M35.19,4.8c-3.2,0-5.81,2.61-5.81,5.81s2.61,5.81,5.81,5.81c3.2,0,5.81-2.61,5.81-5.81S38.39,4.8,35.19,4.8z
-				 M35.19,15.09c-2.48,0-4.49-2.01-4.49-4.49s2.01-4.49,4.49-4.49s4.49,2.01,4.49,4.49S37.67,15.09,35.19,15.09z"/>
-			<path class="st1" d="M5.1,8.81L3.91,9.36l1.81,3.89l3.89-1.81l-0.56-1.19l-1.8,0.84C7.76,9.96,8.4,8.93,9.14,8
-				C8.81,7.7,8.43,7.47,8,7.32c-0.8,1.03-1.48,2.16-2.02,3.37L5.1,8.81z"/>
-			<path class="st1" d="M32.74,10.24l-0.56,1.19l3.89,1.81l1.81-3.89l-1.19-0.56l-0.85,1.82c-0.53-1.17-1.19-2.26-1.96-3.26
-				c-0.41,0.17-0.79,0.41-1.1,0.72c0.72,0.92,1.34,1.94,1.84,3.04L32.74,10.24z"/>
-		</g>
-	</g>
-</g>
-</svg>
diff --git a/okitweb/static/okit/palette/deprecated/networking/Route_Table.svg b/okitweb/static/okit/palette/deprecated/networking/Route_Table.svg
deleted file mode 100644
index 62b35af7d..000000000
--- a/okitweb/static/okit/palette/deprecated/networking/Route_Table.svg
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 42 42" style="enable-background:new 0 0 42 42;" xml:space="preserve">
-<g>
-	<g>
-		<rect x="0.5" y="0.5" style="fill:#FFFFFF;" width="41" height="41"/>
-		<path style="fill:#FFFFFF;" d="M41,1v40H1V1H41 M42,0h-1H1H0v1v40v1h1h40h1v-1V1V0L42,0z"/>
-	</g>
-	<g>
-		<path style="fill:#BB501C;" d="M1,1v40h40V1H1z M39.5,13.8H13.6V2.5h25.9V13.8z M2.5,28.2h9.6v11.4H2.5V28.2z M12.1,2.5v11.4H2.5
-			V2.5H12.1z M12.1,15.3v11.4H2.5V15.3H12.1z M13.6,39.5V28.2h25.9v11.4H13.6z M13.6,26.7V15.3h25.9v11.4H13.6z"/>
-		<polygon style="fill:#BB501C;" points="15,12.3 16.7,12.3 17.6,10.6 18.5,12.3 20.1,12.3 18.6,9.6 20,7.1 18.4,7.1 17.6,8.7 
-			16.7,7.1 15.1,7.1 16.6,9.6 		"/>
-		<rect x="20.9" y="11.1" style="fill:#BB501C;" width="1.4" height="1.2"/>
-		<polygon style="fill:#BB501C;" points="25,12.3 25.9,10.6 26.8,12.3 28.4,12.3 26.8,9.6 28.3,7.1 26.8,7.1 25.9,8.7 25,7.1 
-			23.4,7.1 24.9,9.6 23.4,12.3 		"/>
-		<rect x="28.9" y="11.1" style="fill:#BB501C;" width="1.4" height="1.2"/>
-		<polygon style="fill:#BB501C;" points="32.7,12.3 33.6,10.6 34.6,12.3 36.1,12.3 34.6,9.6 36,7.1 34.5,7.1 33.6,8.7 32.7,7.1 
-			31.2,7.1 32.6,9.6 31.1,12.3 		"/>
-		<rect x="36.6" y="11.1" style="fill:#BB501C;" width="1.4" height="1.2"/>
-		<polygon style="fill:#BB501C;" points="20,20.1 18.4,20.1 17.6,21.7 16.7,20.1 15.1,20.1 16.6,22.6 15,25.3 16.7,25.3 17.6,23.6 
-			18.5,25.3 20.1,25.3 18.6,22.6 		"/>
-		<rect x="20.9" y="24" style="fill:#BB501C;" width="1.4" height="1.2"/>
-		<polygon style="fill:#BB501C;" points="28.3,20.1 26.8,20.1 25.9,21.7 25,20.1 23.4,20.1 24.9,22.6 23.4,25.3 25,25.3 25.9,23.6 
-			26.8,25.3 28.4,25.3 26.8,22.6 		"/>
-		<rect x="28.9" y="24" style="fill:#BB501C;" width="1.4" height="1.2"/>
-		<polygon style="fill:#BB501C;" points="36,20.1 34.5,20.1 33.6,21.7 32.7,20.1 31.2,20.1 32.6,22.6 31.1,25.3 32.7,25.3 
-			33.6,23.6 34.6,25.3 36.1,25.3 34.6,22.6 		"/>
-		<rect x="36.6" y="24" style="fill:#BB501C;" width="1.4" height="1.2"/>
-		<polygon style="fill:#BB501C;" points="20,32.9 18.4,32.9 17.6,34.4 16.7,32.9 15.1,32.9 16.6,35.3 15,38 16.7,38 17.6,36.3 
-			18.5,38 20.1,38 18.6,35.4 		"/>
-		<rect x="20.9" y="36.8" style="fill:#BB501C;" width="1.4" height="1.2"/>
-		<polygon style="fill:#BB501C;" points="28.3,32.9 26.8,32.9 25.9,34.4 25,32.9 23.4,32.9 24.9,35.3 23.4,38 25,38 25.9,36.3 
-			26.8,38 28.4,38 26.8,35.4 		"/>
-		<rect x="28.9" y="36.8" style="fill:#BB501C;" width="1.4" height="1.2"/>
-		<polygon style="fill:#BB501C;" points="36,32.9 34.5,32.9 33.6,34.4 32.7,32.9 31.2,32.9 32.6,35.3 31.1,38 32.7,38 33.6,36.3 
-			34.6,38 36.1,38 34.6,35.4 		"/>
-		<rect x="36.6" y="36.8" style="fill:#BB501C;" width="1.4" height="1.2"/>
-	</g>
-</g>
-</svg>
diff --git a/okitweb/static/okit/palette/deprecated/networking/Security_List.svg b/okitweb/static/okit/palette/deprecated/networking/Security_List.svg
deleted file mode 100644
index bd73ef640..000000000
--- a/okitweb/static/okit/palette/deprecated/networking/Security_List.svg
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 32.3 42.2" style="enable-background:new 0 0 32.3 42.2;" xml:space="preserve">
-<g>
-	<g>
-		<path style="fill:#FFFFFF;" d="M15.8,41.5C8,38.6,4.3,33.6,2.5,29.8c-2-4.3-2-7.9-2-8.1V7.3l15.7-6.7l15.6,6.7v14.5
-			c0,0.6-0.2,14.2-15.1,19.7l-0.4,0.2L15.8,41.5z"/>
-		<path style="fill:#FFFFFF;" d="M16.2,1.1l15.1,6.5v14.2c0,0.6-0.2,13.8-14.8,19.2l-0.3,0.1L16,41C8.3,38.2,4.7,33.3,3,29.6
-			c-1.9-4.1-2-7.7-2-7.8V7.6L16.2,1.1 M16.2,0l-0.4,0.2L0.6,6.7L0,6.9v0.7v14.2c0,0.2,0,3.9,2.1,8.3c1.8,3.8,5.6,9,13.6,11.9
-			l0.3,0.1l0.3,0.1l0.3-0.1l0.3-0.1c15.3-5.6,15.5-19.6,15.5-20.2V7.6V6.9l-0.6-0.3L16.6,0.2L16.2,0L16.2,0z"/>
-	</g>
-	<g>
-		<path style="fill:none;" d="M2.5,8.6v13.2c0,0.1,0,3.4,1.8,7.2c2.3,4.9,6.3,8.4,11.9,10.5c13.4-5.1,13.6-17.2,13.6-17.7V8.6
-			L16.2,2.7L2.5,8.6z M16.1,28.3H7v-1.5h9.1V28.3z M16.1,21.5H7V20h9.1V21.5z M16.1,14.2H7v-1.5h9.1V14.2z M20.2,12.7l1.2,1.2l3-3
-			l1,1l-4,4l-2.2-2.2L20.2,12.7z M24.8,22.2l-1,1l-1.5-1.5l-1.5,1.5l-1-1l1.5-1.5l-1.5-1.5l1-1l1.5,1.5l1.5-1.5l1,1l-1.5,1.5
-			L24.8,22.2z M20.2,26.8l1.2,1.2l3-3l1,1l-4,4l-2.2-2.2L20.2,26.8z"/>
-		<path style="fill:#BB501C;" d="M16.2,1.1L1,7.6v14.2c0,0.1,0,3.7,2,7.8c1.7,3.7,5.4,8.6,13,11.4l0.3,0.1l0.3-0.1
-			c14.6-5.4,14.8-18.7,14.8-19.2V7.6L16.2,1.1z M29.8,21.8c0,0.5-0.2,12.6-13.6,17.7C10.6,37.4,6.6,33.9,4.3,29
-			c-1.8-3.9-1.8-7.1-1.8-7.2V8.6l13.7-5.9l13.6,5.9V21.8z"/>
-		<rect x="7" y="12.7" style="fill:#BB501C;" width="9.1" height="1.5"/>
-		<polygon style="fill:#BB501C;" points="25.4,12 24.3,11 21.4,13.9 20.2,12.7 19.1,13.8 21.4,16 		"/>
-		<rect x="7" y="20" style="fill:#BB501C;" width="9.1" height="1.5"/>
-		<polygon style="fill:#BB501C;" points="23.8,18.1 22.3,19.7 20.7,18.1 19.7,19.2 21.2,20.7 19.7,22.2 20.7,23.3 22.3,21.8 
-			23.8,23.3 24.8,22.2 23.3,20.7 24.8,19.2 		"/>
-		<rect x="7" y="26.8" style="fill:#BB501C;" width="9.1" height="1.5"/>
-		<polygon style="fill:#BB501C;" points="25.4,26.1 24.3,25.1 21.4,28 20.2,26.8 19.1,27.9 21.4,30.1 		"/>
-	</g>
-</g>
-</svg>
diff --git a/okitweb/static/okit/palette/deprecated/networking/Subnet.svg b/okitweb/static/okit/palette/deprecated/networking/Subnet.svg
deleted file mode 100644
index 33f2fb8c6..000000000
--- a/okitweb/static/okit/palette/deprecated/networking/Subnet.svg
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 42 42" style="enable-background:new 0 0 42 42;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FFFFFF;}
-	.st1{fill:none;}
-	.st2{fill:#BB501C;}
-</style>
-<g>
-	<g>
-		<g>
-			<polygon class="st0" points="26.33,41.5 26.33,26.33 32.38,26.33 32.38,22.33 9.42,22.33 9.42,26.33 15.67,26.33 15.67,41.5 
-				0.5,41.5 0.5,26.33 6.75,26.33 6.75,22.33 0.5,22.33 0.5,19.67 19.67,19.67 19.67,15.67 13.31,15.67 13.31,0.5 28.48,0.5 
-				28.48,15.67 22.33,15.67 22.33,19.67 41.5,19.67 41.5,22.33 35.04,22.33 35.04,26.33 41.5,26.33 41.5,41.5 			"/>
-			<path class="st0" d="M27.98,1v14.17h-6.15v5H41v1.67h-6.46v5H41V41H26.83V26.83h6.04v-5H8.92v5h6.25V41H1V26.83h6.25v-5H1v-1.67
-				h19.17v-5h-6.35V1H27.98 M28.98,0h-1H13.81h-1v1v14.17v1h1h5.35v3H1H0v1v1.67v1h1h5.25v3H1H0v1V41v1h1h14.17h1v-1V26.83v-1h-1
-				H9.92v-3h21.96v3h-5.04h-1v1V41v1h1H41h1v-1V26.83v-1h-1h-5.46v-3H41h1v-1v-1.67v-1h-1H22.83v-3h5.15h1v-1V1V0L28.98,0z"/>
-		</g>
-		<g>
-			<rect x="15.48" y="2.67" style="fill:none;" width="10.83" height="10.83"/>
-			<rect x="2.67" y="28.5" style="fill:none;" width="10.83" height="10.83"/>
-			<rect x="28.5" y="28.5" style="fill:none;" width="10.83" height="10.83"/>
-			<path style="fill:#BB501C;" d="M41,21.83v-1.67H21.83v-5h6.15V1H13.81v14.17h6.35v5H1v1.67h6.25v5H1V41h14.17V26.83H8.92v-5h23.96v5h-6.04
-				V41H41V26.83h-6.46v-5H41z M13.5,28.5v10.83H2.67V28.5H13.5z M15.48,13.5V2.67h10.83V13.5H15.48z M39.33,28.5v10.83H28.5V28.5
-				H39.33z"/>
-		</g>
-	</g>
-</g>
-</svg>
diff --git a/okitweb/static/okit/palette/deprecated/networking/Virtual_Cloud_Network.svg b/okitweb/static/okit/palette/deprecated/networking/Virtual_Cloud_Network.svg
deleted file mode 100644
index f297b938c..000000000
--- a/okitweb/static/okit/palette/deprecated/networking/Virtual_Cloud_Network.svg
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 43.5 42" style="enable-background:new 0 0 43.5 42;" xml:space="preserve">
-<g>
-	<g>
-		<path style="fill:#FFFFFF;" d="M31.2,41.5c-2.8,0-5.3-2-5.9-4.8h-7.1c-0.6,2.7-3,4.8-5.9,4.8c-3.3,0-6-2.7-6-6
-			c0-2.1,1.2-4.1,3-5.2l-2.2-6.7c-0.2,0-0.4,0-0.6,0c-3.3,0-6-2.7-6-6c0-3.3,2.7-6,6-6c1.5,0,2.9,0.5,4,1.6L16.3,9
-			c-0.3-0.8-0.5-1.6-0.5-2.5c0-3.3,2.7-6,6-6s6,2.7,6,6c0,0.8-0.2,1.7-0.5,2.5l5.7,4.2c1.1-1,2.5-1.6,4-1.6c3.3,0,6,2.7,6,6
-			s-2.7,6-6,6c-0.2,0-0.4,0-0.6,0l-2.2,6.7c1.8,1.1,3,3.1,3,5.2C37.2,38.8,34.5,41.5,31.2,41.5z"/>
-		<path style="fill:#FFFFFF;" d="M21.7,1c3,0,5.5,2.5,5.5,5.5c0,0.9-0.2,1.8-0.7,2.6l6.4,4.7c1-1.1,2.4-1.7,4-1.7
-			c3,0,5.5,2.5,5.5,5.5c0,3-2.5,5.5-5.5,5.5c-0.3,0-0.7,0-1-0.1l-2.5,7.5c1.8,0.9,3.1,2.8,3.1,5c0,3-2.5,5.5-5.5,5.5
-			c-2.8,0-5.1-2.1-5.5-4.8h-7.9c-0.4,2.7-2.7,4.8-5.5,4.8c-3,0-5.5-2.5-5.5-5.5c0-2.2,1.3-4.1,3.1-5L7.5,23c-0.3,0.1-0.7,0.1-1,0.1
-			c-3,0-5.5-2.5-5.5-5.5s2.5-5.5,5.5-5.5c1.6,0,3,0.7,4,1.7l6.4-4.7c-0.4-0.8-0.7-1.7-0.7-2.6C16.2,3.5,18.7,1,21.7,1 M21.7,0
-			c-3.6,0-6.5,2.9-6.5,6.5c0,0.8,0.1,1.6,0.4,2.3l-5.1,3.7c-1.1-0.9-2.6-1.4-4-1.4C2.9,11.1,0,14,0,17.6s2.9,6.5,6.5,6.5
-			c0.1,0,0.2,0,0.3,0l1.9,6c-1.8,1.2-2.9,3.2-2.9,5.4c0,3.6,2.9,6.5,6.5,6.5c2.9,0,5.5-2,6.3-4.8h6.3c0.8,2.8,3.3,4.8,6.3,4.8
-			c3.6,0,6.5-2.9,6.5-6.5c0-2.2-1.1-4.2-2.9-5.4l1.9-6c0.1,0,0.2,0,0.3,0c3.6,0,6.5-2.9,6.5-6.5c0-3.6-2.9-6.5-6.5-6.5
-			c-1.5,0-2.9,0.5-4.1,1.4l-5.1-3.7c0.3-0.7,0.4-1.5,0.4-2.3C28.3,2.9,25.3,0,21.7,0L21.7,0z"/>
-	</g>
-	<g>
-		<path style="fill:#BB501C;" d="M37,12.1c-1.6,0-3,0.7-4,1.7l-6.4-4.7c0.4-0.8,0.7-1.7,0.7-2.6c0-3-2.5-5.5-5.5-5.5
-			s-5.5,2.5-5.5,5.5c0,0.9,0.2,1.8,0.7,2.6l-6.4,4.7c-1-1-2.4-1.7-4-1.7c-3,0-5.5,2.5-5.5,5.5s2.5,5.5,5.5,5.5c0.3,0,0.7,0,1-0.1
-			l2.4,7.5c-1.8,0.9-3.1,2.8-3.1,5c0,3,2.5,5.5,5.5,5.5c2.8,0,5.1-2.1,5.5-4.8h7.9c0.4,2.7,2.7,4.8,5.5,4.8c3,0,5.5-2.5,5.5-5.5
-			c0-2.2-1.3-4.1-3.1-5L36,23c0.3,0.1,0.7,0.1,1,0.1c3,0,5.5-2.5,5.5-5.5S40,12.1,37,12.1z M31.2,39.5c-2.2,0-4-1.8-4-4
-			c0-2.2,1.8-4,4-4s4,1.8,4,4C35.2,37.7,33.4,39.5,31.2,39.5z M17.8,34.8c-0.2-1.3-0.8-2.4-1.7-3.3l3-4.2c0.8,0.4,1.7,0.7,2.6,0.7
-			c0.9,0,1.8-0.2,2.6-0.7l3,4.2c-0.9,0.8-1.5,2-1.7,3.3H17.8z M8.3,35.5c0-2.2,1.8-4,4-4s4,1.8,4,4c0,2.2-1.8,4-4,4
-			S8.3,37.7,8.3,35.5z M6.5,13.5c2.2,0,4,1.8,4,4s-1.8,4-4,4s-4-1.8-4-4S4.3,13.5,6.5,13.5z M17.7,6.5c0-2.2,1.8-4,4-4s4,1.8,4,4
-			s-1.8,4-4,4S17.7,8.7,17.7,6.5z M31.6,18.5l-4.9,1.6c-0.8-1.6-2.4-2.8-4.2-3.1V12c1.3-0.2,2.4-0.8,3.2-1.7l6.4,4.7
-			c-0.4,0.8-0.7,1.7-0.7,2.6C31.5,17.9,31.5,18.2,31.6,18.5z M25.8,22.5c0,2.2-1.8,4-4,4s-4-1.8-4-4s1.8-4,4-4S25.8,20.2,25.8,22.5z
-			 M21,12V17c-1.9,0.3-3.5,1.4-4.2,3.1l-4.9-1.6c0.1-0.3,0.1-0.6,0.1-1c0-0.9-0.2-1.8-0.7-2.6l6.4-4.7C18.6,11.2,19.7,11.8,21,12z
-			 M11.5,19.9l4.9,1.6c-0.1,0.3-0.1,0.6-0.1,1c0,1.6,0.7,3,1.7,4l-3,4.2c-0.8-0.4-1.7-0.7-2.6-0.7c-0.3,0-0.7,0-1,0.1l-2.4-7.5
-			C10,22,10.9,21.1,11.5,19.9z M31.2,30c-0.9,0-1.8,0.2-2.6,0.7l-3-4.2c1.1-1,1.7-2.4,1.7-4c0-0.3,0-0.7-0.1-1l4.9-1.6
-			c0.5,1.1,1.5,2,2.6,2.6l-2.5,7.5C31.8,30,31.5,30,31.2,30z M33,17.6c0-2.2,1.8-4,4-4s4,1.8,4,4s-1.8,4-4,4S33,19.8,33,17.6z"/>
-	</g>
-</g>
-</svg>
diff --git a/okitweb/static/okit/palette/deprecated/storage/Block_Storage_Volume.svg b/okitweb/static/okit/palette/deprecated/storage/Block_Storage_Volume.svg
deleted file mode 100644
index 6af988c3d..000000000
--- a/okitweb/static/okit/palette/deprecated/storage/Block_Storage_Volume.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 42 42" style="enable-background:new 0 0 42 42;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FFFFFF;}
-	.st1{fill:#2C5967;}
-</style>
-<g>
-	<g>
-		<g>
-			<path class="st0" d="M2.67,41.5c-1.19,0-2.17-0.97-2.17-2.17V2.67c0-1.2,0.97-2.17,2.17-2.17h36.67c1.19,0,2.17,0.97,2.17,2.17
-				v36.67c0,1.2-0.97,2.17-2.17,2.17H2.67z"/>
-			<path class="st0" d="M39.33,1C40.25,1,41,1.75,41,2.67v0.97v0.24v35.46c0,0.92-0.75,1.67-1.67,1.67H2.67C1.75,41,1,40.25,1,39.33
-				V3.87V3.64V2.67C1,1.75,1.75,1,2.67,1H39.33 M39.33,0H2.67C1.2,0,0,1.2,0,2.67v0.97v0.24v35.46C0,40.8,1.2,42,2.67,42h36.67
-				C40.8,42,42,40.8,42,39.33V3.87V3.64V2.67C42,1.2,40.8,0,39.33,0L39.33,0z"/>
-		</g>
-		<g>
-			<path class="st1" d="M19.85,9.46H7.4V21.7h12.45V9.46z M18.37,20.22H8.89v-9.28h9.48V20.22z"/>
-			<path class="st1" d="M34.66,9.46H22.21V21.7h12.45V9.46z M33.17,20.22h-9.48v-9.28h9.48V20.22z"/>
-			<path class="st1" d="M19.85,23.99H7.4v12.24h12.45V23.99z M18.37,34.75H8.89v-9.28h9.48V34.75z"/>
-			<path class="st1" d="M34.66,23.99H22.21v12.24h12.45V23.99z M33.17,34.75h-9.48v-9.28h9.48V34.75z"/>
-			<path class="st1" d="M1,39.33C1,40.25,1.75,41,2.67,41h36.67c0.92,0,1.67-0.75,1.67-1.67V4.99H1V39.33z M2.48,6.47h37.04v32.87
-				c0,0.1-0.08,0.19-0.19,0.19H2.67c-0.1,0-0.19-0.08-0.19-0.19V6.47z"/>
-			<path class="st1" d="M39.33,1H2.67C1.75,1,1,1.75,1,2.67v1.21h40V2.67C41,1.75,40.25,1,39.33,1z"/>
-		</g>
-	</g>
-</g>
-</svg>
diff --git a/okitweb/static/okit/palette/deprecated/storage/Object_Storage_Bucket.svg b/okitweb/static/okit/palette/deprecated/storage/Object_Storage_Bucket.svg
deleted file mode 100644
index 588f03879..000000000
--- a/okitweb/static/okit/palette/deprecated/storage/Object_Storage_Bucket.svg
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 42 42" style="enable-background:new 0 0 42 42;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FFFFFF;}
-	.st1{fill:#2C5967;}
-</style>
-<g>
-	<g>
-		<g>
-			<path class="st0" d="M2.67,41.5c-1.19,0-2.17-0.97-2.17-2.17V2.67c0-1.2,0.97-2.17,2.17-2.17h36.67c1.19,0,2.17,0.97,2.17,2.17
-				v36.67c0,1.2-0.97,2.17-2.17,2.17H2.67z"/>
-			<path class="st0" d="M39.33,1C40.25,1,41,1.75,41,2.67v36.67c0,0.92-0.75,1.67-1.67,1.67H2.67C1.75,41,1,40.25,1,39.33V2.67
-				C1,1.75,1.75,1,2.67,1H39.33 M39.33,0H2.67C1.2,0,0,1.2,0,2.67v36.67C0,40.8,1.2,42,2.67,42h36.67C40.8,42,42,40.8,42,39.33V2.67
-				C42,1.2,40.8,0,39.33,0L39.33,0z"/>
-		</g>
-		<g>
-			<g>
-				<path class="st1" d="M30.44,11.65l2.71,4.72l-2.74,4.72h-5.45l-2.71-4.72l2.74-4.72H30.44 M31.3,10.17h-7.16l-3.59,6.2l3.57,6.2
-					h7.16l3.59-6.2L31.3,10.17L31.3,10.17z"/>
-			</g>
-			<g>
-				<path class="st1" d="M20.72,25.94c2.59,0,4.69,2.1,4.69,4.69c0,2.59-2.1,4.69-4.69,4.69c-2.59,0-4.69-2.1-4.69-4.69
-					C16.04,28.05,18.14,25.94,20.72,25.94 M20.72,24.46c-3.42,0-6.17,2.76-6.17,6.17c0,3.42,2.79,6.17,6.17,6.17
-					c3.39,0,6.17-2.76,6.17-6.17C26.9,27.22,24.14,24.46,20.72,24.46L20.72,24.46z"/>
-			</g>
-			<g>
-				<path class="st1" d="M13.6,12.83l4.38,7.93H9.26L13.6,12.83 M13.59,9.75L6.76,22.24h13.72L13.59,9.75L13.59,9.75z"/>
-			</g>
-		</g>
-		<g>
-			<path class="st1" d="M39.33,41H2.67C1.75,41,1,40.25,1,39.33V4.99h40v34.35C41,40.25,40.25,41,39.33,41z M2.48,6.47v32.87
-				c0,0.1,0.08,0.19,0.19,0.19h36.67c0.1,0,0.19-0.08,0.19-0.19V6.47H2.48z"/>
-		</g>
-		<g>
-			<path class="st1" d="M41,3.87H1V2.67C1,1.75,1.75,1,2.67,1h36.67C40.25,1,41,1.75,41,2.67V3.87z"/>
-		</g>
-	</g>
-</g>
-</svg>
diff --git a/okitweb/static/okit/palette/palette.json b/okitweb/static/okit/palette/palette.json
index 49b9474e7..747729b9e 100644
--- a/okitweb/static/okit/palette/palette.json
+++ b/okitweb/static/okit/palette/palette.json
@@ -30,6 +30,11 @@
                     "title": "Analytics Instance",
                     "targets": ["oci", "pca"],
                     "svg": "AnalyticsCloudService.svg"
+                },
+                {
+                    "title": "Bare Metal Compute",
+                    "targets": ["hidden"],
+                    "svg": "BareMetalCompute.svg"
                 }
             ]
         },
@@ -51,6 +56,21 @@
                     "title": "MySQL Database System",
                     "targets": ["oci"],
                     "svg": "MySQLDatabaseServiceMDS.svg"
+                },
+                {
+                    "title": "NoSQL Database",
+                    "targets": ["oci", "hidden"],
+                    "svg": "NoSQLDatabase.svg"
+                },
+                {
+                    "title": "Autonomous Data Warehouse Cloud Service",
+                    "targets": ["hidden"],
+                    "svg": "AutonomousDataWarehouseCloudService.svg"
+                },
+                {
+                    "title": "Exadata Database System",
+                    "targets": ["hidden"],
+                    "svg": "ExadataDatabaseSystem.svg"
                 }
             ]
         },
@@ -63,6 +83,11 @@
                     "targets": ["oci"],
                     "svg": "LoadBalancerLB.svg"
                 },
+                {
+                    "title": "NetworkLoad Balancer",
+                    "targets": ["oci", "hidden"],
+                    "svg": "NetworkLoadBalancerLB.svg"
+                },
                 {
                     "title": "Virtual Cloud Network",
                     "targets": ["oci", "free tier", "pca"],
@@ -166,10 +191,25 @@
             "title": "Identity",
             "svg": "identity.svg",
             "resources": [
+                {
+                    "title": "Bastion",
+                    "targets": ["oci", "pca"],
+                    "svg": "Bastion.svg"
+                },
                 {
                     "title": "Policy",
                     "targets": ["oci", "pca"],
                     "svg": "Policies.svg"
+                },
+                {
+                    "title": "Vault",
+                    "targets": ["oci", "pca", "hidden"],
+                    "svg": "KeyVault.svg"
+                },
+                {
+                    "title": "Key",
+                    "targets": ["oci", "pca", "hidden"],
+                    "svg": "KeyManagement.svg"
                 }
             ]
         }
diff --git a/okitweb/static/okit/palette/svg/Autonomous-Transaction-Processing-ATP.svg b/okitweb/static/okit/palette/svg/AutonomousTransactionProcessingATP.svg
similarity index 100%
rename from okitweb/static/okit/palette/svg/Autonomous-Transaction-Processing-ATP.svg
rename to okitweb/static/okit/palette/svg/AutonomousTransactionProcessingATP.svg
diff --git a/okitweb/static/okit/palette/svg/Bastion.svg b/okitweb/static/okit/palette/svg/Bastion.svg
new file mode 100644
index 000000000..db39be846
--- /dev/null
+++ b/okitweb/static/okit/palette/svg/Bastion.svg
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 40.23 40.23" style="enable-background:new 0 0 40.23 40.23;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;}
+	.st1{fill:none;}
+	.st2{fill:#2C5967;}
+</style>
+<g>
+	<g>
+		<path class="st0" d="M2.59,39.73c-1.15,0-2.09-0.94-2.09-2.09V2.59c0-1.15,0.94-2.09,2.09-2.09h35.04c1.15,0,2.09,0.94,2.09,2.09
+			v35.04c0,1.15-0.94,2.09-2.09,2.09H2.59z"/>
+		<path class="st0" d="M37.64,1c0.88,0,1.59,0.71,1.59,1.59v35.04c0,0.88-0.71,1.59-1.59,1.59H2.59C1.71,39.23,1,38.52,1,37.64V2.59
+			C1,1.71,1.71,1,2.59,1H37.64 M37.64,0H2.59C1.16,0,0,1.16,0,2.59v35.04c0,1.43,1.16,2.59,2.59,2.59h35.04
+			c1.43,0,2.59-1.16,2.59-2.59V2.59C40.23,1.16,39.07,0,37.64,0L37.64,0z"/>
+	</g>
+	<g>
+		<rect x="6.66" y="17.28" class="st1" width="1.06" height="5.66"/>
+		<rect x="14.1" y="17.28" class="st1" width="1.06" height="5.66"/>
+		<rect x="9.14" y="17.28" class="st1" width="1.06" height="5.66"/>
+		<path class="st1" d="M33.57,27.73H6.66v5.66h26.9V27.73z M30.38,31.62c-0.59,0-1.06-0.48-1.06-1.06c0-0.59,0.48-1.06,1.06-1.06
+			c0.59,0,1.06,0.48,1.06,1.06C31.44,31.14,30.97,31.62,30.38,31.62z"/>
+		<rect x="11.62" y="17.28" class="st1" width="1.06" height="5.66"/>
+		<rect x="16.58" y="17.28" class="st1" width="1.06" height="5.66"/>
+		<rect x="11.62" y="6.66" class="st1" width="1.06" height="5.66"/>
+		<rect x="16.58" y="6.66" class="st1" width="1.06" height="5.66"/>
+		<rect x="9.14" y="6.66" class="st1" width="1.06" height="5.66"/>
+		<rect x="30.03" y="17.28" class="st1" width="1.06" height="5.66"/>
+		<rect x="14.1" y="6.66" class="st1" width="1.06" height="5.66"/>
+		<rect x="6.66" y="6.66" class="st1" width="1.06" height="5.66"/>
+		<rect x="27.55" y="17.28" class="st1" width="1.06" height="5.66"/>
+		<rect x="32.5" y="6.66" class="st1" width="1.06" height="5.66"/>
+		<rect x="25.07" y="6.66" class="st1" width="1.06" height="5.66"/>
+		<rect x="30.03" y="6.66" class="st1" width="1.06" height="5.66"/>
+		<rect x="27.55" y="6.66" class="st1" width="1.06" height="5.66"/>
+		<path class="st1" d="M37.64,2.42H2.59c-0.1,0-0.18,0.08-0.18,0.18v35.04c0,0.1,0.08,0.18,0.18,0.18h35.04
+			c0.1,0,0.18-0.08,0.18-0.18V2.59C37.81,2.5,37.73,2.42,37.64,2.42z M5.25,5.25h13.81v8.5H5.25V5.25z M5.25,15.87h13.81v8.5H5.25
+			V15.87z M34.98,34.81H5.25v-8.5h29.73V34.81z M34.98,24.36H21.18v-8.5h13.81V24.36z M34.98,13.74H21.18v-8.5h13.81V13.74z"/>
+		<rect x="22.59" y="6.66" class="st1" width="1.06" height="5.66"/>
+		<rect x="32.5" y="17.28" class="st1" width="1.06" height="5.66"/>
+		<rect x="25.07" y="17.28" class="st1" width="1.06" height="5.66"/>
+		<rect x="22.59" y="17.28" class="st1" width="1.06" height="5.66"/>
+		<path class="st2" d="M37.64,1H2.59C1.71,1,1,1.71,1,2.59v35.04c0,0.88,0.71,1.59,1.59,1.59h35.04c0.88,0,1.59-0.71,1.59-1.59V2.59
+			C39.23,1.71,38.52,1,37.64,1z M37.81,37.64c0,0.1-0.08,0.18-0.18,0.18H2.59c-0.1,0-0.18-0.08-0.18-0.18V2.59
+			c0-0.1,0.08-0.18,0.18-0.18h35.04c0.1,0,0.18,0.08,0.18,0.18V37.64z"/>
+		<path class="st2" d="M5.25,34.81h29.73v-8.5H5.25V34.81z M6.66,27.73h26.9v5.66H6.66V27.73z"/>
+		<circle class="st2" cx="30.38" cy="30.56" r="1.06"/>
+		<path class="st2" d="M19.05,5.25H5.25v8.5h13.81V5.25z M11.62,6.66h1.06v5.66h-1.06V6.66z M10.2,12.33H9.14V6.66h1.06V12.33z
+			 M14.1,6.66h1.06v5.66H14.1V6.66z M6.66,6.66h1.06v5.66H6.66V6.66z M17.64,12.33h-1.06V6.66h1.06V12.33z"/>
+		<path class="st2" d="M21.18,13.74h13.81v-8.5H21.18V13.74z M28.61,12.33h-1.06V6.66h1.06V12.33z M30.03,6.66h1.06v5.66h-1.06V6.66
+			z M26.13,12.33h-1.06V6.66h1.06V12.33z M33.57,12.33H32.5V6.66h1.06V12.33z M22.59,6.66h1.06v5.66h-1.06V6.66z"/>
+		<path class="st2" d="M19.05,15.87H5.25v8.5h13.81V15.87z M11.62,17.28h1.06v5.66h-1.06V17.28z M10.2,22.95H9.14v-5.66h1.06V22.95z
+			 M14.1,17.28h1.06v5.66H14.1V17.28z M6.66,17.28h1.06v5.66H6.66V17.28z M17.64,22.95h-1.06v-5.66h1.06V22.95z"/>
+		<path class="st2" d="M21.18,24.36h13.81v-8.5H21.18V24.36z M28.61,22.95h-1.06v-5.66h1.06V22.95z M30.03,17.28h1.06v5.66h-1.06
+			V17.28z M26.13,22.95h-1.06v-5.66h1.06V22.95z M33.57,22.95H32.5v-5.66h1.06V22.95z M22.59,17.28h1.06v5.66h-1.06V17.28z"/>
+	</g>
+</g>
+</svg>
diff --git a/okitweb/static/okit/palette/svg/Exadata-Database-System.svg b/okitweb/static/okit/palette/svg/Exadata-Database-System.svg
deleted file mode 100644
index 95eeecb62..000000000
--- a/okitweb/static/okit/palette/svg/Exadata-Database-System.svg
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 31.7 42" style="enable-background:new 0 0 31.7 42;" xml:space="preserve">
-<g>
-	<g>
-		<path style="fill:#FFFFFF;" d="M6.3,41.5l0-1.6L8,39.1V16.4H0.5L0.6,15c0.2-2.6,1.7-4.9,4-6.1c0.4-0.2,0.7-0.6,0.8-1
-			C5.8,6,7.1,4.4,8.8,3.7c0.7-0.3,1.6-0.5,2.4-0.5c0.2,0,0.4,0,0.5,0c0,0,0.1,0,0.1,0c0.4,0,0.7-0.2,1-0.4c1.3-1.4,3.2-2.3,5.2-2.3
-			c2.7,0,5.2,1.5,6.4,3.9c0.2,0.4,0.6,0.7,1,0.8c0.8,0.2,1.6,0.5,2.3,0.9c3.2,2,4.3,6.2,2.5,9.6l-0.4,0.7h-4.8v22.6l1.7,0.8v1.6H6.3
-			z"/>
-		<path style="fill:#FFFFFF;" d="M18.1,1c2.5,0,4.8,1.4,5.9,3.7c0.3,0.5,0.8,0.9,1.4,1c0.8,0.2,1.5,0.5,2.1,0.9c3,1.9,4,5.8,2.4,8.9
-			l-0.2,0.4h-5v23.4l1.7,0.8V41h0v0H6.8v0h0v-0.8l1.7-0.8V15.9H1.1l0.1-0.9c0.2-2.4,1.6-4.6,3.8-5.7c0.5-0.3,0.9-0.8,1-1.3
-			C6.3,6.3,7.4,4.8,9,4.1c0.7-0.3,1.4-0.5,2.2-0.5c0.2,0,0.3,0,0.5,0c0.1,0,0.1,0,0.2,0c0.5,0,1-0.2,1.4-0.6C14.5,1.8,16.3,1,18.1,1
-			 M18.1,0c-2.1,0-4.1,0.9-5.6,2.4c-0.2,0.2-0.4,0.3-0.6,0.3c0,0-0.1,0-0.1,0c-0.2,0-0.4,0-0.6,0c-0.9,0-1.8,0.2-2.6,0.5
-			C6.7,4,5.3,5.8,4.9,7.8C4.9,8.1,4.7,8.3,4.4,8.5C2,9.8,0.4,12.2,0.1,15l-0.1,0.9L0,16.9h1.1h6.4v21.8l-1.1,0.5l-0.6,0.3v0.6V41
-			v0.8L6.6,42l0.1,0l0.1,0h19.5h1l0-1l0-0.8l0-0.6l-0.6-0.3l-1.1-0.5V16.9h4h0.6l0.3-0.5l0.2-0.4c1.9-3.6,0.7-8.1-2.7-10.3
-			c-0.8-0.5-1.6-0.8-2.5-1c-0.3-0.1-0.5-0.3-0.7-0.5C23.6,1.6,21,0,18.1,0L18.1,0z"/>
-	</g>
-	<g>
-		<g>
-			<g>
-				<polygon style="fill:#FFFFFF;" points="7.3,40.5 9,39.7 9,9.6 24.1,9.6 24.1,39.7 25.8,40.5 				"/>
-				<path style="fill:#FFFFFF;" d="M23.6,10.1v29.3V40H9.5v-0.6V10.1H23.6 M24.6,9.1H8.5v30.3l-1.7,0.8V41h19.5v-0.8l-1.7-0.8V9.1
-					L24.6,9.1z"/>
-			</g>
-			<path style="fill:#2C5967;" d="M24.6,39.4V9.1H8.5v30.3l-1.7,0.8V41h19.5v-0.8L24.6,39.4z M10.1,10.7H23v28.7H10.1V10.7z
-				 M11.4,11.9h10.4v1.6H11.4V11.9z M20.5,14.7h-7.9v1.4h-1.2v1.6h1.2v1.4h7.9v-1.4h1.2v-1.6h-1.2V14.7z M18.8,17.6h-4.6v-1.2h4.6
-				V17.6z M17.7,32.1l2.4,4.6H18l-1.5-3.2l-1.4,3.2H13l2.4-4.7l-2.2-4.4h2.1l1.4,3l1.4-3H20L17.7,32.1z M13,22h-1.7v-1.6H13V22z
-				 M15.9,22h-1.7v-1.6h1.7V22z M18.8,22h-1.7v-1.6h1.7V22z M20.1,20.4h1.7V22h-1.7V20.4z M13,24.8h-1.7v-1.6H13V24.8z M14.3,23.2
-				h1.7v1.6h-1.7V23.2z M17.2,23.2h1.7v1.6h-1.7V23.2z M20.1,23.2h1.7v1.6h-1.7V23.2z"/>
-		</g>
-		<path style="fill:#2C5967;" d="M29.8,15.5l-0.2,0.4h-4v-1.6h3c1-2.3,0.2-5-2-6.4c-0.5-0.3-1.1-0.5-1.6-0.7c-1.1-0.2-2-0.9-2.4-1.9
-			c-0.9-1.7-2.6-2.8-4.5-2.8c-1.4,0-2.7,0.6-3.7,1.6c-0.7,0.8-1.8,1.2-2.9,1.1c-0.6-0.1-1.3,0-1.9,0.3C8.6,6.1,7.7,7.1,7.5,8.3
-			c-0.2,1.1-0.9,2-1.8,2.5c-1.4,0.7-2.4,2-2.8,3.6h4.5v1.6H1.1l0.1-0.9c0.2-2.4,1.6-4.6,3.8-5.7c0.5-0.3,0.9-0.8,1-1.3
-			C6.3,6.3,7.4,4.8,9,4.1c0.8-0.4,1.8-0.5,2.7-0.4c0.6,0.1,1.2-0.2,1.6-0.6c1.2-1.3,3-2.1,4.8-2.1c2.5,0,4.8,1.4,5.9,3.7
-			c0.3,0.5,0.8,0.9,1.4,1c0.8,0.2,1.5,0.5,2.1,0.9C30.5,8.5,31.5,12.4,29.8,15.5"/>
-	</g>
-</g>
-</svg>
diff --git a/okitweb/static/okit/palette/deprecated/hidden/Exadata_Infrastructure.svg b/okitweb/static/okit/palette/svg/ExadataDatabaseSystem.svg
similarity index 100%
rename from okitweb/static/okit/palette/deprecated/hidden/Exadata_Infrastructure.svg
rename to okitweb/static/okit/palette/svg/ExadataDatabaseSystem.svg
diff --git a/okitweb/static/okit/palette/deprecated/storage/File_Storage_System.svg b/okitweb/static/okit/palette/svg/FileSystem.svg
similarity index 100%
rename from okitweb/static/okit/palette/deprecated/storage/File_Storage_System.svg
rename to okitweb/static/okit/palette/svg/FileSystem.svg
diff --git a/okitweb/static/okit/palette/svg/MountTarget.svg b/okitweb/static/okit/palette/svg/MountTarget.svg
new file mode 100644
index 000000000..4b6dd7789
--- /dev/null
+++ b/okitweb/static/okit/palette/svg/MountTarget.svg
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 26.34 42" style="enable-background:new 0 0 26.34 42;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;}
+	.st1{fill:#2C5967;}
+</style>
+<g>
+	<g>
+		<g>
+			<path class="st0" d="M2.77,41.5c-1.25,0-2.27-1.02-2.27-2.27V13.72c0-1.25,1.02-2.27,2.27-2.27h5.42l-0.55-0.8
+				C5.6,7.7,6.29,3.67,9.18,1.66c1.08-0.75,2.41-1.16,3.77-1.16c2.11,0,4.03,1.02,5.26,2.79c1.54,2.21,1.55,5.17,0.04,7.36
+				l-0.55,0.8h5.87c1.25,0,2.27,1.02,2.27,2.27v25.52c0,1.25-1.02,2.27-2.27,2.27H2.77z"/>
+			<path class="st0" d="M12.95,1c1.95,0,3.72,0.94,4.85,2.57c1.42,2.04,1.43,4.77,0.04,6.79l-1.09,1.58h6.82
+				c0.97,0,1.77,0.79,1.77,1.77v25.52c0,0.97-0.79,1.77-1.77,1.77H2.77C1.79,41,1,40.21,1,39.23V13.72c0-0.97,0.79-1.77,1.77-1.77
+				h6.37l-1.09-1.58C6.17,7.64,6.8,3.92,9.47,2.07C10.46,1.38,11.69,1,12.95,1 M12.95,0c-1.45,0-2.89,0.44-4.05,1.25
+				c-3.12,2.16-3.87,6.51-1.66,9.69l0.01,0.01H2.77C1.24,10.95,0,12.19,0,13.72v25.52C0,40.76,1.24,42,2.77,42h20.81
+				c1.53,0,2.77-1.24,2.77-2.77V13.72c0-1.53-1.24-2.77-2.77-2.77h-4.92l0.01-0.02c1.63-2.36,1.61-5.54-0.04-7.93
+				C17.29,1.1,15.23,0,12.95,0L12.95,0z"/>
+		</g>
+		<g>
+			<path class="st1" d="M23.57,11.95h-5.39l-1.08,1.57h6.47c0.11,0,0.2,0.09,0.2,0.2v25.52c0,0.11-0.09,0.2-0.2,0.2H2.77
+				c-0.11,0-0.2-0.09-0.2-0.2V13.72c0-0.11,0.09-0.2,0.2-0.2h6.02l-1.08-1.57H2.77C1.79,11.95,1,12.74,1,13.72v25.52
+				C1,40.21,1.79,41,2.77,41h20.81c0.97,0,1.77-0.79,1.77-1.77V13.72C25.34,12.74,24.55,11.95,23.57,11.95z"/>
+			<polygon class="st1" points="3.75,21.76 22.59,21.76 22.59,14.7 16.3,14.7 15.22,16.27 21.02,16.27 21.02,20.19 5.32,20.19 
+				5.32,16.27 10.67,16.27 9.6,14.7 3.75,14.7 			"/>
+			<circle class="st1" cx="19.06" cy="18.23" r="0.79"/>
+			<path class="st1" d="M3.75,30.01h18.84v-7.07H3.75V30.01z M5.32,24.51h15.7v3.93H5.32V24.51z"/>
+			<circle class="st1" cx="19.06" cy="26.48" r="0.79"/>
+			<path class="st1" d="M3.75,38.25h18.84v-7.07H3.75V38.25z M5.32,32.76h15.7v3.93H5.32V32.76z"/>
+			<circle class="st1" cx="19.06" cy="34.72" r="0.79"/>
+			<path class="st1" d="M12.95,17.5l4.89-7.13c1.39-2.02,1.38-4.75-0.04-6.79C16.66,1.94,14.89,1,12.95,1
+				c-1.25,0-2.49,0.38-3.48,1.07c-2.67,1.85-3.3,5.57-1.41,8.3L12.95,17.5z M16.51,4.47c1.05,1.51,1.06,3.52,0.04,5.01l-3.6,5.25
+				l-3.6-5.25l0,0c-1.4-2.01-0.94-4.76,1.01-6.12c0.72-0.5,1.66-0.79,2.59-0.79C14.37,2.57,15.67,3.26,16.51,4.47z"/>
+			<path class="st1" d="M12.95,9.61c1.39,0,2.52-1.13,2.52-2.52c0-1.39-1.13-2.52-2.52-2.52c-1.39,0-2.52,1.13-2.52,2.52
+				C10.42,8.48,11.56,9.61,12.95,9.61z M12.95,6.14c0.52,0,0.95,0.43,0.95,0.95c0,0.52-0.43,0.95-0.95,0.95s-0.95-0.43-0.95-0.95
+				C11.99,6.57,12.42,6.14,12.95,6.14z"/>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/okitweb/static/okit/palette/svg/NoSQL-Database.svg b/okitweb/static/okit/palette/svg/NoSQLDatabase.svg
similarity index 100%
rename from okitweb/static/okit/palette/svg/NoSQL-Database.svg
rename to okitweb/static/okit/palette/svg/NoSQLDatabase.svg
diff --git a/okitweb/static/okit/palette/svg/User.svg b/okitweb/static/okit/palette/svg/User.svg
index 950a971f5..2d685907e 100644
--- a/okitweb/static/okit/palette/svg/User.svg
+++ b/okitweb/static/okit/palette/svg/User.svg
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Generator: Adobe Illustrator 24.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 32.98 42" style="enable-background:new 0 0 32.98 42;" xml:space="preserve">
+	 viewBox="0 0 42 42" style="enable-background:new 0 0 42 42;" xml:space="preserve">
 <style type="text/css">
 	.st0{fill:#FFFFFF;}
 	.st1{fill:#2C5967;}
 	.st2{fill:#FFFFFF;stroke:#FFFFFF;stroke-miterlimit:10;}
 </style>
-<g>
+<g transform="translate(5,2)">
 	<g>
 		<g>
 			<path class="st0" d="M16.49,21.29c-5.73,0-10.4-4.66-10.4-10.39c0-5.73,4.66-10.4,10.4-10.4c5.73,0,10.4,4.66,10.4,10.4
diff --git a/okitweb/static/okit/palette/svg/UserGroup.svg b/okitweb/static/okit/palette/svg/UserGroup.svg
index 873a6b453..1c65326d3 100644
--- a/okitweb/static/okit/palette/svg/UserGroup.svg
+++ b/okitweb/static/okit/palette/svg/UserGroup.svg
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Generator: Adobe Illustrator 24.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 56.9 42" style="enable-background:new 0 0 56.9 42;" xml:space="preserve">
-<g>
+	 viewBox="0 0 57 57" style="enable-background:new 0 0 57 57;" xml:space="preserve">
+<g transform="translate(0,8)">
 	<g>
 		<path style="fill:#FFFFFF;" d="M0.5,41.5V26.3c0-3,2.4-5.4,5.4-5.4H8v-0.3c-2.2-1.3-3.7-3.7-3.7-6.4c0-4.1,3.3-7.4,7.4-7.4
 			s7.4,3.3,7.4,7.4c0,2.6-1.4,4.9-3.5,6.3h0.5c1.2-1.5,3-2.4,5-2.4h2.6V17c-2.6-1.6-4.2-4.5-4.2-7.6c0-4.9,4-8.9,8.9-8.9
diff --git a/okitweb/static/okit/view/designer/js/artefacts/autonomous_database.js b/okitweb/static/okit/view/designer/js/artefacts/autonomous_database.js
index e57af310f..d0f07ec79 100644
--- a/okitweb/static/okit/view/designer/js/artefacts/autonomous_database.js
+++ b/okitweb/static/okit/view/designer/js/artefacts/autonomous_database.js
@@ -13,6 +13,7 @@ class AutonomousDatabaseView extends OkitDesignerArtefactView {
     }
 
     // -- Reference
+    get icon_definition_id() {return this.db_workload.startsWith('DW') ? OkitJsonView.toSvgIconDef('AutonomousDataWarehouseCloudService') : super.icon_definition_id;}
     get parent_id() {
         let subnet = this.getJsonView().getSubnet(this.artefact.subnet_id);
         if (subnet && subnet.compartment_id === this.artefact.compartment_id) {
diff --git a/okitweb/static/okit/view/designer/js/artefacts/bastion.js b/okitweb/static/okit/view/designer/js/artefacts/bastion.js
new file mode 100644
index 000000000..b50bca983
--- /dev/null
+++ b/okitweb/static/okit/view/designer/js/artefacts/bastion.js
@@ -0,0 +1,168 @@
+/*
+** Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+*/
+console.info('Loaded Bastion View Javascript');
+
+/*
+** Define Bastion View Class
+*/
+class BastionView extends OkitArtefactView {
+    constructor(artefact=null, json_view) {
+        if (!json_view.bastions) json_view.bastions = [];
+        super(artefact, json_view);
+    }
+    // -- Reference
+    get parent_id() {
+        let primary_subnet = this.getJsonView().getSubnet(this.subnet_id);
+        if (primary_subnet && primary_subnet.compartment_id === this.artefact.compartment_id) {
+            return this.subnet_id;
+        } else {
+            return this.compartment_id;
+        }
+    }
+    get parent() {return this.getJsonView().getSubnet(this.parent_id) ? this.getJsonView().getSubnet(this.parent_id) : this.getJsonView().getCompartment(this.parent_id);}
+    // Direct Subnet Access
+    get subnet_id() {return this.artefact.target_subnet_id;}
+    set subnet_id(id) {this.artefact.target_subnet_id = id;}
+    /*
+    ** SVG Processing
+    */
+    /*
+    ** Property Sheet Load function
+    */
+    loadProperties() {
+        const self = this;
+        $(jqId(PROPERTIES_PANEL)).load("propertysheets/bastion.html", () => {loadPropertiesSheet(self.artefact);});
+    }
+    /*
+    ** Load and display Value Proposition
+    */
+    loadValueProposition() {
+        $(jqId(VALUE_PROPOSITION_PANEL)).load("valueproposition/bastion.html");
+    }
+    /*
+    ** Static Functionality
+    */
+    static getArtifactReference() {
+        return Bastion.getArtifactReference();
+    }
+    static getDropTargets() {
+        return [Compartment.getArtifactReference(), Subnet.getArtifactReference()];
+    }
+}
+/*
+** Dynamically Add View Functions
+*/
+OkitJsonView.prototype.dropBastionView = function(target) {
+    let view_artefact = this.newBastion();
+    if (target.type === Subnet.getArtifactReference()) {
+        view_artefact.getArtefact().target_subnet_id = target.id;
+        view_artefact.getArtefact().compartment_id = target.compartment_id;
+    } else if (target.type === Compartment.getArtifactReference()) {
+        view_artefact.getArtefact().compartment_id = target.id;
+}
+    view_artefact.recalculate_dimensions = true;
+    return view_artefact;
+}
+OkitJsonView.prototype.newBastion = function(obj) {
+    this.getBastions().push(obj ? new BastionView(obj, this) : new BastionView(this.okitjson.newBastion(), this));
+    return this.getBastions()[this.getBastions().length - 1];
+}
+OkitJsonView.prototype.getBastions = function() {
+    if (!this.bastions) {
+        this.bastions = [];
+    }
+    return this.bastions;
+}
+OkitJsonView.prototype.getBastion = function(id='') {
+    for (let artefact of this.getBastions()) {
+        if (artefact.id === id) {
+            return artefact;
+        }
+    }
+    return undefined;
+}
+OkitJsonView.prototype.loadBastions = function(bastions) {
+    for (const artefact of bastions) {
+        this.getBastions().push(new BastionView(new Bastion(artefact, this.okitjson), this));
+    }
+}
+OkitJsonView.prototype.moveBastion = function(id) {
+    // Build Dialog
+    const self = this;
+    let bastion = this.getBastion(id);
+    $(jqId('modal_dialog_title')).text('Move ' + bastion.display_name);
+    $(jqId('modal_dialog_body')).empty();
+    $(jqId('modal_dialog_footer')).empty();
+    const table = d3.select(d3Id('modal_dialog_body')).append('div')
+        .attr('class', 'table okit-table');
+    const tbody = table.append('div')
+        .attr('class', 'tbody');
+    // Subnet
+    let tr = tbody.append('div')
+        .attr('class', 'tr');
+    tr.append('div')
+        .attr('class', 'td')
+        .text('Subnet');
+    tr.append('div')
+        .attr('class', 'td')
+        .append('select')
+        .attr('id', 'move_bastion_subnet_id');
+    // Load Subnets
+    this.loadSubnetsSelect('move_bastion_subnet_id');
+    $(jqId("move_bastion_subnet_id")).val(bastion.artefact.subnet_id);
+    // Submit Button
+    const submit = d3.select(d3Id('modal_dialog_footer')).append('div').append('button')
+        .attr('id', 'submit_query_btn')
+        .attr('type', 'button')
+        .text('Move')
+        .on('click', function () {
+            $(jqId('modal_dialog_wrapper')).addClass('hidden');
+            if (bastion.artefact.subnet_id !== $(jqId("move_bastion_subnet_id")).val()) {
+                self.getSubnet(bastion.artefact.subnet_id).recalculate_dimensions = true;
+                self.getSubnet($(jqId("move_bastion_subnet_id")).val()).recalculate_dimensions = true;
+                bastion.artefact.subnet_id = $(jqId("move_bastion_subnet_id")).val();
+                bastion.artefact.compartment_id = self.getSubnet(bastion.artefact.subnet_id).artefact.compartment_id;
+            }
+            self.update(this.okitjson);
+        });
+    $(jqId('modal_dialog_wrapper')).removeClass('hidden');
+}
+OkitJsonView.prototype.pasteBastion = function(drop_target) {
+    const clone = this.copied_artefact.artefact.clone();
+    clone.display_name += 'Copy';
+    if (this.paste_count) {clone.display_name += `-${this.paste_count}`;}
+    this.paste_count += 1;
+    clone.id = clone.okit_id;
+    if (drop_target.getArtifactReference() === Subnet.getArtifactReference()) {
+        clone.subnet_id = drop_target.id;
+        clone.compartment_id = drop_target.compartment_id;
+    }
+    this.okitjson.bastions.push(clone);
+    this.update(this.okitjson);
+}
+OkitJsonView.prototype.loadBastionsSelect = function(select_id, empty_option=false) {
+    $(jqId(select_id)).empty();
+    const bastion_select = $(jqId(select_id));
+    if (empty_option) {
+        bastion_select.append($('<option>').attr('value', '').text(''));
+    }
+    for (let bastion of this.getBastions()) {
+        bastion_select.append($('<option>').attr('value', bastion.id).text(bastion.display_name));
+    }
+}
+OkitJsonView.prototype.loadBastionsMultiSelect = function(select_id) {
+    $(jqId(select_id)).empty();
+    const multi_select = d3.select(d3Id(select_id));
+    for (let bastion of this.getBastions()) {
+        const div = multi_select.append('div');
+        div.append('input')
+            .attr('type', 'checkbox')
+            .attr('id', safeId(bastion.id))
+            .attr('value', bastion.id);
+        div.append('label')
+            .attr('for', safeId(bastion.id))
+            .text(bastion.display_name);
+    }
+}
diff --git a/okitweb/static/okit/view/designer/js/artefacts/compartment.js b/okitweb/static/okit/view/designer/js/artefacts/compartment.js
index 7d11032dc..de5b9205a 100644
--- a/okitweb/static/okit/view/designer/js/artefacts/compartment.js
+++ b/okitweb/static/okit/view/designer/js/artefacts/compartment.js
@@ -83,7 +83,7 @@ class CompartmentView extends OkitContainerDesignerArtefactView {
     }
 
     getLeftArtifacts() {
-        return [BlockStorageVolume.getArtifactReference(), Policy.getArtifactReference(), Group.getArtifactReference(), User.getArtifactReference(), DynamicGroup.getArtifactReference()];
+        return [Bastion.getArtifactReference(), BlockStorageVolume.getArtifactReference(), Policy.getArtifactReference(), Group.getArtifactReference(), User.getArtifactReference(), DynamicGroup.getArtifactReference()];
     }
 
     getRightArtifacts() {
diff --git a/okitweb/static/okit/view/designer/js/artefacts/database_system.js b/okitweb/static/okit/view/designer/js/artefacts/database_system.js
index 566dffe75..6d56d143b 100644
--- a/okitweb/static/okit/view/designer/js/artefacts/database_system.js
+++ b/okitweb/static/okit/view/designer/js/artefacts/database_system.js
@@ -23,6 +23,8 @@ class DatabaseSystemView extends OkitDesignerArtefactView {
         }
         return false;
     }
+    // ---- Icon
+    get icon_definition_id() {return this.shape.startsWith('Exadata.') ? OkitJsonView.toSvgIconDef('ExadataDatabaseSystem') : super.icon_definition_id;}
     get parent_id() {return this.artefact.subnet_id;}
     get parent() {return this.getJsonView().getSubnet(this.parent_id);}
     // Direct Subnet Access
diff --git a/okitweb/static/okit/view/designer/js/artefacts/dhcp_option.js b/okitweb/static/okit/view/designer/js/artefacts/dhcp_option.js
index 5f2566652..f1fc7fd4a 100644
--- a/okitweb/static/okit/view/designer/js/artefacts/dhcp_option.js
+++ b/okitweb/static/okit/view/designer/js/artefacts/dhcp_option.js
@@ -24,6 +24,7 @@ class DhcpOptionView extends OkitArtefactView {
     }
     get parent_id() {return this.attached_id ? this.attached_id : this.artefact.vcn_id;}
     get parent() {return this.attached_id ? this.getJsonView().getSubnet(this.parent_id) : this.getJsonView().getVirtualCloudNetwork(this.parent_id);}
+    get vcn_name() {return this.getJsonView().getVirtualCloudNetwork(this.vcn_id).display_name}
     /*
     ** SVG Processing
     */
@@ -111,8 +112,8 @@ class DhcpOptionView extends OkitArtefactView {
                 const option_type = this.options[this.selectedIndex].value;
                 // Reset Other Options
                 option.server_type = '';
-                option.custom_dns_servers = '';
-                option.search_domain_names = '';
+                option.custom_dns_servers = [];
+                option.search_domain_names = [];
                 // Get Type
                 option['type'] = option_type;
                 if (option_type === 'DomainNameServer') {
@@ -126,8 +127,12 @@ class DhcpOptionView extends OkitArtefactView {
                     $(jqId("server_type_row" + option_idx)).addClass('collapsed');
                     $(jqId("custom_dns_servers_row" + option_idx)).addClass('collapsed');
                     $(jqId("search_domain_names_row" + option_idx)).removeClass('collapsed');
+                    option.search_domain_names = [`${self.vcn_name.split('-').join('')}.oraclevcn.com`];
                 }
-                displayOkitJson();
+                $(jqId(`server_type${option_idx}`)).val(option.server_type);
+                $(jqId(`custom_dns_servers${option_idx}`)).val(option.custom_dns_servers);
+                $(jqId(`search_domain_names${option_idx}`)).val(option.search_domain_names);
+            displayOkitJson();
             });
         types_map.forEach((value, key) => {
             type_select.append('option')
@@ -205,17 +210,17 @@ class DhcpOptionView extends OkitArtefactView {
             $(jqId("server_type_row" + option_idx)).removeClass('collapsed');
             $(jqId("custom_dns_servers_row" + option_idx)).removeClass('collapsed');
             $(jqId("search_domain_names_row" + option_idx)).addClass('collapsed');
+            if (option.server_type === 'VcnLocalPlusInternet') {
+                $(jqId("custom_dns_servers_row" + option_idx)).addClass('collapsed');
+            } else {
+                $(jqId("custom_dns_servers_row" + option_idx)).removeClass('collapsed');
+            }
         } else {
             $(jqId("server_type_row" + option_idx)).addClass('collapsed');
             $(jqId("custom_dns_servers_row" + option_idx)).addClass('collapsed');
             $(jqId("search_domain_names_row" + option_idx)).removeClass('collapsed');
         }
-        if (option.server_type === 'VcnLocalPlusInternet') {
-            $(jqId("custom_dns_servers_row" + option_idx)).addClass('collapsed');
-        } else {
-            $(jqId("custom_dns_servers_row" + option_idx)).removeClass('collapsed');
-        }
-}
+    }
     /*
     ** Load and display Value Proposition
     */
diff --git a/okitweb/static/okit/view/designer/js/artefacts/file_system.js b/okitweb/static/okit/view/designer/js/artefacts/file_system.js
new file mode 100644
index 000000000..e87c14d92
--- /dev/null
+++ b/okitweb/static/okit/view/designer/js/artefacts/file_system.js
@@ -0,0 +1,163 @@
+/*
+** Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+*/
+console.info('Loaded File System View Javascript');
+
+/*
+** Define File System View Class
+*/
+class FileSystemView extends OkitArtefactView {
+    constructor(artefact=null, json_view) {
+        if (!json_view.file_systems) json_view.file_systems = [];
+        super(artefact, json_view);
+    }
+    // TODO: Return Artefact Parent id e.g. vcn_id for a Internet Gateway
+    get parent_id() {return this.artefact.vcn_id;}
+    // TODO: Return Artefact Parent Object e.g. VirtualCloudNetwork for a Internet Gateway
+    get parent() {return this.getJsonView().getVirtualCloudNetwork(this.parent_id);}
+    // TODO: If the Resource is within a Subnet but the subnet_iss is not at the top level then raise it with the following functions if not required delete them.
+    // Direct Subnet Access
+    get subnet_id() {return this.artefact.primary_mount_target.subnet_id;}
+    set subnet_id(id) {this.artefact.primary_mount_target.subnet_id = id;}
+    /*
+    ** SVG Processing
+    */
+    /*
+    ** Property Sheet Load function
+    */
+    loadProperties() {
+        const self = this;
+        $(jqId(PROPERTIES_PANEL)).load("propertysheets/file_system.html", () => {loadPropertiesSheet(self.artefact);});
+    }
+    /*
+    ** Load and display Value Proposition
+    */
+    loadValueProposition() {
+        $(jqId(VALUE_PROPOSITION_PANEL)).load("valueproposition/file_system.html");
+    }
+    /*
+    ** Static Functionality
+    */
+    static getArtifactReference() {
+        return FileSystem.getArtifactReference();
+    }
+    static getDropTargets() {
+        // TODO: Return List of Artefact Drop Targets Parent Object Reference Names e.g. VirtualCloudNetwork for a Internet Gateway
+        return [Compartment.getArtifactReference()];
+    }
+}
+/*
+** Dynamically Add View Functions
+*/
+OkitJsonView.prototype.dropFileSystemView = function(target) {
+    let view_artefact = this.newFileSystem();
+    if (target.type === Compartment.getArtifactReference()) {
+        view_artefact.artefact.compartment_id = target.id;
+    } else {
+        view_artefact.artefact.compartment_id = target.compartment_id;
+    }
+    view_artefact.recalculate_dimensions = true;
+    return view_artefact;
+}
+OkitJsonView.prototype.newFileSystem = function(obj) {
+    this.getFileSystems().push(obj ? new FileSystemView(obj, this) : new FileSystemView(this.okitjson.newFileSystem(), this));
+    return this.getFileSystems()[this.getFileSystems().length - 1];
+}
+OkitJsonView.prototype.getFileSystems = function() {
+    if (!this.file_systems) {
+        this.file_systems = [];
+    }
+    return this.file_systems;
+}
+OkitJsonView.prototype.getFileSystem = function(id='') {
+    for (let artefact of this.getFileSystems()) {
+        if (artefact.id === id) {
+            return artefact;
+        }
+    }
+    return undefined;
+}
+OkitJsonView.prototype.loadFileSystems = function(file_systems) {
+    for (const artefact of file_systems) {
+        this.getFileSystems().push(new FileSystemView(new FileSystem(artefact, this.okitjson), this));
+    }
+}
+OkitJsonView.prototype.moveFileSystem = function(id) {
+    // Build Dialog
+    const self = this;
+    let file_system = this.getFileSystem(id);
+    $(jqId('modal_dialog_title')).text('Move ' + file_system.display_name);
+    $(jqId('modal_dialog_body')).empty();
+    $(jqId('modal_dialog_footer')).empty();
+    const table = d3.select(d3Id('modal_dialog_body')).append('div')
+        .attr('class', 'table okit-table');
+    const tbody = table.append('div')
+        .attr('class', 'tbody');
+    // Subnet
+    let tr = tbody.append('div')
+        .attr('class', 'tr');
+    tr.append('div')
+        .attr('class', 'td')
+        .text('Subnet');
+    tr.append('div')
+        .attr('class', 'td')
+        .append('select')
+        .attr('id', 'move_file_system_subnet_id');
+    // Load Subnets
+    this.loadSubnetsSelect('move_file_system_subnet_id');
+    $(jqId("move_file_system_subnet_id")).val(file_system.artefact.subnet_id);
+    // Submit Button
+    const submit = d3.select(d3Id('modal_dialog_footer')).append('div').append('button')
+        .attr('id', 'submit_query_btn')
+        .attr('type', 'button')
+        .text('Move')
+        .on('click', function () {
+            $(jqId('modal_dialog_wrapper')).addClass('hidden');
+            if (file_system.artefact.subnet_id !== $(jqId("move_file_system_subnet_id")).val()) {
+                self.getSubnet(file_system.artefact.subnet_id).recalculate_dimensions = true;
+                self.getSubnet($(jqId("move_file_system_subnet_id")).val()).recalculate_dimensions = true;
+                file_system.artefact.subnet_id = $(jqId("move_file_system_subnet_id")).val();
+                file_system.artefact.compartment_id = self.getSubnet(file_system.artefact.subnet_id).artefact.compartment_id;
+            }
+            self.update(this.okitjson);
+        });
+    $(jqId('modal_dialog_wrapper')).removeClass('hidden');
+}
+OkitJsonView.prototype.pasteFileSystem = function(drop_target) {
+    const clone = this.copied_artefact.artefact.clone();
+    clone.display_name += 'Copy';
+    if (this.paste_count) {clone.display_name += `-${this.paste_count}`;}
+    this.paste_count += 1;
+    clone.id = clone.okit_id;
+    if (drop_target.getArtifactReference() === Subnet.getArtifactReference()) {
+        clone.subnet_id = drop_target.id;
+        clone.compartment_id = drop_target.compartment_id;
+    }
+    this.okitjson.file_systems.push(clone);
+    this.update(this.okitjson);
+}
+OkitJsonView.prototype.loadFileSystemsSelect = function(select_id, empty_option=false) {
+    $(jqId(select_id)).empty();
+    const file_system_select = $(jqId(select_id));
+    if (empty_option) {
+        file_system_select.append($('<option>').attr('value', '').text(''));
+    }
+    for (let file_system of this.getFileSystems()) {
+        file_system_select.append($('<option>').attr('value', file_system.id).text(file_system.display_name));
+    }
+}
+OkitJsonView.prototype.loadFileSystemsMultiSelect = function(select_id) {
+    $(jqId(select_id)).empty();
+    const multi_select = d3.select(d3Id(select_id));
+    for (let file_system of this.getFileSystems()) {
+        const div = multi_select.append('div');
+        div.append('input')
+            .attr('type', 'checkbox')
+            .attr('id', safeId(file_system.id))
+            .attr('value', file_system.id);
+        div.append('label')
+            .attr('for', safeId(file_system.id))
+            .text(file_system.display_name);
+    }
+}
diff --git a/okitweb/static/okit/view/designer/js/artefacts/instance.js b/okitweb/static/okit/view/designer/js/artefacts/instance.js
index a3e57f07d..4e2602d89 100644
--- a/okitweb/static/okit/view/designer/js/artefacts/instance.js
+++ b/okitweb/static/okit/view/designer/js/artefacts/instance.js
@@ -25,7 +25,7 @@ class InstanceView extends OkitDesignerArtefactView {
     // --- Dimensions
     // TODO: Decide if show attachments is required
     // ---- Icon
-    get icon_definition_id() {return this.shape.startsWith('BM.') ? 'BareMetalInstanceSvg' : super.icon_definition_id;}
+    get icon_definition_id() {return this.shape.startsWith('BM.') ? OkitJsonView.toSvgIconDef('BareMetalCompute') : super.icon_definition_id;}
     // ---- Text
     get summary_tooltip() {return `Name: ${this.display_name} \nAvailability Domain: ${this.artefact.availability_domain} \nShape: ${this.artefact.shape} \nOS: ${this.source_details.os} ${this.source_details.version}`;}
     // Direct Subnet Access
diff --git a/okitweb/static/okit/view/designer/js/artefacts/key.js b/okitweb/static/okit/view/designer/js/artefacts/key.js
new file mode 100644
index 000000000..a0bad090e
--- /dev/null
+++ b/okitweb/static/okit/view/designer/js/artefacts/key.js
@@ -0,0 +1,163 @@
+/*
+** Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+*/
+console.info('Loaded Key View Javascript');
+
+/*
+** Define Key View Class
+*/
+class KeyView extends OkitArtefactView {
+    constructor(artefact=null, json_view) {
+        if (!json_view.keys) json_view.keys = [];
+        super(artefact, json_view);
+    }
+    // TODO: Return Artefact Parent id e.g. vcn_id for a Internet Gateway
+    get parent_id() {return this.artefact.vcn_id;}
+    // TODO: Return Artefact Parent Object e.g. VirtualCloudNetwork for a Internet Gateway
+    get parent() {return this.getJsonView().getVirtualCloudNetwork(this.parent_id);}
+    // TODO: If the Resource is within a Subnet but the subnet_iss is not at the top level then raise it with the following functions if not required delete them.
+    // Direct Subnet Access
+    get subnet_id() {return this.artefact.primary_mount_target.subnet_id;}
+    set subnet_id(id) {this.artefact.primary_mount_target.subnet_id = id;}
+    /*
+    ** SVG Processing
+    */
+    /*
+    ** Property Sheet Load function
+    */
+    loadProperties() {
+        const self = this;
+        $(jqId(PROPERTIES_PANEL)).load("propertysheets/key.html", () => {loadPropertiesSheet(self.artefact);});
+    }
+    /*
+    ** Load and display Value Proposition
+    */
+    loadValueProposition() {
+        $(jqId(VALUE_PROPOSITION_PANEL)).load("valueproposition/key.html");
+    }
+    /*
+    ** Static Functionality
+    */
+    static getArtifactReference() {
+        return Key.getArtifactReference();
+    }
+    static getDropTargets() {
+        // TODO: Return List of Artefact Drop Targets Parent Object Reference Names e.g. VirtualCloudNetwork for a Internet Gateway
+        return [VirtualCloudNetwork.getArtifactReference()];
+    }
+}
+/*
+** Dynamically Add View Functions
+*/
+OkitJsonView.prototype.dropKeyView = function(target) {
+    let view_artefact = this.newKey();
+    if (target.type === Compartment.getArtifactReference()) {
+        view_artefact.artefact.compartment_id = target.id;
+    } else {
+        view_artefact.artefact.compartment_id = target.compartment_id;
+    }
+    view_artefact.recalculate_dimensions = true;
+    return view_artefact;
+}
+OkitJsonView.prototype.newKey = function(obj) {
+    this.getKeys().push(obj ? new KeyView(obj, this) : new KeyView(this.okitjson.newKey(), this));
+    return this.getKeys()[this.getKeys().length - 1];
+}
+OkitJsonView.prototype.getKeys = function() {
+    if (!this.keys) {
+        this.keys = [];
+    }
+    return this.keys;
+}
+OkitJsonView.prototype.getKey = function(id='') {
+    for (let artefact of this.getKeys()) {
+        if (artefact.id === id) {
+            return artefact;
+        }
+    }
+    return undefined;
+}
+OkitJsonView.prototype.loadKeys = function(keys) {
+    for (const artefact of keys) {
+        this.getKeys().push(new KeyView(new Key(artefact, this.okitjson), this));
+    }
+}
+OkitJsonView.prototype.moveKey = function(id) {
+    // Build Dialog
+    const self = this;
+    let key = this.getKey(id);
+    $(jqId('modal_dialog_title')).text('Move ' + key.display_name);
+    $(jqId('modal_dialog_body')).empty();
+    $(jqId('modal_dialog_footer')).empty();
+    const table = d3.select(d3Id('modal_dialog_body')).append('div')
+        .attr('class', 'table okit-table');
+    const tbody = table.append('div')
+        .attr('class', 'tbody');
+    // Subnet
+    let tr = tbody.append('div')
+        .attr('class', 'tr');
+    tr.append('div')
+        .attr('class', 'td')
+        .text('Subnet');
+    tr.append('div')
+        .attr('class', 'td')
+        .append('select')
+        .attr('id', 'move_key_subnet_id');
+    // Load Subnets
+    this.loadSubnetsSelect('move_key_subnet_id');
+    $(jqId("move_key_subnet_id")).val(key.artefact.subnet_id);
+    // Submit Button
+    const submit = d3.select(d3Id('modal_dialog_footer')).append('div').append('button')
+        .attr('id', 'submit_query_btn')
+        .attr('type', 'button')
+        .text('Move')
+        .on('click', function () {
+            $(jqId('modal_dialog_wrapper')).addClass('hidden');
+            if (key.artefact.subnet_id !== $(jqId("move_key_subnet_id")).val()) {
+                self.getSubnet(key.artefact.subnet_id).recalculate_dimensions = true;
+                self.getSubnet($(jqId("move_key_subnet_id")).val()).recalculate_dimensions = true;
+                key.artefact.subnet_id = $(jqId("move_key_subnet_id")).val();
+                key.artefact.compartment_id = self.getSubnet(key.artefact.subnet_id).artefact.compartment_id;
+            }
+            self.update(this.okitjson);
+        });
+    $(jqId('modal_dialog_wrapper')).removeClass('hidden');
+}
+OkitJsonView.prototype.pasteKey = function(drop_target) {
+    const clone = this.copied_artefact.artefact.clone();
+    clone.display_name += 'Copy';
+    if (this.paste_count) {clone.display_name += `-${this.paste_count}`;}
+    this.paste_count += 1;
+    clone.id = clone.okit_id;
+    if (drop_target.getArtifactReference() === Subnet.getArtifactReference()) {
+        clone.subnet_id = drop_target.id;
+        clone.compartment_id = drop_target.compartment_id;
+    }
+    this.okitjson.keys.push(clone);
+    this.update(this.okitjson);
+}
+OkitJsonView.prototype.loadKeysSelect = function(select_id, empty_option=false) {
+    $(jqId(select_id)).empty();
+    const key_select = $(jqId(select_id));
+    if (empty_option) {
+        key_select.append($('<option>').attr('value', '').text(''));
+    }
+    for (let key of this.getKeys()) {
+        key_select.append($('<option>').attr('value', key.id).text(key.display_name));
+    }
+}
+OkitJsonView.prototype.loadKeysMultiSelect = function(select_id) {
+    $(jqId(select_id)).empty();
+    const multi_select = d3.select(d3Id(select_id));
+    for (let key of this.getKeys()) {
+        const div = multi_select.append('div');
+        div.append('input')
+            .attr('type', 'checkbox')
+            .attr('id', safeId(key.id))
+            .attr('value', key.id);
+        div.append('label')
+            .attr('for', safeId(key.id))
+            .text(key.display_name);
+    }
+}
diff --git a/okitweb/static/okit/view/designer/js/artefacts/mount_target.js b/okitweb/static/okit/view/designer/js/artefacts/mount_target.js
new file mode 100644
index 000000000..abad4d320
--- /dev/null
+++ b/okitweb/static/okit/view/designer/js/artefacts/mount_target.js
@@ -0,0 +1,163 @@
+/*
+** Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+*/
+console.info('Loaded Mount Target View Javascript');
+
+/*
+** Define Mount Target View Class
+*/
+class MountTargetView extends OkitArtefactView {
+    constructor(artefact=null, json_view) {
+        if (!json_view.mount_targets) json_view.mount_targets = [];
+        super(artefact, json_view);
+    }
+    // TODO: Return Artefact Parent id e.g. vcn_id for a Internet Gateway
+    get parent_id() {return this.artefact.vcn_id;}
+    // TODO: Return Artefact Parent Object e.g. VirtualCloudNetwork for a Internet Gateway
+    get parent() {return this.getJsonView().getVirtualCloudNetwork(this.parent_id);}
+    // TODO: If the Resource is within a Subnet but the subnet_iss is not at the top level then raise it with the following functions if not required delete them.
+    // Direct Subnet Access
+    get subnet_id() {return this.artefact.primary_mount_target.subnet_id;}
+    set subnet_id(id) {this.artefact.primary_mount_target.subnet_id = id;}
+    /*
+    ** SVG Processing
+    */
+    /*
+    ** Property Sheet Load function
+    */
+    loadProperties() {
+        const self = this;
+        $(jqId(PROPERTIES_PANEL)).load("propertysheets/mount_target.html", () => {loadPropertiesSheet(self.artefact);});
+    }
+    /*
+    ** Load and display Value Proposition
+    */
+    loadValueProposition() {
+        $(jqId(VALUE_PROPOSITION_PANEL)).load("valueproposition/mount_target.html");
+    }
+    /*
+    ** Static Functionality
+    */
+    static getArtifactReference() {
+        return MountTarget.getArtifactReference();
+    }
+    static getDropTargets() {
+        // TODO: Return List of Artefact Drop Targets Parent Object Reference Names e.g. VirtualCloudNetwork for a Internet Gateway
+        return [Compartment.getArtifactReference()];
+    }
+}
+/*
+** Dynamically Add View Functions
+*/
+OkitJsonView.prototype.dropMountTargetView = function(target) {
+    let view_artefact = this.newMountTarget();
+    if (target.type === Compartment.getArtifactReference()) {
+        view_artefact.artefact.compartment_id = target.id;
+    } else {
+        view_artefact.artefact.compartment_id = target.compartment_id;
+    }
+    view_artefact.recalculate_dimensions = true;
+    return view_artefact;
+}
+OkitJsonView.prototype.newMountTarget = function(obj) {
+    this.getMountTargets().push(obj ? new MountTargetView(obj, this) : new MountTargetView(this.okitjson.newMountTarget(), this));
+    return this.getMountTargets()[this.getMountTargets().length - 1];
+}
+OkitJsonView.prototype.getMountTargets = function() {
+    if (!this.mount_targets) {
+        this.mount_targets = [];
+    }
+    return this.mount_targets;
+}
+OkitJsonView.prototype.getMountTarget = function(id='') {
+    for (let artefact of this.getMountTargets()) {
+        if (artefact.id === id) {
+            return artefact;
+        }
+    }
+    return undefined;
+}
+OkitJsonView.prototype.loadMountTargets = function(mount_targets) {
+    for (const artefact of mount_targets) {
+        this.getMountTargets().push(new MountTargetView(new MountTarget(artefact, this.okitjson), this));
+    }
+}
+OkitJsonView.prototype.moveMountTarget = function(id) {
+    // Build Dialog
+    const self = this;
+    let mount_target = this.getMountTarget(id);
+    $(jqId('modal_dialog_title')).text('Move ' + mount_target.display_name);
+    $(jqId('modal_dialog_body')).empty();
+    $(jqId('modal_dialog_footer')).empty();
+    const table = d3.select(d3Id('modal_dialog_body')).append('div')
+        .attr('class', 'table okit-table');
+    const tbody = table.append('div')
+        .attr('class', 'tbody');
+    // Subnet
+    let tr = tbody.append('div')
+        .attr('class', 'tr');
+    tr.append('div')
+        .attr('class', 'td')
+        .text('Subnet');
+    tr.append('div')
+        .attr('class', 'td')
+        .append('select')
+        .attr('id', 'move_mount_target_subnet_id');
+    // Load Subnets
+    this.loadSubnetsSelect('move_mount_target_subnet_id');
+    $(jqId("move_mount_target_subnet_id")).val(mount_target.artefact.subnet_id);
+    // Submit Button
+    const submit = d3.select(d3Id('modal_dialog_footer')).append('div').append('button')
+        .attr('id', 'submit_query_btn')
+        .attr('type', 'button')
+        .text('Move')
+        .on('click', function () {
+            $(jqId('modal_dialog_wrapper')).addClass('hidden');
+            if (mount_target.artefact.subnet_id !== $(jqId("move_mount_target_subnet_id")).val()) {
+                self.getSubnet(mount_target.artefact.subnet_id).recalculate_dimensions = true;
+                self.getSubnet($(jqId("move_mount_target_subnet_id")).val()).recalculate_dimensions = true;
+                mount_target.artefact.subnet_id = $(jqId("move_mount_target_subnet_id")).val();
+                mount_target.artefact.compartment_id = self.getSubnet(mount_target.artefact.subnet_id).artefact.compartment_id;
+            }
+            self.update(this.okitjson);
+        });
+    $(jqId('modal_dialog_wrapper')).removeClass('hidden');
+}
+OkitJsonView.prototype.pasteMountTarget = function(drop_target) {
+    const clone = this.copied_artefact.artefact.clone();
+    clone.display_name += 'Copy';
+    if (this.paste_count) {clone.display_name += `-${this.paste_count}`;}
+    this.paste_count += 1;
+    clone.id = clone.okit_id;
+    if (drop_target.getArtifactReference() === Subnet.getArtifactReference()) {
+        clone.subnet_id = drop_target.id;
+        clone.compartment_id = drop_target.compartment_id;
+    }
+    this.okitjson.mount_targets.push(clone);
+    this.update(this.okitjson);
+}
+OkitJsonView.prototype.loadMountTargetsSelect = function(select_id, empty_option=false) {
+    $(jqId(select_id)).empty();
+    const mount_target_select = $(jqId(select_id));
+    if (empty_option) {
+        mount_target_select.append($('<option>').attr('value', '').text(''));
+    }
+    for (let mount_target of this.getMountTargets()) {
+        mount_target_select.append($('<option>').attr('value', mount_target.id).text(mount_target.display_name));
+    }
+}
+OkitJsonView.prototype.loadMountTargetsMultiSelect = function(select_id) {
+    $(jqId(select_id)).empty();
+    const multi_select = d3.select(d3Id(select_id));
+    for (let mount_target of this.getMountTargets()) {
+        const div = multi_select.append('div');
+        div.append('input')
+            .attr('type', 'checkbox')
+            .attr('id', safeId(mount_target.id))
+            .attr('value', mount_target.id);
+        div.append('label')
+            .attr('for', safeId(mount_target.id))
+            .text(mount_target.display_name);
+    }
+}
diff --git a/okitweb/static/okit/view/designer/js/artefacts/network_load_balancer.js b/okitweb/static/okit/view/designer/js/artefacts/network_load_balancer.js
new file mode 100644
index 000000000..719c35e38
--- /dev/null
+++ b/okitweb/static/okit/view/designer/js/artefacts/network_load_balancer.js
@@ -0,0 +1,163 @@
+/*
+** Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+*/
+console.info('Loaded Network Load Balancer View Javascript');
+
+/*
+** Define Network Load Balancer View Class
+*/
+class NetworkLoadBalancerView extends OkitArtefactView {
+    constructor(artefact=null, json_view) {
+        if (!json_view.network_load_balancers) json_view.network_load_balancers = [];
+        super(artefact, json_view);
+    }
+    // TODO: Return Artefact Parent id e.g. vcn_id for a Internet Gateway
+    get parent_id() {return this.artefact.vcn_id;}
+    // TODO: Return Artefact Parent Object e.g. VirtualCloudNetwork for a Internet Gateway
+    get parent() {return this.getJsonView().getVirtualCloudNetwork(this.parent_id);}
+    // TODO: If the Resource is within a Subnet but the subnet_iss is not at the top level then raise it with the following functions if not required delete them.
+    // Direct Subnet Access
+    get subnet_id() {return this.artefact.primary_mount_target.subnet_id;}
+    set subnet_id(id) {this.artefact.primary_mount_target.subnet_id = id;}
+    /*
+    ** SVG Processing
+    */
+    /*
+    ** Property Sheet Load function
+    */
+    loadProperties() {
+        const self = this;
+        $(jqId(PROPERTIES_PANEL)).load("propertysheets/network_load_balancer.html", () => {loadPropertiesSheet(self.artefact);});
+    }
+    /*
+    ** Load and display Value Proposition
+    */
+    loadValueProposition() {
+        $(jqId(VALUE_PROPOSITION_PANEL)).load("valueproposition/network_load_balancer.html");
+    }
+    /*
+    ** Static Functionality
+    */
+    static getArtifactReference() {
+        return NetworkLoadBalancer.getArtifactReference();
+    }
+    static getDropTargets() {
+        // TODO: Return List of Artefact Drop Targets Parent Object Reference Names e.g. VirtualCloudNetwork for a Internet Gateway
+        return [VirtualCloudNetwork.getArtifactReference()];
+    }
+}
+/*
+** Dynamically Add View Functions
+*/
+OkitJsonView.prototype.dropNetworkLoadBalancerView = function(target) {
+    let view_artefact = this.newNetworkLoadBalancer();
+    if (target.type === Compartment.getArtifactReference()) {
+        view_artefact.artefact.compartment_id = target.id;
+    } else {
+        view_artefact.artefact.compartment_id = target.compartment_id;
+    }
+    view_artefact.recalculate_dimensions = true;
+    return view_artefact;
+}
+OkitJsonView.prototype.newNetworkLoadBalancer = function(obj) {
+    this.getNetworkLoadBalancers().push(obj ? new NetworkLoadBalancerView(obj, this) : new NetworkLoadBalancerView(this.okitjson.newNetworkLoadBalancer(), this));
+    return this.getNetworkLoadBalancers()[this.getNetworkLoadBalancers().length - 1];
+}
+OkitJsonView.prototype.getNetworkLoadBalancers = function() {
+    if (!this.network_load_balancers) {
+        this.network_load_balancers = [];
+    }
+    return this.network_load_balancers;
+}
+OkitJsonView.prototype.getNetworkLoadBalancer = function(id='') {
+    for (let artefact of this.getNetworkLoadBalancers()) {
+        if (artefact.id === id) {
+            return artefact;
+        }
+    }
+    return undefined;
+}
+OkitJsonView.prototype.loadNetworkLoadBalancers = function(network_load_balancers) {
+    for (const artefact of network_load_balancers) {
+        this.getNetworkLoadBalancers().push(new NetworkLoadBalancerView(new NetworkLoadBalancer(artefact, this.okitjson), this));
+    }
+}
+OkitJsonView.prototype.moveNetworkLoadBalancer = function(id) {
+    // Build Dialog
+    const self = this;
+    let network_load_balancer = this.getNetworkLoadBalancer(id);
+    $(jqId('modal_dialog_title')).text('Move ' + network_load_balancer.display_name);
+    $(jqId('modal_dialog_body')).empty();
+    $(jqId('modal_dialog_footer')).empty();
+    const table = d3.select(d3Id('modal_dialog_body')).append('div')
+        .attr('class', 'table okit-table');
+    const tbody = table.append('div')
+        .attr('class', 'tbody');
+    // Subnet
+    let tr = tbody.append('div')
+        .attr('class', 'tr');
+    tr.append('div')
+        .attr('class', 'td')
+        .text('Subnet');
+    tr.append('div')
+        .attr('class', 'td')
+        .append('select')
+        .attr('id', 'move_network_load_balancer_subnet_id');
+    // Load Subnets
+    this.loadSubnetsSelect('move_network_load_balancer_subnet_id');
+    $(jqId("move_network_load_balancer_subnet_id")).val(network_load_balancer.artefact.subnet_id);
+    // Submit Button
+    const submit = d3.select(d3Id('modal_dialog_footer')).append('div').append('button')
+        .attr('id', 'submit_query_btn')
+        .attr('type', 'button')
+        .text('Move')
+        .on('click', function () {
+            $(jqId('modal_dialog_wrapper')).addClass('hidden');
+            if (network_load_balancer.artefact.subnet_id !== $(jqId("move_network_load_balancer_subnet_id")).val()) {
+                self.getSubnet(network_load_balancer.artefact.subnet_id).recalculate_dimensions = true;
+                self.getSubnet($(jqId("move_network_load_balancer_subnet_id")).val()).recalculate_dimensions = true;
+                network_load_balancer.artefact.subnet_id = $(jqId("move_network_load_balancer_subnet_id")).val();
+                network_load_balancer.artefact.compartment_id = self.getSubnet(network_load_balancer.artefact.subnet_id).artefact.compartment_id;
+            }
+            self.update(this.okitjson);
+        });
+    $(jqId('modal_dialog_wrapper')).removeClass('hidden');
+}
+OkitJsonView.prototype.pasteNetworkLoadBalancer = function(drop_target) {
+    const clone = this.copied_artefact.artefact.clone();
+    clone.display_name += 'Copy';
+    if (this.paste_count) {clone.display_name += `-${this.paste_count}`;}
+    this.paste_count += 1;
+    clone.id = clone.okit_id;
+    if (drop_target.getArtifactReference() === Subnet.getArtifactReference()) {
+        clone.subnet_id = drop_target.id;
+        clone.compartment_id = drop_target.compartment_id;
+    }
+    this.okitjson.network_load_balancers.push(clone);
+    this.update(this.okitjson);
+}
+OkitJsonView.prototype.loadNetworkLoadBalancersSelect = function(select_id, empty_option=false) {
+    $(jqId(select_id)).empty();
+    const network_load_balancer_select = $(jqId(select_id));
+    if (empty_option) {
+        network_load_balancer_select.append($('<option>').attr('value', '').text(''));
+    }
+    for (let network_load_balancer of this.getNetworkLoadBalancers()) {
+        network_load_balancer_select.append($('<option>').attr('value', network_load_balancer.id).text(network_load_balancer.display_name));
+    }
+}
+OkitJsonView.prototype.loadNetworkLoadBalancersMultiSelect = function(select_id) {
+    $(jqId(select_id)).empty();
+    const multi_select = d3.select(d3Id(select_id));
+    for (let network_load_balancer of this.getNetworkLoadBalancers()) {
+        const div = multi_select.append('div');
+        div.append('input')
+            .attr('type', 'checkbox')
+            .attr('id', safeId(network_load_balancer.id))
+            .attr('value', network_load_balancer.id);
+        div.append('label')
+            .attr('for', safeId(network_load_balancer.id))
+            .text(network_load_balancer.display_name);
+    }
+}
diff --git a/okitweb/static/okit/view/designer/js/artefacts/nosql_database.js b/okitweb/static/okit/view/designer/js/artefacts/nosql_database.js
new file mode 100644
index 000000000..56cd72902
--- /dev/null
+++ b/okitweb/static/okit/view/designer/js/artefacts/nosql_database.js
@@ -0,0 +1,163 @@
+/*
+** Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+*/
+console.info('Loaded NoSQL Database View Javascript');
+
+/*
+** Define NoSQL Database View Class
+*/
+class NoSQLDatabaseView extends OkitArtefactView {
+    constructor(artefact=null, json_view) {
+        if (!json_view.nosql_databases) json_view.nosql_databases = [];
+        super(artefact, json_view);
+    }
+    // TODO: Return Artefact Parent id e.g. vcn_id for a Internet Gateway
+    get parent_id() {return this.artefact.vcn_id;}
+    // TODO: Return Artefact Parent Object e.g. VirtualCloudNetwork for a Internet Gateway
+    get parent() {return this.getJsonView().getVirtualCloudNetwork(this.parent_id);}
+    // TODO: If the Resource is within a Subnet but the subnet_iss is not at the top level then raise it with the following functions if not required delete them.
+    // Direct Subnet Access
+    get subnet_id() {return this.artefact.primary_mount_target.subnet_id;}
+    set subnet_id(id) {this.artefact.primary_mount_target.subnet_id = id;}
+    /*
+    ** SVG Processing
+    */
+    /*
+    ** Property Sheet Load function
+    */
+    loadProperties() {
+        const self = this;
+        $(jqId(PROPERTIES_PANEL)).load("propertysheets/nosql_database.html", () => {loadPropertiesSheet(self.artefact);});
+    }
+    /*
+    ** Load and display Value Proposition
+    */
+    loadValueProposition() {
+        $(jqId(VALUE_PROPOSITION_PANEL)).load("valueproposition/nosql_database.html");
+    }
+    /*
+    ** Static Functionality
+    */
+    static getArtifactReference() {
+        return NoSQLDatabase.getArtifactReference();
+    }
+    static getDropTargets() {
+        // TODO: Return List of Artefact Drop Targets Parent Object Reference Names e.g. VirtualCloudNetwork for a Internet Gateway
+        return [VirtualCloudNetwork.getArtifactReference()];
+    }
+}
+/*
+** Dynamically Add View Functions
+*/
+OkitJsonView.prototype.dropNoSQLDatabaseView = function(target) {
+    let view_artefact = this.newNoSQLDatabase();
+    if (target.type === Compartment.getArtifactReference()) {
+        view_artefact.artefact.compartment_id = target.id;
+    } else {
+        view_artefact.artefact.compartment_id = target.compartment_id;
+    }
+    view_artefact.recalculate_dimensions = true;
+    return view_artefact;
+}
+OkitJsonView.prototype.newNoSQLDatabase = function(obj) {
+    this.getNoSQLDatabases().push(obj ? new NoSQLDatabaseView(obj, this) : new NoSQLDatabaseView(this.okitjson.newNoSQLDatabase(), this));
+    return this.getNoSQLDatabases()[this.getNoSQLDatabases().length - 1];
+}
+OkitJsonView.prototype.getNoSQLDatabases = function() {
+    if (!this.nosql_databases) {
+        this.nosql_databases = [];
+    }
+    return this.nosql_databases;
+}
+OkitJsonView.prototype.getNoSQLDatabase = function(id='') {
+    for (let artefact of this.getNoSQLDatabases()) {
+        if (artefact.id === id) {
+            return artefact;
+        }
+    }
+    return undefined;
+}
+OkitJsonView.prototype.loadNoSQLDatabases = function(nosql_databases) {
+    for (const artefact of nosql_databases) {
+        this.getNoSQLDatabases().push(new NoSQLDatabaseView(new NoSQLDatabase(artefact, this.okitjson), this));
+    }
+}
+OkitJsonView.prototype.moveNoSQLDatabase = function(id) {
+    // Build Dialog
+    const self = this;
+    let nosql_database = this.getNoSQLDatabase(id);
+    $(jqId('modal_dialog_title')).text('Move ' + nosql_database.display_name);
+    $(jqId('modal_dialog_body')).empty();
+    $(jqId('modal_dialog_footer')).empty();
+    const table = d3.select(d3Id('modal_dialog_body')).append('div')
+        .attr('class', 'table okit-table');
+    const tbody = table.append('div')
+        .attr('class', 'tbody');
+    // Subnet
+    let tr = tbody.append('div')
+        .attr('class', 'tr');
+    tr.append('div')
+        .attr('class', 'td')
+        .text('Subnet');
+    tr.append('div')
+        .attr('class', 'td')
+        .append('select')
+        .attr('id', 'move_nosql_database_subnet_id');
+    // Load Subnets
+    this.loadSubnetsSelect('move_nosql_database_subnet_id');
+    $(jqId("move_nosql_database_subnet_id")).val(nosql_database.artefact.subnet_id);
+    // Submit Button
+    const submit = d3.select(d3Id('modal_dialog_footer')).append('div').append('button')
+        .attr('id', 'submit_query_btn')
+        .attr('type', 'button')
+        .text('Move')
+        .on('click', function () {
+            $(jqId('modal_dialog_wrapper')).addClass('hidden');
+            if (nosql_database.artefact.subnet_id !== $(jqId("move_nosql_database_subnet_id")).val()) {
+                self.getSubnet(nosql_database.artefact.subnet_id).recalculate_dimensions = true;
+                self.getSubnet($(jqId("move_nosql_database_subnet_id")).val()).recalculate_dimensions = true;
+                nosql_database.artefact.subnet_id = $(jqId("move_nosql_database_subnet_id")).val();
+                nosql_database.artefact.compartment_id = self.getSubnet(nosql_database.artefact.subnet_id).artefact.compartment_id;
+            }
+            self.update(this.okitjson);
+        });
+    $(jqId('modal_dialog_wrapper')).removeClass('hidden');
+}
+OkitJsonView.prototype.pasteNoSQLDatabase = function(drop_target) {
+    const clone = this.copied_artefact.artefact.clone();
+    clone.display_name += 'Copy';
+    if (this.paste_count) {clone.display_name += `-${this.paste_count}`;}
+    this.paste_count += 1;
+    clone.id = clone.okit_id;
+    if (drop_target.getArtifactReference() === Subnet.getArtifactReference()) {
+        clone.subnet_id = drop_target.id;
+        clone.compartment_id = drop_target.compartment_id;
+    }
+    this.okitjson.nosql_databases.push(clone);
+    this.update(this.okitjson);
+}
+OkitJsonView.prototype.loadNoSQLDatabasesSelect = function(select_id, empty_option=false) {
+    $(jqId(select_id)).empty();
+    const nosql_database_select = $(jqId(select_id));
+    if (empty_option) {
+        nosql_database_select.append($('<option>').attr('value', '').text(''));
+    }
+    for (let nosql_database of this.getNoSQLDatabases()) {
+        nosql_database_select.append($('<option>').attr('value', nosql_database.id).text(nosql_database.display_name));
+    }
+}
+OkitJsonView.prototype.loadNoSQLDatabasesMultiSelect = function(select_id) {
+    $(jqId(select_id)).empty();
+    const multi_select = d3.select(d3Id(select_id));
+    for (let nosql_database of this.getNoSQLDatabases()) {
+        const div = multi_select.append('div');
+        div.append('input')
+            .attr('type', 'checkbox')
+            .attr('id', safeId(nosql_database.id))
+            .attr('value', nosql_database.id);
+        div.append('label')
+            .attr('for', safeId(nosql_database.id))
+            .text(nosql_database.display_name);
+    }
+}
diff --git a/okitweb/static/okit/view/designer/js/artefacts/subnet.js b/okitweb/static/okit/view/designer/js/artefacts/subnet.js
index c3b441c63..56789eb31 100644
--- a/okitweb/static/okit/view/designer/js/artefacts/subnet.js
+++ b/okitweb/static/okit/view/designer/js/artefacts/subnet.js
@@ -160,7 +160,7 @@ class SubnetView extends OkitContainerDesignerArtefactView {
     }
 
     getTopArtifacts() {
-        return [LoadBalancer.getArtifactReference()];
+        return [Bastion.getArtifactReference(), LoadBalancer.getArtifactReference()];
     }
 
     getBottomArtifacts() {
diff --git a/okitweb/static/okit/view/designer/js/artefacts/user.js b/okitweb/static/okit/view/designer/js/artefacts/user.js
index d86b400cf..62b3cf7b4 100644
--- a/okitweb/static/okit/view/designer/js/artefacts/user.js
+++ b/okitweb/static/okit/view/designer/js/artefacts/user.js
@@ -143,7 +143,7 @@ OkitJsonView.prototype.loadUsersSelect = function(select_id, empty_option=false)
 OkitJsonView.prototype.loadUsersMultiSelect = function(select_id) {
     $(jqId(select_id)).empty();
     const multi_select = d3.select(d3Id(select_id));
-    for (let user of this.getUsers()) {
+    for (let user of this.okitjson.getUsers()) {
         const div = multi_select.append('div');
         div.append('input')
             .attr('type', 'checkbox')
diff --git a/okitweb/static/okit/view/designer/js/artefacts/vault.js b/okitweb/static/okit/view/designer/js/artefacts/vault.js
new file mode 100644
index 000000000..6d9d0ea05
--- /dev/null
+++ b/okitweb/static/okit/view/designer/js/artefacts/vault.js
@@ -0,0 +1,163 @@
+/*
+** Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+*/
+console.info('Loaded Vault View Javascript');
+
+/*
+** Define Vault View Class
+*/
+class VaultView extends OkitArtefactView {
+    constructor(artefact=null, json_view) {
+        if (!json_view.vaults) json_view.vaults = [];
+        super(artefact, json_view);
+    }
+    // TODO: Return Artefact Parent id e.g. vcn_id for a Internet Gateway
+    get parent_id() {return this.artefact.vcn_id;}
+    // TODO: Return Artefact Parent Object e.g. VirtualCloudNetwork for a Internet Gateway
+    get parent() {return this.getJsonView().getVirtualCloudNetwork(this.parent_id);}
+    // TODO: If the Resource is within a Subnet but the subnet_iss is not at the top level then raise it with the following functions if not required delete them.
+    // Direct Subnet Access
+    get subnet_id() {return this.artefact.primary_mount_target.subnet_id;}
+    set subnet_id(id) {this.artefact.primary_mount_target.subnet_id = id;}
+    /*
+    ** SVG Processing
+    */
+    /*
+    ** Property Sheet Load function
+    */
+    loadProperties() {
+        const self = this;
+        $(jqId(PROPERTIES_PANEL)).load("propertysheets/vault.html", () => {loadPropertiesSheet(self.artefact);});
+    }
+    /*
+    ** Load and display Value Proposition
+    */
+    loadValueProposition() {
+        $(jqId(VALUE_PROPOSITION_PANEL)).load("valueproposition/vault.html");
+    }
+    /*
+    ** Static Functionality
+    */
+    static getArtifactReference() {
+        return Vault.getArtifactReference();
+    }
+    static getDropTargets() {
+        // TODO: Return List of Artefact Drop Targets Parent Object Reference Names e.g. VirtualCloudNetwork for a Internet Gateway
+        return [VirtualCloudNetwork.getArtifactReference()];
+    }
+}
+/*
+** Dynamically Add View Functions
+*/
+OkitJsonView.prototype.dropVaultView = function(target) {
+    let view_artefact = this.newVault();
+    if (target.type === Compartment.getArtifactReference()) {
+        view_artefact.artefact.compartment_id = target.id;
+    } else {
+        view_artefact.artefact.compartment_id = target.compartment_id;
+    }
+    view_artefact.recalculate_dimensions = true;
+    return view_artefact;
+}
+OkitJsonView.prototype.newVault = function(obj) {
+    this.getVaults().push(obj ? new VaultView(obj, this) : new VaultView(this.okitjson.newVault(), this));
+    return this.getVaults()[this.getVaults().length - 1];
+}
+OkitJsonView.prototype.getVaults = function() {
+    if (!this.vaults) {
+        this.vaults = [];
+    }
+    return this.vaults;
+}
+OkitJsonView.prototype.getVault = function(id='') {
+    for (let artefact of this.getVaults()) {
+        if (artefact.id === id) {
+            return artefact;
+        }
+    }
+    return undefined;
+}
+OkitJsonView.prototype.loadVaults = function(vaults) {
+    for (const artefact of vaults) {
+        this.getVaults().push(new VaultView(new Vault(artefact, this.okitjson), this));
+    }
+}
+OkitJsonView.prototype.moveVault = function(id) {
+    // Build Dialog
+    const self = this;
+    let vault = this.getVault(id);
+    $(jqId('modal_dialog_title')).text('Move ' + vault.display_name);
+    $(jqId('modal_dialog_body')).empty();
+    $(jqId('modal_dialog_footer')).empty();
+    const table = d3.select(d3Id('modal_dialog_body')).append('div')
+        .attr('class', 'table okit-table');
+    const tbody = table.append('div')
+        .attr('class', 'tbody');
+    // Subnet
+    let tr = tbody.append('div')
+        .attr('class', 'tr');
+    tr.append('div')
+        .attr('class', 'td')
+        .text('Subnet');
+    tr.append('div')
+        .attr('class', 'td')
+        .append('select')
+        .attr('id', 'move_vault_subnet_id');
+    // Load Subnets
+    this.loadSubnetsSelect('move_vault_subnet_id');
+    $(jqId("move_vault_subnet_id")).val(vault.artefact.subnet_id);
+    // Submit Button
+    const submit = d3.select(d3Id('modal_dialog_footer')).append('div').append('button')
+        .attr('id', 'submit_query_btn')
+        .attr('type', 'button')
+        .text('Move')
+        .on('click', function () {
+            $(jqId('modal_dialog_wrapper')).addClass('hidden');
+            if (vault.artefact.subnet_id !== $(jqId("move_vault_subnet_id")).val()) {
+                self.getSubnet(vault.artefact.subnet_id).recalculate_dimensions = true;
+                self.getSubnet($(jqId("move_vault_subnet_id")).val()).recalculate_dimensions = true;
+                vault.artefact.subnet_id = $(jqId("move_vault_subnet_id")).val();
+                vault.artefact.compartment_id = self.getSubnet(vault.artefact.subnet_id).artefact.compartment_id;
+            }
+            self.update(this.okitjson);
+        });
+    $(jqId('modal_dialog_wrapper')).removeClass('hidden');
+}
+OkitJsonView.prototype.pasteVault = function(drop_target) {
+    const clone = this.copied_artefact.artefact.clone();
+    clone.display_name += 'Copy';
+    if (this.paste_count) {clone.display_name += `-${this.paste_count}`;}
+    this.paste_count += 1;
+    clone.id = clone.okit_id;
+    if (drop_target.getArtifactReference() === Subnet.getArtifactReference()) {
+        clone.subnet_id = drop_target.id;
+        clone.compartment_id = drop_target.compartment_id;
+    }
+    this.okitjson.vaults.push(clone);
+    this.update(this.okitjson);
+}
+OkitJsonView.prototype.loadVaultsSelect = function(select_id, empty_option=false) {
+    $(jqId(select_id)).empty();
+    const vault_select = $(jqId(select_id));
+    if (empty_option) {
+        vault_select.append($('<option>').attr('value', '').text(''));
+    }
+    for (let vault of this.getVaults()) {
+        vault_select.append($('<option>').attr('value', vault.id).text(vault.display_name));
+    }
+}
+OkitJsonView.prototype.loadVaultsMultiSelect = function(select_id) {
+    $(jqId(select_id)).empty();
+    const multi_select = d3.select(d3Id(select_id));
+    for (let vault of this.getVaults()) {
+        const div = multi_select.append('div');
+        div.append('input')
+            .attr('type', 'checkbox')
+            .attr('id', safeId(vault.id))
+            .attr('value', vault.id);
+        div.append('label')
+            .attr('for', safeId(vault.id))
+            .text(vault.display_name);
+    }
+}
diff --git a/okitweb/static/okit/view/designer/js/artefacts/virtual_cloud_network.js b/okitweb/static/okit/view/designer/js/artefacts/virtual_cloud_network.js
index 8f6e93894..7cf335b6a 100644
--- a/okitweb/static/okit/view/designer/js/artefacts/virtual_cloud_network.js
+++ b/okitweb/static/okit/view/designer/js/artefacts/virtual_cloud_network.js
@@ -48,7 +48,7 @@ class VirtualCloudNetworkView extends OkitContainerDesignerArtefactView {
         $(jqId(PROPERTIES_PANEL)).load("propertysheets/virtual_cloud_network.html", () => {
             loadPropertiesSheet(me.artefact);
             $(jqId('cidr_blocks')).on('change', function() {
-                console.info('CIDR Block Changed ' + $(jqId('cidr_block')).val());
+                console.info('CIDR Block Changed ' + $(jqId('cidr_blocks')).val());
                 for (let subnet of me.artefact.getOkitJson().subnets) {
                     if (subnet.vcn_id === me.id) {
                         subnet.generateCIDR();
diff --git a/okitweb/static/okit/view/identity/css/okit_identity_view.css b/okitweb/static/okit/view/identity/css/okit_identity_view.css
index e525199c8..b58816b3d 100644
--- a/okitweb/static/okit/view/identity/css/okit_identity_view.css
+++ b/okitweb/static/okit/view/identity/css/okit_identity_view.css
@@ -3,10 +3,12 @@
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
  */
 
- .okit-text-json-canvas {
-    display: block;
+ .okit-identity-canvas {
+    display: grid;
+    grid-auto-flow: column;
+    column-gap: 20px;
     background: #fff;
-    padding: 0;
+    padding: 0 0 20px 20px;
     margin: 0;
     height: 100%;
     width: 100%;
@@ -15,32 +17,184 @@
     font-size: smaller;
 }
 
+/*
+** Background Images
+*/
 .oci-user-group {
-    background-image: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA1Ni45IDQyIj48ZyBmaWxsPSIjZmZmIj48cGF0aCBkPSJNLjUgNDEuNVYyNi4zYzAtMyAyLjQtNS40IDUuNC01LjRIOHYtLjNjLTIuMi0xLjMtMy43LTMuNy0zLjctNi40IDAtNC4xIDMuMy03LjQgNy40LTcuNHM3LjQgMy4zIDcuNCA3LjRjMCAyLjYtMS40IDQuOS0zLjUgNi4zaC41YzEuMi0xLjUgMy0yLjQgNS0yLjRoMi42VjE3Yy0yLjYtMS42LTQuMi00LjUtNC4yLTcuNiAwLTQuOSA0LTguOSA4LjktOC45czguOSA0IDguOSA4LjljMCAzLjEtMS42IDYtNC4zIDcuNnYxaDIuN2MyIDAgMy44LjkgNS4xIDIuNGguNWE3LjQ4IDcuNDggMCAwMS0zLjUtNi4zYzAtNC4xIDMuMy03LjQgNy40LTcuNHM3LjQgMy4zIDcuNCA3LjRjMCAyLjYtMS40IDUuMS0zLjYgNi40di41aDJjMyAwIDUuNCAyLjQgNS40IDUuNHYxNS4ySC41eiIvPjxwYXRoIGQ9Ik0yOC40IDFjNC42IDAgOC40IDMuOCA4LjQgOC40IDAgMy4xLTEuNyA1LjktNC4zIDcuM3YxLjhoMy4yYzEuOSAwIDMuNyAxIDQuOCAyLjRoMy4yYy0zLjEtLjctNS40LTMuNS01LjQtNi44IDAtMy44IDMuMS02LjkgNi45LTYuOXM2LjkgMy4xIDYuOSA2LjljMCAzLjMtMi4zIDYuMS01LjQgNi44aDEuOHYuNUg1MWMyLjcgMCA0LjkgMi4yIDQuOSA0LjlWNDFIMVYyNi4zYzAtMi43IDIuMi00LjkgNC45LTQuOWgyLjZWMjFoMS43Yy0zLjEtLjctNS40LTMuNS01LjQtNi44IDAtMy44IDMuMS02LjkgNi45LTYuOXM2LjkgMy4xIDYuOSA2LjljMCAzLjMtMi4zIDYuMS01LjQgNi44aDMuMmMxLjEtMS41IDIuOC0yLjQgNC43LTIuNGgzLjF2LTEuOWMtMi41LTEuNC00LjItNC4yLTQuMi03LjNDMjAgNC44IDIzLjggMSAyOC40IDFtMC0xQzIzLjIgMCAxOSA0LjIgMTkgOS40YzAgMy4yIDEuNiA2LjEgNC4yIDcuOHYuM2gtMi4xYy0uOSAwLTEuNy4yLTIuNS41LjYtMS4xIDEtMi40IDEtMy44IDAtNC40LTMuNi03LjktNy45LTcuOXMtNy45IDMuNi03LjkgNy45YzAgMi41IDEuMiA0LjggMyA2LjJoLTFjLTMuMiAwLTUuOSAyLjYtNS45IDUuOVY0Mmg1Ni45VjI2LjNjMC0zLjItMi42LTUuOS01LjktNS45aC0xYzEuOS0xLjUgMy0zLjggMy02LjIgMC00LjQtMy42LTcuOS03LjktNy45cy03LjkgMy42LTcuOSA3LjljMCAxLjQuNCAyLjcgMSAzLjgtLjgtLjMtMS43LS41LTIuNi0uNWgtMi4ydi0uM2MyLjctMS43IDQuMy00LjcgNC4zLTcuOS4yLTUuMS00LTkuMy05LjItOS4zeiIvPjwvZz48ZyBmaWxsPSIjMmM1OTY3Ij48cGF0aCBkPSJNNDUuMiAyMS4yYzMuOCAwIDYuOS0zLjEgNi45LTYuOXMtMy4xLTctNi45LTctNi45IDMuMS02LjkgNi45IDMuMSA3IDYuOSA3em0wLTEyLjJjMi45IDAgNS4zIDIuNCA1LjMgNS4zcy0yLjQgNS4zLTUuMyA1LjMtNS4zLTIuNC01LjMtNS4zUzQyLjMgOSA0NS4yIDl6Ii8+PHBhdGggZD0iTTUxLjEgMjEuNWgtMS40bC0uMy4zYy0xIDEuMy0yLjUgMi4xLTQuMiAyLjEtMS42IDAtMy4yLS44LTQuMi0yLjFsLS4zLS4zaC0uMWMtMS0xLjctMi45LTIuOS01LTIuOUgzNGwtLjMuM2MtMS4zIDEuNy0zLjIgMi42LTUuMyAyLjZzLTQtMS01LjMtMi42bC0uMy0uM2gtMS43Yy0yLjEgMC00IDEuMi01IDIuOWwtLjMuM2MtMSAxLjMtMi41IDIuMS00LjIgMi4xcy0zLjItLjgtNC4yLTIuMWwtLjMtLjNINS45Yy0yLjcgMC00LjkgMi4yLTQuOSA0LjlWNDFoMS43VjI2LjNjMC0xLjggMS40LTMuMiAzLjItMy4yaC42YzEuMyAxLjUgMy4yIDIuNCA1LjIgMi40IDEuMyAwIDIuNi0uNCAzLjYtMVY0MUgxN1YyNC40YzAtMi4zIDEuOS00LjEgNC4xLTQuMWguOWMxLjYgMS45IDMuOSAzIDYuNCAzczQuOC0xLjEgNi40LTNoLjljMi4zIDAgNC4xIDEuOSA0LjEgNC4xVjQxaDEuNlYyNC40YzEuMS43IDIuNCAxLjEgMy43IDEuMSAyIDAgMy45LS45IDUuMi0yLjRoLjZjMS44IDAgMy4yIDEuNCAzLjIgMy4yVjQxaDEuN1YyNi4zYy4xLTIuNy0yLTQuOC00LjctNC44eiIvPjxwYXRoIGQ9Ik0xMS43IDIxLjJjMy44IDAgNi45LTMuMSA2LjktNi45cy0zLjEtNi45LTYuOS02LjktNi45IDMuMS02LjkgNi45IDMuMSA2LjkgNi45IDYuOXptMC0xMi4yYzIuOSAwIDUuMyAyLjQgNS4zIDUuM3MtMi40IDUuMy01LjMgNS4zLTUuMy0yLjQtNS4zLTUuM1M4LjggOSAxMS43IDl6TTI4LjQgMTcuOGM0LjYgMCA4LjQtMy44IDguNC04LjRTMzMuMSAxIDI4LjQgMSAyMCA0LjggMjAgOS40czMuOCA4LjQgOC40IDguNHptMC0xNS4xYTYuNyA2LjcgMCAxMTAgMTMuNCA2LjcgNi43IDAgMDEwLTEzLjR6TTIxLjIgMzAuNmgtLjlWNDFIMjJ2LTguN3pNMzUuNiAzMC42bC0uOCAxLjdWNDFoMS43VjMwLjZ6TTUwLjEgMzR2N2gxLjZ2LTguN2gtLjh6TTUuMiAzMi4zVjQxaDEuN3YtN0w2IDMyLjN6Ii8+PC9nPjwvc3ZnPg==");
+    background-image: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA1NyA1NyI+PGcgZmlsbD0iI2ZmZiI+PHBhdGggZD0iTS41IDQ5LjVWMzQuM2MwLTMgMi40LTUuNCA1LjQtNS40SDh2LS4zYy0yLjItMS4zLTMuNy0zLjctMy43LTYuNCAwLTQuMSAzLjMtNy40IDcuNC03LjRzNy40IDMuMyA3LjQgNy40YzAgMi42LTEuNCA0LjktMy41IDYuM2guNWMxLjItMS41IDMtMi40IDUtMi40aDIuNlYyNWMtMi42LTEuNi00LjItNC41LTQuMi03LjYgMC00LjkgNC04LjkgOC45LTguOXM4LjkgNCA4LjkgOC45YzAgMy4xLTEuNiA2LTQuMyA3LjZ2MWgyLjdjMiAwIDMuOC45IDUuMSAyLjRoLjVhNy40OCA3LjQ4IDAgMDEtMy41LTYuM2MwLTQuMSAzLjMtNy40IDcuNC03LjRzNy40IDMuMyA3LjQgNy40YzAgMi42LTEuNCA1LjEtMy42IDYuNHYuNWgyYzMgMCA1LjQgMi40IDUuNCA1LjR2MTUuMkguNXoiLz48cGF0aCBkPSJNMjguNCA5YzQuNiAwIDguNCAzLjggOC40IDguNCAwIDMuMS0xLjcgNS45LTQuMyA3LjN2MS44aDMuMmMxLjkgMCAzLjcgMSA0LjggMi40aDMuMmMtMy4xLS43LTUuNC0zLjUtNS40LTYuOCAwLTMuOCAzLjEtNi45IDYuOS02LjlzNi45IDMuMSA2LjkgNi45YzAgMy4zLTIuMyA2LjEtNS40IDYuOGgxLjh2LjVINTFjMi43IDAgNC45IDIuMiA0LjkgNC45VjQ5SDFWMzQuM2MwLTIuNyAyLjItNC45IDQuOS00LjloMi42VjI5aDEuN2MtMy4xLS43LTUuNC0zLjUtNS40LTYuOCAwLTMuOCAzLjEtNi45IDYuOS02LjlzNi45IDMuMSA2LjkgNi45YzAgMy4zLTIuMyA2LjEtNS40IDYuOGgzLjJjMS4xLTEuNSAyLjgtMi40IDQuNy0yLjRoMy4xdi0xLjljLTIuNS0xLjQtNC4yLTQuMi00LjItNy4zIDAtNC42IDMuOC04LjQgOC40LTguNG0wLTFjLTUuMiAwLTkuNCA0LjItOS40IDkuNCAwIDMuMiAxLjYgNi4xIDQuMiA3Ljh2LjNoLTIuMWMtLjkgMC0xLjcuMi0yLjUuNS42LTEuMSAxLTIuNCAxLTMuOCAwLTQuNC0zLjYtNy45LTcuOS03LjlzLTcuOSAzLjYtNy45IDcuOWMwIDIuNSAxLjIgNC44IDMgNi4yaC0xYy0zLjIgMC01LjkgMi42LTUuOSA1LjlWNTBoNTYuOVYzNC4zYzAtMy4yLTIuNi01LjktNS45LTUuOWgtMWMxLjktMS41IDMtMy44IDMtNi4yIDAtNC40LTMuNi03LjktNy45LTcuOXMtNy45IDMuNi03LjkgNy45YzAgMS40LjQgMi43IDEgMy44LS44LS4zLTEuNy0uNS0yLjYtLjVoLTIuMnYtLjNjMi43LTEuNyA0LjMtNC43IDQuMy03LjkuMi01LjEtNC05LjMtOS4yLTkuM3oiLz48L2c+PGcgZmlsbD0iIzJjNTk2NyI+PHBhdGggZD0iTTQ1LjIgMjkuMmMzLjggMCA2LjktMy4xIDYuOS02LjlzLTMuMS03LTYuOS03LTYuOSAzLjEtNi45IDYuOSAzLjEgNyA2LjkgN3ptMC0xMi4yYzIuOSAwIDUuMyAyLjQgNS4zIDUuM3MtMi40IDUuMy01LjMgNS4zLTUuMy0yLjQtNS4zLTUuMyAyLjQtNS4zIDUuMy01LjN6Ii8+PHBhdGggZD0iTTUxLjEgMjkuNWgtMS40bC0uMy4zYy0xIDEuMy0yLjUgMi4xLTQuMiAyLjEtMS42IDAtMy4yLS44LTQuMi0yLjFsLS4zLS4zaC0uMWMtMS0xLjctMi45LTIuOS01LTIuOUgzNGwtLjMuM2MtMS4zIDEuNy0zLjIgMi42LTUuMyAyLjZzLTQtMS01LjMtMi42bC0uMy0uM2gtMS43Yy0yLjEgMC00IDEuMi01IDIuOWwtLjMuM2MtMSAxLjMtMi41IDIuMS00LjIgMi4xcy0zLjItLjgtNC4yLTIuMWwtLjMtLjNINS45Yy0yLjcgMC00LjkgMi4yLTQuOSA0LjlWNDloMS43VjM0LjNjMC0xLjggMS40LTMuMiAzLjItMy4yaC42YzEuMyAxLjUgMy4yIDIuNCA1LjIgMi40IDEuMyAwIDIuNi0uNCAzLjYtMVY0OUgxN1YzMi40YzAtMi4zIDEuOS00LjEgNC4xLTQuMWguOWMxLjYgMS45IDMuOSAzIDYuNCAzczQuOC0xLjEgNi40LTNoLjljMi4zIDAgNC4xIDEuOSA0LjEgNC4xVjQ5aDEuNlYzMi40YzEuMS43IDIuNCAxLjEgMy43IDEuMSAyIDAgMy45LS45IDUuMi0yLjRoLjZjMS44IDAgMy4yIDEuNCAzLjIgMy4yVjQ5aDEuN1YzNC4zYy4xLTIuNy0yLTQuOC00LjctNC44eiIvPjxwYXRoIGQ9Ik0xMS43IDI5LjJjMy44IDAgNi45LTMuMSA2LjktNi45cy0zLjEtNi45LTYuOS02LjktNi45IDMuMS02LjkgNi45IDMuMSA2LjkgNi45IDYuOXptMC0xMi4yYzIuOSAwIDUuMyAyLjQgNS4zIDUuM3MtMi40IDUuMy01LjMgNS4zLTUuMy0yLjQtNS4zLTUuM1M4LjggMTcgMTEuNyAxN3pNMjguNCAyNS44YzQuNiAwIDguNC0zLjggOC40LTguNFMzMy4xIDkgMjguNCA5IDIwIDEyLjggMjAgMTcuNHMzLjggOC40IDguNCA4LjR6bTAtMTUuMWE2LjcgNi43IDAgMTEwIDEzLjQgNi43IDYuNyAwIDAxMC0xMy40ek0yMS4yIDM4LjZoLS45VjQ5SDIydi04Ljd6TTM1LjYgMzguNmwtLjggMS43VjQ5aDEuN1YzOC42ek01MC4xIDQydjdoMS42di04LjdoLS44ek01LjIgNDAuM1Y0OWgxLjd2LTdMNiA0MC4zeiIvPjwvZz48L3N2Zz4=");
 }
 
 .oci-user {
-    background-image: url("data:image/svg+xml;base64,PHN2ZyB2ZXJzaW9uPSIxLjEiIGlkPSJwcmVmaXhfX0xheWVyXzEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeD0iMCIgeT0iMCIgdmlld0JveD0iMCAwIDMyLjk4IDQyIiB4bWw6c3BhY2U9InByZXNlcnZlIj48c3R5bGU+LnByZWZpeF9fc3Qwe2ZpbGw6I2ZmZn0ucHJlZml4X19zdDF7ZmlsbDojMmM1OTY3fTwvc3R5bGU+PHBhdGggY2xhc3M9InByZWZpeF9fc3QwIiBkPSJNMTYuNDkgMjEuMjljLTUuNzMgMC0xMC40LTQuNjYtMTAuNC0xMC4zOVMxMC43NS41IDE2LjQ5LjVjNS43MyAwIDEwLjQgNC42NiAxMC40IDEwLjQtLjAxIDUuNzMtNC42NyAxMC4zOS0xMC40IDEwLjM5eiIvPjxwYXRoIGNsYXNzPSJwcmVmaXhfX3N0MCIgZD0iTTE2LjQ5IDFjNS40NiAwIDkuOSA0LjQ0IDkuOSA5LjlzLTQuNDQgOS45LTkuOSA5LjktOS45LTQuNDQtOS45LTkuOVMxMS4wMyAxIDE2LjQ5IDFtMC0xYy02LjAxIDAtMTAuOSA0Ljg5LTEwLjkgMTAuOSAwIDYuMDEgNC44OSAxMC45IDEwLjkgMTAuOXMxMC45LTQuODkgMTAuOS0xMC45QzI3LjM4IDQuODkgMjIuNSAwIDE2LjQ5IDB6Ii8+PGc+PHBhdGggY2xhc3M9InByZWZpeF9fc3QwIiBkPSJNLjUgNDEuNVYyOC44NGMwLTQuMDIgMy4yNy03LjI5IDcuMjktNy4yOWgyLjE3bC40LjUyYTcuNjgyIDcuNjgyIDAgMDA2LjEzIDMuMDJjLjM0IDAgLjY4LS4wMiAxLjAyLS4wNiAyLS4yNSAzLjkxLTEuNCA1LjI1LTMuMTRsLjI2LS4zNGgyLjE3YzQuMDIgMCA3LjI5IDMuMjcgNy4yOSA3LjI5VjQxLjVILjV6Ii8+PHBhdGggY2xhc3M9InByZWZpeF9fc3QwIiBkPSJNMjUuMTggMjIuMDRhNi43OSA2Ljc5IDAgMDE2Ljc5IDYuNzlWNDFIMVYyOC44NGE2Ljc5IDYuNzkgMCAwMTYuNzktNi43OWgxLjkybC4yNS4zM2E4LjE4NCA4LjE4NCAwIDAwNi41MiAzLjIyYy4zNiAwIC43Mi0uMDIgMS4wOC0uMDcgMi4yMy0uMjggNC4yMi0xLjU1IDUuNTktMy4zM2wuMTEtLjE0aDEuOTJtMC0xLjAyaC0yLjQxbC0uMy4zOS0uMTEuMTRjLTEuMjYgMS42NC0zLjA1IDIuNzItNC45MiAyLjk1LS4zMi4wNC0uNjQuMDYtLjk1LjA2YTcuMTcgNy4xNyAwIDAxLTUuNzMtMi44M2wtLjI1LS4zMy0uMy0uMzlINy43OWMtNC4zIDAtNy43OSAzLjUtNy43OSA3Ljc5VjQyaDMyLjk4VjI4Ljg0YzAtNC4zLTMuNS03LjgtNy44LTcuOHoiLz48L2c+PGc+PHBhdGggY2xhc3M9InByZWZpeF9fc3QxIiBkPSJNMTYuNDkgMjAuNzljNS40NiAwIDkuOS00LjQ0IDkuOS05LjlTMjEuOTUgMSAxNi40OSAxcy05LjkgNC40NC05LjkgOS45IDQuNDQgOS44OSA5LjkgOS44OXptMC0xOC4xMmM0LjU0IDAgOC4yMyAzLjY5IDguMjMgOC4yM3MtMy42OSA4LjIzLTguMjMgOC4yMy04LjIzLTMuNjktOC4yMy04LjIzIDMuNjktOC4yMyA4LjIzLTguMjN6TTI1LjE4IDIyLjA0aC0xLjkybC0uMjUuMzNjLTEuNTcgMi4wNC0zLjk1IDMuMjItNi41MiAzLjIycy00Ljk1LTEuMTctNi41Mi0zLjIybC0uMjUtLjMzSDcuNzljLTMuNzQgMC02Ljc5IDMuMDUtNi43OSA2LjhWNDFoMS42N1YyOC44NGMwLTIuODMgMi4zLTUuMTMgNS4xMy01LjEzaDEuMWMxLjg5IDIuMjYgNC42MyAzLjU0IDcuNTggMy41NHM1LjctMS4yOSA3LjU4LTMuNTRoMS4xMWMyLjgzIDAgNS4xMyAyLjMgNS4xMyA1LjEzVjQxaDEuNjdWMjguODRjLjAxLTMuNzUtMy4wNC02LjgtNi43OS02Ljh6Ii8+PC9nPjwvc3ZnPg==");
+    background-image: url("data:image/svg+xml;base64,PHN2ZyB2ZXJzaW9uPSIxLjEiIGlkPSJwcmVmaXhfX0xheWVyXzEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeD0iMCIgeT0iMCIgdmlld0JveD0iMCAwIDQyIDQyIiB4bWw6c3BhY2U9InByZXNlcnZlIj48c3R5bGU+LnByZWZpeF9fc3Qwe2ZpbGw6I2ZmZn0ucHJlZml4X19zdDF7ZmlsbDojMmM1OTY3fTwvc3R5bGU+PHBhdGggY2xhc3M9InByZWZpeF9fc3QwIiBkPSJNMTYuNDkgMjEuMjljLTUuNzMgMC0xMC40LTQuNjYtMTAuNC0xMC4zOVMxMC43NS41IDE2LjQ5LjVjNS43MyAwIDEwLjQgNC42NiAxMC40IDEwLjQtLjAxIDUuNzMtNC42NyAxMC4zOS0xMC40IDEwLjM5eiIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoNSAyKSIvPjxwYXRoIGNsYXNzPSJwcmVmaXhfX3N0MCIgZD0iTTE2LjQ5IDFjNS40NiAwIDkuOSA0LjQ0IDkuOSA5LjlzLTQuNDQgOS45LTkuOSA5LjktOS45LTQuNDQtOS45LTkuOVMxMS4wMyAxIDE2LjQ5IDFtMC0xYy02LjAxIDAtMTAuOSA0Ljg5LTEwLjkgMTAuOSAwIDYuMDEgNC44OSAxMC45IDEwLjkgMTAuOXMxMC45LTQuODkgMTAuOS0xMC45QzI3LjM4IDQuODkgMjIuNSAwIDE2LjQ5IDB6IiB0cmFuc2Zvcm09InRyYW5zbGF0ZSg1IDIpIi8+PGc+PHBhdGggY2xhc3M9InByZWZpeF9fc3QwIiBkPSJNLjUgNDEuNVYyOC44NGMwLTQuMDIgMy4yNy03LjI5IDcuMjktNy4yOWgyLjE3bC40LjUyYTcuNjgyIDcuNjgyIDAgMDA2LjEzIDMuMDJjLjM0IDAgLjY4LS4wMiAxLjAyLS4wNiAyLS4yNSAzLjkxLTEuNCA1LjI1LTMuMTRsLjI2LS4zNGgyLjE3YzQuMDIgMCA3LjI5IDMuMjcgNy4yOSA3LjI5VjQxLjVILjV6IiB0cmFuc2Zvcm09InRyYW5zbGF0ZSg1IDIpIi8+PHBhdGggY2xhc3M9InByZWZpeF9fc3QwIiBkPSJNMjUuMTggMjIuMDRhNi43OSA2Ljc5IDAgMDE2Ljc5IDYuNzlWNDFIMVYyOC44NGE2Ljc5IDYuNzkgMCAwMTYuNzktNi43OWgxLjkybC4yNS4zM2E4LjE4NCA4LjE4NCAwIDAwNi41MiAzLjIyYy4zNiAwIC43Mi0uMDIgMS4wOC0uMDcgMi4yMy0uMjggNC4yMi0xLjU1IDUuNTktMy4zM2wuMTEtLjE0aDEuOTJtMC0xLjAyaC0yLjQxbC0uMy4zOS0uMTEuMTRjLTEuMjYgMS42NC0zLjA1IDIuNzItNC45MiAyLjk1LS4zMi4wNC0uNjQuMDYtLjk1LjA2YTcuMTcgNy4xNyAwIDAxLTUuNzMtMi44M2wtLjI1LS4zMy0uMy0uMzlINy43OWMtNC4zIDAtNy43OSAzLjUtNy43OSA3Ljc5VjQyaDMyLjk4VjI4Ljg0YzAtNC4zLTMuNS03LjgtNy44LTcuOHoiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDUgMikiLz48L2c+PGc+PHBhdGggY2xhc3M9InByZWZpeF9fc3QxIiBkPSJNMTYuNDkgMjAuNzljNS40NiAwIDkuOS00LjQ0IDkuOS05LjlTMjEuOTUgMSAxNi40OSAxcy05LjkgNC40NC05LjkgOS45IDQuNDQgOS44OSA5LjkgOS44OXptMC0xOC4xMmM0LjU0IDAgOC4yMyAzLjY5IDguMjMgOC4yM3MtMy42OSA4LjIzLTguMjMgOC4yMy04LjIzLTMuNjktOC4yMy04LjIzIDMuNjktOC4yMyA4LjIzLTguMjN6TTI1LjE4IDIyLjA0aC0xLjkybC0uMjUuMzNjLTEuNTcgMi4wNC0zLjk1IDMuMjItNi41MiAzLjIycy00Ljk1LTEuMTctNi41Mi0zLjIybC0uMjUtLjMzSDcuNzljLTMuNzQgMC02Ljc5IDMuMDUtNi43OSA2LjhWNDFoMS42N1YyOC44NGMwLTIuODMgMi4zLTUuMTMgNS4xMy01LjEzaDEuMWMxLjg5IDIuMjYgNC42MyAzLjU0IDcuNTggMy41NHM1LjctMS4yOSA3LjU4LTMuNTRoMS4xMWMyLjgzIDAgNS4xMyAyLjMgNS4xMyA1LjEzVjQxaDEuNjdWMjguODRjLjAxLTMuNzUtMy4wNC02LjgtNi43OS02Ljh6IiB0cmFuc2Zvcm09InRyYW5zbGF0ZSg1IDIpIi8+PC9nPjwvc3ZnPg==");
 }
 
 .oci-policy {
     background-image: url("data:image/svg+xml;base64,PHN2ZyB2ZXJzaW9uPSIxLjEiIGlkPSJwcmVmaXhfX0xheWVyXzEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeD0iMCIgeT0iMCIgdmlld0JveD0iMCAwIDQxLjk1IDQyIiB4bWw6c3BhY2U9InByZXNlcnZlIj48c3R5bGU+LnByZWZpeF9fc3Qwe2ZpbGw6I2ZmZn0ucHJlZml4X19zdDF7ZmlsbDojMmM1OTY3fTwvc3R5bGU+PHBhdGggY2xhc3M9InByZWZpeF9fc3QwIiBkPSJNLjUgNDEuNXYtMS41NWwxLjQ1LS43MnYtNC42YzAtMS4zNiAxLjEtMi40NiAyLjQ2LTIuNDZoMTMuMTJjMS4zNiAwIDIuNDYgMS4xIDIuNDYgMi40NnY0LjZsMS4yNC43NXYxLjUySC41eiIvPjxwYXRoIGNsYXNzPSJwcmVmaXhfX3N0MCIgZD0iTTE3LjUzIDMyLjY3YzEuMDggMCAxLjk2Ljg4IDEuOTYgMS45NnY0Ljg5aC4wMWwxLjIzLjc0VjQxSDF2LS43NGwxLjQ1LS43MnYtNC45MWMwLTEuMDguODgtMS45NiAxLjk2LTEuOTZoMTMuMTJtMC0xSDQuNDFjLTEuNjMgMC0yLjk2IDEuMzMtMi45NiAyLjk2djQuMjlsLS45LjQ1LS41NS4yN1Y0MmgyMS43M3YtMi4zMWwtLjQ5LS4yOS0uNzYtLjQ2di00LjMyYy4wMS0xLjYzLTEuMzItMi45NS0yLjk1LTIuOTV6Ii8+PGc+PHBhdGggY2xhc3M9InByZWZpeF9fc3QwIiBkPSJNMzQuNjcgMzguNTVsLTEwLjgxLTEwLjgtNS43LTYuMy0yLjI1IDIuMjVjLjQuODIuMjUgMS44Mi0uNDEgMi40OGwtMS4xMSAxLjExYy0uNDEuNDEtLjk1LjYzLTEuNTMuNjNzLTEuMTItLjIzLTEuNTMtLjYzbC04Ljg3LTguODdjLS44NC0uODQtLjg0LTIuMjIgMC0zLjA2bDEuMTEtMS4xMWMuNDEtLjQxLjk1LS42MyAxLjUzLS42My4zMyAwIC42Ni4wOC45NS4yMmw5LjExLTkuMTFjLS40LS44Mi0uMjUtMS44Mi40MS0yLjQ4bDEuMTEtMS4xMWMuNDEtLjQxLjk1LS42MyAxLjUzLS42M3MxLjEyLjIzIDEuNTMuNjNsOC44NyA4Ljg3Yy44NC44NC44NCAyLjIyIDAgMy4wNmwtMS4xMSAxLjExYy0uNDEuNDEtLjk1LjYzLTEuNTMuNjMtLjMzIDAtLjY2LS4wOC0uOTUtLjIybC0yLjIzIDIuMjMgNi40NSA1LjU1IDEwLjc3IDEwLjc3IDEuMzYgMS43OS0uNjUgMS45NC0yLjQxIDIuNDEtMS45NC42NS0xLjctMS4zOHoiLz48cGF0aCBjbGFzcz0icHJlZml4X19zdDAiIGQ9Ik0xOC4yMSAxYy40MyAwIC44NS4xNiAxLjE4LjQ5bDguODcgOC44N2MuNjUuNjUuNjUgMS43MSAwIDIuMzZsLTEuMTEgMS4xMWExLjY3NCAxLjY3NCAwIDAxLTIuMjEuMTRsLTIuODkgMi44OSA2Ljg2IDUuOUwzOS42NSAzMy41bDEuMTYgMS41My0uNTMgMS41Ny0yLjI0IDIuMjQtMS41Ny41My0xLjQ5LTEuMi0xMC43Ni0xMC43OC02LjA0LTYuNjctMi45IDIuOWMuNTEuNjUuNDcgMS42LS4xMyAyLjJsLTEuMTEgMS4xMWMtLjMyLjMyLS43NS40OS0xLjE4LjQ5cy0uODUtLjE2LTEuMTgtLjQ5bC04Ljg3LTguODdjLS42NS0uNjUtLjY1LTEuNzEgMC0yLjM2bDEuMTEtMS4xMWExLjY3NCAxLjY3NCAwIDAxMi4yMS0uMTRsOS42Ny05LjY3Yy0uNTEtLjY1LS40Ny0xLjYuMTMtMi4ybDEuMTEtMS4xMWMuMzEtLjMxLjc0LS40NyAxLjE3LS40N20wLTFjLS43MSAwLTEuMzguMjgtMS44OS43OGwtMS4xMSAxLjExYy0uNzMuNzMtLjk1IDEuNzktLjY1IDIuNzJsLTguNjUgOC42NWMtLjI3LS4wOS0uNTUtLjEzLS44My0uMTMtLjcxIDAtMS4zOC4yOC0xLjg4Ljc4TDIuMSAxNWEyLjY2OCAyLjY2OCAwIDAwMCAzLjc3bDguODcgOC44N2MuNS41IDEuMTcuNzggMS44OS43OC43MSAwIDEuMzgtLjI4IDEuODktLjc4bDEuMTEtMS4xMWMuNzMtLjczLjk1LTEuNzkuNjUtMi43MmwxLjY1LTEuNjUgNS4zMyA1Ljg5IDEwLjggMTAuODEuMDQuMDQuMDQuMDMgMS40OSAxLjIuNDMuMzQuNTItLjE3IDEuNTctLjUzLjIyLS4wNy4xNy0uMTcgMi4yNC0yLjI0LjE3LS4xNy4wNy0uMjIuNTMtMS41Ny4xNy0uNS0uMzItLjQyLTEuMTYtMS41My0uMDQtLjA1LS4wNS0uMDUtMTAuNzYtMTAuNzQtLjAzLS4wMy0uMDMtLjAyLTYuMDQtNS4yIDEuNjItMS42MmEyLjY4OSAyLjY4OSAwIDAwMi43Mi0uNjVsMS4xMS0xLjExYTIuNjY4IDIuNjY4IDAgMDAwLTMuNzdMMjAuMS43N0MxOS41OS4yOCAxOC45MiAwIDE4LjIxIDB6Ii8+PC9nPjxnPjxwYXRoIGNsYXNzPSJwcmVmaXhfX3N0MSIgZD0iTTE5LjQ5IDM5LjUyaC4xOEgyLjQ4aC4wM0wxIDQwLjI2VjQxaDE5Ljcxdi0uNzR6TTE5LjQ5IDM0LjYzYzAtMS4wOC0uODgtMS45Ni0xLjk2LTEuOTZINC40MWMtMS4wOCAwLTEuOTYuODgtMS45NiAxLjk2djMuNzdsMTcuMDQuMDF2LTMuNzh6bS0xLjQ4IDIuM2wtMTQuMDgtLjAxdi0yLjI5YzAtLjI2LjIyLS40OC40OC0uNDhoMTMuMTJjLjI2IDAgLjQ4LjIyLjQ4LjQ4djIuM3pNNDAuODEgMzUuMDJsLS41Mi0uNTItNC4zNCA0LjM0LjUyLjUyIDEuNTctLjUyIDIuMjUtMi4yNXpNMjguOTEgMjIuNzVsLTYuODYtNS45IDIuODktMi44OWMuMy4yNC42Ni4zNSAxLjAzLjM1LjQzIDAgLjg1LS4xNiAxLjE4LS40OWwxLjExLTEuMTFjLjY1LS42NS42NS0xLjcxIDAtMi4zNmwtOC44Ny04Ljg3Yy0uNjUtLjY1LTEuNzEtLjY1LTIuMzYgMGwtMS4xMSAxLjExYy0uNi42LS42NCAxLjU1LS4xMyAyLjJsLTkuNjcgOS42N2MtLjY1LS41MS0xLjYtLjQ3LTIuMi4xM0wyLjgxIDE1LjdjLS42NS42NS0uNjUgMS43MSAwIDIuMzZsOC44NyA4Ljg3Yy4zMi4zMi43NS40OSAxLjE4LjQ5cy44NS0uMTYgMS4xOC0uNDlsMS4xMS0xLjExYy42LS42LjY0LTEuNTUuMTMtMi4ybDIuOS0yLjkgNi4wNCA2LjY3IDEwLjc3IDEwLjc3IDQuNjctNC42Ny0xMC43NS0xMC43NHpNMTYuOTcgMy42NGwxLjExLTEuMTFjLjA0LS4wNC4wOC0uMDUuMTMtLjA1cy4wOS4wMi4xMy4wNWw4Ljg3IDguODdjLjA3LjA3LjA3LjE5IDAgLjI2bC0xLjExIDEuMTFjLS4wNy4wNy0uMTkuMDctLjI2IDBMMTYuOTcgMy45YS4xODcuMTg3IDAgMDEwLS4yNnptLTIuODggMjEuMTRsLTEuMTEgMS4xMWMtLjA3LjA3LS4xOS4wNy0uMjYgMGwtOC44Ny04Ljg3YS4xODcuMTg3IDAgMDEwLS4yNmwxLjExLTEuMTFjLjA0LS4wNC4wOC0uMDUuMTMtLjA1cy4wOS4wMi4xMy4wNWw4Ljg3IDguODdjLjA4LjA3LjA4LjE5IDAgLjI2em0uMTUtMi4yMWwtNy4wNi03LjA2IDkuNjUtOS42NSA3LjA2IDcuMDYtMi45NiAyLjk2LTMuNzUgMy43NS0yLjk0IDIuOTR6bTExLjA2IDMuODJsLTYuMDctNi43MSAxLjc4LTEuNzggNi44OCA1LjkyIDkuNjggOS42OC0yLjU4IDIuNTgtOS42OS05LjY5eiIvPjwvZz48L3N2Zz4=");
 }
 
+.okit-user-add {
+    background-image: url("data:image/svg+xml;base64,PHN2ZyB2ZXJzaW9uPSIxLjEiIGlkPSJwcmVmaXhfX0xheWVyXzEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeD0iMCIgeT0iMCIgdmlld0JveD0iMCAwIDQyIDQyIiB4bWw6c3BhY2U9InByZXNlcnZlIj48c3R5bGU+LnByZWZpeF9fc3Qwe2ZpbGw6I2ZmZn0ucHJlZml4X19zdDF7ZmlsbDojMmM1OTY3fTwvc3R5bGU+PHBhdGggY2xhc3M9InByZWZpeF9fc3QwIiBkPSJNMTYuNDkgMjEuMjljLTUuNzMgMC0xMC40LTQuNjYtMTAuNC0xMC4zOVMxMC43NS41IDE2LjQ5LjVjNS43MyAwIDEwLjQgNC42NiAxMC40IDEwLjQtLjAxIDUuNzMtNC42NyAxMC4zOS0xMC40IDEwLjM5eiIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoNSAyKSIvPjxwYXRoIGNsYXNzPSJwcmVmaXhfX3N0MCIgZD0iTTE2LjQ5IDFjNS40NiAwIDkuOSA0LjQ0IDkuOSA5LjlzLTQuNDQgOS45LTkuOSA5LjktOS45LTQuNDQtOS45LTkuOVMxMS4wMyAxIDE2LjQ5IDFtMC0xYy02LjAxIDAtMTAuOSA0Ljg5LTEwLjkgMTAuOSAwIDYuMDEgNC44OSAxMC45IDEwLjkgMTAuOXMxMC45LTQuODkgMTAuOS0xMC45QzI3LjM4IDQuODkgMjIuNSAwIDE2LjQ5IDB6IiB0cmFuc2Zvcm09InRyYW5zbGF0ZSg1IDIpIi8+PGc+PHBhdGggY2xhc3M9InByZWZpeF9fc3QwIiBkPSJNLjUgNDEuNVYyOC44NGMwLTQuMDIgMy4yNy03LjI5IDcuMjktNy4yOWgyLjE3bC40LjUyYTcuNjgyIDcuNjgyIDAgMDA2LjEzIDMuMDJjLjM0IDAgLjY4LS4wMiAxLjAyLS4wNiAyLS4yNSAzLjkxLTEuNCA1LjI1LTMuMTRsLjI2LS4zNGgyLjE3YzQuMDIgMCA3LjI5IDMuMjcgNy4yOSA3LjI5VjQxLjVILjV6IiB0cmFuc2Zvcm09InRyYW5zbGF0ZSg1IDIpIi8+PHBhdGggY2xhc3M9InByZWZpeF9fc3QwIiBkPSJNMjUuMTggMjIuMDRhNi43OSA2Ljc5IDAgMDE2Ljc5IDYuNzlWNDFIMVYyOC44NGE2Ljc5IDYuNzkgMCAwMTYuNzktNi43OWgxLjkybC4yNS4zM2E4LjE4NCA4LjE4NCAwIDAwNi41MiAzLjIyYy4zNiAwIC43Mi0uMDIgMS4wOC0uMDcgMi4yMy0uMjggNC4yMi0xLjU1IDUuNTktMy4zM2wuMTEtLjE0aDEuOTJtMC0xLjAyaC0yLjQxbC0uMy4zOS0uMTEuMTRjLTEuMjYgMS42NC0zLjA1IDIuNzItNC45MiAyLjk1LS4zMi4wNC0uNjQuMDYtLjk1LjA2YTcuMTcgNy4xNyAwIDAxLTUuNzMtMi44M2wtLjI1LS4zMy0uMy0uMzlINy43OWMtNC4zIDAtNy43OSAzLjUtNy43OSA3Ljc5VjQyaDMyLjk4VjI4Ljg0YzAtNC4zLTMuNS03LjgtNy44LTcuOHoiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDUgMikiLz48L2c+PGc+PHBhdGggY2xhc3M9InByZWZpeF9fc3QxIiBkPSJNMTYuNDkgMjAuNzljNS40NiAwIDkuOS00LjQ0IDkuOS05LjlTMjEuOTUgMSAxNi40OSAxcy05LjkgNC40NC05LjkgOS45IDQuNDQgOS44OSA5LjkgOS44OXptMC0xOC4xMmM0LjU0IDAgOC4yMyAzLjY5IDguMjMgOC4yM3MtMy42OSA4LjIzLTguMjMgOC4yMy04LjIzLTMuNjktOC4yMy04LjIzIDMuNjktOC4yMyA4LjIzLTguMjN6TTI1LjE4IDIyLjA0aC0xLjkybC0uMjUuMzNjLTEuNTcgMi4wNC0zLjk1IDMuMjItNi41MiAzLjIycy00Ljk1LTEuMTctNi41Mi0zLjIybC0uMjUtLjMzSDcuNzljLTMuNzQgMC02Ljc5IDMuMDUtNi43OSA2LjhWNDFoMS42N1YyOC44NGMwLTIuODMgMi4zLTUuMTMgNS4xMy01LjEzaDEuMWMxLjg5IDIuMjYgNC42MyAzLjU0IDcuNTggMy41NHM1LjctMS4yOSA3LjU4LTMuNTRoMS4xMWMyLjgzIDAgNS4xMyAyLjMgNS4xMyA1LjEzVjQxaDEuNjdWMjguODRjLjAxLTMuNzUtMy4wNC02LjgtNi43OS02Ljh6IiB0cmFuc2Zvcm09InRyYW5zbGF0ZSg1IDIpIi8+PC9nPjxwYXRoIGQ9Ik0xIDZoMTBNNiAxdjEwTTEgTmFOIiBzdHJva2U9IiMwNDc1MGEiIHN0cm9rZS13aWR0aD0iMiIvPjwvc3ZnPg==");
+}
+
+.okit-user-group-add {
+    background-image: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA1NyA1NyI+PGcgZmlsbD0iI2ZmZiI+PHBhdGggZD0iTS41IDQ5LjVWMzQuM2MwLTMgMi40LTUuNCA1LjQtNS40SDh2LS4zYy0yLjItMS4zLTMuNy0zLjctMy43LTYuNCAwLTQuMSAzLjMtNy40IDcuNC03LjRzNy40IDMuMyA3LjQgNy40YzAgMi42LTEuNCA0LjktMy41IDYuM2guNWMxLjItMS41IDMtMi40IDUtMi40aDIuNlYyNWMtMi42LTEuNi00LjItNC41LTQuMi03LjYgMC00LjkgNC04LjkgOC45LTguOXM4LjkgNCA4LjkgOC45YzAgMy4xLTEuNiA2LTQuMyA3LjZ2MWgyLjdjMiAwIDMuOC45IDUuMSAyLjRoLjVhNy40OCA3LjQ4IDAgMDEtMy41LTYuM2MwLTQuMSAzLjMtNy40IDcuNC03LjRzNy40IDMuMyA3LjQgNy40YzAgMi42LTEuNCA1LjEtMy42IDYuNHYuNWgyYzMgMCA1LjQgMi40IDUuNCA1LjR2MTUuMkguNXoiLz48cGF0aCBkPSJNMjguNCA5YzQuNiAwIDguNCAzLjggOC40IDguNCAwIDMuMS0xLjcgNS45LTQuMyA3LjN2MS44aDMuMmMxLjkgMCAzLjcgMSA0LjggMi40aDMuMmMtMy4xLS43LTUuNC0zLjUtNS40LTYuOCAwLTMuOCAzLjEtNi45IDYuOS02LjlzNi45IDMuMSA2LjkgNi45YzAgMy4zLTIuMyA2LjEtNS40IDYuOGgxLjh2LjVINTFjMi43IDAgNC45IDIuMiA0LjkgNC45VjQ5SDFWMzQuM2MwLTIuNyAyLjItNC45IDQuOS00LjloMi42VjI5aDEuN2MtMy4xLS43LTUuNC0zLjUtNS40LTYuOCAwLTMuOCAzLjEtNi45IDYuOS02LjlzNi45IDMuMSA2LjkgNi45YzAgMy4zLTIuMyA2LjEtNS40IDYuOGgzLjJjMS4xLTEuNSAyLjgtMi40IDQuNy0yLjRoMy4xdi0xLjljLTIuNS0xLjQtNC4yLTQuMi00LjItNy4zIDAtNC42IDMuOC04LjQgOC40LTguNG0wLTFjLTUuMiAwLTkuNCA0LjItOS40IDkuNCAwIDMuMiAxLjYgNi4xIDQuMiA3Ljh2LjNoLTIuMWMtLjkgMC0xLjcuMi0yLjUuNS42LTEuMSAxLTIuNCAxLTMuOCAwLTQuNC0zLjYtNy45LTcuOS03LjlzLTcuOSAzLjYtNy45IDcuOWMwIDIuNSAxLjIgNC44IDMgNi4yaC0xYy0zLjIgMC01LjkgMi42LTUuOSA1LjlWNTBoNTYuOVYzNC4zYzAtMy4yLTIuNi01LjktNS45LTUuOWgtMWMxLjktMS41IDMtMy44IDMtNi4yIDAtNC40LTMuNi03LjktNy45LTcuOXMtNy45IDMuNi03LjkgNy45YzAgMS40LjQgMi43IDEgMy44LS44LS4zLTEuNy0uNS0yLjYtLjVoLTIuMnYtLjNjMi43LTEuNyA0LjMtNC43IDQuMy03LjkuMi01LjEtNC05LjMtOS4yLTkuM3oiLz48L2c+PGcgZmlsbD0iIzJjNTk2NyI+PHBhdGggZD0iTTQ1LjIgMjkuMmMzLjggMCA2LjktMy4xIDYuOS02LjlzLTMuMS03LTYuOS03LTYuOSAzLjEtNi45IDYuOSAzLjEgNyA2LjkgN3ptMC0xMi4yYzIuOSAwIDUuMyAyLjQgNS4zIDUuM3MtMi40IDUuMy01LjMgNS4zLTUuMy0yLjQtNS4zLTUuMyAyLjQtNS4zIDUuMy01LjN6Ii8+PHBhdGggZD0iTTUxLjEgMjkuNWgtMS40bC0uMy4zYy0xIDEuMy0yLjUgMi4xLTQuMiAyLjEtMS42IDAtMy4yLS44LTQuMi0yLjFsLS4zLS4zaC0uMWMtMS0xLjctMi45LTIuOS01LTIuOUgzNGwtLjMuM2MtMS4zIDEuNy0zLjIgMi42LTUuMyAyLjZzLTQtMS01LjMtMi42bC0uMy0uM2gtMS43Yy0yLjEgMC00IDEuMi01IDIuOWwtLjMuM2MtMSAxLjMtMi41IDIuMS00LjIgMi4xcy0zLjItLjgtNC4yLTIuMWwtLjMtLjNINS45Yy0yLjcgMC00LjkgMi4yLTQuOSA0LjlWNDloMS43VjM0LjNjMC0xLjggMS40LTMuMiAzLjItMy4yaC42YzEuMyAxLjUgMy4yIDIuNCA1LjIgMi40IDEuMyAwIDIuNi0uNCAzLjYtMVY0OUgxN1YzMi40YzAtMi4zIDEuOS00LjEgNC4xLTQuMWguOWMxLjYgMS45IDMuOSAzIDYuNCAzczQuOC0xLjEgNi40LTNoLjljMi4zIDAgNC4xIDEuOSA0LjEgNC4xVjQ5aDEuNlYzMi40YzEuMS43IDIuNCAxLjEgMy43IDEuMSAyIDAgMy45LS45IDUuMi0yLjRoLjZjMS44IDAgMy4yIDEuNCAzLjIgMy4yVjQ5aDEuN1YzNC4zYy4xLTIuNy0yLTQuOC00LjctNC44eiIvPjxwYXRoIGQ9Ik0xMS43IDI5LjJjMy44IDAgNi45LTMuMSA2LjktNi45cy0zLjEtNi45LTYuOS02LjktNi45IDMuMS02LjkgNi45IDMuMSA2LjkgNi45IDYuOXptMC0xMi4yYzIuOSAwIDUuMyAyLjQgNS4zIDUuM3MtMi40IDUuMy01LjMgNS4zLTUuMy0yLjQtNS4zLTUuM1M4LjggMTcgMTEuNyAxN3pNMjguNCAyNS44YzQuNiAwIDguNC0zLjggOC40LTguNFMzMy4xIDkgMjguNCA5IDIwIDEyLjggMjAgMTcuNHMzLjggOC40IDguNCA4LjR6bTAtMTUuMWE2LjcgNi43IDAgMTEwIDEzLjQgNi43IDYuNyAwIDAxMC0xMy40ek0yMS4yIDM4LjZoLS45VjQ5SDIydi04Ljd6TTM1LjYgMzguNmwtLjggMS43VjQ5aDEuN1YzOC42ek01MC4xIDQydjdoMS42di04LjdoLS44ek01LjIgNDAuM1Y0OWgxLjd2LTdMNiA0MC4zeiIvPjwvZz48cGF0aCBkPSJNMSA2aDEwTTYgMXYxME0xIE5hTiIgc3Ryb2tlPSIjMDQ3NTBhIiBzdHJva2Utd2lkdGg9IjIiLz48L3N2Zz4=");
+}
+
+.user-group-button-background {
+    background-position: center;
+    background-repeat: no-repeat;
+    background-size: 2em;
+    height: 2em;
+    width: 2em;
+}
+
+.user-button-background {
+    background-position: center;
+    background-repeat: no-repeat;
+    background-size: 2em;
+    height: 2em;
+    width: 2em;
+}
+
+
+/*
+** User Groups
+*/
+.okit-groups-panel1 {
+    height: 100%;
+    overflow-y: scroll;
+}
+
 .okit-user-group {
+    position: relative;
     background-repeat: no-repeat;
-    background-position: 0 0;
+    background-position: 8px 5px;
     background-size: 25px 25px;
+    min-height: 200px;
+    min-width: 200px;
+    width: 200px;
+    /* height:200px; */
+    border: 1px dashed black;
+    border-radius: 2px;
+    margin: 5px;
+    padding-left: 40px;
 }
 
 .okit-group-grid {
     display: grid;
-    grid-template-columns: repeat( auto-fit, minmax(25px, 1fr) );
+    grid-template-columns: repeat( auto-fill, minmax(200px, 1fr) );
+    justify-content: start;
+    grid-auto-flow: dense;
+    gap: 15px;
+}
+
+/*
+** Users
+*/
+.okit-users-panel1 {
+    height: 100%;
+    overflow-y: scroll;
 }
 
 .okit-user {
+    position: relative;
     background-repeat: no-repeat;
-    background-position: 0 0;
+    background-position: 5px 5px;
     background-size: 25px 25px;
-    height: 25px;
+    min-height: 40px;
+    min-width: 40px;
+    height: 40px;
+    border: 1px dashed black;
+    border-radius: 2px;
+    margin: 5px;
+    padding-left: 40px;
+}
+
+.okit-users-grid {
+    display: grid;
+    grid-template-columns: repeat( auto-fill, minmax(140px, 1fr) );
+    justify-content: start;
+    grid-auto-flow: dense;
+    gap: 15px;
+}
+
+
+/*
+** Common
+*/
+.okit-resource-details {
+    display: grid;
+    grid-auto-flow: row;
+    row-gap: 2px;
+    max-width: 100px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    padding: 0;
+    margin: 2px 0 0 0;
+}
+
+.okit-resource-details > div > input {
+    max-width: 90px;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    overflow: hidden;
+}
+
+.okit-resource-title {
+    opacity: 0.5;
+}
+
+.okit-resource-display-name {
+    font-weight: bold;
+    border: none;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    overflow: hidden;
+}
+
+.okit-resource-display-name:focus {
+    border: none;
+    outline-width: 0;
+    background-color: ghostwhite;
+
+  }
+
+.compact {
+    max-height: 40px !important;
+    max-width: 40px !important;
+    height: 40px;
+    width: 40px;
+}
+
+div.compact div.okit-resource-details {
+    max-height: 0;
+    max-width: 0;
+    visibility: hidden;
+    display: none;
+}
+
+.okit-identity-details {
+    display: block;
+    height: calc(100% - 2em);
+    padding: 10px 10px 50px 10px;
+    border: 1px dashed black;
+    border-radius: 2px;
+}
+
+.okit-identity-scroll-panel {
+    height: 100%;
+    overflow-y: scroll;
+}
+
+.okit-identity-details1:first-child {
+    margin-left: 20px;
+}
+
+.okit-identity-details1 > div {
+    display: grid;
+    column-gap: 20px;
+    border: 1px dashed black;
+    border-radius: 2px;
+    height: 100%;
+    width: 100%;
 }
diff --git a/okitweb/static/okit/view/identity/js/okit_identity_view.js b/okitweb/static/okit/view/identity/js/okit_identity_view.js
index 9068856c6..26158f139 100644
--- a/okitweb/static/okit/view/identity/js/okit_identity_view.js
+++ b/okitweb/static/okit/view/identity/js/okit_identity_view.js
@@ -18,6 +18,146 @@ class OkitIdentityView extends OkitJsonView {
 
     draw(for_export=false) {
         this.newCanvas()
+        // Add Users Div
+        const identify_panel = d3.select(`#${this.parent_id}`)
+        this.drawUsersPanel(d3.select('#identity_users_div'))
+        this.drawGroupsPanel(d3.select('#identity_user_groups_div'))
+    }
+
+    drawUsersPanel(parent) {
+        const self = this
+        const users_panel = parent.append('div').attr('class', 'okit-identity-scroll-panel').append('div').attr('id', 'identity_users_panel').attr('class', 'okit-users-grid okit-users-panel')
+        self.model.getUsers().forEach((user) => self.addUserToPanel(users_panel, user))
+    }
+
+    addUserToPanel(parent, user, group) {
+        const self = this
+        const user_div = parent.append('div').attr('class', 'oci-user okit-user')
+            .attr('title', `${user.display_name}`)
+            .on('click', (e) => {d3.event.stopPropagation(); $(jqId(PROPERTIES_PANEL)).load("propertysheets/user.html", () => {loadPropertiesSheet(user);})});
+        const details_div = user_div.append('div').attr('class', 'okit-resource-details')
+        details_div.append('div').attr('class', 'okit-resource-title').text('User')
+        details_div.append('div').append('input').attr('class', 'okit-resource-display-name').attr('tabindex', -1)
+            .attr('type', 'text')
+            .attr('name', `user_${user.display_name.replaceAll(' ','_')}`)
+            .attr('value', `${user.display_name}`)
+            .on('change', (d, i, o) => {
+                self.updateUserDisplayName(user.display_name, o[0].value)
+                user.display_name = o[0].value
+            })
+        user_div.append('div').attr('class', 'cancel action-button-background cancel-overlay')
+            .on('click', () => {group ? self.deleteUserFromGroup(user, group) : self.deleteUser(user.id)})
+        if (!group) {
+            user_div.attr('draggable', 'true').on('dragstart', () => {
+                d3.event.dataTransfer.setData('text/plain', user.id)
+            })
+            // .on('dragend', () => {console.info('Drag End', d3.event)})
+        }
+    }
+
+    updateUserDisplayName(existing, updated) {
+        const val_query = `#identity-div input[name="user_${existing.replaceAll(' ','_')}"][value="${existing}"]`
+        // const val_query = `input[name="user_${existing.replaceAll(' ','_')}"]`
+        const name_query = `#identity-div input[name="user_${existing.replaceAll(' ','_')}"]`
+        console.info('Query', val_query)
+        $(val_query).val(updated)
+        $(name_query).attr('value', updated)
+        $(name_query).attr('name', `user_${updated.replaceAll(' ','_')}`)
+    }
+
+    drawGroupsPanel(parent) {
+        const self = this
+        const groups_panel = parent.append('div').attr('class', 'okit-identity-scroll-panel').append('div').attr('id', 'identity_groups_panel').attr('class', 'okit-group-grid okit-groups-panel')
+        self.model.getGroups().forEach((group) => self.addGroupToPanel(groups_panel, group))
+    }
+
+    addGroupToPanel(parent, group) {
+        const self = this
+        const group_div = parent.append('div').attr('class', 'oci-user-group okit-user-group')
+            .on('click', () => {$(jqId(PROPERTIES_PANEL)).load("propertysheets/group.html", () => {
+                self.loadUsersMultiSelect('user_ids')
+                loadPropertiesSheet(group)
+                $('#user_ids').find("input:checkbox").each(function() {
+                    console.info('Adding Click event')
+                    $(this).on('change', () => {self.draw(); console.info('Clicked')});
+                });    
+            })});
+        const details_div = group_div.append('div').attr('class', 'okit-resource-details')
+        details_div.append('div').append('label').attr('class', 'okit-resource-title').text('User Group')
+        details_div.append('div').append('input').attr('class', 'okit-resource-display-name').attr('tabindex', -1)
+            .attr('type', 'text')
+            .attr('name', `group_${group.display_name.replaceAll(' ','_')}`)
+            .attr('value', `${group.display_name}`)
+            .on('change', (d, i, o) => {
+                self.updateGroupDisplayName(group.display_name, o[0].value)
+                group.display_name = o[0].value
+            })
+
+        group.user_ids.forEach((id) => self.addUserToPanel(group_div, self.model.getUser(id), group))
+        group_div.append('div').attr('class', 'cancel action-button-background cancel-overlay')
+            .on('click', () => {self.deleteUserGroup(group.id)})
+        group_div.on('dragover', () => {d3.event.preventDefault()}).on('drop', () => {
+            const user_id = d3.event.dataTransfer.getData('text/plain')
+            if (!group.user_ids.includes(user_id)) group.user_ids.push(user_id)
+            // if (!group.user_ids.includes(user_id)) group.user_ids = [...group.user_ids, user_id]
+            self.draw()
+        })
+    }
+
+    updateGroupDisplayName(existing, updated) {
+        const val_query = `#identity-div input[name="group_${existing.replaceAll(' ','_')}"][value="${existing}"]`
+        // const val_query = `input[name="user_${existing.replaceAll(' ','_')}"]`
+        const name_query = `#identity-div input[name="group_${existing.replaceAll(' ','_')}"]`
+        console.info('Query', val_query)
+        $(val_query).val(updated)
+        $(name_query).attr('value', updated)
+        $(name_query).attr('name', `group_${updated.replaceAll(' ','_')}`)
+    }
+
+    addUser() {
+        const users_panel = d3.select('#identity_users_panel')
+        const user = this.model.newUser({})
+        this.addUserToPanel(users_panel, user)
+    }
+
+    deleteUser(id) {
+        this.model.deleteUser(id)
+        this.model.getGroups().forEach((g) => g.user_ids = g.user_ids ? g.user_ids.filter((uid) => uid !== id) : [])
+        this.draw()
+    }
+
+    deleteUserFromGroup(user, group) {
+        group.user_ids = group.user_ids.filter((id) => id !== user.id)
+        this.draw()
+    }
+
+    addUserGroup() {
+        const groups_panel = d3.select('#identity_groups_panel')
+        const group = this.model.newGroup({})
+        this.addGroupToPanel(groups_panel, group)
+    }
+
+    deleteUserGroup(id) {
+        this.model.deleteGroup(id)
+        this.draw()
+    }
+
+   newCanvas() {
+        const self = this
+        $(`#${this.parent_id}`).empty()
+        const identify_panel = d3.select(`#${this.parent_id}`)
+        // Users
+        const users_details = identify_panel.append('div').attr('id', 'identity_users_div').attr('class', 'okit-identity-details')
+        const user_details_title = users_details.append('div').attr('class', 'okit-data-entry-title')
+        user_details_title.append('label').text('Users')
+        user_details_title.append('div').attr('class', 'okit-user-add user-button-background')
+            .on('click', () => {self.addUser()})
+        // User Groups
+        const groups_details = identify_panel.append('div').attr('id', 'identity_user_groups_div').attr('class', 'okit-identity-details')
+        const group_details_title = groups_details.append('div').attr('class', 'okit-data-entry-title')
+        group_details_title.append('label').text('User Groups')
+        group_details_title.append('div').attr('class', 'okit-user-group-add user-group-button-background')
+            .on('click', () => {self.addUserGroup()})
     }
 
 }
diff --git a/okitweb/static/okit/view/json/js/okit_json_view.js b/okitweb/static/okit/view/json/js/okit_json_view.js
index 51f5c362d..76a45052d 100644
--- a/okitweb/static/okit/view/json/js/okit_json_view.js
+++ b/okitweb/static/okit/view/json/js/okit_json_view.js
@@ -155,3 +155,156 @@ class OkitTextJsonView extends OkitJsonView {
 okitViewClasses.push(OkitTextJsonView);
 
 let okitTextJsonView = null;
+
+class OkitCacheJsonView extends OkitTextJsonView {
+    constructor(okitjson=null, oci_data=null, resource_icons=[], parent_id = 'json-text-div') {
+        super(null, oci_data, resource_icons, parent_id);
+        this.okitjson = okitjson;
+        this.oci_data = oci_data;
+        this.resource_icons = resource_icons;
+        this.parent_id = parent_id;
+    }
+    get model() {return this.okitjson;}
+    get data() {return this.oci_data;}
+
+    static newView(model, oci_data=null, resource_icons=[], parent_id = 'json-text-div') {
+        return new OkitCacheJsonView((model, oci_data, parent_id, resource_icons))
+    }
+
+    // draw(for_export=false) {
+    //     this.newCanvas()
+    // }
+
+    // newCanvas(width=800, height=800, for_export=false) {
+    //     // Empty Existing
+    //     let json_div = document.getElementById(this.parent_id)
+    //     json_div.innerHTML = ''
+    //     let root = this.createRoot(json_div)
+    //     this.addObjectAttribute(root, this.model, '')
+    // }
+
+    // createRoot(parent) {
+    //     let root = document.createElement('ul')
+    //     root.setAttribute('id', 'json_view_root')
+    //     root.setAttribute('class', 'json-view-root')
+    //     parent.appendChild(root)
+    //     return root
+    // }
+
+    // addObjectAttribute(parent, obj, key='') {
+    //     let element = document.createElement('li')
+    //     element.setAttribute('class', 'object')
+    //     element.onclick = (event) => {
+    //         event.stopPropagation()
+    //         if(event.target !== event.currentTarget) return false
+    //         const ul = element.getElementsByTagName('ul')[0]
+    //         element.classList.toggle('element-collapsed')
+    //         return false
+    //     }
+    //     parent.appendChild(element)
+    //     let key_label = this.buildKey(key)
+    //     key_label.onclick = (event) => {
+    //         event.stopPropagation()
+    //         const ul = element.getElementsByTagName('ul')[0]
+    //         element.classList.toggle('element-collapsed')
+    //         return false
+    //     }
+    //     element.appendChild(key_label)
+    //     if (Object.keys(obj).length === 0) {
+    //         element.setAttribute('class', 'object empty')
+    //     } else {
+    //         element.setAttribute('id', obj.id)
+    //         element.setAttribute('class', 'object collapsible')
+    //         // Process key/val
+    //         let object_ul = document.createElement('ul')
+    //         element.appendChild(object_ul)
+    //         Object.entries(obj).forEach(([k, v]) => {
+    //             if (v instanceof Function) console.info('Ignoring Function', k)
+    //             else if (Array.isArray(v)) this.addArrayAttribute(object_ul, v, k)
+    //             else if (v instanceof Object) this.addObjectAttribute(object_ul, v, k)
+    //             else this.addSimpleAttribute(object_ul, v, k)
+    //         })
+    //     }
+    // }
+
+    // addArrayAttribute(parent, arr, key='') {
+    //     let element = document.createElement('li')
+    //     element.setAttribute('class', 'array')
+    //     element.onclick = (event) => {
+    //         event.stopPropagation()
+    //         if(event.target !== event.currentTarget) return false
+    //         const ul = element.getElementsByTagName('ul')[0]
+    //         element.classList.toggle('element-collapsed')
+    //         return false
+    //     }
+    //     parent.appendChild(element)
+    //     let key_label = this.buildKey(key)
+    //     key_label.onclick = (event) => {
+    //         event.stopPropagation()
+    //         const ul = element.getElementsByTagName('ul')[0]
+    //         element.classList.toggle('element-collapsed')
+    //         return false
+    //     }
+    //     element.appendChild(key_label)
+    //     if (arr.length === 0) {
+    //         element.setAttribute('class', 'array empty')
+    //     } else {
+    //         element.setAttribute('class', 'array collapsible')
+    //         // Process key/val
+    //         let object_ul = document.createElement('ul')
+    //         element.appendChild(object_ul)
+    //         arr.forEach((v) => {
+    //             if (Array.isArray(v)) this.addArrayAttribute(object_ul, v)
+    //             else if (v instanceof Object) this.addObjectAttribute(object_ul, v)
+    //             else this.addSimpleAttribute(object_ul, v)
+    //         })
+    //     }
+    // }
+
+    // addSimpleAttribute(parent, val, key='') {
+    //     let element = document.createElement('li')
+    //     element.setAttribute('class', 'simple')
+    //     parent.appendChild(element)
+    //     if (key && key !== '') {
+    //         element.appendChild(this.buildKey(key))
+    //     }
+    //     let label = document.createElement('label')
+    //     label.setAttribute('class', typeof val)
+    //     label.appendChild(document.createTextNode(val))
+    //     element.appendChild(label)
+    // }
+
+    // addCloseBrace(parent, brace=')') {
+    //     const close_li = document.createElement('li')
+    //     const close_brace = document.createElement('span')
+    //     close_brace.setAttribute('class', 'brace')
+    //     close_brace.appendChild(document.createTextNode(`${brace}`))
+    //     close_li.appendChild(close_brace)
+    //     parent.appendChild(close_li)
+    // }
+
+    // buildKey(key) {
+    //     // HTML Elements
+    //     const div = document.createElement('div')
+    //     const label = document.createElement('label')
+    //     const span = document.createElement('span')
+    //     const colon = document.createElement('span')
+    //     // Create Element Name Label
+    //     if (key !== '') {
+    //         span.appendChild(document.createTextNode(`"${key}"`))
+    //         span.setAttribute('class', 'key')
+    //         colon.appendChild(document.createTextNode(':'))
+    //         colon.setAttribute('class', 'colon')
+    //         label.setAttribute('class', 'key')
+    //         label.appendChild(span)
+    //         label.appendChild(colon)
+    //         label.setAttribute('class', 'key-displayed')
+    //     }
+    //     return label
+    //     // div.appendChild(label)
+    //     // return div
+    // }
+
+}
+
+let okitCacheJsonView = null;
diff --git a/okitweb/static/svg/user_add.svg b/okitweb/static/svg/user_add.svg
new file mode 100644
index 000000000..f4cfe97aa
--- /dev/null
+++ b/okitweb/static/svg/user_add.svg
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 42 42" style="enable-background:new 0 0 42 42;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;}
+	.st1{fill:#2C5967;}
+	.st2{fill:#FFFFFF;stroke:#FFFFFF;stroke-miterlimit:10;}
+</style>
+<g transform="translate(5,2)">
+	<g>
+		<g>
+			<path class="st0" d="M16.49,21.29c-5.73,0-10.4-4.66-10.4-10.39c0-5.73,4.66-10.4,10.4-10.4c5.73,0,10.4,4.66,10.4,10.4
+				C26.88,16.63,22.22,21.29,16.49,21.29z"/>
+			<path class="st0" d="M16.49,1c5.46,0,9.9,4.44,9.9,9.9s-4.44,9.9-9.9,9.9s-9.9-4.44-9.9-9.9S11.03,1,16.49,1 M16.49,0
+				c-6.01,0-10.9,4.89-10.9,10.9c0,6.01,4.89,10.9,10.9,10.9s10.9-4.89,10.9-10.9C27.38,4.89,22.5,0,16.49,0L16.49,0z"/>
+		</g>
+		<g>
+			<path class="st0" d="M0.5,41.5V28.84c0-4.02,3.27-7.29,7.29-7.29h2.17l0.4,0.52c1.48,1.92,3.71,3.02,6.13,3.02
+				c0.34,0,0.68-0.02,1.02-0.06c2-0.25,3.91-1.4,5.25-3.14l0.26-0.34h2.17c4.02,0,7.29,3.27,7.29,7.29V41.5H0.5z"/>
+			<path class="st0" d="M25.18,22.04c3.75,0,6.79,3.04,6.79,6.79V41h-1.49h-0.18H1V28.84c0-3.75,3.04-6.79,6.79-6.79h1.92l0.25,0.33
+				c1.57,2.04,3.95,3.22,6.52,3.22c0.36,0,0.72-0.02,1.08-0.07c2.23-0.28,4.22-1.55,5.59-3.33l0.11-0.14H25.18 M25.18,21.04h-1.92
+				h-0.49l-0.3,0.39l-0.11,0.14c-1.26,1.64-3.05,2.72-4.92,2.95c-0.32,0.04-0.64,0.06-0.95,0.06c-2.26,0-4.35-1.03-5.73-2.83
+				l-0.25-0.33l-0.3-0.39H9.71H7.79c-4.3,0-7.79,3.5-7.79,7.79V41v1h1h29.31h0.18h1.49h1v-1V28.84
+				C32.98,24.54,29.48,21.04,25.18,21.04L25.18,21.04z"/>
+		</g>
+	</g>
+	<g>
+		<path class="st1" d="M16.49,20.79c5.46,0,9.9-4.44,9.9-9.9S21.95,1,16.49,1s-9.9,4.44-9.9,9.9S11.03,20.79,16.49,20.79z
+			 M16.49,2.67c4.54,0,8.23,3.69,8.23,8.23s-3.69,8.23-8.23,8.23s-8.23-3.69-8.23-8.23S11.95,2.67,16.49,2.67z"/>
+		<path class="st1" d="M25.18,22.04h-1.92l-0.25,0.33c-1.57,2.04-3.95,3.22-6.52,3.22s-4.95-1.17-6.52-3.22l-0.25-0.33H7.79
+			C4.05,22.04,1,25.09,1,28.84V41h1.67V28.84c0-2.83,2.3-5.13,5.13-5.13H8.9c1.89,2.26,4.63,3.54,7.58,3.54s5.7-1.29,7.58-3.54h1.11
+			c2.83,0,5.13,2.3,5.13,5.13V41h1.67V28.84C31.98,25.09,28.93,22.04,25.18,22.04z"/>
+	</g>
+	<path class="st2" d="M9.49,22"/>
+    <!-- <path d="M15,35H25 M20,30V40 M1 " stroke="#04750a" stroke-width="2"/> -->
+</g>
+    <path d="M1,6H11 M6,1V11 M1 " stroke="#04750a" stroke-width="2"/>
+</svg>
diff --git a/okitweb/static/svg/user_group_add.svg b/okitweb/static/svg/user_group_add.svg
new file mode 100644
index 000000000..dff6a2ef6
--- /dev/null
+++ b/okitweb/static/svg/user_group_add.svg
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 57 57" style="enable-background:new 0 0 57 57;" xml:space="preserve">
+<g transform="translate(0,8)">
+	<g>
+		<path style="fill:#FFFFFF;" d="M0.5,41.5V26.3c0-3,2.4-5.4,5.4-5.4H8v-0.3c-2.2-1.3-3.7-3.7-3.7-6.4c0-4.1,3.3-7.4,7.4-7.4
+			s7.4,3.3,7.4,7.4c0,2.6-1.4,4.9-3.5,6.3h0.5c1.2-1.5,3-2.4,5-2.4h2.6V17c-2.6-1.6-4.2-4.5-4.2-7.6c0-4.9,4-8.9,8.9-8.9
+			c4.9,0,8.9,4,8.9,8.9c0,3.1-1.6,6-4.3,7.6v1h2.7c2,0,3.8,0.9,5.1,2.4h0.5c-2.1-1.3-3.5-3.7-3.5-6.3c0-4.1,3.3-7.4,7.4-7.4
+			s7.4,3.3,7.4,7.4c0,2.6-1.4,5.1-3.6,6.4V21h2c3,0,5.4,2.4,5.4,5.4v15.2H0.5z"/>
+		<path style="fill:#FFFFFF;" d="M28.4,1c4.6,0,8.4,3.8,8.4,8.4c0,3.1-1.7,5.9-4.3,7.3v1.8h3.2c1.9,0,3.7,1,4.8,2.4h3.2
+			c-3.1-0.7-5.4-3.5-5.4-6.8c0-3.8,3.1-6.9,6.9-6.9s6.9,3.1,6.9,6.9c0,3.3-2.3,6.1-5.4,6.8h1.8v0.5h2.5c2.7,0,4.9,2.2,4.9,4.9V41H1
+			V26.3c0-2.7,2.2-4.9,4.9-4.9h2.6V21h1.7c-3.1-0.7-5.4-3.5-5.4-6.8c0-3.8,3.1-6.9,6.9-6.9s6.9,3.1,6.9,6.9c0,3.3-2.3,6.1-5.4,6.8
+			h3.2c1.1-1.5,2.8-2.4,4.7-2.4h3.1v-1.9c-2.5-1.4-4.2-4.2-4.2-7.3C20,4.8,23.8,1,28.4,1 M28.4,0C23.2,0,19,4.2,19,9.4
+			c0,3.2,1.6,6.1,4.2,7.8v0.3h-2.1c-0.9,0-1.7,0.2-2.5,0.5c0.6-1.1,1-2.4,1-3.8c0-4.4-3.6-7.9-7.9-7.9s-7.9,3.6-7.9,7.9
+			c0,2.5,1.2,4.8,3,6.2h-1c-3.2,0-5.9,2.6-5.9,5.9V41v1h1h54.9h1v-1V26.3c0-3.2-2.6-5.9-5.9-5.9h-1c1.9-1.5,3-3.8,3-6.2
+			c0-4.4-3.6-7.9-7.9-7.9s-7.9,3.6-7.9,7.9c0,1.4,0.4,2.7,1,3.8c-0.8-0.3-1.7-0.5-2.6-0.5h-2.2v-0.3c2.7-1.7,4.3-4.7,4.3-7.9
+			C37.8,4.2,33.6,0,28.4,0L28.4,0z"/>
+	</g>
+	<g>
+		<path style="fill:#2C5967;" d="M45.2,21.2c3.8,0,6.9-3.1,6.9-6.9S49,7.3,45.2,7.3s-6.9,3.1-6.9,6.9S41.4,21.2,45.2,21.2z M45.2,9
+			c2.9,0,5.3,2.4,5.3,5.3s-2.4,5.3-5.3,5.3c-2.9,0-5.3-2.4-5.3-5.3S42.3,9,45.2,9z"/>
+		<path style="fill:#2C5967;" d="M51.1,21.5h-1.4l-0.3,0.3c-1,1.3-2.5,2.1-4.2,2.1c-1.6,0-3.2-0.8-4.2-2.1l-0.3-0.3h-0.1
+			c-1-1.7-2.9-2.9-5-2.9H34l-0.3,0.3c-1.3,1.7-3.2,2.6-5.3,2.6s-4-1-5.3-2.6l-0.3-0.3h-1.7c-2.1,0-4,1.2-5,2.9h0l-0.3,0.3
+			c-1,1.3-2.5,2.1-4.2,2.1s-3.2-0.8-4.2-2.1l-0.3-0.3H5.9c-2.7,0-4.9,2.2-4.9,4.9V41h1.7V26.3c0-1.8,1.4-3.2,3.2-3.2h0.6
+			c1.3,1.5,3.2,2.4,5.2,2.4c1.3,0,2.6-0.4,3.6-1V41h0.8H17V24.4c0-2.3,1.9-4.1,4.1-4.1H22c1.6,1.9,3.9,3,6.4,3s4.8-1.1,6.4-3h0.9
+			c2.3,0,4.1,1.9,4.1,4.1V41h0.8h0.8V24.4c1.1,0.7,2.4,1.1,3.7,1.1c2,0,3.9-0.9,5.2-2.4h0.6c1.8,0,3.2,1.4,3.2,3.2V41h1.7V26.3
+			C55.9,23.6,53.8,21.5,51.1,21.5z"/>
+		<path style="fill:#2C5967;" d="M11.7,21.2c3.8,0,6.9-3.1,6.9-6.9s-3.1-6.9-6.9-6.9s-6.9,3.1-6.9,6.9S7.9,21.2,11.7,21.2z M11.7,9
+			c2.9,0,5.3,2.4,5.3,5.3s-2.4,5.3-5.3,5.3s-5.3-2.4-5.3-5.3S8.8,9,11.7,9z"/>
+		<path style="fill:#2C5967;" d="M28.4,17.8c4.6,0,8.4-3.8,8.4-8.4S33.1,1,28.4,1S20,4.8,20,9.4S23.8,17.8,28.4,17.8z M28.4,2.7
+			c3.7,0,6.7,3,6.7,6.7s-3,6.7-6.7,6.7s-6.7-3-6.7-6.7S24.7,2.7,28.4,2.7z"/>
+		<polygon style="fill:#2C5967;" points="21.2,30.6 20.3,30.6 20.3,41 20.7,41 22,41 22,32.3 		"/>
+		<polygon style="fill:#2C5967;" points="35.6,30.6 35.6,30.6 34.8,32.3 34.8,41 36.2,41 36.5,41 36.5,30.6 		"/>
+		<polygon style="fill:#2C5967;" points="50.1,34 50.1,41 51.7,41 51.7,32.3 50.9,32.3 		"/>
+		<polygon style="fill:#2C5967;" points="5.2,32.3 5.2,41 6.9,41 6.9,34 6,32.3 		"/>
+	</g>
+    <!-- <path d="M23,35H33 M28,30V40 M1 " stroke="#04750a" stroke-width="2"/> -->
+</g>
+    <path d="M1,6H11 M6,1V11 M1 " stroke="#04750a" stroke-width="2"/>
+</svg>
diff --git a/okitweb/templates/okit/okit_designer.html b/okitweb/templates/okit/okit_designer.html
index 345f16200..7d0e29f5d 100644
--- a/okitweb/templates/okit/okit_designer.html
+++ b/okitweb/templates/okit/okit_designer.html
@@ -17,6 +17,7 @@
     <script type="text/javascript" src="{{ url_for('static', filename='okit/view/relationship/js/okit_relationship_view.js') }}"></script>
     <script type="text/javascript" src="{{ url_for('static', filename='okit/view/json/js/okit_json_view.js') }}"></script>
     <script type="text/javascript" src="{{ url_for('static', filename='okit/view/tree/js/okit_tree_view.js') }}"></script>
+    <script type="text/javascript" src="{{ url_for('static', filename='okit/view/identity/js/okit_identity_view.js') }}"></script>
     <script type="text/javascript" src="{{ url_for('static', filename='okit/query/oci/js/okit_query.js') }}"></script>
     <script type="text/javascript" src="{{ url_for('static', filename='okit/js/okit_designer.js') }}"></script>
     <script type="text/javascript" src="{{ url_for('static', filename='okit/js/okit_view_layout.js') }}"></script>
@@ -97,6 +98,7 @@
     <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='okit/css/okit_threedots_menu.css') }}">
     <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='okit/view/tree/css/okit_tree_view.css') }}">
     <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='okit/view/json/css/okit_json_view.css') }}">
+    <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='okit/view/identity/css/okit_identity_view.css') }}">
 {% endblock %}
 
 {% block navmenublock %}
@@ -259,10 +261,12 @@
     <div id="okit_toolbar_left" class="okit-toolbar-left">
         <div>
             <select id="toolbar_view_select" class="okit-toolbar-select" onchange="handleViewSelect()">
-                <option id="designer_view_option"  value="designer"selected="selected">Designer</option>
+                <option id="designer_view_option"  value="designer" selected="selected">Designer</option>
+                <option id="identity_view_option"  value="identity">Users/Groups</option>
                 <option id="tabular_view_option" value="tabular">Tabular</option>
                 <option id="relationship_view_option" value="relationship">Relationship</option>
                 <option id="json_view_option" value="json">Json</option>
+                {%- if developer_mode -%}<option id="cache_view_option" value="cache">Cache</option>{%- endif -%}
             </select>
         </div>
     </div>
@@ -366,11 +370,11 @@
 <div id="global_tags_panel" class="okit-right-side-panel okit-slide-hide-right">
     <details open>
         <summary class="details summary-background"><label>Freeform Tags</label></summary>
-        <div class="table okit-table"><div class="thead"><div class="tr"><div class="th">Key</div><div class="th">Value</div><div class="th add-tag action-button-background" onclick="handleAddGlobalFreeformTag()"></div></div></div><div id="global_freeform_tags_tbody" class="tbody"></div></div>
+        <div class="table okit-table"><div class="thead"><div class="tr"><div class="th">Key</div><div class="th">Value</div><div class="th add-tag action-button-background action-button-column" onclick="handleAddGlobalFreeformTag()"></div></div></div><div id="global_freeform_tags_tbody" class="tbody"></div></div>
     </details>
     <details open>
         <summary class="details summary-background"><label>Defined Tags</label></summary>
-        <div class="table okit-table"><div class="thead"><div class="tr"><div class="th">Namespace</div><div class="th">Key</div><div class="th">Value</div><div class="th add-tag action-button-background" onclick="handleAddGlobalDefinedTag()"></div></div></div><div id="global_defined_tags_tbody" class="tbody"></div></div>
+        <div class="table okit-table"><div class="thead"><div class="tr"><div class="th">Namespace</div><div class="th">Key</div><div class="th">Value</div><div class="th add-tag action-button-background action-button-column" onclick="handleAddGlobalDefinedTag()"></div></div></div><div id="global_defined_tags_tbody" class="tbody"></div></div>
     </details>
 </div>
 <div id="settings_panel" class="okit-right-side-panel okit-slide-hide-right"></div>
@@ -398,9 +402,14 @@
                     <ul>
                         <li><a>Json</a></li>
                         <li><a>Terraform</a></li>
-                        <li><a>SVG</a></li>
-                        <li><a>PNG</a></li>
-                        <li><a>JPG</a></li>
+                        <li><a>Resource Manager</a></li>
+                        <li><a>Image</a>
+                            <ul>
+                                <li><a>SVG</a></li>
+                                <li><a>PNG</a></li>
+                                <li><a>JPG</a></li>
+                            </ul>
+                        </li>
                     </ul>
                 </li>
             </ul>
diff --git a/okitweb/templates/okit/propertysheets/base_property_sheet.html b/okitweb/templates/okit/propertysheets/base_property_sheet.html
index 4bc6908a8..133dab988 100644
--- a/okitweb/templates/okit/propertysheets/base_property_sheet.html
+++ b/okitweb/templates/okit/propertysheets/base_property_sheet.html
@@ -8,9 +8,9 @@
     {% elif type == 'number' %}
         <div id="{{ name }}_row" class='tr{% if collapsed %} collapsed{% endif %}'><div class='td'>{{ title }}</div><div class='td'><input type="{{ type }}" id="{{ name }}" name="{{ name }}" class="okit-property-value" {% if readonly %} readonly{% endif %} {% if data.min is defined %} min="{{ data.min }}" {% endif %} {% if data.max is defined %} max="{{ data.max }}" {% endif %} onblur="this.reportValidity();"></div></div>
     {% elif type == 'ipv4' %}
-        <div id="{{ name }}_row" class='tr{% if collapsed %} collapsed{% endif %}'><div class='td'>{{ title }}</div><div class='td'><input type="{{ type }}" id="{{ name }}" name="{{ name }}" class="okit-property-value" {% if readonly %} readonly{% endif %} pattern="^((([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])(\/(3[0-2]|[1-2][0-9]|[0-9]))$)+" title="IPv4 CIDR block" onblur="this.reportValidity();"></div></div>
+        <div id="{{ name }}_row" class='tr{% if collapsed %} collapsed{% endif %}'><div class='td'>{{ title }}</div><div class='td'><input type="text" id="{{ name }}" name="{{ name }}" class="okit-property-value" {% if readonly %} readonly{% endif %} pattern="^((([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])(\/(3[0-2]|[1-2][0-9]|[0-9]))$)+" title="IPv4 CIDR block" onblur="this.reportValidity();"></div></div>
     {% elif type == 'ipv4-list' %}
-        <div id="{{ name }}_row" class='tr{% if collapsed %} collapsed{% endif %}'><div class='td'>{{ title }}</div><div class='td'><input type="{{ type }}" id="{{ name }}" name="{{ name }}" class="okit-property-value" {% if readonly %} readonly{% endif %} pattern="^((([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])(\/(3[0-2]|[1-2][0-9]|[0-9]))(,\s?|$))+" title="Comma separated IPv4 CIDR blocks" onblur="this.reportValidity();"></div></div>
+        <div id="{{ name }}_row" class='tr{% if collapsed %} collapsed{% endif %}'><div class='td'>{{ title }}</div><div class='td'><input type="text" id="{{ name }}" name="{{ name }}" class="okit-property-value" {% if readonly %} readonly{% endif %} pattern="^((([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])(\/(3[0-2]|[1-2][0-9]|[0-9]))(,\s?|$))+" title="Comma separated IPv4 CIDR blocks" onblur="this.reportValidity();"></div></div>
     {% elif type == 'checkbox' %}
         <div id="{{ name }}_row" class='tr{% if collapsed %} collapsed{% endif %}'><div class='td'></div><div class='td'><label><input type="{{ type }}" id="{{ name }}" name="{{ name }}" value="false" {% if readonly %} readonly  onclick="return false"{% endif %}>{{ title }}</label></div></div>
     {% elif type == 'textarea' %}
diff --git a/okitweb/templates/okit/propertysheets/bastion.html b/okitweb/templates/okit/propertysheets/bastion.html
new file mode 100644
index 000000000..29ec594c2
--- /dev/null
+++ b/okitweb/templates/okit/propertysheets/bastion.html
@@ -0,0 +1,13 @@
+<!--
+** Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+-->
+{% extends "okit/propertysheets/base_property_sheet.html" %}
+{% block title_block %}Bastion{% endblock %}
+{% block required_properties_table_rows_block %}
+    {{ properties_input('CIDR block allowlist', 'client_cidr_block_allow_list', type='ipv4-list') }}
+{% endblock %}
+{% block optional_properties_table_rows_block %}
+    {{ properties_input('Session TTL (Seconds)', 'max_session_ttl_in_seconds', type='number') }}
+{% endblock %}
+{% block optional_properties_block %}{% endblock %}
diff --git a/okitweb/templates/okit/propertysheets/file_system.html b/okitweb/templates/okit/propertysheets/file_system.html
new file mode 100644
index 000000000..f9369559a
--- /dev/null
+++ b/okitweb/templates/okit/propertysheets/file_system.html
@@ -0,0 +1,9 @@
+<!--
+** Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+-->
+{% extends "okit/propertysheets/base_property_sheet.html" %}
+{% block title_block %}File System{% endblock %}
+{% block required_properties_table_rows_block %}{% endblock %}
+{% block optional_properties_table_rows_block %}{% endblock %}
+{% block optional_properties_block %}{% endblock %}
diff --git a/okitweb/templates/okit/propertysheets/group.html b/okitweb/templates/okit/propertysheets/group.html
index 38d6eac61..578fc29a2 100644
--- a/okitweb/templates/okit/propertysheets/group.html
+++ b/okitweb/templates/okit/propertysheets/group.html
@@ -4,6 +4,10 @@
 -->
 {% extends "okit/propertysheets/base_property_sheet.html" %}
 {% block title_block %}Group{% endblock %}
-{% block required_properties_table_rows_block %}{% endblock %}
-{% block optional_properties_table_rows_block %}{% endblock %}
+{% block required_properties_table_rows_block %}
+    {{ properties_input('Description', 'description', type='text') }}
+{% endblock %}
+{% block optional_properties_table_rows_block %}
+    {{ properties_input('Users', 'user_ids', type='multiselect') }}
+{% endblock %}
 {% block optional_properties_block %}{% endblock %}
diff --git a/okitweb/templates/okit/propertysheets/key.html b/okitweb/templates/okit/propertysheets/key.html
new file mode 100644
index 000000000..c8d4a1883
--- /dev/null
+++ b/okitweb/templates/okit/propertysheets/key.html
@@ -0,0 +1,9 @@
+<!--
+** Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+-->
+{% extends "okit/propertysheets/base_property_sheet.html" %}
+{% block title_block %}Key{% endblock %}
+{% block required_properties_table_rows_block %}{% endblock %}
+{% block optional_properties_table_rows_block %}{% endblock %}
+{% block optional_properties_block %}{% endblock %}
diff --git a/okitweb/templates/okit/propertysheets/mount_target.html b/okitweb/templates/okit/propertysheets/mount_target.html
new file mode 100644
index 000000000..46f8369fd
--- /dev/null
+++ b/okitweb/templates/okit/propertysheets/mount_target.html
@@ -0,0 +1,9 @@
+<!--
+** Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+-->
+{% extends "okit/propertysheets/base_property_sheet.html" %}
+{% block title_block %}Mount Target{% endblock %}
+{% block required_properties_table_rows_block %}{% endblock %}
+{% block optional_properties_table_rows_block %}{% endblock %}
+{% block optional_properties_block %}{% endblock %}
diff --git a/okitweb/templates/okit/propertysheets/network_load_balancer.html b/okitweb/templates/okit/propertysheets/network_load_balancer.html
new file mode 100644
index 000000000..9fb8a3bad
--- /dev/null
+++ b/okitweb/templates/okit/propertysheets/network_load_balancer.html
@@ -0,0 +1,9 @@
+<!--
+** Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+-->
+{% extends "okit/propertysheets/base_property_sheet.html" %}
+{% block title_block %}Network Load Balancer{% endblock %}
+{% block required_properties_table_rows_block %}{% endblock %}
+{% block optional_properties_table_rows_block %}{% endblock %}
+{% block optional_properties_block %}{% endblock %}
diff --git a/okitweb/templates/okit/propertysheets/nosql_database.html b/okitweb/templates/okit/propertysheets/nosql_database.html
new file mode 100644
index 000000000..a2c66495e
--- /dev/null
+++ b/okitweb/templates/okit/propertysheets/nosql_database.html
@@ -0,0 +1,9 @@
+<!--
+** Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+-->
+{% extends "okit/propertysheets/base_property_sheet.html" %}
+{% block title_block %}NoSQL Database{% endblock %}
+{% block required_properties_table_rows_block %}{% endblock %}
+{% block optional_properties_table_rows_block %}{% endblock %}
+{% block optional_properties_block %}{% endblock %}
diff --git a/okitweb/templates/okit/propertysheets/user.html b/okitweb/templates/okit/propertysheets/user.html
index c1f0492d1..bb19b7fb7 100644
--- a/okitweb/templates/okit/propertysheets/user.html
+++ b/okitweb/templates/okit/propertysheets/user.html
@@ -4,6 +4,10 @@
 -->
 {% extends "okit/propertysheets/base_property_sheet.html" %}
 {% block title_block %}User{% endblock %}
-{% block required_properties_table_rows_block %}{% endblock %}
-{% block optional_properties_table_rows_block %}{% endblock %}
+{% block required_properties_table_rows_block %}
+    {{ properties_input('Description', 'description', type='text') }}
+{% endblock %}
+{% block optional_properties_table_rows_block %}
+    {{ properties_input('Email', 'email', type='email') }}
+{% endblock %}
 {% block optional_properties_block %}{% endblock %}
diff --git a/okitweb/templates/okit/propertysheets/vault.html b/okitweb/templates/okit/propertysheets/vault.html
new file mode 100644
index 000000000..b1135c50a
--- /dev/null
+++ b/okitweb/templates/okit/propertysheets/vault.html
@@ -0,0 +1,9 @@
+<!--
+** Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+-->
+{% extends "okit/propertysheets/base_property_sheet.html" %}
+{% block title_block %}Vault{% endblock %}
+{% block required_properties_table_rows_block %}{% endblock %}
+{% block optional_properties_table_rows_block %}{% endblock %}
+{% block optional_properties_block %}{% endblock %}
diff --git a/okitweb/templates/okit/valueproposition/bastion.html b/okitweb/templates/okit/valueproposition/bastion.html
new file mode 100644
index 000000000..70d71bede
--- /dev/null
+++ b/okitweb/templates/okit/valueproposition/bastion.html
@@ -0,0 +1,5 @@
+<!--
+** Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+-->
+{% extends "okit/valueproposition/oci.html" %}
diff --git a/okitweb/templates/okit/valueproposition/file_system.html b/okitweb/templates/okit/valueproposition/file_system.html
new file mode 100644
index 000000000..70d71bede
--- /dev/null
+++ b/okitweb/templates/okit/valueproposition/file_system.html
@@ -0,0 +1,5 @@
+<!--
+** Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+-->
+{% extends "okit/valueproposition/oci.html" %}
diff --git a/okitweb/templates/okit/valueproposition/key.html b/okitweb/templates/okit/valueproposition/key.html
new file mode 100644
index 000000000..70d71bede
--- /dev/null
+++ b/okitweb/templates/okit/valueproposition/key.html
@@ -0,0 +1,5 @@
+<!--
+** Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+-->
+{% extends "okit/valueproposition/oci.html" %}
diff --git a/okitweb/templates/okit/valueproposition/mount_target.html b/okitweb/templates/okit/valueproposition/mount_target.html
new file mode 100644
index 000000000..70d71bede
--- /dev/null
+++ b/okitweb/templates/okit/valueproposition/mount_target.html
@@ -0,0 +1,5 @@
+<!--
+** Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+-->
+{% extends "okit/valueproposition/oci.html" %}
diff --git a/okitweb/templates/okit/valueproposition/network_load_balancer.html b/okitweb/templates/okit/valueproposition/network_load_balancer.html
new file mode 100644
index 000000000..70d71bede
--- /dev/null
+++ b/okitweb/templates/okit/valueproposition/network_load_balancer.html
@@ -0,0 +1,5 @@
+<!--
+** Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+-->
+{% extends "okit/valueproposition/oci.html" %}
diff --git a/okitweb/templates/okit/valueproposition/nosql_database.html b/okitweb/templates/okit/valueproposition/nosql_database.html
new file mode 100644
index 000000000..70d71bede
--- /dev/null
+++ b/okitweb/templates/okit/valueproposition/nosql_database.html
@@ -0,0 +1,5 @@
+<!--
+** Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+-->
+{% extends "okit/valueproposition/oci.html" %}
diff --git a/okitweb/templates/okit/valueproposition/vault.html b/okitweb/templates/okit/valueproposition/vault.html
new file mode 100644
index 000000000..70d71bede
--- /dev/null
+++ b/okitweb/templates/okit/valueproposition/vault.html
@@ -0,0 +1,5 @@
+<!--
+** Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+-->
+{% extends "okit/valueproposition/oci.html" %}
diff --git a/skeletons/templates/artefact_model.js.jinja2 b/skeletons/templates/artefact_model.js.jinja2
index f2a1c98d4..94e4c33f2 100644
--- a/skeletons/templates/artefact_model.js.jinja2
+++ b/skeletons/templates/artefact_model.js.jinja2
@@ -67,12 +67,6 @@ OkitJson.prototype.get{{ model_class_name }} = function(id='') {
 return undefined;
 }
 OkitJson.prototype.delete{{ model_class_name }} = function(id) {
-    for (let i = 0; i < this.{{ artefact_json_list }}.length; i++) {
-        if (this.{{ artefact_json_list }}[i].id === id) {
-            this.{{ artefact_json_list }}[i].delete();
-            this.{{ artefact_json_list }}.splice(i, 1);
-            break;
-        }
-    }
+    this.{{ artefact_json_list }} = this.{{ artefact_json_list }} ? this.{{ artefact_json_list }}.filter((r) => r.id !== id) : []
 }
 
diff --git a/skeletons/templates/artefact_view.js.jinja2 b/skeletons/templates/artefact_view.js.jinja2
index 3c188a88d..2428110f9 100644
--- a/skeletons/templates/artefact_view.js.jinja2
+++ b/skeletons/templates/artefact_view.js.jinja2
@@ -48,7 +48,7 @@ class {{ model_class_name }}View extends OkitContainerArtefactView {
     }
     static getDropTargets() {
         // TODO: Return List of Artefact Drop Targets Parent Object Reference Names e.g. VirtualCloudNetwork for a Internet Gateway
-        return [VirtualCloudNetwork.getArtifactReference()];
+        return [Compartment.getArtifactReference()];
     }
 }
 /*
diff --git a/visualiser/discovery/oci_discovery_client.py b/visualiser/discovery/oci_discovery_client.py
index 441218a05..af3a12b21 100755
--- a/visualiser/discovery/oci_discovery_client.py
+++ b/visualiser/discovery/oci_discovery_client.py
@@ -20,6 +20,8 @@ class OciResourceDiscoveryClient(object):
     # methods. Creates a map of:
     #     { resource_name -> (Client, list_method) }
     get_resource_client_methods = {
+        # oci.bastion.BastionClient
+        "BastionDetails": (oci.bastion.BastionClient, "get_bastion"), # used to get full details
         # oci.core.BlockstorageClient
         "VolumeBackupPolicyAssignment": (oci.core.BlockstorageClient, "get_volume_backup_policy_asset_assignment"),
         # oci.core.ComputeClient
@@ -32,7 +34,7 @@ class OciResourceDiscoveryClient(object):
         # oci.database.DatabaseClient
         "ExadataIormConfig": (oci.database.DatabaseClient, "get_cloud_vm_cluster_iorm_config"),
         # oci.mysql.DbSystemClient
-        "MySQLDbSystemDetails": (oci.mysql.DbSystemClient, "get_db_system"), # used to get full details of the result and list_db_systems does not include all attributes
+        "MySQLDbSystemDetails": (oci.mysql.DbSystemClient, "get_db_system"), # used to get full details of the result as list_db_systems does not include all attributes
         # oci.mysql.MysqlaasClient
         "MySQLConfiguration": (oci.mysql.MysqlaasClient, "get_configuration"), # used to get details of the Default configurations
         # oci.os_management.OsManagementClient
@@ -600,12 +602,17 @@ def submit_list_resource_worker_requests(self, executor, regional_resources_comp
                     logger.warn(f"unsupported resource type {resource_type}")
                     continue                    
 
+                # do a get for resources that need full details or don't have a list method
                 if resource_type in self.get_resource_client_methods and item[2]:
                     klass, method_name = self.get_resource_client_methods[resource_type]
                     if method_name == "get_application": # DataFlowApplicationDetails
                         application_id = item[2]
                         future = executor.submit(self.list_resources, klass, method_name, region, application_id=application_id)
                         futures_list.update({(region, resource_type, compartment_id, application_id):future})
+                    if method_name == "get_bastion": # BastionDetails
+                        bastion_id = item[2]
+                        future = executor.submit(self.list_resources, klass, method_name, region, bastion_id=bastion_id)
+                        futures_list.update({(region, resource_type, None, bastion_id):future})
                     elif method_name == "get_cloud_vm_cluster_iorm_config": # CloudExadataInfrastrcture
                         cloud_vm_cluster_id = item[2]
                         future = executor.submit(self.list_resources, klass, method_name, region, cloud_vm_cluster_id=cloud_vm_cluster_id)
@@ -640,6 +647,7 @@ def submit_list_resource_worker_requests(self, executor, regional_resources_comp
                         future = executor.submit(self.list_resources, klass, method_name, region, asset_id=asset_id)
                         futures_list.update({(region, resource_type, compartment_id, asset_id):future})
 
+                # do a list for other resources, which is more efficient than separate get requests
                 if resource_type in self.static_resource_client_methods:
                     klass, method_name = self.static_resource_client_methods[resource_type]
                     if method_name == "get_cluster_options":
@@ -993,6 +1001,7 @@ def process_list_resource_worker_reponses(self, futures_list):
                         new_result = [ExtendedVirtualCircuitBandwidthShape(fastconnect_provider_id, shape) for shape in result]
                         result = new_result
                     elif resource_type in [
+                        "BastionDetails",
                         "ClusterOptions",
                         "DataFlowApplicationDetails", "DataFlowRunDetails",
                         "Image",
@@ -1017,15 +1026,12 @@ def process_list_resource_worker_reponses(self, futures_list):
             except oci.exceptions.ConnectTimeout as ct:
                 logger.warn(("get_resources()", future, ct))
                 failed_requests.append(future)
-                # TODO retry
             except oci.exceptions.RequestException as re:
                 logger.warn(("get_resources()", future, re))
                 failed_requests.append(future)
-                # TODO retry
             except TimeoutError as te:
                 logger.error(("get_resources()", future, te, self.timeout))
                 failed_requests.append(future)
-                # TODO retry
             except Exception as e:
                 logger.error(("get_resources()", future, e))
 
@@ -1342,6 +1348,10 @@ def get_all_resources(self):
             if "DataFlowRun" in resources_by_region[region]:
                 for resource in resources_by_region[region]["DataFlowRun"]:
                     regional_resource_requests.add(("DataFlowRunDetails", resource.compartment_id, resource.id))
+            # get extra details for Bastion
+            if "Bastion" in resources_by_region[region]:
+                for resource in resources_by_region[region]["Bastion"]:
+                    regional_resource_requests.add(("BastionDetails", resource.compartment_id, resource.id))
 
             extra_resource_requests.update({region:regional_resource_requests})
 
@@ -1387,13 +1397,14 @@ def get_all_resources(self):
                     # add
                     resources_by_region[region][resource_type] = final_resources_by_region[region][resource_type]
 
-            if len(resources_by_region) == 0:
-                logger.warn("Resource discovery results are empty")  
-            else:
-                # replace summary result with resource details
-                self.replace_resource_details(resources_by_region, region, "MySQLDbSystem", "MySQLDbSystemDetails")
-                self.replace_resource_details(resources_by_region, region, "DataFlowApplication", "DataFlowApplicationDetails")
-                self.replace_resource_details(resources_by_region, region, "DataFlowRun", "DataFlowRunDetails")
+        if len(resources_by_region) == 0:
+            logger.warn("Resource discovery results are empty")  
+        else:
+            # replace summary result with resource details
+            self.replace_resource_details(resources_by_region, region, "MySQLDbSystem", "MySQLDbSystemDetails")
+            self.replace_resource_details(resources_by_region, region, "DataFlowApplication", "DataFlowApplicationDetails")
+            self.replace_resource_details(resources_by_region, region, "DataFlowRun", "DataFlowRunDetails")
+            self.replace_resource_details(resources_by_region, region, "Bastion", "BastionDetails")
 
         # remove duplicate shapes
         # For multi-AD regions the list_shapes method returns shapes per AD, but does not distinguish which shape
diff --git a/visualiser/facades/ociBastion.py b/visualiser/facades/ociBastion.py
new file mode 100644
index 000000000..767280792
--- /dev/null
+++ b/visualiser/facades/ociBastion.py
@@ -0,0 +1,52 @@
+#!/usr/bin/python
+
+# Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+
+"""Provide Module Description
+"""
+
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~#
+__author__ = ["Andrew Hopkinson (Oracle Cloud Solutions A-Team)"]
+__version__ = "1.0.0"
+__module__ = "ociBastion"
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~#
+
+
+import oci
+
+from common.okitLogging import getLogger
+from facades.ociConnection import OCIBastionConnection
+
+# Configure logging
+logger = getLogger()
+
+
+class OCIBastions(OCIBastionConnection):
+    def __init__(self, config=None, configfile=None, profile=None, compartment_id=None):
+        self.compartment_id = compartment_id
+        self.bastions_json = []
+        super(OCIBastions, self).__init__(config=config, configfile=configfile, profile=profile)
+
+    def list(self, compartment_id=None, filter=None):
+        if compartment_id is None:
+            compartment_id = self.compartment_id
+
+        # Add filter to only return AVAILABLE Compartments
+        if filter is None:
+            filter = {}
+
+        if 'lifecycle_state' not in filter:
+            filter['lifecycle_state'] = 'AVAILABLE'
+
+        bastions = oci.pagination.list_call_get_all_results(self.client.list_bastions, compartment_id=compartment_id).data
+
+        # Convert to Json object
+        bastions_json = self.toJson(bastions)
+        logger.debug(str(bastions_json))
+
+        # Filter results
+        self.bastions_json = self.filterJsonObjectList(bastions_json, filter)
+        logger.debug(str(self.bastions_json))
+
+        return self.bastions_json
diff --git a/visualiser/facades/ociConnection.py b/visualiser/facades/ociConnection.py
index 5c0e9c8d2..babf1f049 100644
--- a/visualiser/facades/ociConnection.py
+++ b/visualiser/facades/ociConnection.py
@@ -25,7 +25,7 @@
 
 class OCIConnection(object):
     PAGINATION_LIMIT = 1000
-    OKIT_VERSION = 'v0.27.1'
+    OKIT_VERSION = 'v0.28.0'
 
     def __init__(self, config=None, configfile=None, profile=None, region=None):
         self.tenancy_ocid = ''
diff --git a/visualiser/facades/ociFileSystem.py b/visualiser/facades/ociFileSystem.py
new file mode 100644
index 000000000..6b0cbb320
--- /dev/null
+++ b/visualiser/facades/ociFileSystem.py
@@ -0,0 +1,52 @@
+#!/usr/bin/python
+
+# Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+
+"""Provide Module Description
+"""
+
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~#
+__author__ = ["Andrew Hopkinson (Oracle Cloud Solutions A-Team)"]
+__version__ = "1.0.0"
+__module__ = "ociFileSystem"
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~#
+
+
+import oci
+
+from common.okitLogging import getLogger
+from facades.ociConnection import OCIFileSystemConnection
+
+# Configure logging
+logger = getLogger()
+
+
+class OCIFileSystems(OCIFileSystemConnection):
+    def __init__(self, config=None, configfile=None, profile=None, compartment_id=None):
+        self.compartment_id = compartment_id
+        self.file_systems_json = []
+        super(OCIFileSystems, self).__init__(config=config, configfile=configfile, profile=profile)
+
+    def list(self, compartment_id=None, filter=None):
+        if compartment_id is None:
+            compartment_id = self.compartment_id
+
+        # Add filter to only return AVAILABLE Compartments
+        if filter is None:
+            filter = {}
+
+        if 'lifecycle_state' not in filter:
+            filter['lifecycle_state'] = 'AVAILABLE'
+
+        file_systems = oci.pagination.list_call_get_all_results(self.client.list_file_systems, compartment_id=compartment_id).data
+
+        # Convert to Json object
+        file_systems_json = self.toJson(file_systems)
+        logger.debug(str(file_systems_json))
+
+        # Filter results
+        self.file_systems_json = self.filterJsonObjectList(file_systems_json, filter)
+        logger.debug(str(self.file_systems_json))
+
+        return self.file_systems_json
diff --git a/visualiser/facades/ociKey.py b/visualiser/facades/ociKey.py
new file mode 100644
index 000000000..5dc16c377
--- /dev/null
+++ b/visualiser/facades/ociKey.py
@@ -0,0 +1,52 @@
+#!/usr/bin/python
+
+# Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+
+"""Provide Module Description
+"""
+
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~#
+__author__ = ["Andrew Hopkinson (Oracle Cloud Solutions A-Team)"]
+__version__ = "1.0.0"
+__module__ = "ociKey"
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~#
+
+
+import oci
+
+from common.okitLogging import getLogger
+from facades.ociConnection import OCIKeyConnection
+
+# Configure logging
+logger = getLogger()
+
+
+class OCIKeys(OCIKeyConnection):
+    def __init__(self, config=None, configfile=None, profile=None, compartment_id=None):
+        self.compartment_id = compartment_id
+        self.keys_json = []
+        super(OCIKeys, self).__init__(config=config, configfile=configfile, profile=profile)
+
+    def list(self, compartment_id=None, filter=None):
+        if compartment_id is None:
+            compartment_id = self.compartment_id
+
+        # Add filter to only return AVAILABLE Compartments
+        if filter is None:
+            filter = {}
+
+        if 'lifecycle_state' not in filter:
+            filter['lifecycle_state'] = 'AVAILABLE'
+
+        keys = oci.pagination.list_call_get_all_results(self.client.list_keys, compartment_id=compartment_id).data
+
+        # Convert to Json object
+        keys_json = self.toJson(keys)
+        logger.debug(str(keys_json))
+
+        # Filter results
+        self.keys_json = self.filterJsonObjectList(keys_json, filter)
+        logger.debug(str(self.keys_json))
+
+        return self.keys_json
diff --git a/visualiser/facades/ociMountTarget.py b/visualiser/facades/ociMountTarget.py
new file mode 100644
index 000000000..e1493c967
--- /dev/null
+++ b/visualiser/facades/ociMountTarget.py
@@ -0,0 +1,52 @@
+#!/usr/bin/python
+
+# Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+
+"""Provide Module Description
+"""
+
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~#
+__author__ = ["Andrew Hopkinson (Oracle Cloud Solutions A-Team)"]
+__version__ = "1.0.0"
+__module__ = "ociMountTarget"
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~#
+
+
+import oci
+
+from common.okitLogging import getLogger
+from facades.ociConnection import OCIMountTargetConnection
+
+# Configure logging
+logger = getLogger()
+
+
+class OCIMountTargets(OCIMountTargetConnection):
+    def __init__(self, config=None, configfile=None, profile=None, compartment_id=None):
+        self.compartment_id = compartment_id
+        self.mount_targets_json = []
+        super(OCIMountTargets, self).__init__(config=config, configfile=configfile, profile=profile)
+
+    def list(self, compartment_id=None, filter=None):
+        if compartment_id is None:
+            compartment_id = self.compartment_id
+
+        # Add filter to only return AVAILABLE Compartments
+        if filter is None:
+            filter = {}
+
+        if 'lifecycle_state' not in filter:
+            filter['lifecycle_state'] = 'AVAILABLE'
+
+        mount_targets = oci.pagination.list_call_get_all_results(self.client.list_mount_targets, compartment_id=compartment_id).data
+
+        # Convert to Json object
+        mount_targets_json = self.toJson(mount_targets)
+        logger.debug(str(mount_targets_json))
+
+        # Filter results
+        self.mount_targets_json = self.filterJsonObjectList(mount_targets_json, filter)
+        logger.debug(str(self.mount_targets_json))
+
+        return self.mount_targets_json
diff --git a/visualiser/facades/ociNetworkLoadBalancer.py b/visualiser/facades/ociNetworkLoadBalancer.py
new file mode 100644
index 000000000..df0184033
--- /dev/null
+++ b/visualiser/facades/ociNetworkLoadBalancer.py
@@ -0,0 +1,52 @@
+#!/usr/bin/python
+
+# Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+
+"""Provide Module Description
+"""
+
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~#
+__author__ = ["Andrew Hopkinson (Oracle Cloud Solutions A-Team)"]
+__version__ = "1.0.0"
+__module__ = "ociNetworkLoadBalancer"
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~#
+
+
+import oci
+
+from common.okitLogging import getLogger
+from facades.ociConnection import OCINetworkLoadBalancerConnection
+
+# Configure logging
+logger = getLogger()
+
+
+class OCINetworkLoadBalancers(OCINetworkLoadBalancerConnection):
+    def __init__(self, config=None, configfile=None, profile=None, compartment_id=None):
+        self.compartment_id = compartment_id
+        self.network_load_balancers_json = []
+        super(OCINetworkLoadBalancers, self).__init__(config=config, configfile=configfile, profile=profile)
+
+    def list(self, compartment_id=None, filter=None):
+        if compartment_id is None:
+            compartment_id = self.compartment_id
+
+        # Add filter to only return AVAILABLE Compartments
+        if filter is None:
+            filter = {}
+
+        if 'lifecycle_state' not in filter:
+            filter['lifecycle_state'] = 'AVAILABLE'
+
+        network_load_balancers = oci.pagination.list_call_get_all_results(self.client.list_network_load_balancers, compartment_id=compartment_id).data
+
+        # Convert to Json object
+        network_load_balancers_json = self.toJson(network_load_balancers)
+        logger.debug(str(network_load_balancers_json))
+
+        # Filter results
+        self.network_load_balancers_json = self.filterJsonObjectList(network_load_balancers_json, filter)
+        logger.debug(str(self.network_load_balancers_json))
+
+        return self.network_load_balancers_json
diff --git a/visualiser/facades/ociNoSQL.py b/visualiser/facades/ociNoSQL.py
new file mode 100644
index 000000000..70af69592
--- /dev/null
+++ b/visualiser/facades/ociNoSQL.py
@@ -0,0 +1,52 @@
+#!/usr/bin/python
+
+# Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+
+"""Provide Module Description
+"""
+
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~#
+__author__ = ["Andrew Hopkinson (Oracle Cloud Solutions A-Team)"]
+__version__ = "1.0.0"
+__module__ = "ociNoSQL"
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~#
+
+
+import oci
+
+from common.okitLogging import getLogger
+from facades.ociConnection import OCINoSQLConnection
+
+# Configure logging
+logger = getLogger()
+
+
+class OCINoSQLs(OCINoSQLConnection):
+    def __init__(self, config=None, configfile=None, profile=None, compartment_id=None):
+        self.compartment_id = compartment_id
+        self.nosqls_json = []
+        super(OCINoSQLs, self).__init__(config=config, configfile=configfile, profile=profile)
+
+    def list(self, compartment_id=None, filter=None):
+        if compartment_id is None:
+            compartment_id = self.compartment_id
+
+        # Add filter to only return AVAILABLE Compartments
+        if filter is None:
+            filter = {}
+
+        if 'lifecycle_state' not in filter:
+            filter['lifecycle_state'] = 'AVAILABLE'
+
+        nosqls = oci.pagination.list_call_get_all_results(self.client.list_nosqls, compartment_id=compartment_id).data
+
+        # Convert to Json object
+        nosqls_json = self.toJson(nosqls)
+        logger.debug(str(nosqls_json))
+
+        # Filter results
+        self.nosqls_json = self.filterJsonObjectList(nosqls_json, filter)
+        logger.debug(str(self.nosqls_json))
+
+        return self.nosqls_json
diff --git a/visualiser/facades/ociNoSQLDatabase.py b/visualiser/facades/ociNoSQLDatabase.py
new file mode 100644
index 000000000..87f067b27
--- /dev/null
+++ b/visualiser/facades/ociNoSQLDatabase.py
@@ -0,0 +1,52 @@
+#!/usr/bin/python
+
+# Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+
+"""Provide Module Description
+"""
+
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~#
+__author__ = ["Andrew Hopkinson (Oracle Cloud Solutions A-Team)"]
+__version__ = "1.0.0"
+__module__ = "ociNoSQLDatabase"
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~#
+
+
+import oci
+
+from common.okitLogging import getLogger
+from facades.ociConnection import OCINoSQLDatabaseConnection
+
+# Configure logging
+logger = getLogger()
+
+
+class OCINoSQLDatabases(OCINoSQLDatabaseConnection):
+    def __init__(self, config=None, configfile=None, profile=None, compartment_id=None):
+        self.compartment_id = compartment_id
+        self.nosql_databases_json = []
+        super(OCINoSQLDatabases, self).__init__(config=config, configfile=configfile, profile=profile)
+
+    def list(self, compartment_id=None, filter=None):
+        if compartment_id is None:
+            compartment_id = self.compartment_id
+
+        # Add filter to only return AVAILABLE Compartments
+        if filter is None:
+            filter = {}
+
+        if 'lifecycle_state' not in filter:
+            filter['lifecycle_state'] = 'AVAILABLE'
+
+        nosql_databases = oci.pagination.list_call_get_all_results(self.client.list_nosql_databases, compartment_id=compartment_id).data
+
+        # Convert to Json object
+        nosql_databases_json = self.toJson(nosql_databases)
+        logger.debug(str(nosql_databases_json))
+
+        # Filter results
+        self.nosql_databases_json = self.filterJsonObjectList(nosql_databases_json, filter)
+        logger.debug(str(self.nosql_databases_json))
+
+        return self.nosql_databases_json
diff --git a/visualiser/facades/ociVault.py b/visualiser/facades/ociVault.py
new file mode 100644
index 000000000..957fc2480
--- /dev/null
+++ b/visualiser/facades/ociVault.py
@@ -0,0 +1,52 @@
+#!/usr/bin/python
+
+# Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+
+"""Provide Module Description
+"""
+
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~#
+__author__ = ["Andrew Hopkinson (Oracle Cloud Solutions A-Team)"]
+__version__ = "1.0.0"
+__module__ = "ociVault"
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~#
+
+
+import oci
+
+from common.okitLogging import getLogger
+from facades.ociConnection import OCIVaultConnection
+
+# Configure logging
+logger = getLogger()
+
+
+class OCIVaults(OCIVaultConnection):
+    def __init__(self, config=None, configfile=None, profile=None, compartment_id=None):
+        self.compartment_id = compartment_id
+        self.vaults_json = []
+        super(OCIVaults, self).__init__(config=config, configfile=configfile, profile=profile)
+
+    def list(self, compartment_id=None, filter=None):
+        if compartment_id is None:
+            compartment_id = self.compartment_id
+
+        # Add filter to only return AVAILABLE Compartments
+        if filter is None:
+            filter = {}
+
+        if 'lifecycle_state' not in filter:
+            filter['lifecycle_state'] = 'AVAILABLE'
+
+        vaults = oci.pagination.list_call_get_all_results(self.client.list_vaults, compartment_id=compartment_id).data
+
+        # Convert to Json object
+        vaults_json = self.toJson(vaults)
+        logger.debug(str(vaults_json))
+
+        # Filter results
+        self.vaults_json = self.filterJsonObjectList(vaults_json, filter)
+        logger.debug(str(self.vaults_json))
+
+        return self.vaults_json
diff --git a/visualiser/generators/okitGenerator.py b/visualiser/generators/okitGenerator.py
index 770ee143b..c7a8a2921 100644
--- a/visualiser/generators/okitGenerator.py
+++ b/visualiser/generators/okitGenerator.py
@@ -26,7 +26,7 @@
 logger = getLogger()
 
 class OCIGenerator(object):
-    OKIT_VERSION = "0.27.1"
+    OKIT_VERSION = "0.28.0"
     def __init__(self, template_dir, output_dir, visualiser_json, use_vars=False):
         # Initialise generator output data variables
         self.create_sequence = []
@@ -130,6 +130,11 @@ def generate(self):
         logger.debug(self.create_sequence[-1])
 
         # Process keys within the input json file
+        # - Users / User Groups
+        for user in self.visualiser_json.get('users', []):
+            self.renderUser(user)
+        for user_group in self.visualiser_json.get('groups', []):
+            self.renderUserGroup(user_group)
         # - Compartment Sub Components
         # -- Compartments
         # --- Get List of Compartment Ids
@@ -223,6 +228,9 @@ def generate(self):
         # -- Loadbalancers
         for loadbalancer in self.visualiser_json.get('load_balancers', []):
             self.renderLoadbalancer(loadbalancer)
+        # -- Bastions
+        for bastion in self.visualiser_json.get('bastions', []):
+            self.renderBastion(bastion)
         # # -- Exadata Infrastructures
         # for resource in self.visualiser_json.get('exadata_infrastructures', []):
         #     self.renderExadataInfrastructure(resource)
@@ -359,6 +367,46 @@ def renderAutonomousDatabase(self, resource):
         logger.debug(self.create_sequence[-1])
         return
 
+    def renderBastion(self, resource):
+        # Reset Variables
+        self.initialiseJinja2Variables()
+        display_name = resource.get("display_name", resource.get("name", "Unknown"))
+        # Read Data
+        standardisedName = self.standardiseResourceName(display_name)
+        resourceName = '{0:s}'.format(standardisedName)
+        self.jinja2_variables['resource_name'] = resourceName
+        self.jinja2_variables['output_name'] = display_name
+        # Process Virtual Cloud Networks Data
+        logger.info('Processing Bastion Information {0!s:s}'.format(standardisedName))
+        # -- Define Variables
+        # --- Read / Create
+        # ---- Read Only
+        self.jinja2_variables['read_only'] = resource.get('read_only', False)
+        # ---- Id
+        self.jinja2_variables["ocid"] = self.formatJinja2Value(resource['id'])
+        # --- Required
+        # ---- Compartment Id
+        self.jinja2_variables["compartment_id"] = self.formatJinja2IdReference(self.standardiseResourceName(self.id_name_map[resource['compartment_id']]))
+        # ---- Bastion Type
+        self.addJinja2Variable("bastion_type", resource.get("bastion_type", 'STANDARD'), standardisedName)
+        # ---- Subnet
+        self.jinja2_variables["target_subnet_id"] = self.formatJinja2IdReference(self.standardiseResourceName(self.id_name_map[resource['target_subnet_id']]))
+        # ---- Display Name
+        self.addJinja2Variable("display_name", display_name, standardisedName)
+        # ---- CIDR Blocks
+        self.jinja2_variables["client_cidr_block_allow_list"] = resource.get("client_cidr_block_allow_list", [])
+        # --- Optional
+        if resource.get("max_session_ttl_in_seconds", 0) > 0:
+            self.addJinja2Variable("max_session_ttl_in_seconds", resource.get("max_session_ttl_in_seconds", 10800), standardisedName)
+        # ---- Tags
+        self.renderTags(resource)
+
+        # -- Render Template
+        jinja2_template = self.jinja2_environment.get_template("bastion.jinja2")
+        self.create_sequence.append(jinja2_template.render(self.jinja2_variables))
+        logger.debug(self.create_sequence[-1])
+        return
+
     def renderBlockStorageVolume(self, resource):
         # Reset Variables
         self.initialiseJinja2Variables()
@@ -666,7 +714,7 @@ def renderDhcpOption(self, resource):
             logger.info(f'DHCP Option: {dhcp_option}')
             jinja2_dhcp_option["type"] = self.generateJinja2Variable('dhcp_option_{0:02d}_type'.format(option_cnt), dhcp_option["type"], standardisedName)
             # ------ Server Type
-            if dhcp_option.get("server_type", '') != '':
+            if len(dhcp_option.get("server_type", '')) > 0:
                 jinja2_dhcp_option["server_type"] = self.generateJinja2Variable('dhcp_option_{0:02d}_server_type'.format(option_cnt), dhcp_option["server_type"], standardisedName)
             # ------ Custom DNS Servers
             if len(dhcp_option.get("custom_dns_servers", [])) > 0:
@@ -1953,6 +2001,88 @@ def renderSubnet(self, resource):
         logger.debug(self.create_sequence[-1])
         return
 
+    def renderUser(self, resource):
+        # Reset Variables
+        self.initialiseJinja2Variables()
+        display_name = resource.get("display_name", resource.get("name", "Unknown"))
+        # Read Data
+        standardisedName = self.standardiseResourceName(display_name)
+        resourceName = '{0:s}'.format(standardisedName)
+        self.jinja2_variables['resource_name'] = resourceName
+        self.jinja2_variables['output_name'] = display_name
+        # Process Virtual Cloud Networks Data
+        logger.info('Processing User Information {0!s:s}'.format(standardisedName))
+        # -- Define Variables
+        # --- Read / Create
+        # ---- Read Only
+        self.jinja2_variables['read_only'] = resource.get('read_only', False)
+        # ---- Id
+        self.jinja2_variables["ocid"] = self.formatJinja2Value(resource['id'])
+        # --- Required
+        # ---- Display Name
+        self.addJinja2Variable("display_name", display_name, standardisedName)
+        # ---- Description
+        description = resource.get("description", display_name)
+        if len(description) == 0:
+            description = display_name
+        self.addJinja2Variable("description", description, standardisedName)
+        # --- Optional
+        if resource.get("email", '') != '':
+            self.addJinja2Variable("email", resource.get("email", ''), standardisedName)
+        # ---- Tags
+        self.renderTags(resource)
+
+        # -- Render Template
+        jinja2_template = self.jinja2_environment.get_template("user.jinja2")
+        self.create_sequence.append(jinja2_template.render(self.jinja2_variables))
+        logger.debug(self.create_sequence[-1])
+        return
+
+    def renderUserGroup(self, resource):
+        # Reset Variables
+        self.initialiseJinja2Variables()
+        display_name = resource.get("display_name", resource.get("name", "Unknown"))
+        # Read Data
+        standardisedName = self.standardiseResourceName(display_name)
+        resourceName = '{0:s}'.format(standardisedName)
+        self.jinja2_variables['resource_name'] = resourceName
+        self.jinja2_variables['output_name'] = display_name
+        # Process Virtual Cloud Networks Data
+        logger.info('Processing User Information {0!s:s}'.format(standardisedName))
+        # -- Define Variables
+        # --- Read / Create
+        # ---- Read Only
+        self.jinja2_variables['read_only'] = resource.get('read_only', False)
+        # ---- Id
+        self.jinja2_variables["ocid"] = self.formatJinja2Value(resource['id'])
+        # --- Required
+        # ---- Display Name
+        self.addJinja2Variable("display_name", display_name, standardisedName)
+        # ---- Description
+        # self.addJinja2Variable("description", resource.get("description", display_name), standardisedName)
+        description = resource.get("description", display_name)
+        if len(description) == 0:
+            description = display_name
+        self.addJinja2Variable("description", description, standardisedName)
+        # --- Optional
+        # ---- User Members
+        if len(resource['user_ids']):
+            jinja2_user_ids = []
+            for user_id in resource.get('user_ids', []):
+                user = self.id_name_map[user_id]
+                jinja2_user_ids.append(self.formatJinja2IdReference(self.standardiseResourceName(user)))
+            self.jinja2_variables["user_ids"] = jinja2_user_ids
+        else:
+            self.jinja2_variables.pop("user_ids", None)
+        # ---- Tags
+        self.renderTags(resource)
+
+        # -- Render Template
+        jinja2_template = self.jinja2_environment.get_template("user_group.jinja2")
+        self.create_sequence.append(jinja2_template.render(self.jinja2_variables))
+        logger.debug(self.create_sequence[-1])
+        return
+
     def renderVirtualCloudNetwork(self, resource):
         # Reset Variables
         self.initialiseJinja2Variables()
@@ -2144,7 +2274,7 @@ def renderTags(self, artifact):
         return
 
     def renderDefinedTags(self, artifact):
-        tags = {**artifact.get("defined_tags", {}), **self.visualiser_json.get("defined_tags", {})}
+        tags = {**artifact.get("defined_tags", {}), **self.visualiser_json.get("defined_tags", {}), **self.getOkitDefinedTags(artifact)}
         if len(tags.keys()) > 0:
             if self.use_vars:
                 standardisedName = self.standardiseResourceName(artifact.get('display_name', artifact.get('name', '')))
@@ -2159,7 +2289,8 @@ def renderDefinedTags(self, artifact):
         return
 
     def renderFreeformTags(self, artifact):
-        tags = {**artifact.get("freeform_tags", {}), **self.visualiser_json.get("freeform_tags", {}), 'okit_version': self.OKIT_VERSION}
+        tags = {**artifact.get("freeform_tags", {}), **self.visualiser_json.get("freeform_tags", {}), **self.getOkitFreeformTags(artifact)}
+        # 'okit_version': self.OKIT_VERSION, 'okit_reference': artifact.get('okit_reference', 'Unknown')
         if len(tags.keys()) > 0:
             if self.use_vars:
                 standardisedName = self.standardiseResourceName(artifact.get('display_name', artifact.get('name', '')))
@@ -2172,6 +2303,13 @@ def renderFreeformTags(self, artifact):
         else:
             self.jinja2_variables.pop("freeform_tags", None)
         return
+    
+    def getOkitDefinedTags(self, resource):
+        return {}
+        # return {"okit": {"version": self.OKIT_VERSION, "reference": resource.get('okit_reference', 'Unknown')}}
+
+    def getOkitFreeformTags(self, resource):
+        return {"okit_version": self.OKIT_VERSION, "okit_reference": resource.get('okit_reference', 'Unknown')}
 
     def standardiseResourceName(self, name):
         # split() will generate a list with no empty values thus join of this will remove all whitespace
diff --git a/visualiser/generators/okitTerraformGenerator.py b/visualiser/generators/okitTerraformGenerator.py
index 84f082b43..ce3a14d54 100644
--- a/visualiser/generators/okitTerraformGenerator.py
+++ b/visualiser/generators/okitTerraformGenerator.py
@@ -80,7 +80,8 @@ def formatJinja2Value(self, value):
             return '"{0!s:s}"'.format(value)
 
     def renderDefinedTags(self, artifact):
-        tags = {**artifact.get("defined_tags", {}), **self.visualiser_json.get("defined_tags", {})}
+        # tags = {**artifact.get("defined_tags", {}), **self.visualiser_json.get("defined_tags", {})}
+        tags = {**artifact.get("defined_tags", {}), **self.visualiser_json.get("defined_tags", {}), **self.getOkitDefinedTags(artifact)}
         if len(tags.keys()) > 0:
             definedtags = {}
             for namespace, tags in tags.items():
diff --git a/visualiser/model/okitValidation.py b/visualiser/model/okitValidation.py
index 5d0ace5b1..6534c9aea 100644
--- a/visualiser/model/okitValidation.py
+++ b/visualiser/model/okitValidation.py
@@ -29,6 +29,7 @@ def validate(self):
         logger.info('Validating OKIT Json')
         self.validateCommon()
         self.validateAutonomousDatabases()
+        self.validateBastions()
         self.validateBlockStorageVolumes()
         self.validateCompartments()
         self.validateCustomerPremiseEquipments()
@@ -129,6 +130,26 @@ def validateAutonomousDatabases(self):
                 }
                 self.results['errors'].append(error)
 
+    # Bastion
+    def validateBastions(self):
+        for resource in self.okit_json.get('bastions', []):
+            logger.info('Validating {!s}'.format(resource['display_name']))
+            for cidr_block in resource.get('client_cidr_block_allow_list', []):
+                for other_cidr_block in resource.get('client_cidr_block_allow_list', []):
+                    logger.info(f'cidr_block {cidr_block} - other_cidr_block {other_cidr_block} : {self.overlaps(cidr_block, other_cidr_block)}')
+                    if cidr_block != other_cidr_block:
+                        if self.overlaps(cidr_block, other_cidr_block):
+                            self.valid = False
+                            error = {
+                                'id': resource['id'],
+                                'type': 'Bastion',
+                                'artefact': resource['display_name'],
+                                'message': 'CIDR Block {!s} overlaps CIDR Block {!s}.'.format(cidr_block, other_cidr_block),
+                                'element': 'client_cidr_block_allow_list'
+                            }
+                            self.results['errors'].append(error)
+
+
     # Block Storage
     def validateBlockStorageVolumes(self):
         for artefact in self.okit_json.get('block_storage_volumes', []):
diff --git a/visualiser/query/ociDropdownQuery.py b/visualiser/query/ociDropdownQuery.py
index 036178e99..84d423449 100644
--- a/visualiser/query/ociDropdownQuery.py
+++ b/visualiser/query/ociDropdownQuery.py
@@ -40,6 +40,7 @@ class OCIDropdownQuery(OCIConnection):
         "FastConnectProviderService", 
         "Image",
         "ImageShapeCompatibility",
+        # "Instance",
         "MySQLShape", 
         "MySQLVersion", 
         "MySQLConfiguration", 
@@ -116,6 +117,7 @@ def images(self, images, resources):
         # logger.info(f'Processing Images - Shape: {sorted(shapes)}')
         for image in images:
             # logger.info(f'Image Id: {image["id"]} in/out {image["id"] in ids}')
+            # logger.info(f'Image {image["display_name"]} Compartment {image["compartment_id"]}')
             image["shapes"] = [s["shape"] for s in resources.get("ImageShapeCompatibility", []) if s["image_id"] == image["id"]]
         return images
     
diff --git a/visualiser/query/ociQuery.py b/visualiser/query/ociQuery.py
index f01fced78..37e8180a1 100644
--- a/visualiser/query/ociQuery.py
+++ b/visualiser/query/ociQuery.py
@@ -35,6 +35,7 @@ class OCIQuery(OCIConnection):
         "AutonomousDatabase",
         "Backend",
         "BackendSet",
+        "Bastion",
         "BootVolume",
         "BootVolumeAttachment",
         "Bucket",
@@ -51,6 +52,7 @@ class OCIQuery(OCIConnection):
         "Export",
         "ExportSet",
         "FileSystem",
+        "Group",
         "Image",
         "Instance",
         # "InstancePool",
@@ -73,6 +75,8 @@ class OCIQuery(OCIConnection):
         "SecurityList",
         "ServiceGateway",
         "Subnet",
+        "User",
+        "UserGroupMembership",
         "Vcn",
         "VmCluster",
         "VmClusterNetwork",
@@ -83,6 +87,7 @@ class OCIQuery(OCIConnection):
     ]
     DISCOVERY_OKIT_MAP = {
         "AutonomousDatabase": "autonomous_databases",
+        "Bastion": "bastions",
         #"BootVolume": "block_storage_volumes",
         "Bucket": "object_storage_buckets",
         "Cluster": "oke_clusters",
@@ -95,6 +100,7 @@ class OCIQuery(OCIConnection):
         "Drg": "dynamic_routing_gateways",
         "ExadataInfrastructure": "exadata_infrastructures",
         "FileSystem": "file_storage_systems",
+        "Group": "groups",
         "Instance": "instances",
         "InstancePool": "instance_pools",
         "InternetGateway": "internet_gateways",
@@ -110,6 +116,7 @@ class OCIQuery(OCIConnection):
         "SecurityList": "security_lists",
         "ServiceGateway": "service_gateways",
         "Subnet": "subnets",
+        "User": "users",
         "Vcn": "virtual_cloud_networks",
         "VmCluster": "vm_clusters",
         "VmClusterNetwork": "vm_cluster_networks",
@@ -203,7 +210,10 @@ def convert(self, discovery_data, compartments):
                         resource_list = self.route_tables(resource_list, resources)
                     elif resource_type == "ServiceGateway":
                         resource_list = self.service_gateways(resource_list, resources)
+                    elif resource_type == "Group":
+                        resource_list = self.groups(resource_list, resources)
                     # Check Life Cycle State
+                    # logger.info(f'Processing {resource_type} : {resource_list}')
                     response_json[self.DISCOVERY_OKIT_MAP[resource_type]] = [r for r in resource_list if "lifecycle_state" not in r or r["lifecycle_state"] in self.VALID_LIFECYCLE_STATES]
                     #response_json[self.DISCOVERY_OKIT_MAP[resource_type]] = resource_list
         return response_json
@@ -226,6 +236,11 @@ def file_storage_systems(self, file_storage_systems, resources):
                 mt["export_set"] = ess[0] if len(ess) else {}
         return file_storage_systems
 
+    def groups(self, groups, resources):
+        for group in groups:
+            group["user_ids"] = [m["user_id"] for m in resources.get("UserGroupMembership", []) if m["group_id"] == group["id"]]
+        return groups
+
     def instances(self, instances, resources):
         # Exclude OKE Instances
         instances = [i for i in instances if 'oke-cluster-id' not in i['metadata']]
diff --git a/visualiser/templates/markdown/common_macros.jinja2 b/visualiser/templates/markdown/common_macros.jinja2
index df8a0bc84..5e4dd72e7 100644
--- a/visualiser/templates/markdown/common_macros.jinja2
+++ b/visualiser/templates/markdown/common_macros.jinja2
@@ -305,3 +305,21 @@
         {%- endif -%}
     {%- endfor -%}
 {%- endmacro -%}
+
+
+{%- macro user_property(id, title="User") -%}
+    {{ document_property(title, user_link(id)) }}
+{%- endmacro -%}
+
+{%- macro user_link(id) -%}
+    {{ property_link(user_name(id)) }}
+{%- endmacro -%}
+
+{%- macro user_name(id) -%}
+    {%- for user in users -%}
+        {%- if user.id == id -%}
+            {{ user.display_name }}
+        {%- endif -%}
+    {%- endfor -%}
+{%- endmacro -%}
+
diff --git a/visualiser/templates/markdown/group.jinja2 b/visualiser/templates/markdown/group.jinja2
new file mode 100644
index 000000000..6066b6e71
--- /dev/null
+++ b/visualiser/templates/markdown/group.jinja2
@@ -0,0 +1,14 @@
+{% import "common_macros.jinja2" as common with context %}
+{% macro document_group(resource) -%}
+{{ common.document_common_details(resource) }}
+| Property | Value    |
+| -------- | -------- |
+{{ common.document_property("Description", resource.description) }}
+    {% for user_id in resource.user_ids -%}
+        {{ common.user_property(user_id) }}
+    {% endfor %}
+{{ common.document_tags(resource) }}
+{%- endmacro %}
+{% for group in groups -%}
+    {{ document_group(group) }}
+{%- endfor %}
\ No newline at end of file
diff --git a/visualiser/templates/markdown/markdown.jinja2 b/visualiser/templates/markdown/markdown.jinja2
index 5dcda12af..26bd53409 100644
--- a/visualiser/templates/markdown/markdown.jinja2
+++ b/visualiser/templates/markdown/markdown.jinja2
@@ -157,8 +157,26 @@
 
 {%- endif %}
 
+{% if (groups is defined and groups|length > 0) or (users is defined and users|length > 0) or (policys is defined and policys|length > 0) -%}
+## Identity
+{% if (users is defined and users|length > 0) -%}
+### Users
+    {% include "user.jinja2" ignore missing with context %}
+{%- endif %}
+
+{% if (groups is defined and groups|length > 0) -%}
+### User Groups
+    {% include "group.jinja2" ignore missing with context %}
+{%- endif %}
+
+{% if (policys is defined and policys|length > 0) -%}
+### Policies
+    {% include "policy.jinja2" ignore missing with context %}
+{%- endif %}
+{%- endif %}
+
 {% if user_defined is defined and user_defined.terraform is defined and user_defined.terraform|length > 0 -%}
-### User Defined Terraform 
+## User Defined Terraform 
 ```terraform
 {{ user_defined.terraform|safe }}
 ```
diff --git a/visualiser/templates/markdown/policy.jinja2 b/visualiser/templates/markdown/policy.jinja2
new file mode 100644
index 000000000..0e5768f97
--- /dev/null
+++ b/visualiser/templates/markdown/policy.jinja2
@@ -0,0 +1,14 @@
+{% import "common_macros.jinja2" as common with context %}
+{% macro document_policy(resource) -%}
+{{ common.document_common_details(resource) }}
+{{ common.document_common_properties(resource) }}
+{{ common.document_property("Description", resource.description) }}
+{{ common.document_property("Version Date", resource.version_date) }}
+    {% for statement in resource.statements -%}
+        {{ common.document_property("Statement", statement) }}
+    {% endfor %}
+{{ common.document_tags(resource) }}
+{%- endmacro %}
+{% for policy in policys -%}
+    {{ document_policy(policy) }}
+{%- endfor %}
\ No newline at end of file
diff --git a/visualiser/templates/markdown/user.jinja2 b/visualiser/templates/markdown/user.jinja2
new file mode 100644
index 000000000..cf264c998
--- /dev/null
+++ b/visualiser/templates/markdown/user.jinja2
@@ -0,0 +1,9 @@
+{% import "common_macros.jinja2" as common with context %}
+{% macro document_user(resource) -%}
+{{ "| %-15s | %-15s | %s |" | format(resource.display_name, resource.email, resource.description) }}
+{%- endmacro %}
+| User Name | Email          | Description    |
+| --------- | -------------- | -------------- |
+{% for user in users -%}
+    {{ document_user(user) }}
+{% endfor %}
\ No newline at end of file
diff --git a/visualiser/templates/markdown/users.jinja2 b/visualiser/templates/markdown/users.jinja2
new file mode 100644
index 000000000..b8bad0973
--- /dev/null
+++ b/visualiser/templates/markdown/users.jinja2
@@ -0,0 +1,9 @@
+{% import "common_macros.jinja2" as common with context %}
+{% macro document_user(resource) -%}
+{{ common.document_property(resource.display_name, resource.description) }}
+{%- endmacro %}
+| User Name | Description    |
+| --------- | -------------- |
+{% for user in users -%}
+    {{ document_user(user) }}
+{% endfor %}
\ No newline at end of file
diff --git a/visualiser/templates/terraform/bastion.jinja2 b/visualiser/templates/terraform/bastion.jinja2
new file mode 100644
index 000000000..0586660b9
--- /dev/null
+++ b/visualiser/templates/terraform/bastion.jinja2
@@ -0,0 +1,39 @@
+{% if read_only %}
+# ------ Read Bastion
+data "oci_bastion_bastion" "{{ resource_name }}" {
+    # Required
+    compartment_id  = {{ compartment_ocid }}
+    bastion_id = {{ ocid | safe }}
+}
+
+locals {
+    {{ resource_name }}_id            = data.oci_bastion_bastion.{{ resource_name }}.id
+}
+{% else %}
+# ------ Create Bastion
+resource "oci_bastion_bastion" "{{ resource_name }}" {
+    #Required
+    compartment_id = {{ compartment_id }}
+    bastion_type = {{ bastion_type | safe }}
+    target_subnet_id = {{ target_subnet_id | safe }}
+
+    #Optional
+    name = {{ display_name | safe }}
+    client_cidr_block_allow_list    = [{% for cidr_block in client_cidr_block_allow_list %}"{{ cidr_block }}"{% if not loop.last %},{% endif %}{% endfor %}]
+{% if max_session_ttl_in_seconds is defined %}
+    max_session_ttl_in_seconds = {{ max_session_ttl_in_seconds | safe }}
+{% endif %}
+{% if phone_book_entry is defined %}
+    phone_book_entry = {{ phone_book_entry | safe }}
+{% endif %}
+{% if static_jump_host_ip_addresses is defined %}
+    static_jump_host_ip_addresses = {{ static_jump_host_ip_addresses | safe }}
+{% endif %}
+{% if defined_tags is defined %}
+        defined_tags     = {{ defined_tags | safe }}
+{% endif %}
+{% if freeform_tags is defined %}
+        freeform_tags    = {{ freeform_tags | safe }}
+{% endif %}
+}
+{% endif %}
diff --git a/visualiser/templates/terraform/dhcp_option.jinja2 b/visualiser/templates/terraform/dhcp_option.jinja2
index 65cbf26eb..bd94e95be 100644
--- a/visualiser/templates/terraform/dhcp_option.jinja2
+++ b/visualiser/templates/terraform/dhcp_option.jinja2
@@ -29,9 +29,11 @@ resource "oci_core_dhcp_options" "{{ resource_name }}" {
 {% for option in options %}
     options    {
         type  = {{ option.type | safe }}
-    {% if option.server_type is defined %}
+    {% if option.server_type is defined and option.server_type | length > 0 %}
         server_type = {{ option.server_type | safe }}
+        {% if option.custom_dns_servers is defined %}
         custom_dns_servers       = [{{ option.custom_dns_servers | safe }}]
+        {% endif %}
     {% else %}
         search_domain_names      = [{{ option.search_domain_names | safe }}]
     {% endif %}
diff --git a/visualiser/templates/terraform/policy.jinja2 b/visualiser/templates/terraform/policy.jinja2
index af72e41f7..08c82d3dc 100644
--- a/visualiser/templates/terraform/policy.jinja2
+++ b/visualiser/templates/terraform/policy.jinja2
@@ -1,7 +1,7 @@
 
 {% if read_only %}
 # ------ Read Policy
-data "oci_identity_policies" "test_policies" {
+data "oci_identity_policies" "{{ resource_name }}" {
     #Required
     compartment_id = {{ compartment_id }}
     filter {
diff --git a/visualiser/templates/terraform/user.jinja2 b/visualiser/templates/terraform/user.jinja2
new file mode 100644
index 000000000..3746c4046
--- /dev/null
+++ b/visualiser/templates/terraform/user.jinja2
@@ -0,0 +1,46 @@
+
+{% if read_only %}
+# ------ Read User
+data "oci_identity_users" "{{ resource_name }}" {
+    #Required
+    compartment_id = {{ compartment_id }}
+    filter {
+        name = "id"
+        values = [{{ ocid | safe }}]
+    }
+}
+
+locals {
+    {{ resource_name }}_id              = {{ ocid | safe }}
+}
+{% else %}
+# ------ Create User
+resource "oci_identity_user" "{{ resource_name }}" {
+    provider       = oci.home_region
+    #Required
+    compartment_id = {{ tenancy_ocid }}
+    description = {{ description | safe }}
+    name = {{ display_name | safe }}
+
+    #Optional
+{% if email is defined %}
+    email = {{ email | safe }}
+{% endif %}
+{% if defined_tags is defined %}
+    defined_tags   = {{ defined_tags | safe }}
+{% endif %}
+{% if freeform_tags is defined %}
+    freeform_tags  = {{ freeform_tags | safe }}
+{% endif %}
+}
+
+locals {
+    {{ resource_name }}_id              = oci_identity_user.{{ resource_name }}.id
+}
+# ------- Create Password
+resource "oci_identity_ui_password" "{{ resource_name }}Password" {
+    provider       = oci.home_region
+    #Required
+    user_id = oci_identity_user.{{ resource_name }}.id
+}
+{% endif %}
diff --git a/visualiser/templates/terraform/user_group.jinja2 b/visualiser/templates/terraform/user_group.jinja2
new file mode 100644
index 000000000..01af0b8f2
--- /dev/null
+++ b/visualiser/templates/terraform/user_group.jinja2
@@ -0,0 +1,46 @@
+
+{% if read_only %}
+# ------ Read User Group
+data "oci_identity_groups" "{{ resource_name }}" {
+    #Required
+    compartment_id = {{ compartment_id }}
+    filter {
+        name = "id"
+        values = [{{ ocid | safe }}]
+    }
+}
+
+locals {
+    {{ resource_name }}_id              = {{ ocid | safe }}
+}
+{% else %}
+# ------ Create User Group
+resource "oci_identity_group" "{{ resource_name }}" {
+    provider       = oci.home_region
+    #Required
+    compartment_id = {{ tenancy_ocid }}
+    description = {{ description | safe }}
+    name = {{ display_name | safe }}
+
+    #Optional
+{% if defined_tags is defined %}
+    defined_tags   = {{ defined_tags | safe }}
+{% endif %}
+{% if freeform_tags is defined %}
+    freeform_tags  = {{ freeform_tags | safe }}
+{% endif %}
+}
+
+locals {
+    {{ resource_name }}_id              = oci_identity_group.{{ resource_name }}.id
+}
+# ------- Add Members
+{% for user_id in user_ids %}
+resource "oci_identity_user_group_membership" "{{ resource_name }}User{{ loop.index }}" {
+    provider       = oci.home_region
+    #Required
+    user_id = {{ user_id }}
+    group_id = local.{{ resource_name }}_id
+}
+{% endfor %}
+{% endif %}