diff --git a/.dockerignore b/.dockerignore
index 8d23634e1..e89ac3deb 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,3 +1,5 @@
 */node_modules
 */dist
-*/data/db
\ No newline at end of file
+*/data/db
+*/mealie/test 
+*/mealie/.temp
\ No newline at end of file
diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml
index 210e84fbc..991da336c 100644
--- a/.github/workflows/pytest.yml
+++ b/.github/workflows/pytest.yml
@@ -21,7 +21,7 @@ jobs:
       - name: Set up python
         uses: actions/setup-python@v2
         with:
-          python-version: 3.8
+          python-version: 3.9
       #----------------------------------------------
       #  -----  install & configure poetry  -----
       #----------------------------------------------
diff --git a/Dockerfile b/Dockerfile
index 020e7e018..ac6c1a061 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -31,11 +31,10 @@ RUN apk add --update --no-cache --virtual .build-deps \
 
 COPY ./mealie /app
 COPY ./Caddyfile /app
+COPY ./app_data/templates /app/data/templates
+RUN rm -rf /app/tests /app/.temp
 COPY --from=build-stage /app/dist /app/dist
-RUN rm -rf /app/test /app/.temp
 
 VOLUME [ "/app/data/" ]
 RUN chmod +x /app/run.sh
-CMD /app/run.sh
-
-# CMD ["uvicorn", "app:app", "--host", "0.0.0.0", "--port", "80"]
+CMD /app/run.sh
\ No newline at end of file
diff --git a/app_data/backups/dev_sample_data_2021-Jan-12.zip b/app_data/backups/dev_sample_data_2021-Feb-13.zip
similarity index 82%
rename from app_data/backups/dev_sample_data_2021-Jan-12.zip
rename to app_data/backups/dev_sample_data_2021-Feb-13.zip
index ee5da95cc..7a79d98bc 100644
Binary files a/app_data/backups/dev_sample_data_2021-Jan-12.zip and b/app_data/backups/dev_sample_data_2021-Feb-13.zip differ
diff --git a/docs/docs/changelog.md b/docs/docs/changelog.md
index 4d982d00d..3a7ecfe5b 100644
--- a/docs/docs/changelog.md
+++ b/docs/docs/changelog.md
@@ -3,14 +3,32 @@
 ## v0.3.0 - Draft!
 
 ### Features and Improvements
+  - Improved Nextcloud Imports
+  - Improved Recipe Parser
   - Open search with `/` hotkey! 
   - Unified and improved snackbar notifications
-  - Recipe Viewer
-    - Categories, Tags, and Notes will not be displayed below the steps on smaller screens
-  - Recipe Editor
+  - New Category/Tag endpoints to filter all recipes by Category or Tag
+  - **Meal Planner**
+    - You can now restrict recipe categories used for random meal-plan creation in the settings menu
+    - Recipe picker dialog will now display recipes when the search bar is empty
+    - Minor UI improvements
+  - **Recipe Viewer**
+    - Categories, Tags, and Notes will now be displayed below the steps on smaller screens
+  - **Recipe Editor**
     - Text areas now auto grow to fit content
     - Description, Steps, and Notes support Markdown! This includes inline html in Markdown. 
 
+## v0.2.1 - Hot Fixes!
+
+### Features and Improvements
+  - Fixes upload image error when no photo was scrapped
+  - Fixes no last_recipe.json not updating
+  - Added markdown rendering for notes
+  - New notifications
+  - Minor UI improvements
+  - Recipe editor refactor
+  - Settings/Theme models refactor
+
 ### Development / Misc
   - Added async file response for images, downloading files.
   - Breakup recipe view component
diff --git a/docs/docs/getting-started/site-settings.md b/docs/docs/getting-started/site-settings.md
index e349f4019..51fe5a688 100644
--- a/docs/docs/getting-started/site-settings.md
+++ b/docs/docs/getting-started/site-settings.md
@@ -19,7 +19,9 @@ Color themes can be created and set from the UI in the settings page. You can se
 ## Backups 
 Site backups can easily be taken and download from the UI. To import, simply select the backup you'd like to restore and check which items you'd like to import. 
 
-## Meal Planner Webhooks
+## Meal Planner 
+In the meal planner section you can select categories to be used as apart of the random recipe selector in the meal plan creator. 
+
 Meal planner webhooks are post requests sent from Mealie to an external endpoint. The body of the message is the Recipe JSON of the scheduled meal. If no meal is schedule, no request is sent. The webhook functionality can be enabled or disabled as well as scheduled. Note that you must "Save Webhooks" prior to any changes taking affect server side. 
 
 
diff --git a/frontend/public/index.html b/frontend/public/index.html
index a28fe4e63..59b9ff166 100644
--- a/frontend/public/index.html
+++ b/frontend/public/index.html
@@ -8,7 +8,6 @@
     <title> Mealie </title>
     <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900">
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@mdi/font@latest/css/materialdesignicons.min.css">
-    <link rel="stylesheet" href="./styles/global.css">
   </head>
   <body>
     <noscript>
diff --git a/frontend/public/styles/global.css b/frontend/public/styles/global.css
deleted file mode 100644
index 215f6ae7d..000000000
--- a/frontend/public/styles/global.css
+++ /dev/null
@@ -1,11 +0,0 @@
-*::-webkit-scrollbar {
-  width: 0.25rem;
-}
-
-*::-webkit-scrollbar-track {
-  background: lightgray;
-}
-
-*::-webkit-scrollbar-thumb {
-  background: grey;
-}
diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index 4509b55a5..0caaacc0c 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -138,4 +138,17 @@ export default {
   margin-bottom: -5px;
   opacity: 0.9 !important;
 }
+
+*::-webkit-scrollbar {
+  width: 0.25rem;
+}
+
+*::-webkit-scrollbar-track {
+  background: lightgray;
+}
+
+*::-webkit-scrollbar-thumb {
+  background: grey;
+}
+
 </style>
diff --git a/frontend/src/api/recipe.js b/frontend/src/api/recipe.js
index c882e6c21..68b674b78 100644
--- a/frontend/src/api/recipe.js
+++ b/frontend/src/api/recipe.js
@@ -8,13 +8,14 @@ const prefix = baseURL + "recipes/";
 
 const recipeURLs = {
   allRecipes: baseURL + "recipes",
+  allRecipesByCategory: prefix + "category",
   create: prefix + "create",
   createByURL: prefix + "create-url",
-  recipe: (slug) => prefix + slug,
-  update: (slug) => prefix + slug,
-  delete: (slug) => prefix + slug,
-  recipeImage: (slug) => `${prefix}${slug}/image`,
-  updateImage: (slug) => `${prefix}${slug}/image`,
+  recipe: slug => prefix + slug,
+  update: slug => prefix + slug,
+  delete: slug => prefix + slug,
+  recipeImage: slug => `${prefix}${slug}/image`,
+  updateImage: slug => `${prefix}${slug}/image`,
 };
 
 export default {
@@ -27,6 +28,14 @@ export default {
     return response;
   },
 
+  async getAllByCategory(categories) {
+    let response = await apiReq.post(
+      recipeURLs.allRecipesByCategory,
+      categories
+    );
+    return response.data;
+  },
+
   async create(recipeData) {
     let response = await apiReq.post(recipeURLs.create, recipeData);
     return response.data;
@@ -67,7 +76,7 @@ export default {
         keys: recipeKeys,
         num: num,
       },
-      paramsSerializer: (params) => {
+      paramsSerializer: params => {
         return qs.stringify(params, { arrayFormat: "repeat" });
       },
     });
diff --git a/frontend/src/components/MealPlan/MealPlanNew.vue b/frontend/src/components/MealPlan/MealPlanNew.vue
index af16cd9bb..1af227f21 100644
--- a/frontend/src/components/MealPlan/MealPlanNew.vue
+++ b/frontend/src/components/MealPlan/MealPlanNew.vue
@@ -96,6 +96,7 @@ export default {
     return {
       isLoading: false,
       meals: [],
+      items: [],
 
       // Dates
       startDate: null,
@@ -117,11 +118,13 @@ export default {
       }
     },
   },
+  async mounted() {
+    let settings = await api.settings.requestAll();
+    console.log(settings);
+    this.items = await api.recipes.getAllByCategory(settings.planCategories);
+  },
 
   computed: {
-    items() {
-      return this.$store.getters.getRecentRecipes;
-    },
     actualStartDate() {
       return Date.parse(this.startDate);
     },
diff --git a/frontend/src/components/Settings/General/index.vue b/frontend/src/components/Settings/General/index.vue
index 0ed822a71..693c3a92c 100644
--- a/frontend/src/components/Settings/General/index.vue
+++ b/frontend/src/components/Settings/General/index.vue
@@ -11,8 +11,6 @@
       </span>
     </v-card-title>
     <v-divider></v-divider>
-    <HomePageSettings />
-    <v-divider></v-divider>
     <v-card-text>
       <h2 class="mt-1 mb-4">{{ $t("settings.language") }}</h2>
       <v-row>
@@ -30,6 +28,8 @@
       </v-row>
     </v-card-text>
     <v-divider></v-divider>
+    <HomePageSettings />
+    <v-divider></v-divider>
   </v-card>
 </template>
 
@@ -59,6 +59,9 @@ export default {
       this.langOptions = this.$store.getters.getAllLangs;
       this.selectedLang = this.$store.getters.getActiveLang;
     },
+    removeCategory(index) {
+      this.value.categories.splice(index, 1);
+    },
   },
 };
 </script>
diff --git a/frontend/src/components/Settings/Webhook/TimePickerDialog.vue b/frontend/src/components/Settings/MealPlanner/TimePickerDialog.vue
similarity index 100%
rename from frontend/src/components/Settings/Webhook/TimePickerDialog.vue
rename to frontend/src/components/Settings/MealPlanner/TimePickerDialog.vue
diff --git a/frontend/src/components/Settings/Webhook/index.vue b/frontend/src/components/Settings/MealPlanner/index.vue
similarity index 66%
rename from frontend/src/components/Settings/Webhook/index.vue
rename to frontend/src/components/Settings/MealPlanner/index.vue
index 261c6a794..298cd6830 100644
--- a/frontend/src/components/Settings/Webhook/index.vue
+++ b/frontend/src/components/Settings/MealPlanner/index.vue
@@ -1,9 +1,45 @@
 <template>
   <v-card>
     <v-card-title class="headline">
-      {{ $t("settings.webhooks.meal-planner-webhooks") }}
+      {{ $t("meal-plan.meal-planner") }}
     </v-card-title>
+    <v-divider></v-divider>
     <v-card-text>
+      <h2 class="mt-1">{{ $t("recipe.categories") }}</h2>
+
+      <v-row>
+        <v-col sm="12" md="6">
+          <v-select
+            v-model="planCategories"
+            :items="categories"
+            item-text="name"
+            item-value="name"
+            label="Allowed Categories"
+            multiple
+            chips
+            hint="Only recipes with these categories will be used in Meal Plans"
+            persistent-hint
+          >
+            <template v-slot:selection="data">
+              <v-chip
+                :input-value="data.selected"
+                close
+                @click:close="removeCategory(data.index)"
+                color="secondary"
+                dark
+              >
+                {{ data.item.name }}
+              </v-chip>
+            </template>
+          </v-select>
+        </v-col>
+      </v-row>
+    </v-card-text>
+    <v-divider> </v-divider>
+    <v-card-text>
+      <h2 class="mt-1 mb-4">
+        {{ $t("settings.webhooks.meal-planner-webhooks") }}
+      </h2>
       <p>
         {{
           $t(
@@ -68,21 +104,29 @@ export default {
       webhooks: [],
       enabled: false,
       time: "",
+      planCategories: [],
     };
   },
   mounted() {
     this.getSiteSettings();
   },
+  computed: {
+    categories() {
+      return this.$store.getters.getCategories;
+    },
+  },
   methods: {
     saveTime(value) {
       this.time = value;
     },
     async getSiteSettings() {
       let settings = await api.settings.requestAll();
+      console.log(settings);
       this.webhooks = settings.webhooks.webhookURLs;
       this.name = settings.name;
       this.time = settings.webhooks.webhookTime;
       this.enabled = settings.webhooks.enabled;
+      this.planCategories = settings.planCategories;
     },
     addWebhook() {
       this.webhooks.push(" ");
@@ -93,6 +137,7 @@ export default {
     saveWebhooks() {
       const body = {
         name: this.name,
+        planCategories: this.planCategories,
         webhooks: {
           webhookURLs: this.webhooks,
           webhookTime: this.time,
@@ -104,6 +149,9 @@ export default {
     testWebhooks() {
       api.settings.testWebhooks();
     },
+    removeCategory(index) {
+      this.planCategories.splice(index, 1);
+    },
   },
 };
 </script>
diff --git a/frontend/src/components/UI/RecipeCard.vue b/frontend/src/components/UI/RecipeCard.vue
index 5bf3ffb6a..ad688f2c7 100644
--- a/frontend/src/components/UI/RecipeCard.vue
+++ b/frontend/src/components/UI/RecipeCard.vue
@@ -6,7 +6,19 @@
       :to="route ? `/recipe/${slug}` : ''"
       @click="$emit('click')"
     >
-      <v-img height="200" :src="getImage(image)"></v-img>
+      <v-img height="200" :src="getImage(image)">
+        <v-expand-transition v-if="description">
+          <div
+            v-if="hover"
+            class="d-flex transition-fast-in-fast-out secondary v-card--reveal  "
+            style="height: 100%;"
+          >
+            <v-card-text class="v-card--text-show white--text">
+              {{ description }}
+            </v-card-text>
+          </div>
+        </v-expand-transition>
+      </v-img>
       <v-card-title class="my-n3 mb-n6">{{ name | truncate(30) }}</v-card-title>
 
       <v-card-actions class="">
@@ -23,16 +35,7 @@
             ></v-rating>
           </v-col>
           <v-col></v-col>
-          <v-col align="end">
-            <v-tooltip top color="secondary" max-width="400" open-delay="50">
-              <template v-slot:activator="{ on, attrs }">
-                <v-btn color="secondary" v-on="on" v-bind="attrs" text>{{
-                  $t("recipe.description")
-                }}</v-btn>
-              </template>
-              <span>{{ description }}</span>
-            </v-tooltip>
-          </v-col>
+          <v-col align="end"> </v-col>
         </v-row>
       </v-card-actions>
     </v-card>
@@ -61,4 +64,15 @@ export default {
 </script>
 
 <style>
+.v-card--reveal {
+  align-items: center;
+  bottom: 0;
+  justify-content: center;
+  opacity: 0.8;
+  position: absolute;
+  width: 100%;
+}
+.v-card--text-show {
+  opacity: 1 !important;
+}
 </style>
\ No newline at end of file
diff --git a/frontend/src/components/UI/SearchBar.vue b/frontend/src/components/UI/SearchBar.vue
index 0ddc4e8f7..4d80f4d0d 100644
--- a/frontend/src/components/UI/SearchBar.vue
+++ b/frontend/src/components/UI/SearchBar.vue
@@ -57,6 +57,7 @@ export default {
     return {
       searchSlug: "",
       search: " ",
+      data: [],
       result: [],
       autoResults: [],
       isDark: false,
@@ -67,27 +68,31 @@ export default {
         distance: 100,
         maxPatternLength: 32,
         minMatchCharLength: 1,
-        keys: ["name", "slug"],
+        keys: ["name", "slug", "description"],
       },
     };
   },
   mounted() {
     this.isDark = this.$store.getters.getIsDark;
+    this.data = this.$store.getters.getRecentRecipes;
   },
   computed: {
-    data() {
-      return this.$store.getters.getRecentRecipes;
-    },
     fuse() {
       return new Fuse(this.data, this.options);
     },
   },
   watch: {
     search() {
-      if (this.search.trim() === "") this.result = this.list;
-      else this.result = this.fuse.search(this.search.trim());
-
+      try {
+        this.result = this.fuse.search(this.search.trim());
+      } catch {
+        this.result = this.data
+          .map(x => ({ item: x }))
+          .sort((a, b) => (a.name > b.name ? 1 : -1));
+      }
+      console.log(this.result);
       this.$emit("results", this.result);
+
       if (this.showResults === true) {
         this.autoResults = this.result;
       }
diff --git a/frontend/src/components/UI/SearchDialog.vue b/frontend/src/components/UI/SearchDialog.vue
index 8874736bf..30d270d6e 100644
--- a/frontend/src/components/UI/SearchDialog.vue
+++ b/frontend/src/components/UI/SearchDialog.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="text-center">
-    <v-dialog v-model="dialog" min-height="700" max-width="1000">
+    <v-dialog v-model="dialog" height="100%" max-width="1200">
       <v-card min-height="725" height="100%">
         <v-card-text>
           <v-card-title></v-card-title>
@@ -22,7 +22,7 @@
               :md="6"
               :lg="4"
               :xl="3"
-              v-for="item in searchResults.slice(0, 10)"
+              v-for="item in searchResults.slice(0, 24)"
               :key="item.item.name"
             >
               <RecipeCard
@@ -58,6 +58,7 @@ export default {
   },
   methods: {
     updateResults(results) {
+      console.log(results);
       this.searchResults = results;
     },
     emitSelect(name, slug) {
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 89543f0a8..a2cbc71a1 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -45,6 +45,7 @@
   },
   "meal-plan": {
     "dinner-this-week": "Dinner This Week",
+    "meal-planner": "Meal Planner",
     "dinner-today": "Dinner Today",
     "planner": "Planner",
     "edit-meal-plan": "Edit Meal Plan",
diff --git a/frontend/src/locales/fr.json b/frontend/src/locales/fr.json
index 49ea9ff78..f4ef69293 100644
--- a/frontend/src/locales/fr.json
+++ b/frontend/src/locales/fr.json
@@ -11,6 +11,7 @@
     "paste-in-your-recipe-data-each-line-will-be-treated-as-an-item-in-a-list": "Copiez votre recette ici. Chaque ligne sera traitée comme un objet de la liste."
   },
   "general": {
+    "upload": "Téléverser",
     "submit": "Soumettre",
     "name": "Nom",
     "settings": "Options",
@@ -28,7 +29,12 @@
     "ok": "OK",
     "enabled": "Activé",
     "download": "Télécharger",
-    "import": "Importer"
+    "import": "Importer",
+    "options": "Options",
+    "templates": "Modèles",
+    "recipes": "Recettes",
+    "themes": "Thèmes",
+    "confirm": "Confirmer"
   },
   "login": {
     "stay-logged-in": "Rester connecté(e) ?",
@@ -60,21 +66,39 @@
     "notes": "Notes",
     "note": "Note",
     "original-url": "Recette originale",
-    "view-recipe": "Voir la recette"
+    "view-recipe": "Voir la recette",
+    "title": "Titre",
+    "total-time": "Temps total",
+    "prep-time": "Temps de préparation",
+    "perform-time": "Temps de cuisson",
+    "api-extras": "Extras API",
+    "object-key": "Clé d'objet",
+    "object-value": "Valeur d'objet",
+    "new-key-name": "Nouveau nom de clé",
+    "add-key": "Ajouter une clé",
+    "key-name-required": "Un nom de clé est requis",
+    "no-white-space-allowed": "Aucun espace blanc autorisé",
+    "delete-recipe": "Supprimer la recette",
+    "delete-confirmation": "Êtes-vous sûr(e) de vouloir supprimer cette recette ?"
   },
   "search": {
-    "search-mealie": "Search Mealie"
+    "search-mealie": "Rechercher dans Mealie"
   },
   "settings": {
+    "general-settings": "Paramètres généraux",
+    "local-api": "API local",
+    "language": "Langue",
     "add-a-new-theme": "Ajouter un nouveau thème",
-    "set-new-time": "Définir une nouvelle heure d'exécution",
+    "set-new-time": "Indiquer un nouveau temps",
     "current": "Version :",
     "latest": "Dernière",
     "explore-the-docs": "Parcourir la documentation",
     "contribute": "Contribuer",
     "backup-and-exports": "Sauver et exporter",
     "backup-info": "Les sauvegardes sont exportées en format JSON standard, ainsi que toutes les images stockées sur le système. Dans votre dossier de sauvegarde, vous trouverez un dossier .zip qui contient toutes les recettes en JSON et les images de la base de données. De plus, si vous avez sélectionné le format de fichier markdown, il sera sauvegardé dans le même dossier .zip. Pour importer une sauvegarde, celle-ci doit être enregistrée dans votre dossier de sauvegardes. Une sauvegarde automatique est effectuée quotidiennement à 03h00.",
+    "available-backups": "Sauvegardes disponibles",
     "theme": {
+      "theme-name": "Nom du thème",
       "theme-settings": "Paramètres du thème",
       "select-a-theme-from-the-dropdown-or-create-a-new-theme-note-that-the-default-theme-will-be-served-to-all-users-who-have-not-set-a-theme-preference": "Sélectionnez un thème depuis la liste ou créez-en un nouveau. Le thème par défaut sera utilisé pour tous les utilisateurs qui n'ont pas choisi de thème personnalisé.",
       "dark-mode": "Mode sombre",
@@ -86,13 +110,15 @@
       "info": "Information",
       "warning": "Avertissement",
       "error": "Erreur",
+      "default-to-system": "Identique au système",
       "light": "Clair",
       "dark": "Sombre",
       "theme": "Thème",
       "saved-color-theme": "Thèmes sauvegardés",
       "delete-theme": "Supprimer le thème",
       "are-you-sure-you-want-to-delete-this-theme": "Etes-vous sûr(e) de vouloir supprimer ce thème ?",
-      "choose-how-mealie-looks-to-you-set-your-theme-preference-to-follow-your-system-settings-or-choose-to-use-the-light-or-dark-theme": "Personnalisez l'apparence de Mealie. Utilisez le thème par défaut de votre système ou choisissez manuellement entre le thème clair ou sombre."
+      "choose-how-mealie-looks-to-you-set-your-theme-preference-to-follow-your-system-settings-or-choose-to-use-the-light-or-dark-theme": "Personnalisez l'apparence de Mealie. Utilisez le thème par défaut de votre système ou choisissez manuellement entre le thème clair ou sombre.",
+      "theme-name-is-required": "Un nom de thème est requis."
     },
     "webhooks": {
       "meal-planner-webhooks": "Webhooks du planificateur de repas",
@@ -104,11 +130,29 @@
     "backup": {
       "import-recipes": "Importer des recettes",
       "import-themes": "Importer des thèmes",
-      "import-settings": "Importer des paramètres"
+      "import-settings": "Importer des paramètres",
+      "create-heading": "Créer une sauvegarde",
+      "backup-tag": "Tag de la sauvegarde",
+      "full-backup": "Sauvegarde complète",
+      "partial-backup": "Sauvegarde partielle",
+      "backup-restore-report": "Rapport de la restauration de la sauvegarde",
+      "successfully-imported": "Importé avec succès",
+      "failed-imports": "Importations échouées"
     }
   },
   "migration": {
     "recipe-migration": "Migrer les recettes",
-    "failed-imports": "Importations échouées"
+    "failed-imports": "Importations échouées",
+    "migration-report": "Rapport de migration",
+    "successful-imports": "Importations réussies",
+    "no-migration-data-available": "Aucune donnée d'importation n'est disponible",
+    "nextcloud": {
+      "title": "Livre de recettes Nextcloud (Cookbook)",
+      "description": "Importer des recettes depuis un livre de recettes Nextcloud existant"
+    },
+    "chowdown": {
+      "title": "Chowdown",
+      "description": "Importer des recettes depuis Chowdown"
+    }
   }
-}
+}
\ No newline at end of file
diff --git a/frontend/src/pages/SettingsPage.vue b/frontend/src/pages/SettingsPage.vue
index f49012e8c..98e9db721 100644
--- a/frontend/src/pages/SettingsPage.vue
+++ b/frontend/src/pages/SettingsPage.vue
@@ -16,7 +16,7 @@
     <General />
     <Theme class="mt-2" />
     <Backup class="mt-2" />
-    <Webhooks class="mt-2" />
+    <MealPlanner class="mt-2" />
     <Migration class="mt-2" />
     <p class="text-center my-2">
       {{ $t("settings.current") }}
@@ -41,7 +41,7 @@
 <script>
 import Backup from "../components/Settings/Backup";
 import General from "../components/Settings/General";
-import Webhooks from "../components/Settings/Webhook";
+import MealPlanner from "../components/Settings/MealPlanner";
 import Theme from "../components/Settings/Theme";
 import Migration from "../components/Settings/Migration";
 import api from "@/api";
@@ -50,7 +50,7 @@ import axios from "axios";
 export default {
   components: {
     Backup,
-    Webhooks,
+    MealPlanner,
     Theme,
     Migration,
     General,
diff --git a/frontend/src/store/modules/homePage.js b/frontend/src/store/modules/homePage.js
index 647888ab1..855c5205e 100644
--- a/frontend/src/store/modules/homePage.js
+++ b/frontend/src/store/modules/homePage.js
@@ -15,7 +15,7 @@ const mutations = {
     state.showLimit = payload;
   },
   setCategories(state, payload) {
-    state.categories = payload;
+    state.categories = payload.sort((a, b) => (a.name > b.name ? 1 : -1));
   },
   setHomeCategories(state, payload) {
     state.homeCategories = payload;
diff --git a/frontend/src/store/modules/language.js b/frontend/src/store/modules/language.js
index 03904d5b7..1243e01db 100644
--- a/frontend/src/store/modules/language.js
+++ b/frontend/src/store/modules/language.js
@@ -31,6 +31,10 @@ const state = {
       name: "繁體中文",
       value: "zh-TW",
     },
+    {
+      name: "German",
+      value: "de",
+    },
   ],
 };
 
diff --git a/frontend/src/store/modules/recipes.js b/frontend/src/store/modules/recipes.js
deleted file mode 100644
index e69de29bb..000000000
diff --git a/frontend/src/store/store.js b/frontend/src/store/store.js
index 769fe2fc0..a4af49226 100644
--- a/frontend/src/store/store.js
+++ b/frontend/src/store/store.js
@@ -29,6 +29,7 @@ const store = new Vuex.Store({
     // All Recipe Data Store
     recentRecipes: [],
     allRecipes: [],
+    mealPlanCategories: [],
   },
 
   mutations: {
@@ -44,6 +45,10 @@ const store = new Vuex.Store({
     setRecentRecipes(state, payload) {
       state.recentRecipes = payload;
     },
+
+    setMealPlanCategories(state, payload) {
+      state.mealPlanCategories = payload;
+    },
   },
 
   actions: {
@@ -69,6 +74,7 @@ const store = new Vuex.Store({
     getSnackType: state => state.snackType,
 
     getRecentRecipes: state => state.recentRecipes,
+    getMealPlanCategories: state => state.mealPlanCategories,
   },
 });
 
diff --git a/mealie/app_config.py b/mealie/app_config.py
index 68910a7f3..f6d8aa812 100644
--- a/mealie/app_config.py
+++ b/mealie/app_config.py
@@ -17,7 +17,7 @@ dotenv.load_dotenv(ENV)
 
 # General
 APP_VERSION = "v0.2.1"
-DB_VERSION = "v0.2.0"
+DB_VERSION = "v0.2.1"
 PRODUCTION = os.environ.get("ENV")
 PORT = int(os.getenv("mealie_port", 9000))
 API = os.getenv("api_docs", True)
diff --git a/mealie/db/database.py b/mealie/db/database.py
index 5524fe016..04d7abfa4 100644
--- a/mealie/db/database.py
+++ b/mealie/db/database.py
@@ -15,7 +15,7 @@ from db.sql.theme_models import SiteThemeModel
 class _Recipes(BaseDocument):
     def __init__(self) -> None:
         self.primary_key = "slug"
-        self.sql_model = RecipeModel
+        self.sql_model: RecipeModel = RecipeModel
 
     def update_image(self, session: Session, slug: str, extension: str = None) -> str:
         entry: RecipeModel = self._query_one(session, match_value=slug)
@@ -48,15 +48,6 @@ class _Settings(BaseDocument):
         self.primary_key = "name"
         self.sql_model = SiteSettingsModel
 
-    def create(self, session: Session, main: dict, webhooks: dict) -> str:
-        new_settings = self.sql_model(main.get("name"), webhooks)
-
-        session.add(new_settings)
-        return_data = new_settings.dict()
-        session.commit()
-
-        return return_data
-
 
 class _Themes(BaseDocument):
     def __init__(self) -> None:
diff --git a/mealie/db/db_base.py b/mealie/db/db_base.py
index 5438d2aba..40d9144de 100644
--- a/mealie/db/db_base.py
+++ b/mealie/db/db_base.py
@@ -100,11 +100,17 @@ class BaseDocument:
             match_key = self.primary_key
 
         result = (
-            session.query(self.sql_model).filter_by(**{match_key: match_value}).one()
+            session.query(self.sql_model)
+            .filter_by(**{match_key: match_value})
+            .limit(limit)
+            .all()
         )
-        db_entry = result.dict()
+        db_entries = [x.dict() for x in result]
 
-        return db_entry
+        if limit == 1:
+            return db_entries[0]
+
+        return db_entries
 
     def create(self, session: Session, document: dict) -> dict:
         """Creates a new database entry for the given SQL Alchemy Model.
diff --git a/mealie/db/sql/recipe_models.py b/mealie/db/sql/recipe_models.py
index 14f30f004..cc877e767 100644
--- a/mealie/db/sql/recipe_models.py
+++ b/mealie/db/sql/recipe_models.py
@@ -85,6 +85,13 @@ class Category(SqlAlchemyBase):
             "recipes": [x.dict() for x in self.recipes],
         }
 
+    def dict_no_recipes(self):
+        return {
+            "id": self.id,
+            "slug": self.slug,
+            "name": self.name,
+        }
+
 
 class Tag(SqlAlchemyBase):
     __tablename__ = "tags"
diff --git a/mealie/db/sql/settings_models.py b/mealie/db/sql/settings_models.py
index 39772ec10..0eaa67f20 100644
--- a/mealie/db/sql/settings_models.py
+++ b/mealie/db/sql/settings_models.py
@@ -1,27 +1,54 @@
 import sqlalchemy as sa
 import sqlalchemy.orm as orm
 from db.sql.model_base import BaseMixins, SqlAlchemyBase
+from db.sql.recipe_models import Category
 
 
-class SiteSettingsModel(SqlAlchemyBase):
+class SiteSettingsModel(SqlAlchemyBase, BaseMixins):
     __tablename__ = "site_settings"
     name = sa.Column(sa.String, primary_key=True)
+    planCategories = orm.relationship(
+        "MealCategory", uselist=True, cascade="all, delete"
+    )
     webhooks = orm.relationship("WebHookModel", uselist=False, cascade="all, delete")
 
-    def __init__(self, name: str = None, webhooks: dict = None, session=None) -> None:
+    def __init__(
+        self, name: str = None, webhooks: dict = None, planCategories=[], session=None
+    ) -> None:
         self.name = name
+        self.planCategories = [MealCategory(cat) for cat in planCategories]
         self.webhooks = WebHookModel(**webhooks)
 
-    def update(self, session, name, webhooks: dict) -> dict:
+    def update(self, session, name, webhooks: dict, planCategories=[]) -> dict:
+
+        self._sql_remove_list(session, [MealCategory], self.name)
         self.name = name
+        self.planCategories = [MealCategory(x) for x in planCategories]
         self.webhooks.update(session=session, **webhooks)
         return
 
     def dict(self):
-        data = {"name": self.name, "webhooks": self.webhooks.dict()}
+        data = {
+            "name": self.name,
+            "planCategories": [cat.to_str() for cat in self.planCategories],
+            "webhooks": self.webhooks.dict(),
+        }
         return data
 
 
+class MealCategory(SqlAlchemyBase):
+    __tablename__ = "meal_plan_categories"
+    id = sa.Column(sa.Integer, primary_key=True)
+    name = sa.Column(sa.String)
+    parent_id = sa.Column(sa.Integer, sa.ForeignKey("site_settings.name"))
+
+    def __init__(self, name) -> None:
+        self.name = name
+
+    def to_str(self):
+        return self.name
+
+
 class WebHookModel(SqlAlchemyBase, BaseMixins):
     __tablename__ = "webhook_settings"
     id = sa.Column(sa.Integer, primary_key=True)
diff --git a/mealie/dist/.gitkeep b/mealie/dist/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/mealie/models/category_models.py b/mealie/models/category_models.py
index e168978ee..977818b5f 100644
--- a/mealie/models/category_models.py
+++ b/mealie/models/category_models.py
@@ -1,4 +1,4 @@
-from typing import List
+from typing import List, Optional
 
 from pydantic.main import BaseModel
 from services.recipe_services import Recipe
@@ -8,7 +8,7 @@ class RecipeCategoryResponse(BaseModel):
     id: int
     name: str
     slug: str
-    recipes: List[Recipe]
+    recipes: Optional[List[Recipe]]
 
     class Config:
         schema_extra = {"example": {"id": 1, "name": "dinner", "recipes": [{}]}}
diff --git a/mealie/models/settings_models.py b/mealie/models/settings_models.py
index 6e8049ea6..c1a69cef6 100644
--- a/mealie/models/settings_models.py
+++ b/mealie/models/settings_models.py
@@ -3,6 +3,7 @@ from typing import List, Optional
 from pydantic import BaseModel
 
 
+
 class Webhooks(BaseModel):
     webhookTime: str = "00:00"
     webhookURLs: Optional[List[str]] = []
@@ -11,12 +12,14 @@ class Webhooks(BaseModel):
 
 class SiteSettings(BaseModel):
     name: str = "main"
+    planCategories: list[str] = []
     webhooks: Webhooks
 
     class Config:
         schema_extra = {
             "example": {
                 "name": "main",
+                "planCategories": ["dinner", "lunch"],
                 "webhooks": {
                     "webhookTime": "00:00",
                     "webhookURLs": ["https://mywebhookurl.com/webhook"],
diff --git a/mealie/routes/recipe/all_recipe_routes.py b/mealie/routes/recipe/all_recipe_routes.py
index 1750999e5..b0106b660 100644
--- a/mealie/routes/recipe/all_recipe_routes.py
+++ b/mealie/routes/recipe/all_recipe_routes.py
@@ -4,6 +4,7 @@ from db.database import db
 from db.db_setup import generate_session
 from fastapi import APIRouter, Depends, Query
 from models.recipe_models import AllRecipeRequest
+from slugify import slugify
 from sqlalchemy.orm.session import Session
 
 router = APIRouter(tags=["Query All Recipes"])
@@ -69,3 +70,25 @@ def get_all_recipes_post(
     """
 
     return db.recipes.get_all_limit_columns(session, body.properties, body.limit)
+
+
+@router.post("/api/recipes/category")
+def filter_by_category(categories: list, session: Session = Depends(generate_session)):
+    """ pass a list of categories and get a list of recipes associated with those categories """
+    #! This should be refactored into a single database call, but I couldn't figure it out
+    in_category = [
+        db.categories.get(session, slugify(cat), limit=1) for cat in categories
+    ]
+    in_category = [cat.get("recipes") for cat in in_category]
+    in_category = [item for sublist in in_category for item in sublist]
+    return in_category
+
+
+@router.post("/api/recipes/tag")
+async def filter_by_tags(tags: list, session: Session = Depends(generate_session)):
+    """ pass a list of tags and get a list of recipes associated with those tags"""
+    #! This should be refactored into a single database call, but I couldn't figure it out
+    in_tags = [db.tags.get(session, slugify(tag), limit=1) for tag in tags]
+    in_tags = [tag.get("recipes") for tag in in_tags]
+    in_tags = [item for sublist in in_tags for item in sublist]
+    return in_tags
diff --git a/mealie/routes/recipe/category_routes.py b/mealie/routes/recipe/category_routes.py
index 57873afef..cbded5b9e 100644
--- a/mealie/routes/recipe/category_routes.py
+++ b/mealie/routes/recipe/category_routes.py
@@ -3,7 +3,6 @@ from db.db_setup import generate_session
 from fastapi import APIRouter, Depends
 from models.category_models import RecipeCategoryResponse
 from sqlalchemy.orm.session import Session
-
 from utils.snackbar import SnackResponse
 
 router = APIRouter(
@@ -26,14 +25,15 @@ def get_all_recipes_by_category(
     return db.categories.get(session, category)
 
 
+
 @router.delete("/{category}")
 async def delete_recipe_category(
     category: str, session: Session = Depends(generate_session)
 ):
-    """ Removes a recipe category from the database. Deleting a 
+    """Removes a recipe category from the database. Deleting a
     category does not impact a recipe. The category will be removed
-    from any recipes that contain it """
+    from any recipes that contain it"""
 
     db.categories.delete(session, category)
 
-    return SnackResponse(f"Category Deleted: {category}")
+    return SnackResponse.error(f"Category Deleted: {category}")
diff --git a/mealie/routes/recipe/recipe_crud_routes.py b/mealie/routes/recipe/recipe_crud_routes.py
index 04694e7ce..613b2d216 100644
--- a/mealie/routes/recipe/recipe_crud_routes.py
+++ b/mealie/routes/recipe/recipe_crud_routes.py
@@ -69,8 +69,10 @@ def delete_recipe(recipe_slug: str, db: Session = Depends(generate_session)):
 async def get_recipe_img(recipe_slug: str):
     """ Takes in a recipe slug, returns the static image """
     recipe_image = read_image(recipe_slug)
-
-    return FileResponse(recipe_image)
+    if recipe_image:
+        return FileResponse(recipe_image)
+    else:
+        return
 
 
 @router.put("/{recipe_slug}/image")
diff --git a/mealie/routes/recipe/tag_routes.py b/mealie/routes/recipe/tag_routes.py
index c18846407..fb0cbf128 100644
--- a/mealie/routes/recipe/tag_routes.py
+++ b/mealie/routes/recipe/tag_routes.py
@@ -2,7 +2,6 @@ from db.database import db
 from db.db_setup import generate_session
 from fastapi import APIRouter, Depends
 from sqlalchemy.orm.session import Session
-
 from utils.snackbar import SnackResponse
 
 router = APIRouter(tags=["Recipes"])
@@ -13,7 +12,7 @@ router = APIRouter(
 )
 
 
-@router.get("/all")
+@router.get("/")
 async def get_all_recipe_tags(session: Session = Depends(generate_session)):
     """ Returns a list of available tags in the database """
     return db.tags.get_all_primary_keys(session)
diff --git a/mealie/routes/setting_routes.py b/mealie/routes/setting_routes.py
index 26d7cd923..03e89f371 100644
--- a/mealie/routes/setting_routes.py
+++ b/mealie/routes/setting_routes.py
@@ -19,13 +19,14 @@ def get_main_settings(session: Session = Depends(generate_session)):
     except:
         default_settings_init(session)
         data = db.settings.get(session, "main")
-
+    print(data)
     return data
 
 
 @router.put("")
 def update_settings(data: SiteSettings, session: Session = Depends(generate_session)):
     """ Returns Site Settings """
+    print("Categories", data.planCategories)
     db.settings.update(session, "main", data.dict())
 
     return SnackResponse.success("Settings Updated")
diff --git a/mealie/services/image_services.py b/mealie/services/image_services.py
index 4200a186a..4e6d542e4 100644
--- a/mealie/services/image_services.py
+++ b/mealie/services/image_services.py
@@ -3,6 +3,7 @@ from pathlib import Path
 
 import requests
 from app_config import IMG_DIR
+from utils.logger import logger
 
 
 def read_image(recipe_slug: str) -> Path:
@@ -48,6 +49,7 @@ def scrape_image(image_url: str, slug: str) -> Path:
     try:
         r = requests.get(image_url, stream=True)
     except:
+        logger.exception("Fatal Image Request Exception")
         return None
 
     if r.status_code == 200:
diff --git a/mealie/services/meal_services.py b/mealie/services/meal_services.py
index 5579ff51f..a723b3fde 100644
--- a/mealie/services/meal_services.py
+++ b/mealie/services/meal_services.py
@@ -1,5 +1,4 @@
 from datetime import date, timedelta
-from pathlib import Path
 from typing import List, Optional
 
 from db.database import db
diff --git a/mealie/services/scrape_services.py b/mealie/services/scrape_services.py
index f31604cfe..caa955972 100644
--- a/mealie/services/scrape_services.py
+++ b/mealie/services/scrape_services.py
@@ -40,7 +40,11 @@ def normalize_instructions(instructions) -> List[dict]:
 
     # One long string split by (possibly multiple) new lines
     if type(instructions) == str:
-        return [{"text": normalize_instruction(line)} for line in instructions.splitlines() if line]
+        return [
+            {"text": normalize_instruction(line)}
+            for line in instructions.splitlines()
+            if line
+        ]
 
     # Plain strings in a list
     elif type(instructions) == list and type(instructions[0]) == str:
@@ -64,7 +68,9 @@ def normalize_instructions(instructions) -> List[dict]:
                 ]
 
             return [
-                {"text": normalize_instruction(step["text"])} for step in instructions if step["@type"] == "HowToStep"
+                {"text": normalize_instruction(step["text"])}
+                for step in instructions
+                if step["@type"] == "HowToStep"
             ]
         except Exception as e:
             # Not "@type", try "type"
@@ -111,8 +117,12 @@ def normalize_data(recipe_data: dict) -> dict:
     recipe_data["prepTime"] = normalize_time(recipe_data.get("prepTime"))
     recipe_data["performTime"] = normalize_time(recipe_data.get("performTime"))
     recipe_data["recipeYield"] = normalize_yield(recipe_data.get("recipeYield"))
-    recipe_data["recipeIngredient"] = normalize_ingredient(recipe_data.get("recipeIngredient"))
-    recipe_data["recipeInstructions"] = normalize_instructions(recipe_data["recipeInstructions"])
+    recipe_data["recipeIngredient"] = normalize_ingredient(
+        recipe_data.get("recipeIngredient")
+    )
+    recipe_data["recipeInstructions"] = normalize_instructions(
+        recipe_data["recipeInstructions"]
+    )
     recipe_data["image"] = normalize_image_url(recipe_data["image"])
     return recipe_data
 
@@ -136,11 +146,15 @@ def process_recipe_data(new_recipe: dict, url=None) -> dict:
 
 def extract_recipe_from_html(html: str, url: str) -> dict:
     try:
-        scraped_recipes: List[dict] = scrape_schema_recipe.loads(html, python_objects=True)
+        scraped_recipes: List[dict] = scrape_schema_recipe.loads(
+            html, python_objects=True
+        )
         dump_last_json(scraped_recipes)
 
         if not scraped_recipes:
-            scraped_recipes: List[dict] = scrape_schema_recipe.scrape_url(url, python_objects=True)
+            scraped_recipes: List[dict] = scrape_schema_recipe.scrape_url(
+                url, python_objects=True
+            )
     except Exception as e:
         # trying without python_objects
         scraped_recipes: List[dict] = scrape_schema_recipe.loads(html)
@@ -170,7 +184,7 @@ def download_image_for_recipe(recipe: dict) -> dict:
         img_path = scrape_image(recipe.get("image"), recipe.get("slug"))
         recipe["image"] = img_path.name
     except:
-        recipe["image"] = None
+        recipe["image"] = "no image"
 
     return recipe
 
diff --git a/mealie/services/settings_services.py b/mealie/services/settings_services.py
index 576e95a63..62e32bb3d 100644
--- a/mealie/services/settings_services.py
+++ b/mealie/services/settings_services.py
@@ -1,7 +1,8 @@
 from db.database import db
-from db.db_setup import create_session, sql_exists
+from db.db_setup import create_session
 from models.settings_models import SiteSettings, Webhooks
 from sqlalchemy.orm.session import Session
+from utils.logger import logger
 
 
 def default_settings_init(session: Session = None):
@@ -10,7 +11,7 @@ def default_settings_init(session: Session = None):
     try:
         webhooks = Webhooks()
         default_entry = SiteSettings(name="main", webhooks=webhooks)
-        document = db.settings.create(session, default_entry.dict(), webhooks.dict())
+        document = db.settings.create(session, default_entry.dict())
+        logger.info(f"Created Site Settings: \n {document}")
     except:
         pass
-
diff --git a/mealie/tests/test_routes/test_settings_routes.py b/mealie/tests/test_routes/test_settings_routes.py
index 9127c453d..56ccae369 100644
--- a/mealie/tests/test_routes/test_settings_routes.py
+++ b/mealie/tests/test_routes/test_settings_routes.py
@@ -13,6 +13,7 @@ from tests.utils.routes import (
 def default_settings():
     return {
         "name": "main",
+        "planCategories": [],
         "webhooks": {"webhookTime": "00:00", "webhookURLs": [], "enabled": False},
     }