diff --git a/frontend/src/api/backup.js b/frontend/src/api/backup.js
index da5e36711..c326b684d 100644
--- a/frontend/src/api/backup.js
+++ b/frontend/src/api/backup.js
@@ -28,15 +28,8 @@ export default {
     await apiReq.delete(backupURLs.deleteBackup(fileName));
   },
 
-  async create(tag, template) {
-    if (typeof template == String) {
-      template = [template];
-    }
-    console.log(tag, template);
-    let response = apiReq.post(backupURLs.createBackup, {
-      tag: tag,
-      template: template,
-    });
+  async create(data) {
+    let response = apiReq.post(backupURLs.createBackup, data);
     return response;
   },
 };
diff --git a/frontend/src/components/Settings/Backup/NewBackupCard.vue b/frontend/src/components/Settings/Backup/NewBackupCard.vue
index d44fdc8a4..d52cfbb07 100644
--- a/frontend/src/components/Settings/Backup/NewBackupCard.vue
+++ b/frontend/src/components/Settings/Backup/NewBackupCard.vue
@@ -1,8 +1,10 @@
 <template>
   <v-card :loading="loading">
     <v-card-title> Create a Backup </v-card-title>
-
-    <v-card-actions class="mt-n6">
+    <v-card-text class="mt-n3">
+      <v-text-field dense label="Backup Tag" v-model="tag"></v-text-field>
+    </v-card-text>
+    <v-card-actions class="mt-n9">
       <v-switch v-model="fullBackup" :label="switchLabel"></v-switch>
       <v-spacer></v-spacer>
       <v-btn color="success" text @click="createBackup()"> Create </v-btn>
@@ -13,31 +15,23 @@
         <v-col sm="4">
           <p>Options:</p>
           <v-checkbox
+            v-for="option in options"
+            :key="option.text"
             class="mb-n4 mt-n3"
             dense
-            label="Recipes"
-            v-model="importRecipes"
-          ></v-checkbox>
-          <v-checkbox
-            class="my-n4"
-            dense
-            label="Themes"
-            v-model="importThemes"
-          ></v-checkbox>
-          <v-checkbox
-            class="my-n4"
-            dense
-            label="Settings"
-            v-model="importThemes"
+            :label="option.text"
+            v-model="option.value"
           ></v-checkbox>
         </v-col>
         <v-col>
           <p>Templates:</p>
           <v-checkbox
+            v-for="template in availableTemplates"
+            :key="template"
             class="mb-n4 mt-n3"
             dense
-            label="Template asdfasdf"
-            v-model="importRecipes"
+            :label="template"
+            @click="appendTemplate(template)"
           ></v-checkbox>
         </v-col>
       </v-row>
@@ -46,13 +40,34 @@
 </template>
 
 <script>
+import api from "../../../api";
 export default {
   data() {
     return {
+      tag: null,
       fullBackup: true,
       loading: false,
+      options: {
+        recipes: {
+          value: true,
+          text: "Recipes",
+        },
+        settings: {
+          value: true,
+          text: "Settings",
+        },
+        themes: {
+          value: true,
+          text: "Themes",
+        },
+      },
+      availableTemplates: [],
+      selectedTemplates: [],
     };
   },
+  mounted() {
+    this.getAvailableBackups();
+  },
   computed: {
     switchLabel() {
       if (this.fullBackup) {
@@ -61,8 +76,39 @@ export default {
     },
   },
   methods: {
-    createBackup() {
+    async getAvailableBackups() {
+      let response = await api.backups.requestAvailable();
+      response.templates.forEach((element) => {
+        this.availableTemplates.push(element);
+      });
+    },
+    async createBackup() {
       this.loading = true;
+
+      let data = {
+        tag: this.tag,
+        options: {
+          recipes: this.options.recipes.value,
+          settings: this.options.settings.value,
+          themes: this.options.themes.value,
+        },
+        templates: this.selectedTemplates,
+      };
+
+      console.log(data);
+
+      await api.backups.create(data);
+      this.loading = false;
+
+      this.$emit("created");
+    },
+    appendTemplate(templateName) {
+      if (this.selectedTemplates.includes(templateName)) {
+        let index = this.selectedTemplates.indexOf(templateName);
+        if (index !== -1) {
+          this.selectedTemplates.splice(index, 1);
+        }
+      } else this.selectedTemplates.push(templateName);
     },
   },
 };
diff --git a/frontend/src/components/Settings/Backup/index.vue b/frontend/src/components/Settings/Backup/index.vue
index 589e80dde..7ba2e35b4 100644
--- a/frontend/src/components/Settings/Backup/index.vue
+++ b/frontend/src/components/Settings/Backup/index.vue
@@ -8,7 +8,7 @@
     <v-card-text>
       <v-row>
         <v-col cols="12" md="6" ss="12">
-          <NewBackupCard />
+          <NewBackupCard @created="processFinished" />
         </v-col>
         <v-col cols="12" md="6" sm="12">
           <p>
@@ -16,6 +16,8 @@
           </p>
         </v-col>
       </v-row>
+      <v-divider class="mb-3"></v-divider>
+
       <AvailableBackupCard
         @loading="backupLoading = true"
         @finished="processFinished"
diff --git a/mealie/app.py b/mealie/app.py
index 9188e01aa..e85dfc09c 100644
--- a/mealie/app.py
+++ b/mealie/app.py
@@ -56,8 +56,8 @@ app.include_router(static_routes.router)
 # post_start()
 
 # Generate API Documentation
-if not PRODUCTION:
-    generate_api_docs(app)
+# if not PRODUCTION:
+#     generate_api_docs(app)
 
 if __name__ == "__main__":
     logger.info("-----SYSTEM STARTUP-----")
diff --git a/mealie/models/backup_models.py b/mealie/models/backup_models.py
index 8502c3cf0..21bf661b6 100644
--- a/mealie/models/backup_models.py
+++ b/mealie/models/backup_models.py
@@ -4,15 +4,32 @@ from typing import List, Optional
 from pydantic import BaseModel
 
 
+class BackupOptions(BaseModel):
+    recipes: bool = True
+    settings: bool = True
+    themes: bool = True
+
+    class Config:
+        schema_extra = {
+            "example": {
+                "recipes": True,
+                "settings": True,
+                "themes": True,
+            }
+        }
+
+
 class BackupJob(BaseModel):
     tag: Optional[str]
-    template: Optional[List[str]]
+    options: BackupOptions
+    templates: Optional[List[str]] = []
 
     class Config:
         schema_extra = {
             "example": {
                 "tag": "July 23rd 2021",
-                "template": "recipes.md",
+                "options": BackupOptions,
+                "template": ["recipes.md"],
             }
         }
 
@@ -49,13 +66,13 @@ class ImportJob(BaseModel):
     settings: bool = False
 
     class Config:
-            schema_extra = {
-                "example": {
-                    "name": "my_local_backup.zip",
-                    "recipes": True,
-                    "force": False,
-                    "rebase": False,
-                    "themes": False,
-                    "settings": False
-                }
+        schema_extra = {
+            "example": {
+                "name": "my_local_backup.zip",
+                "recipes": True,
+                "force": False,
+                "rebase": False,
+                "themes": False,
+                "settings": False,
             }
+        }
diff --git a/mealie/routes/backup_routes.py b/mealie/routes/backup_routes.py
index 823543192..f29c560ce 100644
--- a/mealie/routes/backup_routes.py
+++ b/mealie/routes/backup_routes.py
@@ -19,7 +19,7 @@ def available_imports():
         backup = LocalBackup(name=archive.name, date=archive.stat().st_ctime)
         imports.append(backup)
 
-    for template in TEMPLATE_DIR.glob("*.md"):
+    for template in TEMPLATE_DIR.glob("*.*"):
         templates.append(template.name)
 
     imports.sort(key=operator.attrgetter("date"), reverse=True)
@@ -30,7 +30,13 @@ def available_imports():
 @router.post("/api/backups/export/database/", status_code=201)
 def export_database(data: BackupJob):
     """Generates a backup of the recipe database in json format."""
-    export_path = backup_all(data.tag, data.template)
+    export_path = backup_all(
+        tag=data.tag,
+        templates=data.templates,
+        export_recipes=data.options.recipes,
+        export_settings=data.options.settings,
+        export_themes=data.options.themes,
+    )
     try:
         return SnackResponse.success("Backup Created at " + export_path)
     except:
diff --git a/mealie/services/backups/exports.py b/mealie/services/backups/exports.py
index dbe19f3f8..28ed19baf 100644
--- a/mealie/services/backups/exports.py
+++ b/mealie/services/backups/exports.py
@@ -3,11 +3,11 @@ import shutil
 from datetime import datetime
 from pathlib import Path
 
+from app_config import BACKUP_DIR, IMG_DIR, TEMP_DIR, TEMPLATE_DIR
 from jinja2 import Template
 from services.meal_services import MealPlan
 from services.recipe_services import Recipe
 from services.settings_services import SiteSettings, SiteTheme
-from app_config import BACKUP_DIR, IMG_DIR, TEMP_DIR, TEMPLATE_DIR
 from utils.logger import logger
 
 
@@ -123,15 +123,26 @@ class ExportDatabase:
         return str(zip_path.absolute()) + ".zip"
 
 
-def backup_all(tag=None, templates=None):
+def backup_all(
+    tag=None,
+    templates=None,
+    export_recipes=True,
+    export_settings=True,
+    export_themes=True,
+):
     db_export = ExportDatabase(tag=tag, templates=templates)
 
-    db_export.export_recipes()
-    db_export.export_images()
-    db_export.export_settings()
-    db_export.export_themes()
-    db_export.export_meals()
-    #
+    if export_recipes:
+        db_export.export_recipes()
+        db_export.export_images()
+
+    if export_settings:
+        db_export.export_settings()
+        
+    if export_themes:
+        db_export.export_themes()
+    # db_export.export_meals()
+
     return db_export.finish_export()