diff --git a/src/api/scripts.js b/src/api/scripts.js
index d7af8c6..192bdb6 100644
--- a/src/api/scripts.js
+++ b/src/api/scripts.js
@@ -48,7 +48,7 @@ export async function fetchScriptSnippets(params = {}) {
   } catch (e) { }
 }
 
-export async function addScriptSnippet(payload) {
+export async function saveScriptSnippet(payload) {
   try {
     const { data } = await axios.post(`${baseUrl}/snippets/`, payload)
     return data
@@ -69,9 +69,9 @@ export async function editScriptSnippet(payload) {
   } catch (e) { }
 }
 
-export async function deleteScriptSnippet(payload) {
+export async function removeScriptSnippet(id) {
   try {
-    const { data } = await axios.delete(`${baseUrl}/snippets/${payload.id}/`)
+    const { data } = await axios.delete(`${baseUrl}/snippets/${id}/`)
     return data
   } catch (e) { }
 }
\ No newline at end of file
diff --git a/src/components/scripts/ScriptFormModal.vue b/src/components/scripts/ScriptFormModal.vue
index afcff26..f689fcb 100644
--- a/src/components/scripts/ScriptFormModal.vue
+++ b/src/components/scripts/ScriptFormModal.vue
@@ -148,7 +148,7 @@ export default {
     const $q = useQuasar();
 
     // script form logic
-    const script = props.script ? ref(Object.assign({}, props.script)) : ref({});
+    const script = props.script ? ref(Object.assign({}, props.script)) : ref({ shell: "powershell", timeout: 90 });
 
     if (props.clone) script.value.name = `(Copy) ${script.value.name}`;
     const code = ref("");
@@ -169,7 +169,8 @@ export default {
     });
 
     // get code if editing or cloning script
-    if (props.script) downloadScript(script.value.id).then(r => (code.value = r.code));
+    if (props.script)
+      downloadScript(script.value.id, { with_snippets: props.readonly }).then(r => (code.value = r.code));
 
     async function submitForm() {
       loading.value = true;
diff --git a/src/components/scripts/ScriptManager.vue b/src/components/scripts/ScriptManager.vue
index 9a5136e..0b768b9 100644
--- a/src/components/scripts/ScriptManager.vue
+++ b/src/components/scripts/ScriptManager.vue
@@ -31,9 +31,19 @@
             </q-list>
           </q-btn-dropdown>
           <q-btn
+            no-caps
             dense
             flat
             class="q-ml-sm"
+            label="Script Snippets"
+            icon="mdi-script"
+            @click="ScriptSnippetModal"
+          />
+          <q-btn
+            dense
+            flat
+            no-caps
+            class="q-ml-sm"
             :label="tableView ? 'Folder View' : 'Table View'"
             :icon="tableView ? 'folder' : 'list'"
             @click="tableView = !tableView"
@@ -41,11 +51,13 @@
           <q-btn
             dense
             flat
+            no-caps
             class="q-ml-sm"
             :label="showCommunityScripts ? 'Hide Community Scripts' : 'Show Community Scripts'"
             :icon="showCommunityScripts ? 'visibility_off' : 'visibility'"
             @click="setShowCommunityScripts(!showCommunityScripts)"
           />
+
           <q-space />
           <q-input
             v-model="search"
@@ -326,6 +338,7 @@ import { notifySuccess } from "@/utils/notify";
 // ui imports
 import ScriptUploadModal from "@/components/scripts/ScriptUploadModal";
 import ScriptFormModal from "@/components/scripts/ScriptFormModal";
+import ScriptSnippets from "@/components/scripts/ScriptSnippets";
 
 // static data
 const columns = [
@@ -569,6 +582,12 @@ export default {
       });
     }
 
+    function ScriptSnippetModal() {
+      $q.dialog({
+        component: ScriptSnippets,
+      });
+    }
+
     // component life cycle hooks
     onMounted(getScripts());
 
@@ -599,6 +618,7 @@ export default {
       editScriptModal,
       cloneScriptModal,
       uploadScriptModal,
+      ScriptSnippetModal,
 
       // table and tree view methods
       tree,
diff --git a/src/components/scripts/ScriptSnippetFormModal.vue b/src/components/scripts/ScriptSnippetFormModal.vue
new file mode 100644
index 0000000..835286f
--- /dev/null
+++ b/src/components/scripts/ScriptSnippetFormModal.vue
@@ -0,0 +1,137 @@
+<template>
+  <q-dialog ref="dialogRef" @hide="onDialogHide" persistent @keydown.esc="onDialogHide" :maximized="maximized">
+    <q-card class="q-dialog-plugin" :style="maximized ? '' : 'width: 70vw; max-width: 90vw'">
+      <q-bar>
+        {{ title }}
+        <q-space />
+        <q-btn dense flat icon="minimize" @click="maximized = false" :disable="!maximized">
+          <q-tooltip v-if="maximized" class="bg-white text-primary">Minimize</q-tooltip>
+        </q-btn>
+        <q-btn dense flat icon="crop_square" @click="maximized = true" :disable="maximized">
+          <q-tooltip v-if="!maximized" class="bg-white text-primary">Maximize</q-tooltip>
+        </q-btn>
+        <q-btn dense flat icon="close" v-close-popup>
+          <q-tooltip class="bg-white text-primary">Close</q-tooltip>
+        </q-btn>
+      </q-bar>
+      <q-form @submit="submitForm">
+        <q-card-section>
+          <div class="q-gutter-sm row">
+            <div class="col-5">
+              <q-input :rules="[val => !!val || '*Required']" v-model="formSnippet.name" label="Name" filled dense />
+            </div>
+            <div class="col-2">
+              <q-select
+                v-model="formSnippet.shell"
+                :options="shellOptions"
+                label="Shell Type"
+                options-dense
+                filled
+                dense
+                emit-value
+                map-options
+              />
+            </div>
+            <div class="col-4">
+              <q-input filled dense v-model="formSnippet.desc" label="Description" />
+            </div>
+          </div>
+        </q-card-section>
+
+        <CodeEditor
+          v-model="formSnippet.code"
+          :style="maximized ? '--prism-height: 80vh' : '--prism-height: 70vh'"
+          :shell="formSnippet.shell"
+        />
+        <q-card-actions align="right">
+          <q-btn flat label="Cancel" v-close-popup />
+          <q-btn :loading="loading" flat label="Save" color="primary" type="submit" />
+        </q-card-actions>
+      </q-form>
+    </q-card>
+  </q-dialog>
+</template>
+
+<script>
+// composable imports
+import { ref, computed } from "vue";
+import { useDialogPluginComponent } from "quasar";
+import { saveScriptSnippet, editScriptSnippet } from "@/api/scripts";
+import { notifySuccess } from "@/utils/notify";
+
+// ui imports
+import CodeEditor from "@/components/ui/CodeEditor";
+
+// static data
+import { shellOptions } from "@/composables/scripts";
+
+export default {
+  name: "ScriptFormModal",
+  emits: [...useDialogPluginComponent.emits],
+  components: {
+    CodeEditor,
+  },
+  props: {
+    snippet: Object,
+  },
+  setup(props) {
+    // setup quasar plugins
+    const { dialogRef, onDialogHide, onDialogOK } = useDialogPluginComponent();
+
+    // snippet form logic
+    const snippet = props.snippet
+      ? ref(Object.assign({}, props.snippet))
+      : ref({ name: "", code: "", shell: "powershell" });
+    const maximized = ref(false);
+    const loading = ref(false);
+
+    const title = computed(() => {
+      if (props.snippet) {
+        return `Editing ${snippet.value.name}`;
+      } else {
+        return "Adding New Script Snippet";
+      }
+    });
+
+    async function submitForm() {
+      loading.value = true;
+      let result = "";
+      try {
+        // edit existing script snippet
+        if (props.snippet) {
+          result = await editScriptSnippet(snippet.value);
+
+          // add script snippet
+        } else {
+          result = await saveScriptSnippet(snippet.value);
+        }
+
+        onDialogOK();
+        notifySuccess(result);
+      } catch (e) {}
+
+      loading.value = false;
+    }
+
+    return {
+      // reactive data
+      formSnippet: snippet.value,
+      maximized,
+      loading,
+
+      // non-reactive data
+      shellOptions,
+
+      //computed
+      title,
+
+      //methods
+      submitForm,
+
+      // quasar dialog plugin
+      dialogRef,
+      onDialogHide,
+    };
+  },
+};
+</script>
\ No newline at end of file
diff --git a/src/components/scripts/ScriptSnippets.vue b/src/components/scripts/ScriptSnippets.vue
new file mode 100644
index 0000000..e34e478
--- /dev/null
+++ b/src/components/scripts/ScriptSnippets.vue
@@ -0,0 +1,201 @@
+<template>
+  <q-dialog ref="dialogRef" @hide="onDialogHide">
+    <q-card class="q-dialog-plugin" style="width: 70vw; max-width: 70vw">
+      <q-bar>
+        <q-btn @click="getSnippets" class="q-mr-sm" dense flat push icon="refresh" />Script Snippets
+        <q-space />
+        <q-btn dense flat icon="close" v-close-popup>
+          <q-tooltip class="bg-white text-primary">Close</q-tooltip>
+        </q-btn>
+      </q-bar>
+
+      <div class="q-pa-md">
+        <q-btn dense flat no-caps icon="add" label="New" @click="newSnippetModal" />
+        <q-table
+          dense
+          :table-class="{ 'table-bgcolor': !$q.dark.isActive, 'table-bgcolor-dark': $q.dark.isActive }"
+          class="settings-tbl-sticky"
+          :rows="snippets"
+          :columns="columns"
+          :loading="loading"
+          v-model:pagination="pagination"
+          row-key="id"
+          binary-state-sort
+          hide-pagination
+          virtual-scroll
+          :rows-per-page-options="[0]"
+        >
+          <template v-slot:header-cell-shell="props">
+            <q-th :props="props" auto-width> Shell </q-th>
+          </template>
+
+          <template v-slot:body="props">
+            <!-- Table View -->
+            <q-tr :props="props" @dblclick="editSnippetModal(props.row)" class="cursor-pointer">
+              <!-- Context Menu -->
+              <q-menu context-menu>
+                <q-list dense style="min-width: 200px">
+                  <q-item clickable v-close-popup @click="editSnippetModal(props.row)">
+                    <q-item-section side>
+                      <q-icon name="edit" />
+                    </q-item-section>
+                    <q-item-section>Edit</q-item-section>
+                  </q-item>
+
+                  <q-item clickable v-close-popup @click="deleteSnippet(props.row)">
+                    <q-item-section side>
+                      <q-icon name="delete" />
+                    </q-item-section>
+                    <q-item-section>Delete</q-item-section>
+                  </q-item>
+
+                  <q-item clickable v-close-popup>
+                    <q-item-section>Close</q-item-section>
+                  </q-item>
+                </q-list>
+              </q-menu>
+              <q-td>
+                <q-icon v-if="props.row.shell === 'powershell'" name="mdi-powershell" color="primary" size="sm">
+                  <q-tooltip> Powershell </q-tooltip>
+                </q-icon>
+                <q-icon v-else-if="props.row.shell === 'python'" name="mdi-language-python" color="primary" size="sm">
+                  <q-tooltip> Python </q-tooltip>
+                </q-icon>
+                <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-td>
+              <!-- name -->
+              <q-td>{{ props.row.name }}</q-td>
+              <q-td>{{ props.row.desc }}</q-td>
+            </q-tr>
+          </template>
+        </q-table>
+      </div>
+    </q-card>
+  </q-dialog>
+</template>
+
+<script>
+// composition imports
+import { ref, onMounted } from "vue";
+import { useQuasar, useDialogPluginComponent } from "quasar";
+import { fetchScriptSnippets, removeScriptSnippet } from "@/api/scripts";
+import { notifySuccess } from "@/utils/notify";
+
+// ui imports
+import ScriptSnippetFormModal from "@/components/scripts/ScriptSnippetFormModal";
+
+// static data
+const columns = [
+  {
+    name: "shell",
+    label: "Shell",
+    field: "shell",
+    align: "left",
+    sortable: true,
+  },
+  {
+    name: "name",
+    label: "Name",
+    field: "name",
+    align: "left",
+    sortable: true,
+  },
+  {
+    name: "desc",
+    label: "Description",
+    field: "description",
+    align: "left",
+    sortable: false,
+  },
+];
+
+export default {
+  name: "ScriptSnippetManager",
+  emits: [...useDialogPluginComponent.emits],
+  setup() {
+    // setup quasar plugins
+    const { dialogRef, onDialogHide } = useDialogPluginComponent();
+    const $q = useQuasar();
+
+    // script snippet manager logic
+    const snippets = ref([]);
+
+    async function getSnippets() {
+      loading.value = true;
+      snippets.value = await fetchScriptSnippets();
+      loading.value = false;
+    }
+
+    function deleteSnippet(snippet) {
+      $q.dialog({
+        title: `Delete script snippet: ${snippet.name}?`,
+        cancel: true,
+        ok: { label: "Delete", color: "negative" },
+      }).onOk(async () => {
+        loading.value = true;
+        try {
+          const data = await removeScriptSnippet(snippet.id);
+          notifySuccess(data);
+          getSnippets();
+        } catch (e) {}
+
+        loading.value = false;
+      });
+    }
+
+    // table setup
+    const loading = ref(false);
+    const pagination = ref({
+      rowsPerPage: 0,
+      sortBy: "name",
+      descending: true,
+    });
+
+    function newSnippetModal() {
+      $q.dialog({
+        component: ScriptSnippetFormModal,
+      }).onOk(() => {
+        getSnippets();
+      });
+    }
+
+    function editSnippetModal(snippet) {
+      $q.dialog({
+        component: ScriptSnippetFormModal,
+        componentProps: {
+          snippet,
+        },
+      }).onOk(() => {
+        getSnippets();
+      });
+    }
+
+    // component life cycle hooks
+    onMounted(getSnippets());
+
+    return {
+      // reactive data
+      snippets,
+      pagination,
+      loading,
+
+      // non-reactive data
+      columns,
+
+      // api methods
+      getSnippets,
+      deleteSnippet,
+
+      // dialog methods
+      newSnippetModal,
+      editSnippetModal,
+
+      // quasar dialog plugin
+      dialogRef,
+      onDialogHide,
+    };
+  },
+};
+</script>
\ No newline at end of file