diff --git a/nano/debug.html b/nano/debug.html
index bcc9cdb9be8..2c4fe4709fe 100644
--- a/nano/debug.html
+++ b/nano/debug.html
@@ -5,7 +5,7 @@
 	<head>
 		<link rel='stylesheet' type='text/css' href='shared.css'><link rel='stylesheet' type='text/css' href='icons.css'>
 	</head>
-	<body scroll=auto data-url-parameters='{"src":"[0x2100e35f]"}' data-template-data='{"main":"vending.tmpl"}' data-initial-data='{"premiumItems":{"/obj/item/clothing/suit/hgpirate":1,"/obj/item/clothing/head/hgpiratecap":1,"/obj/item/clothing/head/helmet/roman":1,"/obj/item/clothing/head/helmet/roman/legionaire":1,"/obj/item/clothing/under/roman":1,"/obj/item/clothing/shoes/roman":1,"/obj/item/weapon/shield/riot/roman":1},"contraband":{"/obj/item/clothing/suit/cardborg":1,"/obj/item/clothing/head/cardborg":1,"/obj/item/clothing/suit/judgerobe":1,"/obj/item/clothing/head/powdered_wig":1,"/obj/item/weapon/gun/magic/wand":1},"products":{"/obj/item/clothing/suit/chickensuit":1,"/obj/item/clothing/head/chicken":1,"/obj/item/clothing/head/corgi":1,"/obj/item/clothing/suit/corgisuit":1,"/obj/item/clothing/under/gladiator":1,"/obj/item/clothing/head/helmet/gladiator":1,"/obj/item/clothing/under/gimmick/rank/captain/suit":1,"/obj/item/clothing/head/flatcap":1,"/obj/item/clothing/glasses/gglasses":1,"/obj/item/clothing/shoes/jackboots":1,"/obj/item/clothing/under/schoolgirl":1,"/obj/item/clothing/head/kitty":1,"/obj/item/clothing/under/blackskirt":1,"/obj/item/clothing/head/beret":1,"/obj/item/clothing/suit/wcoat":1,"/obj/item/clothing/under/suit_jacket":1,"/obj/item/clothing/head/that":1,"/obj/item/clothing/head/cueball":1,"/obj/item/clothing/under/scratch":1,"/obj/item/clothing/under/kilt":1,"/obj/item/clothing/glasses/monocle":1,"/obj/item/clothing/head/bowler":1,"/obj/item/weapon/cane":1,"/obj/item/clothing/under/sl_suit":1,"/obj/item/clothing/mask/fakemoustache":1,"/obj/item/clothing/suit/bio_suit/plaguedoctorsuit":1,"/obj/item/clothing/head/plaguedoctorhat":1,"/obj/item/clothing/mask/gas/plaguedoctor":1,"/obj/item/clothing/under/owl":1,"/obj/item/clothing/mask/gas/owl_mask":1,"/obj/item/clothing/suit/apron":1,"/obj/item/clothing/under/waiter":1,"/obj/item/clothing/under/pirate":1,"/obj/item/clothing/suit/pirate":1,"/obj/item/clothing/head/pirate":1,"/obj/item/clothing/head/bandana":1,"/obj/item/clothing/under/soviet":1,"/obj/item/clothing/head/ushanka":1,"/obj/item/clothing/suit/imperium_monk":1,"/obj/item/clothing/mask/gas/cyborg":1,"/obj/item/clothing/suit/holidaypriest":1,"/obj/item/clothing/head/wizard/marisa/fake":1,"/obj/item/clothing/suit/wizrobe/marisa/fake":1,"/obj/item/clothing/under/sundress":1,"/obj/item/clothing/head/witchwig":1,"/obj/item/weapon/staff/broom":1,"/obj/item/clothing/suit/wizrobe/fake":1,"/obj/item/clothing/head/wizard/fake":1,"/obj/item/weapon/staff":3,"/obj/item/clothing/mask/gas/sexyclown":1,"/obj/item/clothing/under/sexyclown":1,"/obj/item/clothing/mask/gas/sexymime":1,"/obj/item/clothing/under/sexymime":1,"/obj/item/clothing/suit/apron/overalls":1,"/obj/item/clothing/head/rabbitears":1},"coin":null,"extendedInventory":0,"panelOpen":0,"productData":[{"amount":1,"name":"Chicken Suit","price":null,"displayColor":"blue","itself":"[0x2100c000]","path":"/obj/item/clothing/suit/chickensuit"},{"amount":1,"name":"chicken suit head","price":null,"displayColor":"red","itself":"[0x2100bfff]","path":"/obj/item/clothing/head/chicken"},{"amount":1,"name":"corgi suit head","price":null,"displayColor":"blue","itself":"[0x2100bffe]","path":"/obj/item/clothing/head/corgi"},{"amount":1,"name":"Chicken Suit","price":null,"displayColor":"blue","itself":"[0x2100bffd]","path":"/obj/item/clothing/suit/corgisuit"},{"amount":1,"name":"gladiator uniform","price":null,"displayColor":"green","itself":"[0x2100bffc]","path":"/obj/item/clothing/under/gladiator"},{"amount":1,"name":"gladiator helmet","price":null,"displayColor":"red","itself":"[0x2100bffb]","path":"/obj/item/clothing/head/helmet/gladiator"},{"amount":1,"name":"captain`s suit","price":null,"displayColor":"blue","itself":"[0x2100bffa]","path":"/obj/item/clothing/under/gimmick/rank/captain/suit"},{"amount":1,"name":"flat cap","price":null,"displayColor":"green","itself":"[0x2100bff9]","path":"/obj/item/clothing/head/flatcap"},{"amount":1,"name":"Green Glasses","price":null,"displayColor":"green","itself":"[0x2100bff8]","path":"/obj/item/clothing/glasses/gglasses"},{"amount":1,"name":"jackboots","price":null,"displayColor":"green","itself":"[0x2100bff7]","path":"/obj/item/clothing/shoes/jackboots"},{"amount":1,"name":"schoolgirl uniform","price":null,"displayColor":"red","itself":"[0x2100bff6]","path":"/obj/item/clothing/under/schoolgirl"},{"amount":1,"name":"kitty ears","price":null,"displayColor":"green","itself":"[0x2100bff5]","path":"/obj/item/clothing/head/kitty"},{"amount":1,"name":"black skirt","price":null,"displayColor":"red","itself":"[0x2100bff4]","path":"/obj/item/clothing/under/blackskirt"},{"amount":1,"name":"beret","price":null,"displayColor":"blue","itself":"[0x2100bff3]","path":"/obj/item/clothing/head/beret"},{"amount":1,"name":"waistcoat","price":null,"displayColor":"blue","itself":"[0x2100bff2]","path":"/obj/item/clothing/suit/wcoat"},{"amount":1,"name":"black suit","price":null,"displayColor":"red","itself":"[0x2100bff1]","path":"/obj/item/clothing/under/suit_jacket"},{"amount":1,"name":"sturdy top-hat","price":null,"displayColor":"blue","itself":"[0x2100bff0]","path":"/obj/item/clothing/head/that"},{"amount":1,"name":"cueball helmet","price":null,"displayColor":"green","itself":"[0x2100bfef]","path":"/obj/item/clothing/head/cueball"},{"amount":1,"name":"white suit","price":null,"displayColor":"green","itself":"[0x2100bfee]","path":"/obj/item/clothing/under/scratch"},{"amount":1,"name":"kilt","price":null,"displayColor":"blue","itself":"[0x2100bfed]","path":"/obj/item/clothing/under/kilt"},{"amount":1,"name":"monocle","price":null,"displayColor":"green","itself":"[0x2100bfec]","path":"/obj/item/clothing/glasses/monocle"},{"amount":1,"name":"bowler-hat","price":null,"displayColor":"red","itself":"[0x2100bfeb]","path":"/obj/item/clothing/head/bowler"},{"amount":1,"name":"cane","price":null,"displayColor":"red","itself":"[0x2100bfea]","path":"/obj/item/weapon/cane"},{"amount":1,"name":"amish suit","price":null,"displayColor":"green","itself":"[0x2100bfe9]","path":"/obj/item/clothing/under/sl_suit"},{"amount":1,"name":"fake moustache","price":null,"displayColor":"green","itself":"[0x2100bfe8]","path":"/obj/item/clothing/mask/fakemoustache"},{"amount":1,"name":"Plague doctor suit","price":null,"displayColor":"red","itself":"[0x2100bfe7]","path":"/obj/item/clothing/suit/bio_suit/plaguedoctorsuit"},{"amount":1,"name":"plague doctor`s hat","price":null,"displayColor":"blue","itself":"[0x2100bfe6]","path":"/obj/item/clothing/head/plaguedoctorhat"},{"amount":1,"name":"plague doctor mask","price":null,"displayColor":"blue","itself":"[0x2100bfe5]","path":"/obj/item/clothing/mask/gas/plaguedoctor"},{"amount":1,"name":"owl uniform","price":null,"displayColor":"green","itself":"[0x2100bfe4]","path":"/obj/item/clothing/under/owl"},{"amount":1,"name":"owl mask","price":null,"displayColor":"red","itself":"[0x2100bfe3]","path":"/obj/item/clothing/mask/gas/owl_mask"},{"amount":1,"name":"apron","price":null,"displayColor":"red","itself":"[0x2100bfe2]","path":"/obj/item/clothing/suit/apron"},{"amount":1,"name":"waiter`s outfit","price":null,"displayColor":"red","itself":"[0x2100bfe1]","path":"/obj/item/clothing/under/waiter"},{"amount":1,"name":"pirate outfit","price":null,"displayColor":"green","itself":"[0x2100bfe0]","path":"/obj/item/clothing/under/pirate"},{"amount":1,"name":"pirate coat","price":null,"displayColor":"red","itself":"[0x2100bfdf]","path":"/obj/item/clothing/suit/pirate"},{"amount":1,"name":"pirate hat","price":null,"displayColor":"blue","itself":"[0x2100bfde]","path":"/obj/item/clothing/head/pirate"},{"amount":1,"name":"pirate bandana","price":null,"displayColor":"blue","itself":"[0x2100bfdd]","path":"/obj/item/clothing/head/bandana"},{"amount":1,"name":"soviet uniform","price":null,"displayColor":"red","itself":"[0x2100bfdc]","path":"/obj/item/clothing/under/soviet"},{"amount":1,"name":"ushanka","price":null,"displayColor":"blue","itself":"[0x2100bfdb]","path":"/obj/item/clothing/head/ushanka"},{"amount":1,"name":"Imperium monk","price":null,"displayColor":"green","itself":"[0x2100bfda]","path":"/obj/item/clothing/suit/imperium_monk"},{"amount":1,"name":"cyborg visor","price":null,"displayColor":"green","itself":"[0x2100bfd9]","path":"/obj/item/clothing/mask/gas/cyborg"},{"amount":1,"name":"Holiday Priest","price":null,"displayColor":"green","itself":"[0x2100bfd8]","path":"/obj/item/clothing/suit/holidaypriest"},{"amount":1,"name":"Witch Hat","price":null,"displayColor":"red","itself":"[0x2100bfd7]","path":"/obj/item/clothing/head/wizard/marisa/fake"},{"amount":1,"name":"Witch Robe","price":null,"displayColor":"blue","itself":"[0x2100bfd6]","path":"/obj/item/clothing/suit/wizrobe/marisa/fake"},{"amount":1,"name":"sundress","price":null,"displayColor":"blue","itself":"[0x2100bfd5]","path":"/obj/item/clothing/under/sundress"},{"amount":1,"name":"witch costume wig","price":null,"displayColor":"green","itself":"[0x2100bfd4]","path":"/obj/item/clothing/head/witchwig"},{"amount":1,"name":"broom","price":null,"displayColor":"blue","itself":"[0x2100bfd3]","path":"/obj/item/weapon/staff/broom"},{"amount":1,"name":"wizard robe","price":null,"displayColor":"green","itself":"[0x2100bfd2]","path":"/obj/item/clothing/suit/wizrobe/fake"},{"amount":1,"name":"wizard hat","price":null,"displayColor":"blue","itself":"[0x2100bfd1]","path":"/obj/item/clothing/head/wizard/fake"},{"amount":3,"name":"wizards staff","price":null,"displayColor":"green","itself":"[0x2100bfd0]","path":"/obj/item/weapon/staff"},{"amount":1,"name":"sexy-clown wig and mask","price":null,"displayColor":"green","itself":"[0x2100bfcf]","path":"/obj/item/clothing/mask/gas/sexyclown"},{"amount":1,"name":"sexy-clown suit","price":null,"displayColor":"red","itself":"[0x2100bfce]","path":"/obj/item/clothing/under/sexyclown"},{"amount":1,"name":"sexy mime mask","price":null,"displayColor":"blue","itself":"[0x2100bfcd]","path":"/obj/item/clothing/mask/gas/sexymime"},{"amount":1,"name":"sexy mime outfit","price":null,"displayColor":"green","itself":"[0x2100bfcc]","path":"/obj/item/clothing/under/sexymime"},{"amount":1,"name":"coveralls","price":null,"displayColor":"red","itself":"[0x2100bfcb]","path":"/obj/item/clothing/suit/apron/overalls"},{"amount":1,"name":"rabbit ears","price":null,"displayColor":"blue","itself":"[0x2100bfca]","path":"/obj/item/clothing/head/rabbitears"}],"premiumData":[{"amount":1,"name":"pirate captain coat","price":null,"displayColor":"red","itself":"[0x2100bfc4]","path":"/obj/item/clothing/suit/hgpirate"},{"amount":1,"name":"pirate hat","price":null,"displayColor":"blue","itself":"[0x2100bfc3]","path":"/obj/item/clothing/head/hgpiratecap"},{"amount":1,"name":"roman helmet","price":null,"displayColor":"blue","itself":"[0x2100bfc2]","path":"/obj/item/clothing/head/helmet/roman"},{"amount":1,"name":"roman legionaire helmet","price":null,"displayColor":"red","itself":"[0x2100bfc1]","path":"/obj/item/clothing/head/helmet/roman/legionaire"},{"amount":1,"name":"roman armor","price":null,"displayColor":"green","itself":"[0x2100bfc0]","path":"/obj/item/clothing/under/roman"},{"amount":1,"name":"roman sandals","price":null,"displayColor":"red","itself":"[0x2100bfbf]","path":"/obj/item/clothing/shoes/roman"},{"amount":1,"name":"roman shield","price":null,"displayColor":"green","itself":"[0x2100bfbe]","path":"/obj/item/weapon/shield/riot/roman"}],"contrabandData":[{"amount":1,"name":"cardborg suit","price":null,"displayColor":"blue","itself":"[0x2100bfc9]","path":"/obj/item/clothing/suit/cardborg"},{"amount":1,"name":"cardborg helmet","price":null,"displayColor":"red","itself":"[0x2100bfc8]","path":"/obj/item/clothing/head/cardborg"},{"amount":1,"name":"judge`s robe","price":null,"displayColor":"blue","itself":"[0x2100bfc7]","path":"/obj/item/clothing/suit/judgerobe"},{"amount":1,"name":"powdered wig","price":null,"displayColor":"red","itself":"[0x2100bfc6]","path":"/obj/item/clothing/head/powdered_wig"},{"amount":1,"name":"wand of nothing","price":null,"displayColor":"green","itself":"[0x2100bfc5]","path":"/obj/item/weapon/gun/magic/wand"}],"ui":{"status":2,"user":{"name":"Henry Sidower"}}}'>
+	<body scroll=auto data-url-parameters='{"src":"[0x2100e3fe]"}' data-template-data='{"main":"vending.tmpl"}' data-initial-data='{"premiumItems":[],"contraband":{"/obj/item/weapon/reagent_containers/food/snacks/syndicake":6},"products":{"/obj/item/weapon/reagent_containers/food/snacks/candy":6,"/obj/item/weapon/reagent_containers/food/drinks/dry_ramen":6,"/obj/item/weapon/reagent_containers/food/snacks/chips":6,"/obj/item/weapon/reagent_containers/food/snacks/sosjerky":6,"/obj/item/weapon/reagent_containers/food/snacks/no_raisin":6,"/obj/item/weapon/reagent_containers/food/snacks/spacetwinkie":6,"/obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers":6},"coin":null,"extendedInventory":0,"panelOpen":0,"productData":[{"amount":6,"name":"candy","price":20,"displayColor":"red","itself":"[0x2100ac7a]","path":"/obj/item/weapon/reagent_containers/food/snacks/candy"},{"amount":6,"name":"Cup Ramen","price":30,"displayColor":"green","itself":"[0x2100ac77]","path":"/obj/item/weapon/reagent_containers/food/drinks/dry_ramen"},{"amount":6,"name":"chips","price":25,"displayColor":"green","itself":"[0x2100ac74]","path":"/obj/item/weapon/reagent_containers/food/snacks/chips"},{"amount":6,"name":"Scaredy`s Private Reserve Beef Jerky","price":30,"displayColor":"blue","itself":"[0x2100ac71]","path":"/obj/item/weapon/reagent_containers/food/snacks/sosjerky"},{"amount":6,"name":"4no Raisins","price":20,"displayColor":"blue","itself":"[0x2100ac6e]","path":"/obj/item/weapon/reagent_containers/food/snacks/no_raisin"},{"amount":6,"name":"Space Twinkie","price":30,"displayColor":"blue","itself":"[0x2100ac6b]","path":"/obj/item/weapon/reagent_containers/food/snacks/spacetwinkie"},{"amount":6,"name":"Cheesie Honkers","price":25,"displayColor":"red","itself":"[0x2100ac68]","path":"/obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers"}],"premiumData":[],"contrabandData":[{"amount":6,"name":"Syndi-Cakes","price":null,"displayColor":"green","itself":"[0x2100ac64]","path":"/obj/item/weapon/reagent_containers/food/snacks/syndicake"}],"ui":{"status":2,"user":{"name":"Rhetta Butterfill"}}}'>
 		<script type='text/javascript'>
 			function receiveUpdateData(jsonString)
 			{
diff --git a/nano/templates/firealarm.tmpl b/nano/templates/firealarm.tmpl
index f0c84cd8893..40aed5a6430 100644
--- a/nano/templates/firealarm.tmpl
+++ b/nano/templates/firealarm.tmpl
@@ -8,7 +8,7 @@ YOU HAVE TO PUT THIS FILE INTO "send_resources" CLIENT PROC! ELSE IT WON'T WORK!
 		Fire Alarm:
 	</div>
 	<div class="itemContent">
-			{^{:~link('Activated', 'lightbulb', {'alarm': 1}, fire ? 'selected' : null)}}{^{:~link('Deactivated', 'lightbulb', {'reset': 1}, fire ? null : 'selected')}}
+			{{:~link('Activated', 'lightbulb', {'alarm': 1}, fire ? 'selected' : null)}}{{:~link('Deactivated', 'lightbulb', {'reset': 1}, fire ? null : 'selected')}}
 	</div>
 </div>
 <div class="item">
@@ -16,12 +16,12 @@ YOU HAVE TO PUT THIS FILE INTO "send_resources" CLIENT PROC! ELSE IT WON'T WORK!
 		Security Level:
 	</div>
 	<div class="itemContentSmall">
-		{^{if securityLevel == "GREEN"}}
-			<span class='good'>{^{:securityLevel}}</span>
+		{{if securityLevel == "GREEN"}}
+			<span class='good'>{{:securityLevel}}</span>
 		{{else securityLevel == "BLUE"}}
-			<font color="lightblue">{^{:securityLevel}}</font>
+			<font color="lightblue">{{:securityLevel}}</font>
 		{{else}}
-			<span class='bad'>{^{:securityLevel}}</span>
+			<span class='bad'>{{:securityLevel}}</span>
 		{{/if}}
 	</div>
 </div>
@@ -30,21 +30,21 @@ YOU HAVE TO PUT THIS FILE INTO "send_resources" CLIENT PROC! ELSE IT WON'T WORK!
 		Timer System:
 	</div>
 	<div class="itemContentSmall">
-		{^{:~link('Initiate', 'play', {'time': 1}, timing ? 'selected' : null)}}
-		{^{:~link('Stop', 'pause', {'time': 0}, timing? null : 'selected')}}
+		{{:~link('Initiate', 'play', {'time': 1}, timing ? 'selected' : null)}}
+		{{:~link('Stop', 'pause', {'time': 0}, timing? null : 'selected')}}
 	</div>
 </div>
 <div class="item">
 	<div class="itemContent">
-		{^{if working}}
-			Time Left: <b>{^{:time}}</b>
+		{{if working}}
+			Time Left: <b>{{:time}}</b>
 		{{/if}}
 	</div>
 	<div class="itemContent">
 		Time Modifiers:
-		{^{:~link('30', 'minus', {'tp': -30}, null)}}
-		{^{:~link('1', 'minus', {'tp': -1}, null)}}
-		{^{:~link('1', 'plus', {'tp': +1}, null)}}
-		{^{:~link('30', 'plus', {'tp': +30}, null)}}
+		{{:~link('30', 'minus', {'tp': -30}, null)}}
+		{{:~link('1', 'minus', {'tp': -1}, null)}}
+		{{:~link('1', 'plus', {'tp': +1}, null)}}
+		{{:~link('30', 'plus', {'tp': +30}, null)}}
 	</div>
 </div>
diff --git a/nano/templates/vending.tmpl b/nano/templates/vending.tmpl
index 12e77cbda92..90b97c84fb9 100644
--- a/nano/templates/vending.tmpl
+++ b/nano/templates/vending.tmpl
@@ -1,6 +1,6 @@
-<div class="item">{^{:~link('Eject Coin', 'eject', {'remove_coin' : 1}, coin ? null : 'disabled', 'floatRight')}}
+<div class="item">{{:~link('Eject Coin', 'eject', {'remove_coin' : 1}, coin ? null : 'disabled', 'floatRight')}}
         <div class="floatRight">
-                {^{if !coin}}
+                {{if !coin}}
                         <div class="bad">No coin loaded.&nbsp;&nbsp;</div>
                 {{else}}
                         <div class="good">Coin Loaded.&nbsp;&nbsp;</div>
@@ -16,13 +16,13 @@
 <div class="statusDisplay" style="height: auto; overflow: auto;">
         <div class="item">
                 <div class="itemContent">
-                        {^{if products}}
+                        {{if products}}
                                 {{for productData}}
                                         <div class="fixedLeft" style="width: 500px;>
                                                 {{if amount}}
-                                                        {^{:~link('Vend', 'eject', {'vend': itself}, vendReady ? 'disabled' : null)}} <font color="{{:displayColor}}"> {{:name}} </font>- <b>{{:amount}}</b>-<b>{{:price}}</b>
+                                                        {{:~link('Vend', 'eject', {'vend': itself}, vendReady ? 'disabled' : null)}} <font color="{{:displayColor}}"> {{:name}} </font>- <b>{{:amount}}</b>-<b>{{:price}}</b>
                                                 {{else}}
-                                                        {^{:~link('Vend', 'eject', {'vend': itself}, 'disabled')}}<font color="{{:displayColor}}">{{:name}} - <font color="#cd6500"><i>Sold Out.</i></font></font>
+                                                        {{:~link('Vend', 'eject', {'vend': itself}, 'disabled')}}<font color="{{:displayColor}}">{{:name}} - <font color="#cd6500"><i>Sold Out.</i></font></font>
                                                 {{/if}}
                                         </div>
                                 {{/for}}
@@ -32,7 +32,7 @@
                 </div>
         </div>
 </div>
-{^{if coin}}
+{{if coin}}
 <hr>
 <div class="itemLabel">
 	Premium Items:
@@ -41,13 +41,13 @@
 <div class="statusDisplay" style="height: auto; overflow: auto;">
         <div class="item">
                 <div class="itemContent">
-                        {^{if products}}
+                        {{if products}}
                                 {{for premiumData}}
-                                        <div class="fixedLeft" style="width: 500px;>
+                                        <div class="fixedLeft" style="width: 500px";>
                                                 {{if amount}}
-                                                        {^{:~link('Vend', 'eject', {'vend': itself}, vendReady ? 'disabled' : null)}} <font color="{{:displayColor}}"> {{:name}} </font>- <b>{{:amount}}</b>-<b>{{:price}}</b>
+                                                        {{:~link('Vend', 'eject', {'vend': itself}, vendReady ? 'disabled' : null)}} <font color="{{:displayColor}}"> {{:name}} </font>- <b>{{:amount}}</b>-<b>{{:price}}</b>
                                                 {{else}}
-                                                        {^{:~link('Vend', 'eject', {'vend': itself}, 'disabled')}}<font color="{{:displayColor}}">{{:name}} - <font color="#cd6500"><i>Sold Out.</i></font></font>
+                                                        {{:~link('Vend', 'eject', {'vend': itself}, 'disabled')}}<font color="{{:displayColor}}">{{:name}} - <font color="#cd6500"><i>Sold Out.</i></font></font>
                                                 {{/if}}
                                         </div>
                                 {{/for}}
@@ -58,7 +58,7 @@
         </div>
 </div>
 {{/if}}
-{^{if extendedInventory}}
+{{if extendedInventory}}
 <div class="itemLabel">
 	Contraband:
 </div>
@@ -66,13 +66,13 @@
 	<div class="statusDisplay" style="height: auto; overflow: auto;">
 			<div class="item">
 					<div class="itemContent">
-							{^{if products}}
+							{{if products}}
 									{{for contrabandData}}
-											<div class="fixedLeft" style="width: 500px;>
+											<div class="fixedLeft" style="width: 500px";>
 													{{if amount}}
-															{^{:~link('Vend', 'eject', {'vend': itself}, vendReady ? 'disabled' : null)}} <font color="{{:displayColor}}"> {{:name}} </font>- <b>{{:amount}}</b>-<b>{{:price}}</b>
+															{{:~link('Vend', 'eject', {'vend': itself}, vendReady ? 'disabled' : null)}} <font color="{{:displayColor}}"> {{:name}} </font>- <b>{{:amount}}</b>-<b>{{:price}}</b>
 													{{else}}
-															{^{:~link('Vend', 'eject', {'vend': itself}, 'disabled')}}<font color="{{:displayColor}}">{{:name}} - <font color="#cd6500"><i>Sold Out.</i></font></font>
+															{{:~link('Vend', 'eject', {'vend': itself}, 'disabled')}}<font color="{{:displayColor}}">{{:name}} - <font color="#cd6500"><i>Sold Out.</i></font></font>
 													{{/if}}
 											</div>
 									{{/for}}
