diff --git a/djangocms_blog/migrations/0024_auto_20160706_1524.py b/djangocms_blog/migrations/0024_auto_20160706_1524.py
index bd658c8..fa34841 100644
--- a/djangocms_blog/migrations/0024_auto_20160706_1524.py
+++ b/djangocms_blog/migrations/0024_auto_20160706_1524.py
@@ -3,6 +3,10 @@ from __future__ import unicode_literals
 
 from django.db import migrations, models
 
+from djangocms_blog.settings import get_setting
+
+BLOG_PLUGIN_TEMPLATE_FOLDERS = get_setting('PLUGIN_TEMPLATE_FOLDERS')
+
 
 class Migration(migrations.Migration):
 
@@ -14,16 +18,16 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='authorentriesplugin',
             name='template_folder',
-            field=models.CharField(default='Default template', verbose_name='Plugin template', max_length=200, help_text='Select plugin template to load for this instance', choices=[('plugins', 'Default template')]),
+            field=models.CharField(default='plugins', verbose_name='Plugin template', max_length=200, help_text='Select plugin template to load for this instance', choices=BLOG_PLUGIN_TEMPLATE_FOLDERS),
         ),
         migrations.AddField(
             model_name='genericblogplugin',
             name='template_folder',
-            field=models.CharField(default='Default template', verbose_name='Plugin template', max_length=200, help_text='Select plugin template to load for this instance', choices=[('plugins', 'Default template')]),
+            field=models.CharField(default='plugins', verbose_name='Plugin template', max_length=200, help_text='Select plugin template to load for this instance', choices=BLOG_PLUGIN_TEMPLATE_FOLDERS),
         ),
         migrations.AddField(
             model_name='latestpostsplugin',
             name='template_folder',
-            field=models.CharField(default='Default template', verbose_name='Plugin template', max_length=200, help_text='Select plugin template to load for this instance', choices=[('plugins', 'Default template')]),
+            field=models.CharField(default='plugins', verbose_name='Plugin template', max_length=200, help_text='Select plugin template to load for this instance', choices=BLOG_PLUGIN_TEMPLATE_FOLDERS),
         ),
     ]
diff --git a/djangocms_blog/migrations/0027_auto_20160917_0123.py b/djangocms_blog/migrations/0027_auto_20160917_0123.py
deleted file mode 100644
index 3cfcce6..0000000
--- a/djangocms_blog/migrations/0027_auto_20160917_0123.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.9 on 2016-09-16 23:23
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('djangocms_blog', '0026_merge'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='authorentriesplugin',
-            name='template_folder',
-            field=models.CharField(choices=[('plugins', 'Default template')], default='plugins', help_text='Select plugin template to load for this instance', max_length=200, verbose_name='Plugin template'),
-        ),
-        migrations.AlterField(
-            model_name='genericblogplugin',
-            name='template_folder',
-            field=models.CharField(choices=[('plugins', 'Default template')], default='plugins', help_text='Select plugin template to load for this instance', max_length=200, verbose_name='Plugin template'),
-        ),
-        migrations.AlterField(
-            model_name='latestpostsplugin',
-            name='template_folder',
-            field=models.CharField(choices=[('plugins', 'Default template')], default='plugins', help_text='Select plugin template to load for this instance', max_length=200, verbose_name='Plugin template'),
-        ),
-    ]