diff --git a/src/components/modals/agents/BulkAction.vue b/src/components/modals/agents/BulkAction.vue
index ab5e58e..a6b4d99 100644
--- a/src/components/modals/agents/BulkAction.vue
+++ b/src/components/modals/agents/BulkAction.vue
@@ -319,14 +319,15 @@ export default {
     const filteredScriptOptions = computed(() => {
       if (props.mode !== "script") return [];
 
-      if (state.value.osType === "linux")
-        return removeExtraOptionCategories(
-          scriptOptions.value.filter(script => script.category || script.shell === "shell" || script.shell === "python")
-        );
-      else
-        return removeExtraOptionCategories(
-          scriptOptions.value.filter(script => script.category || script.shell !== "shell")
-        );
+      return removeExtraOptionCategories(
+        scriptOptions.value.filter(
+          script =>
+            script.category ||
+            !script.supported_platforms ||
+            !script.supported_platforms.length === 0 ||
+            script.supported_platforms.includes(state.value.osType)
+        )
+      );
     });
 
     // component lifecycle hooks
diff --git a/src/components/modals/agents/RunScript.vue b/src/components/modals/agents/RunScript.vue
index d4dcf5a..6f0a1e3 100644
--- a/src/components/modals/agents/RunScript.vue
+++ b/src/components/modals/agents/RunScript.vue
@@ -174,14 +174,12 @@ export default {
     }
 
     const filteredScriptOptions = computed(() => {
-      if (props.agent.plat === "linux")
-        return removeExtraOptionCategories(
-          scriptOptions.value.filter(script => script.category || script.shell === "shell" || script.shell === "python")
-        );
-      else
-        return removeExtraOptionCategories(
-          scriptOptions.value.filter(script => script.category || script.shell !== "shell")
-        );
+      return removeExtraOptionCategories(
+        scriptOptions.value.filter(
+          script =>
+            script.category || !script.supported_platforms || script.supported_platforms.includes(props.agent.plat)
+        )
+      );
     });
 
     // watchers
diff --git a/src/components/scripts/ScriptFormModal.vue b/src/components/scripts/ScriptFormModal.vue
index cf99806..03db026 100644
--- a/src/components/scripts/ScriptFormModal.vue
+++ b/src/components/scripts/ScriptFormModal.vue
@@ -38,6 +38,16 @@
               map-options
               label="Shell Type"
             />
+            <tactical-dropdown
+              v-model="formScript.supported_platforms"
+              :options="agentPlatformOptions"
+              label="Supported Platforms (All supported if blank)"
+              clearable
+              mapOptions
+              filled
+              multiple
+              :readonly="readonly"
+            />
             <tactical-dropdown
               filled
               v-model="formScript.category"
@@ -127,10 +137,10 @@
 
 <script>
 // composable imports
-import { ref, computed, watch, onMounted } from "vue";
+import { ref, computed, onMounted } from "vue";
 import { useQuasar, useDialogPluginComponent } from "quasar";
 import { saveScript, editScript, downloadScript } from "@/api/scripts";
-import { useAgentDropdown } from "@/composables/agents";
+import { useAgentDropdown, agentPlatformOptions } from "@/composables/agents";
 import { notifySuccess } from "@/utils/notify";
 
 // ui imports
@@ -186,16 +196,6 @@ export default {
     const loading = ref(false);
     const agentLoading = ref(false);
 
-    // watch(script.value, (newValue, oldValue) => {
-    //   if (!props.script && script.value.script_body === "") {
-    //     if (newValue.shell === "shell") {
-    //       script.value.script_body = "#!/bin/bash\n\n# don't forget to include the shebang above!\n\n";
-    //     } else if (newValue.shell === "python") {
-    //       script.value.script_body = "#!/usr/bin/python3\n\n# don't forget to include the shebang above!\n\n";
-    //     }
-    //   }
-    // });
-
     const title = computed(() => {
       if (props.script) {
         return props.readonly
@@ -274,6 +274,7 @@ export default {
 
       // non-reactive data
       shellOptions,
+      agentPlatformOptions,
 
       //computed
       title,
diff --git a/src/components/scripts/ScriptManager.vue b/src/components/scripts/ScriptManager.vue
index 9f05b84..c4049a5 100644
--- a/src/components/scripts/ScriptManager.vue
+++ b/src/components/scripts/ScriptManager.vue
@@ -66,6 +66,16 @@
           @click="setShowCommunityScripts(!showCommunityScripts)"
         />
 
+        <q-btn
+          dense
+          flat
+          no-caps
+          class="q-ml-sm"
+          :label="showHiddenScripts ? 'Hide Hidden Scripts' : 'Show Hidden Scripts'"
+          :icon="showHiddenScripts ? 'visibility_off' : 'visibility'"
+          @click="showHiddenScripts = !showHiddenScripts"
+        />
+
         <q-space />
         <q-input v-model="search" style="width: 300px" label="Search" dense outlined clearable class="q-pr-md q-pb-xs">
           <template v-slot:prepend>
@@ -110,7 +120,9 @@
                 <q-tooltip> Shell </q-tooltip>
               </q-icon>
 
-              <span class="q-pl-xs text-weight-bold">{{ props.node.name }}</span>
+              <span class="q-pl-xs text-weight-bold" :style="{ color: props.node.hidden ? 'grey' : '' }">{{
+                props.node.name
+              }}</span>
               <span class="q-pl-xs">{{ props.node.description }}</span>
             </div>
 
@@ -171,6 +183,15 @@
                   <q-item-section>Download Script</q-item-section>
                 </q-item>
 
+                <q-separator />
+
+                <q-item clickable v-close-popup @click="hideScript(props.node)">
+                  <q-item-section side>
+                    <q-icon :name="props.node.hidden ? 'visibility' : 'visibility_off'" />
+                  </q-item-section>
+                  <q-item-section>{{ props.node.hidden ? "Show Script" : "Hide Script" }}</q-item-section>
+                </q-item>
+
                 <q-separator></q-separator>
 
                 <q-item clickable v-close-popup>
@@ -272,6 +293,15 @@
                   <q-item-section>Download Script</q-item-section>
                 </q-item>
 
+                <q-separator />
+
+                <q-item clickable v-close-popup @click="hideScript(props.row)">
+                  <q-item-section side>
+                    <q-icon :name="props.row.hidden ? 'visibility' : 'visibility_off'" />
+                  </q-item-section>
+                  <q-item-section>{{ props.row.hidden ? "Show Script" : "Hide Script" }}</q-item-section>
+                </q-item>
+
                 <q-separator></q-separator>
 
                 <q-item clickable v-close-popup>
@@ -279,9 +309,11 @@
                 </q-item>
               </q-list>
             </q-menu>
+            <!-- favorite -->
             <q-td>
               <q-icon v-if="props.row.favorite" color="yellow-8" name="star" size="sm" />
             </q-td>
+            <!-- shell icon -->
             <q-td>
               <q-icon v-if="props.row.shell === 'powershell'" name="mdi-powershell" color="primary" size="sm">
                 <q-tooltip> Powershell </q-tooltip>
@@ -296,8 +328,14 @@
                 <q-tooltip> Shell </q-tooltip>
               </q-icon>
             </q-td>
-            <!-- name -->
+            <!-- supported platforms -->
             <q-td>
+              <q-badge v-for="plat in props.row.supported_platforms" :key="plat" color="primary" class="q-pr-xs">{{
+                capitalize(plat)
+              }}</q-badge>
+            </q-td>
+            <!-- name -->
+            <q-td :style="{ color: props.row.hidden ? 'grey' : '' }">
               {{ truncateText(props.row.name, 50) }}
               <q-tooltip v-if="props.row.name.length >= 50" style="font-size: 12px">
                 {{ props.row.name }}
@@ -334,6 +372,7 @@ import { ref, computed, watch, onMounted } from "vue";
 import { useStore } from "vuex";
 import { useQuasar, useDialogPluginComponent, exportFile } from "quasar";
 import { fetchScripts, editScript, downloadScript, removeScript } from "@/api/scripts";
+import { capitalize } from "@/utils/format";
 import { truncateText } from "@/utils/format";
 import { notifySuccess } from "@/utils/notify";
 
@@ -358,6 +397,13 @@ const columns = [
     align: "left",
     sortable: true,
   },
+  {
+    name: "supported_platforms",
+    label: "Platforms",
+    field: "supported_platforms",
+    align: "left",
+    sortable: true,
+  },
   {
     name: "name",
     label: "Name",
@@ -409,11 +455,12 @@ export default {
 
     // script manager logic
     const scripts = ref([]);
+    const showHiddenScripts = ref(false);
 
     async function getScripts() {
       loading.value = true;
       try {
-        scripts.value = await fetchScripts();
+        scripts.value = await fetchScripts({ showHiddenScripts: true });
       } catch (e) {
         console.error(e);
       }
@@ -432,6 +479,18 @@ export default {
       loading.value = false;
     }
 
+    async function hideScript(script) {
+      loading.value = true;
+      const notifyText = !script.hidden ? "Script was hidden!" : "Script was unhidden!";
+      try {
+        const result = await editScript({ id: script.id, hidden: !script.hidden });
+        await getScripts();
+        notifySuccess(notifyText);
+      } catch (e) {}
+
+      loading.value = false;
+    }
+
     function deleteScript(script) {
       $q.dialog({
         title: `Delete script: ${script.name}?`,
@@ -467,9 +526,15 @@ export default {
     const expanded = ref([]);
     const loading = ref(false);
 
-    const visibleScripts = computed(() =>
-      showCommunityScripts.value ? scripts.value : scripts.value.filter(i => i.script_type !== "builtin")
-    );
+    const visibleScripts = computed(() => {
+      if (showHiddenScripts.value) {
+        return showCommunityScripts.value ? scripts.value : scripts.value.filter(i => i.script_type !== "builtin");
+      } else {
+        return showCommunityScripts.value
+          ? scripts.value.filter(i => !i.hidden)
+          : scripts.value.filter(i => i.script_type !== "builtin" && !i.hidden);
+      }
+    });
 
     const categories = computed(() => {
       let list = [];
@@ -617,6 +682,7 @@ export default {
       expanded,
       loading,
       showCommunityScripts,
+      showHiddenScripts,
 
       // computed
       visibleScripts,
@@ -628,6 +694,7 @@ export default {
       getScripts,
       deleteScript,
       favoriteScript,
+      hideScript,
       exportScript,
 
       // dialog methods
@@ -644,6 +711,7 @@ export default {
 
       // helper methods
       truncateText,
+      capitalize,
 
       // quasar dialog plugin
       dialogRef,
@@ -651,4 +719,4 @@ export default {
     };
   },
 };
-</script>
\ No newline at end of file
+</script>
\ No newline at end of file
diff --git a/src/components/scripts/ScriptSnippets.vue b/src/components/scripts/ScriptSnippets.vue
index fb23e76..37e7f08 100644
--- a/src/components/scripts/ScriptSnippets.vue
+++ b/src/components/scripts/ScriptSnippets.vue
@@ -72,7 +72,7 @@
               <q-icon v-else-if="props.row.shell === 'cmd'" name="mdi-microsoft-windows" color="primary" size="sm">
                 <q-tooltip> Batch </q-tooltip>
               </q-icon>
-              <q-icon v-else-if="props.row.shell === 'shell'" name="mdi-bash" color="primary">
+              <q-icon v-else-if="props.row.shell === 'shell'" name="mdi-bash" color="primary" size="sm">
                 <q-tooltip> Shell </q-tooltip>
               </q-icon>
             </q-td>
diff --git a/src/components/scripts/ScriptUploadModal.vue b/src/components/scripts/ScriptUploadModal.vue
index be91e9f..08eb60f 100644
--- a/src/components/scripts/ScriptUploadModal.vue
+++ b/src/components/scripts/ScriptUploadModal.vue
@@ -50,6 +50,18 @@
           <tactical-dropdown v-model="script.shell" :options="shellOptions" label="Type" outlined mapOptions />
         </q-card-section>
 
+        <q-card-section>
+          <tactical-dropdown
+            v-model="script.supported_platforms"
+            :options="agentPlatformOptions"
+            label="Supported Platforms (All supported if blank)"
+            clearable
+            mapOptions
+            filled
+            multiple
+          />
+        </q-card-section>
+
         <q-card-section>
           <tactical-dropdown
             v-model="script.args"
@@ -90,6 +102,7 @@
 import { ref, watch } from "vue";
 import { useDialogPluginComponent } from "quasar";
 import { saveScript } from "@/api/scripts";
+import { agentPlatformOptions } from "@/composables/agents";
 import { notifySuccess } from "@/utils/notify";
 
 // ui imports
@@ -149,6 +162,7 @@ export default {
 
       // non-reactive data
       shellOptions,
+      agentPlatformOptions,
 
       // methods
       submitForm,
diff --git a/src/composables/agents.js b/src/composables/agents.js
index 3f0847a..3f1fccb 100644
--- a/src/composables/agents.js
+++ b/src/composables/agents.js
@@ -30,3 +30,8 @@ export function cmdPlaceholder(shell) {
   else if (shell === "powershell") return "Remove-Item -Recurse -Force C:\\Windows\\System32";
   else return "rm -rf --no-preserve-root /";
 }
+
+export const agentPlatformOptions = [
+  { value: "windows", label: "Windows" },
+  { value: "linux", label: "Linux" }
+]
\ No newline at end of file
diff --git a/src/utils/format.js b/src/utils/format.js
index fcb4ced..b888a9f 100644
--- a/src/utils/format.js
+++ b/src/utils/format.js
@@ -51,9 +51,9 @@ export function formatScriptOptions(data) {
     let tmp = [];
     data.forEach(script => {
       if (script.category === cat) {
-        tmp.push({ label: script.name, value: script.id, timeout: script.default_timeout, args: script.args, filename: script.filename, syntax: script.syntax, script_type: script.script_type, shell: script.shell });
+        tmp.push({ label: script.name, value: script.id, timeout: script.default_timeout, args: script.args, filename: script.filename, syntax: script.syntax, script_type: script.script_type, shell: script.shell, supported_platforms: script.supported_platforms });
       } else if (cat === "Unassigned" && !script.category) {
-        tmp.push({ label: script.name, value: script.id, timeout: script.default_timeout, args: script.args, filename: script.filename, syntax: script.syntax, script_type: script.script_type, shell: script.shell });
+        tmp.push({ label: script.name, value: script.id, timeout: script.default_timeout, args: script.args, filename: script.filename, syntax: script.syntax, script_type: script.script_type, shell: script.shell, supported_platforms: script.supported_platforms });
       }
     })
     const sorted = tmp.sort((a, b) => a.label.localeCompare(b.label));