diff --git a/cookbook/migrations/0001_initial.py b/cookbook/migrations/0001_initial.py
index e39a95f1..0f69acae 100644
--- a/cookbook/migrations/0001_initial.py
+++ b/cookbook/migrations/0001_initial.py
@@ -1,5 +1,6 @@
-# Generated by Django 2.0.5 on 2018-06-06 21:31
+# Generated by Django 2.2.7 on 2019-11-19 18:43
 
+from django.conf import settings
 from django.db import migrations, models
 import django.db.models.deletion
 
@@ -9,21 +10,10 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
     ]
 
     operations = [
-        migrations.CreateModel(
-            name='Category',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(max_length=64, unique=True)),
-                ('icon', models.CharField(blank=True, max_length=1, null=True)),
-                ('description', models.TextField(blank=True, default='')),
-                ('created_by', models.IntegerField(default=0)),
-                ('created_at', models.DateTimeField(auto_now_add=True)),
-                ('updated_at', models.DateTimeField(auto_now=True)),
-            ],
-        ),
         migrations.CreateModel(
             name='Keyword',
             fields=[
@@ -41,32 +31,24 @@ class Migration(migrations.Migration):
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('name', models.CharField(max_length=128)),
+                ('instructions', models.TextField(blank=True)),
                 ('file_uid', models.CharField(default='', max_length=256)),
                 ('file_path', models.CharField(default='', max_length=512)),
                 ('link', models.CharField(default='', max_length=512)),
-                ('created_by', models.IntegerField(default=0)),
+                ('time', models.IntegerField(default=0)),
+                ('internal', models.BooleanField(default=False)),
                 ('created_at', models.DateTimeField(auto_now_add=True)),
                 ('updated_at', models.DateTimeField(auto_now=True)),
-                ('category', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='cookbook.Category')),
+                ('created_by', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL)),
                 ('keywords', models.ManyToManyField(blank=True, to='cookbook.Keyword')),
             ],
         ),
-        migrations.CreateModel(
-            name='RecipeImport',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(max_length=128)),
-                ('file_uid', models.CharField(default='', max_length=256)),
-                ('file_path', models.CharField(default='', max_length=512)),
-                ('created_at', models.DateTimeField(auto_now_add=True)),
-            ],
-        ),
         migrations.CreateModel(
             name='Storage',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('name', models.CharField(max_length=128)),
-                ('method', models.CharField(choices=[('DB', 'Dropbox')], default='DB', max_length=128)),
+                ('method', models.CharField(choices=[('DB', 'Dropbox'), ('NEXTCLOUD', 'Nextcloud')], default='DB', max_length=128)),
                 ('username', models.CharField(blank=True, max_length=128, null=True)),
                 ('password', models.CharField(blank=True, max_length=128, null=True)),
                 ('token', models.CharField(blank=True, max_length=512, null=True)),
@@ -78,6 +60,7 @@ class Migration(migrations.Migration):
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('path', models.CharField(default='', max_length=512)),
+                ('active', models.BooleanField(default=True)),
                 ('last_checked', models.DateTimeField()),
                 ('created_at', models.DateTimeField(auto_now_add=True)),
                 ('updated_at', models.DateTimeField(auto_now=True)),
@@ -94,14 +77,41 @@ class Migration(migrations.Migration):
                 ('sync', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='cookbook.Sync')),
             ],
         ),
-        migrations.AddField(
-            model_name='recipeimport',
-            name='storage',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='cookbook.Storage'),
+        migrations.CreateModel(
+            name='RecipeIngredients',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('unit', models.CharField(max_length=128)),
+                ('amount', models.DecimalField(decimal_places=2, default=0, max_digits=16)),
+                ('ingredient', models.CharField(max_length=128)),
+                ('recipe', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='cookbook.Recipe')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='RecipeImport',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=128)),
+                ('file_uid', models.CharField(default='', max_length=256)),
+                ('file_path', models.CharField(default='', max_length=512)),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('storage', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='cookbook.Storage')),
+            ],
         ),
         migrations.AddField(
             model_name='recipe',
             name='storage',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='cookbook.Storage'),
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='cookbook.Storage'),
+        ),
+        migrations.CreateModel(
+            name='Comment',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('text', models.TextField()),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('updated_at', models.DateTimeField(auto_now=True)),
+                ('created_by', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+                ('recipe', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='cookbook.Recipe')),
+            ],
         ),
     ]
diff --git a/cookbook/migrations/0002_auto_20191113_2224.py b/cookbook/migrations/0002_auto_20191113_2224.py
deleted file mode 100644
index 5af89b8c..00000000
--- a/cookbook/migrations/0002_auto_20191113_2224.py
+++ /dev/null
@@ -1,46 +0,0 @@
-# Generated by Django 2.2.7 on 2019-11-13 21:24
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('cookbook', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Ingredients',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(max_length=128)),
-            ],
-        ),
-        migrations.CreateModel(
-            name='RecipeIngredients',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('unit', models.CharField(max_length=128)),
-                ('ingredient', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='cookbook.Ingredients')),
-            ],
-        ),
-        migrations.RemoveField(
-            model_name='recipe',
-            name='category',
-        ),
-        migrations.AddField(
-            model_name='recipe',
-            name='instructions',
-            field=models.TextField(blank=True),
-        ),
-        migrations.DeleteModel(
-            name='Category',
-        ),
-        migrations.AddField(
-            model_name='recipeingredients',
-            name='recipe',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='cookbook.Recipe'),
-        ),
-    ]
diff --git a/cookbook/migrations/0003_auto_20191113_2235.py b/cookbook/migrations/0003_auto_20191113_2235.py
deleted file mode 100644
index 4e33b440..00000000
--- a/cookbook/migrations/0003_auto_20191113_2235.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# Generated by Django 2.2.7 on 2019-11-13 21:35
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('cookbook', '0002_auto_20191113_2224'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='recipe',
-            name='storage',
-            field=models.ForeignKey(blank=True, on_delete=django.db.models.deletion.PROTECT, to='cookbook.Storage'),
-        ),
-    ]
diff --git a/cookbook/migrations/0004_auto_20191113_2238.py b/cookbook/migrations/0004_auto_20191113_2238.py
deleted file mode 100644
index 023a67e2..00000000
--- a/cookbook/migrations/0004_auto_20191113_2238.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# Generated by Django 2.2.7 on 2019-11-13 21:38
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('cookbook', '0003_auto_20191113_2235'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='recipe',
-            name='storage',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='cookbook.Storage'),
-        ),
-    ]
diff --git a/cookbook/migrations/0005_recipeingredients_amount.py b/cookbook/migrations/0005_recipeingredients_amount.py
deleted file mode 100644
index d8e104dd..00000000
--- a/cookbook/migrations/0005_recipeingredients_amount.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 2.2.7 on 2019-11-13 23:24
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('cookbook', '0004_auto_20191113_2238'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='recipeingredients',
-            name='amount',
-            field=models.DecimalField(decimal_places=2, default=0, max_digits=16),
-        ),
-    ]
diff --git a/cookbook/migrations/0006_comment.py b/cookbook/migrations/0006_comment.py
deleted file mode 100644
index cad0be51..00000000
--- a/cookbook/migrations/0006_comment.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# Generated by Django 2.2.7 on 2019-11-14 08:49
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ('cookbook', '0005_recipeingredients_amount'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Comment',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('text', models.TextField()),
-                ('created_at', models.DateTimeField(auto_now_add=True)),
-                ('updated_at', models.DateTimeField(auto_now=True)),
-                ('created_by', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
-                ('recipe', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='cookbook.Recipe')),
-            ],
-        ),
-    ]
diff --git a/cookbook/migrations/0007_auto_20191114_1044.py b/cookbook/migrations/0007_auto_20191114_1044.py
deleted file mode 100644
index 6f7a3c4d..00000000
--- a/cookbook/migrations/0007_auto_20191114_1044.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# Generated by Django 2.2.7 on 2019-11-14 09:44
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('cookbook', '0006_comment'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='sync',
-            name='active',
-            field=models.BooleanField(default=True),
-        ),
-        migrations.AlterField(
-            model_name='storage',
-            name='method',
-            field=models.CharField(choices=[('DB', 'Dropbox'), ('DAV', 'WebDAV')], default='DB', max_length=128),
-        ),
-    ]
diff --git a/cookbook/migrations/0008_auto_20191114_1046.py b/cookbook/migrations/0008_auto_20191114_1046.py
deleted file mode 100644
index 79e03ef0..00000000
--- a/cookbook/migrations/0008_auto_20191114_1046.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 2.2.7 on 2019-11-14 09:46
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('cookbook', '0007_auto_20191114_1044'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='storage',
-            name='method',
-            field=models.CharField(choices=[('DB', 'Dropbox'), ('NEXTCLOUD', 'Nextcloud')], default='DB', max_length=128),
-        ),
-    ]
diff --git a/cookbook/migrations/0009_auto_20191114_1800.py b/cookbook/migrations/0009_auto_20191114_1800.py
deleted file mode 100644
index 54f9d826..00000000
--- a/cookbook/migrations/0009_auto_20191114_1800.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# Generated by Django 2.2.7 on 2019-11-14 17:00
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('cookbook', '0008_auto_20191114_1046'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='recipe',
-            name='created_by',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL),
-        ),
-    ]
diff --git a/cookbook/migrations/0010_recipe_internal.py b/cookbook/migrations/0010_recipe_internal.py
deleted file mode 100644
index e1a1de5b..00000000
--- a/cookbook/migrations/0010_recipe_internal.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 2.2.7 on 2019-11-15 12:55
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('cookbook', '0009_auto_20191114_1800'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='recipe',
-            name='internal',
-            field=models.BooleanField(default=False),
-        ),
-    ]
diff --git a/cookbook/migrations/0011_recipe_time.py b/cookbook/migrations/0011_recipe_time.py
deleted file mode 100644
index d777bdc6..00000000
--- a/cookbook/migrations/0011_recipe_time.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# Generated by Django 2.2.7 on 2019-11-15 13:50
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('cookbook', '0010_recipe_internal'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='recipe',
-            name='time',
-            field=models.IntegerField(blank=True, default=0),
-            preserve_default=False,
-        ),
-    ]
diff --git a/cookbook/migrations/0012_auto_20191115_1504.py b/cookbook/migrations/0012_auto_20191115_1504.py
deleted file mode 100644
index 022cc958..00000000
--- a/cookbook/migrations/0012_auto_20191115_1504.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 2.2.7 on 2019-11-15 14:04
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('cookbook', '0011_recipe_time'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='recipe',
-            name='time',
-            field=models.IntegerField(default=0),
-        ),
-    ]
diff --git a/cookbook/migrations/0012_auto_20191118_1251.py b/cookbook/migrations/0012_auto_20191118_1251.py
deleted file mode 100644
index 04874a63..00000000
--- a/cookbook/migrations/0012_auto_20191118_1251.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 2.2.7 on 2019-11-18 11:51
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('cookbook', '0011_recipe_time'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='recipe',
-            name='time',
-            field=models.IntegerField(default=0),
-        ),
-    ]
diff --git a/cookbook/migrations/0013_auto_20191118_1328.py b/cookbook/migrations/0013_auto_20191118_1328.py
deleted file mode 100644
index 00c6c52a..00000000
--- a/cookbook/migrations/0013_auto_20191118_1328.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# Generated by Django 2.2.7 on 2019-11-18 12:28
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('cookbook', '0012_auto_20191118_1251'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='recipeingredients',
-            name='ingredient',
-            field=models.CharField(max_length=128),
-        ),
-        migrations.DeleteModel(
-            name='Ingredients',
-        ),
-    ]
diff --git a/cookbook/migrations/0014_merge_20191119_1937.py b/cookbook/migrations/0014_merge_20191119_1937.py
deleted file mode 100644
index a15950c4..00000000
--- a/cookbook/migrations/0014_merge_20191119_1937.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# Generated by Django 2.2.7 on 2019-11-19 18:37
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('cookbook', '0013_auto_20191118_1328'),
-        ('cookbook', '0012_auto_20191115_1504'),
-    ]
-
-    operations = [
-    ]