diff --git a/app/javascript/template_builder/area.vue b/app/javascript/template_builder/area.vue
index dd405e6bc..ad665d14a 100644
--- a/app/javascript/template_builder/area.vue
+++ b/app/javascript/template_builder/area.vue
@@ -254,7 +254,9 @@ export default {
         'border-purple-600/80',
         'border-pink-500/80',
         'border-cyan-500/80',
-        'border-orange-500/80'
+        'border-orange-500/80',
+        'border-lime-500/80',
+        'border-indigo-500/80'
       ]
     },
     bgColors () {
@@ -276,7 +278,9 @@ export default {
         'bg-purple-100/80',
         'bg-pink-100/80',
         'bg-cyan-100/80',
-        'bg-orange-100/80'
+        'bg-orange-100/80',
+        'bg-lime-100/80',
+        'bg-indigo-100/80'
       ]
     },
     isSelected () {
diff --git a/app/javascript/template_builder/field_submitter.vue b/app/javascript/template_builder/field_submitter.vue
index db8d3de02..53fef1568 100644
--- a/app/javascript/template_builder/field_submitter.vue
+++ b/app/javascript/template_builder/field_submitter.vue
@@ -67,7 +67,7 @@
               </button>
             </a>
           </li>
-          <li v-if="submitters.length < 18 && editable">
+          <li v-if="submitters.length < names.length && editable">
             <a
               href="#"
               class="flex px-2"
@@ -145,7 +145,7 @@
         <a
           href="#"
           class="flex px-2 group justify-between items-center"
-          :class="{ 'active': submitter === selectedSubmitter, 'py-1': submitters.length > 8 }"
+          :class="{ 'active': submitter === selectedSubmitter, 'py-0.5': submitters.length > 8 }"
           @click.prevent="selectSubmitter(submitter)"
         >
           <span class="py-1 flex items-center">
@@ -189,7 +189,7 @@
           </div>
         </a>
       </li>
-      <li v-if="submitters.length < 18 && editable && allowAddNew">
+      <li v-if="submitters.length < names.length && editable && allowAddNew">
         <a
           href="#"
           class="flex px-2"
@@ -285,7 +285,9 @@ export default {
         'bg-purple-600',
         'bg-pink-500',
         'bg-cyan-500',
-        'bg-orange-500'
+        'bg-orange-500',
+        'bg-lime-500',
+        'bg-indigo-500'
       ]
     },
     names () {
@@ -307,7 +309,9 @@ export default {
         this.t('fifteenth_party'),
         this.t('sixteenth_party'),
         this.t('seventeenth_party'),
-        this.t('eighteenth_party')
+        this.t('eighteenth_party'),
+        this.t('nineteenth_party'),
+        this.t('twentieth_party')
       ]
     },
     selectedSubmitter () {
diff --git a/app/javascript/template_builder/i18n.js b/app/javascript/template_builder/i18n.js
index 4a93ae33e..f0e2fdb3e 100644
--- a/app/javascript/template_builder/i18n.js
+++ b/app/javascript/template_builder/i18n.js
@@ -40,6 +40,8 @@ const en = {
   sixteenth_party: 'Sixteenth Party',
   seventeenth_party: 'Seventeenth Party',
   eighteenth_party: 'Eighteenth Party',
+  nineteenth_party: 'Nineteenth Party',
+  twentieth_party: 'Twentieth Party',
   add: 'Add',
   or_add_field_without_drawing: 'Or add field without drawing',
   text: 'Text',