diff --git a/.dev/build_dev.sh b/.dev/build_dev.sh
new file mode 100644
index 0000000..6c0bd26
--- /dev/null
+++ b/.dev/build_dev.sh
@@ -0,0 +1 @@
+docker build -t flame:dev -f .docker/Dockerfile .
\ No newline at end of file
diff --git a/client/src/components/Settings/GeneralSettings/CustomQueries/CustomQueries.tsx b/client/src/components/Settings/GeneralSettings/CustomQueries/CustomQueries.tsx
index 8340308..8471fae 100644
--- a/client/src/components/Settings/GeneralSettings/CustomQueries/CustomQueries.tsx
+++ b/client/src/components/Settings/GeneralSettings/CustomQueries/CustomQueries.tsx
@@ -65,7 +65,7 @@ export const CustomQueries = (): JSX.Element => {
       </Modal>
 
       <section>
-        {customQueries.length && (
+        {customQueries.length ? (
           <CompactTable headers={['Name', 'Prefix', 'Actions']}>
             {customQueries.map((q: Query, idx) => (
               <Fragment key={idx}>
@@ -82,6 +82,8 @@ export const CustomQueries = (): JSX.Element => {
               </Fragment>
             ))}
           </CompactTable>
+        ) : (
+          <></>
         )}
 
         <Button
diff --git a/client/src/components/Settings/Themer/ThemeBuilder/ThemeBuilder.tsx b/client/src/components/Settings/Themer/ThemeBuilder/ThemeBuilder.tsx
index 039e4d3..91763ae 100644
--- a/client/src/components/Settings/Themer/ThemeBuilder/ThemeBuilder.tsx
+++ b/client/src/components/Settings/Themer/ThemeBuilder/ThemeBuilder.tsx
@@ -23,7 +23,7 @@ interface Props {
 export const ThemeBuilder = ({ themes }: Props): JSX.Element => {
   const {
     auth: { isAuthenticated },
-    theme: { themeInEdit },
+    theme: { themeInEdit, userThemes },
   } = useSelector((state: State) => state);
 
   const { editTheme } = bindActionCreators(actionCreators, useDispatch());
@@ -38,6 +38,13 @@ export const ThemeBuilder = ({ themes }: Props): JSX.Element => {
     }
   }, [themeInEdit]);
 
+  useEffect(() => {
+    if (isInEdit && !userThemes.length) {
+      toggleIsInEdit(false);
+      toggleShowModal(false);
+    }
+  }, [userThemes]);
+
   return (
     <div className={classes.ThemeBuilder}>
       {/* MODALS */}
diff --git a/client/src/utility/templateObjects/settingsTemplate.ts b/client/src/utility/templateObjects/settingsTemplate.ts
index af3d137..9bfdd61 100644
--- a/client/src/utility/templateObjects/settingsTemplate.ts
+++ b/client/src/utility/templateObjects/settingsTemplate.ts
@@ -33,6 +33,7 @@ export const weatherSettingsTemplate: WeatherForm = {
 export const generalSettingsTemplate: GeneralForm = {
   searchSameTab: false,
   defaultSearchProvider: 'l',
+  secondarySearchProvider: 'd',
   pinAppsByDefault: true,
   pinCategoriesByDefault: true,
   useOrdering: 'createdAt',