diff --git a/vasl_templates/webapp/data/default-templates/atmm.j2 b/vasl_templates/webapp/data/default-templates/atmm.j2
index b1b83f3..5dc8975 100644
--- a/vasl_templates/webapp/data/default-templates/atmm.j2
+++ b/vasl_templates/webapp/data/default-templates/atmm.j2
@@ -1 +1 @@
-Kaboom!!!
+Kaboom!!! ; col=[{{OB_COLOR}}]/[{{OB_COLOR_2}}]
diff --git a/vasl_templates/webapp/data/default-templates/baz.j2 b/vasl_templates/webapp/data/default-templates/baz.j2
index aa92168..c31dce9 100644
--- a/vasl_templates/webapp/data/default-templates/baz.j2
+++ b/vasl_templates/webapp/data/default-templates/baz.j2
@@ -1 +1 @@
-BAZ: {%if BAZ_TYPE%}'{{BAZ_TYPE}} ; range=[{{BAZ_RANGE}}] ; X#=[{{BAZ_BREAKDOWN}}] ; TK#=[{{BAZ_TOKILL}}]{%if BAZ_WP%} ; WP#=[{{BAZ_WP}}]{%endif%}{%else%}none{%endif%}
+BAZ: {%if BAZ_TYPE%}'{{BAZ_TYPE}} ; range=[{{BAZ_RANGE}}] ; X#=[{{BAZ_BREAKDOWN}}] ; TK#=[{{BAZ_TOKILL}}]{%if BAZ_WP%} ; WP#=[{{BAZ_WP}}]{%endif%} ; col=[{{OB_COLOR}}]/[{{OB_COLOR_2}}]{%else%}none{%endif%}
diff --git a/vasl_templates/webapp/data/default-templates/mol-p.j2 b/vasl_templates/webapp/data/default-templates/mol-p.j2
index a50ac0b..9eb16d1 100644
--- a/vasl_templates/webapp/data/default-templates/mol-p.j2
+++ b/vasl_templates/webapp/data/default-templates/mol-p.j2
@@ -1 +1 @@
-mol-p template
+mol-p template ; col=[{{OB_COLOR}}]/[{{OB_COLOR_2}}]
diff --git a/vasl_templates/webapp/data/default-templates/mol.j2 b/vasl_templates/webapp/data/default-templates/mol.j2
index cf5d177..3fb395f 100644
--- a/vasl_templates/webapp/data/default-templates/mol.j2
+++ b/vasl_templates/webapp/data/default-templates/mol.j2
@@ -1 +1 @@
-Burn, baby, burn!
+Burn, baby, burn! ; col=[{{OB_COLOR}}]/[{{OB_COLOR_2}}]
diff --git a/vasl_templates/webapp/data/default-templates/ob_setup.j2 b/vasl_templates/webapp/data/default-templates/ob_setup.j2
index d83acf9..216fb22 100644
--- a/vasl_templates/webapp/data/default-templates/ob_setup.j2
+++ b/vasl_templates/webapp/data/default-templates/ob_setup.j2
@@ -1 +1 @@
-[{{OB_SETUP}}] (col=[{{OB_SETUP_COLOR}}/{{OB_SETUP_COLOR_2}}]){%if OB_SETUP_WIDTH%} (width=[{{OB_SETUP_WIDTH}}]){%endif%}
+[{{OB_SETUP}}] (col=[{{OB_COLOR}}/{{OB_COLOR_2}}]){%if OB_SETUP_WIDTH%} (width=[{{OB_SETUP_WIDTH}}]){%endif%}
diff --git a/vasl_templates/webapp/data/default-templates/pf.j2 b/vasl_templates/webapp/data/default-templates/pf.j2
index 0c6c1b9..ca4ab51 100644
--- a/vasl_templates/webapp/data/default-templates/pf.j2
+++ b/vasl_templates/webapp/data/default-templates/pf.j2
@@ -1 +1 @@
-PF: range=[{{PF_RANGE}}] ; check=[{{PF_CHECK_DR}}]{%if PF_CHECK_DRM%} (drm=[{{PF_CHECK_DRM}}]){%endif%}
+PF: range=[{{PF_RANGE}}] ; check=[{{PF_CHECK_DR}}]{%if PF_CHECK_DRM%} (drm=[{{PF_CHECK_DRM}}]){%endif%} ; col=[{{OB_COLOR}}]/[{{OB_COLOR_2}}]
diff --git a/vasl_templates/webapp/data/default-templates/piat.j2 b/vasl_templates/webapp/data/default-templates/piat.j2
index dc704d4..41610d8 100644
--- a/vasl_templates/webapp/data/default-templates/piat.j2
+++ b/vasl_templates/webapp/data/default-templates/piat.j2
@@ -1 +1 @@
-piat template
+piat template ; col=[{{OB_COLOR}}]/[{{OB_COLOR_2}}]
diff --git a/vasl_templates/webapp/data/default-templates/psk.j2 b/vasl_templates/webapp/data/default-templates/psk.j2
index bcccc44..638bbca 100644
--- a/vasl_templates/webapp/data/default-templates/psk.j2
+++ b/vasl_templates/webapp/data/default-templates/psk.j2
@@ -1 +1 @@
-====> whoosh!
+====> whoosh! ; col=[{{OB_COLOR}}]/[{{OB_COLOR_2}}]
diff --git a/vasl_templates/webapp/static/snippets.js b/vasl_templates/webapp/static/snippets.js
index fd8e631..695ad89 100644
--- a/vasl_templates/webapp/static/snippets.js
+++ b/vasl_templates/webapp/static/snippets.js
@@ -24,16 +24,24 @@ function generate_snippet( $btn )
     if ( template_id === "ob_setup_1" ) {
         template_id = "ob_setup" ;
         params.OB_SETUP = params.OB_SETUP_1 ;
-        params.OB_SETUP_COLOR = gNationalities[params.PLAYER_1].ob_colors[0] ;
-        params.OB_SETUP_COLOR_2 = gNationalities[params.PLAYER_1].ob_colors[1] ;
+        delete params.OB_SETUP_1 ;
         params.OB_SETUP_WIDTH = params.OB_SETUP_WIDTH_1 ;
+        delete params.OB_SETUP_WIDTH_1 ;
     }
     else if ( template_id === "ob_setup_2" ) {
         template_id = "ob_setup" ;
         params.OB_SETUP = params.OB_SETUP_2 ;
-        params.OB_SETUP_COLOR = gNationalities[params.PLAYER_2].ob_colors[0] ;
-        params.OB_SETUP_COLOR_2 = gNationalities[params.PLAYER_2].ob_colors[1] ;
+        delete params.OB_SETUP_2 ;
         params.OB_SETUP_WIDTH = params.OB_SETUP_WIDTH_2 ;
+        delete params.OB_SETUP_WIDTH_2 ;
+    }
+    var curr_tab = $("#tabs .ui-tabs-active a").attr( "href" ) ;
+    if ( curr_tab === "#tabs-ob1" ) {
+        params.OB_COLOR = gNationalities[params.PLAYER_1].ob_colors[0] ;
+        params.OB_COLOR_2 = gNationalities[params.PLAYER_1].ob_colors[1] ;
+    } if ( curr_tab === "#tabs-ob2" ) {
+        params.OB_COLOR = gNationalities[params.PLAYER_2].ob_colors[0] ;
+        params.OB_COLOR_2 = gNationalities[params.PLAYER_2].ob_colors[1] ;
     }
 
     // include the player display names
diff --git a/vasl_templates/webapp/tests/test_ob_setup.py b/vasl_templates/webapp/tests/test_ob_setup.py
index 25cab4e..a108c26 100644
--- a/vasl_templates/webapp/tests/test_ob_setup.py
+++ b/vasl_templates/webapp/tests/test_ob_setup.py
@@ -93,14 +93,14 @@ def test_nationality_specific( webapp, webdriver ):
                 assert last_warning.startswith( "PF are only available" )
             else:
                 assert last_warning == ""
-        do_test( (1942,1), "PF: range=[1] ; check=[2] (drm=[+1])", True )
-        do_test( (1943,9), "PF: range=[1] ; check=[2] (drm=[+1])", True )
-        do_test( (1943,10), "PF: range=[1] ; check=[3]", False )
-        do_test( (1944,5), "PF: range=[1] ; check=[3]", False )
-        do_test( (1944,6), "PF: range=[2] ; check=[3]", False )
-        do_test( (1944,12), "PF: range=[2] ; check=[3]", False )
-        do_test( (1945,1), "PF: range=[3] ; check=[4] (drm=[-1])", False )
-        do_test( (1946,1), "PF: range=[3] ; check=[4] (drm=[-1])", False )
+        do_test( (1942,1), "PF: range=[1] ; check=[2] (drm=[+1]) ; col=[OBCOL:german]/[OBCOL2:german]", True )
+        do_test( (1943,9), "PF: range=[1] ; check=[2] (drm=[+1]) ; col=[OBCOL:german]/[OBCOL2:german]", True )
+        do_test( (1943,10), "PF: range=[1] ; check=[3] ; col=[OBCOL:german]/[OBCOL2:german]", False )
+        do_test( (1944,5), "PF: range=[1] ; check=[3] ; col=[OBCOL:german]/[OBCOL2:german]", False )
+        do_test( (1944,6), "PF: range=[2] ; check=[3] ; col=[OBCOL:german]/[OBCOL2:german]", False )
+        do_test( (1944,12), "PF: range=[2] ; check=[3] ; col=[OBCOL:german]/[OBCOL2:german]", False )
+        do_test( (1945,1), "PF: range=[3] ; check=[4] (drm=[-1]) ; col=[OBCOL:german]/[OBCOL2:german]", False )
+        do_test( (1946,1), "PF: range=[3] ; check=[4] (drm=[-1]) ; col=[OBCOL:german]/[OBCOL2:german]", False )
 
     # initialize
     def check_baz_snippets():
@@ -120,21 +120,25 @@ def test_nationality_specific( webapp, webdriver ):
                 assert last_warning == ""
         do_test( (1941,1), "BAZ: none" )
         do_test( (1942,10), "BAZ: none" )
-        do_test( (1942,11), "BAZ: '43 ; range=[4] ; X#=[10] ; TK#=[13]" )
-        do_test( (1943,1), "BAZ: '43 ; range=[4] ; X#=[10] ; TK#=[13]" )
-        do_test( (1944,1), "BAZ: '44 ; range=[4] ; X#=[11] ; TK#=[16]" )
-        do_test( (1945,1), "BAZ: '45 ; range=[5] ; X#=[11] ; TK#=[16] ; WP#=[6]" )
-        do_test( (1946,1), "BAZ: '45 ; range=[5] ; X#=[11] ; TK#=[16] ; WP#=[6]" )
+        do_test( (1942,11), "BAZ: '43 ; range=[4] ; X#=[10] ; TK#=[13] ; col=[OBCOL:american]/[OBCOL2:american]" )
+        do_test( (1943,1), "BAZ: '43 ; range=[4] ; X#=[10] ; TK#=[13] ; col=[OBCOL:american]/[OBCOL2:american]" )
+        do_test( (1944,1), "BAZ: '44 ; range=[4] ; X#=[11] ; TK#=[16] ; col=[OBCOL:american]/[OBCOL2:american]" )
+        do_test( (1945,1),
+            "BAZ: '45 ; range=[5] ; X#=[11] ; TK#=[16] ; WP#=[6] ; col=[OBCOL:american]/[OBCOL2:american]"
+        )
+        do_test( (1946,1),
+            "BAZ: '45 ; range=[5] ; X#=[11] ; TK#=[16] ; WP#=[6] ; col=[OBCOL:american]/[OBCOL2:american]"
+        )
 
     # initialize
     nationality_specific_buttons = {
-        "mol": [ "russian", "Burn, baby, burn!" ],
-        "mol-p": [ "russian", "mol-p template" ],
+        "mol": [ "russian", "Burn, baby, burn! ; col=[OBCOL:russian]/[OBCOL2:russian]" ],
+        "mol-p": [ "russian", "mol-p template ; col=[OBCOL:russian]/[OBCOL2:russian]" ],
         "pf": [ "german", check_pf_snippets ],
-        "psk": [ "german", "====> whoosh!" ],
-        "atmm": [ "german", "Kaboom!!!" ],
+        "psk": [ "german", "====> whoosh! ; col=[OBCOL:german]/[OBCOL2:german]" ],
+        "atmm": [ "german", "Kaboom!!! ; col=[OBCOL:german]/[OBCOL2:german]" ],
         "baz": [ "american", check_baz_snippets ],
-        "piat": [ "british", "piat template" ],
+        "piat": [ "british", "piat template ; col=[OBCOL:british]/[OBCOL2:british]" ],
     }
 
     # iterate through each nationality