diff --git a/data/magic-cockatrice-cs-ech-2.0.mse-export-template/README.txt b/data/magic-cockatrice-v2.mse-export-template/README.txt
similarity index 100%
rename from data/magic-cockatrice-cs-ech-2.0.mse-export-template/README.txt
rename to data/magic-cockatrice-v2.mse-export-template/README.txt
diff --git a/data/magic-cockatrice-cs-ech-2.0.mse-export-template/export-template b/data/magic-cockatrice-v2.mse-export-template/export-template
similarity index 95%
rename from data/magic-cockatrice-cs-ech-2.0.mse-export-template/export-template
rename to data/magic-cockatrice-v2.mse-export-template/export-template
index 2d7893109..380572a20 100644
--- a/data/magic-cockatrice-cs-ech-2.0.mse-export-template/export-template
+++ b/data/magic-cockatrice-v2.mse-export-template/export-template
@@ -1,9 +1,9 @@
 mse version: 0.3.8
 short name: Cockatrice
-full name: CS/ECH 2.0
+full name: Exporter v2.0
 position hint: 007
 icon: icon.png
-version: 2023-01-22
+version: 2023-02-05
 installer group: magic/Export/cockatrice
 
 depends on:
@@ -21,7 +21,7 @@ file type: *.xml|*.xml|*.*|*.*
 option field:
 	type: choice
 	name: info
-	choice: CS/ECH 2.0, guide: https://tinyurl.com/ctexportv2
+	choice: Updated 2023/02, guide: https://tinyurl.com/ctexportv2
 option field:
 	type: text
 	name: cockatrice Set Type
@@ -148,10 +148,10 @@ script:
 		replace@(match:"!",replace: "") + #blank out the command ender
 
 		#for every other card name, surround it with reverse-related tags and put in relevant attributes
-		{for each entry in (break_text(match:related_entry_regex, input)) do ("\<reverse-related" + add_related_count(entry)  + add_attachment(entry) + add_persistent(entry) + ">" + xml_escape(strip_card_name(entry)) + "\</reverse-related>\n")}
+		{for each entry in (break_text(match:related_entry_regex, input)) do ("\n      \<reverse-related" + add_related_count(entry)  + add_attachment(entry) + add_persistent(entry) + ">" + xml_escape(strip_card_name(entry)) + "\</reverse-related>")}
 
 	#remove accidentily created empty <reverse-related> XML blocks
-	remove_empty := replace@(match:"\<(reverse-)?related>\</(reverse-)?related>", replace:"")
+	remove_empty := replace@(match:"        \<(reverse-)?related>\</(reverse-)?related>", replace:"")
 
 	#convert the !token command field to <related> XML blocks
 	convert_token :=
@@ -162,7 +162,7 @@ script:
 		replace@(match:"!",replace: "") + #blank out the command ender
 
 		#for every other card name, surround it with reverse-related tags and put in relevant attributes
-		{for each entry in (break_text(match:related_entry_regex, input)) do ("\<related" + add_related_count(entry)  + add_attachment(entry) + add_persistent(entry) + ">" + xml_escape(strip_card_name(entry)) + "\</related>\n")}
+		{for each entry in (break_text(match:related_entry_regex, input)) do ("\n      \<related" + add_related_count(entry)  + add_attachment(entry) + add_persistent(entry) + ">" + xml_escape(strip_card_name(entry)) + "\</related>")}
 
 
 	filter_related := filter_text@(match:"!relate ?[^!]+!?")
@@ -258,7 +258,7 @@ script:
 		+ CIPT()
 		# Rules Text
 		+"\n      "+"\<text>"+xml_escape(card_rules_text())+"\</text>"
-		+ (if filter_token(card.notes) != "" then remove_empty("\n      " + convert_token(filter_token(card.notes))))
+		+ (if filter_token(card.notes) != "" then remove_empty(convert_token(filter_token(card.notes))))
 		+"\n    "+"\</card>"
 	}
 	write_token := {
@@ -290,10 +290,10 @@ script:
 		# Rules Text
 		+"\n      "+"\<text>"+xml_escape(card_rules_text())+"\</text>"
 		# Token
-		+ "\n     "+"\<token>1\</token>"
+		+ "\n      "+"\<token>1\</token>"
 		# Reverse Related
 		#if there is a !related block in the cards notes, set up the reverse-related XML elements
-		+ (if filter_related(card.notes) != "" then remove_empty("\n     " + convert_related(filter_related(card.notes))))
+		+ (if filter_related(card.notes) != "" then remove_empty(convert_related(filter_related(card.notes))))
 		+"\n    "+"\</card>"
 	}
 	write_flip := {
@@ -365,7 +365,7 @@ script:
 			+"\</tablerow>"
 		# Rules Text
 		+"\n      "+"\<text>"+xml_escape(card_rules_text()+"\n--- \n"+card_rules_text_2())+"\</text>"
-		+ (if filter_token(card.notes) != "" then remove_empty("\n      " + convert_token(filter_token(card.notes))))
+		+ (if filter_token(card.notes) != "" then remove_empty(convert_token(filter_token(card.notes))))
 		+"\n    "+"\</card>"
 	}
 	write_double := {
@@ -409,7 +409,7 @@ script:
 		+"\n---\n(Back): "+strip_card_name(card.name_2))+"\</text>"
 		# Name of the related card
 		+"\n      "+"\<related attach=\"attach\">"+xml_escape(strip_card_name(card.name_2))+"\</related>"
-		+ (if filter_token(card.notes) != "" then remove_empty("\n      " + convert_token(filter_token(card.notes))))
+		+ (if filter_token(card.notes) != "" then remove_empty(convert_token(filter_token(card.notes))))
 		+"\n    "+"\</card>"
 		+"\n    "+"\<card>"
 		# Name II
@@ -449,7 +449,7 @@ script:
 		# Rules Text II
 		+"\n      "+"\<text>"+xml_escape(card_rules_text_2()
 		+"\n---\n(Front): "+strip_card_name(card_name()))+"\</text>"
-		+ (if filter_token(card.notes) != "" then remove_empty("\n      " + convert_token(filter_token(card.notes))))
+		+ (if filter_token(card.notes) != "" then remove_empty(convert_token(filter_token(card.notes))))
 		+"\n    "+"\</card>"
 	}
 
@@ -507,7 +507,7 @@ script:
 			+(if card.loyalty_cost_4 !="" then ": ")
 			+(if contains(paragraph_count(card.rule_text), match:"•••") then split_text(match:"\n", card.rule_text).3)))
 		+"\</text>"
-		+ (if filter_token(card.notes) != "" then remove_empty("\n      " + convert_token(filter_token(card.notes))))
+		+ (if filter_token(card.notes) != "" then remove_empty(convert_token(filter_token(card.notes))))
 		+"\n    "+"\</card>"
 	}
 	write_double_walker := {
@@ -566,7 +566,7 @@ script:
 		+"\n---\n(Back): "+strip_card_name(card.name_2))+"\</text>"
 		# Name of the related card
 		+"\n      "+"\<related attach=\"attach\">"+xml_escape(strip_card_name(card.name_2))+"\</related>"
-		+ (if filter_token(card.notes) != "" then remove_empty("\n      " + convert_token(filter_token(card.notes))))
+		+ (if filter_token(card.notes) != "" then remove_empty(convert_token(filter_token(card.notes))))
 		+"\n    "+"\</card>"
 		+"\n    "+"\<card>"
 		# Name II
@@ -620,7 +620,7 @@ script:
 			+(if contains(paragraph_count(card.rule_text_2), match:"••") then split_text(match:"\n", card.rule_text_2).2)
 		+(if contains(paragraph_count(card.rule_text_2), match:"•••") then "\n"))
 		+"\n---\n(Front): "+strip_card_name(card_name()))+"\</text>"
-		+ (if filter_token(card.notes) != "" then remove_empty("\n      " + convert_token(filter_token(card.notes))))
+		+ (if filter_token(card.notes) != "" then remove_empty(convert_token(filter_token(card.notes))))
 		+"\n    "+"\</card>"
 	}
 	write_sparker := {
@@ -664,7 +664,7 @@ script:
 		+"\n---\n(Back): "+strip_card_name(card.name_2))+"\</text>"
 		# Name of the related card
 		+"\n      "+"\<related attach=\"attach\">"+xml_escape(strip_card_name(card.name_2))+"\</related>"
-		+ (if filter_token(card.notes) != "" then remove_empty("\n      " + convert_token(filter_token(card.notes))))
+		+ (if filter_token(card.notes) != "" then remove_empty(convert_token(filter_token(card.notes))))
 		+"\n    "+"\</card>"
 		+"\n    "+"\<card>"
 		# Name II
@@ -718,7 +718,7 @@ script:
 			+(if contains(paragraph_count(card.rule_text_2), match:"••") then split_text(match:"\n", card.rule_text_2).2)
 		+(if contains(paragraph_count(card.rule_text_2), match:"•••") then "\n"))
 		+"\n---\n(Front): "+strip_card_name(card_name()))+"\</text>"
-		+ (if filter_token(card.notes) != "" then remove_empty("\n      " + convert_token(filter_token(card.notes))))
+		+ (if filter_token(card.notes) != "" then remove_empty(convert_token(filter_token(card.notes))))
 		+"\n    "+"\</card>"
 	}
 	write_sacrificer := {
@@ -777,7 +777,7 @@ script:
 		+"\n---\n(Back): "+strip_card_name(card.name_2))+"\</text>"
 		# Name of the related card
 		+"\n      "+"\<related attach=\"attach\">"+xml_escape(strip_card_name(card.name_2))+"\</related>"
-		+ (if filter_token(card.notes) != "" then remove_empty("\n      " + convert_token(filter_token(card.notes))))
+		+ (if filter_token(card.notes) != "" then remove_empty(convert_token(filter_token(card.notes))))
 		+"\n    "+"\</card>"
 		+"\n    "+"\<card>"
 		# Name II
@@ -817,7 +817,7 @@ script:
 		# Rules Text II
 		+"\n      "+"\<text>"+xml_escape(card_rules_text_2()
 		+"\n---\n(Front): "+strip_card_name(card_name()))+"\</text>"
-		+ (if filter_token(card.notes) != "" then remove_empty("\n      " + convert_token(filter_token(card.notes))))
+		+ (if filter_token(card.notes) != "" then remove_empty(convert_token(filter_token(card.notes))))
 		+"\n    "+"\</card>"
 	}
 	write_leveler := {
@@ -869,7 +869,7 @@ script:
 		 +(if card.pt_3 != "" then "\n"+card.pt_3)
 		 +"\n"+card.rule_text_3)
 		+"\</text>"
-		+ (if filter_token(card.notes) != "" then remove_empty("\n      " + convert_token(filter_token(card.notes))))
+		+ (if filter_token(card.notes) != "" then remove_empty(convert_token(filter_token(card.notes))))
 		+"\n    "+"\</card>"
 	}
 
diff --git a/data/magic-cockatrice-cs-ech-2.0.mse-export-template/icon.png b/data/magic-cockatrice-v2.mse-export-template/icon.png
similarity index 100%
rename from data/magic-cockatrice-cs-ech-2.0.mse-export-template/icon.png
rename to data/magic-cockatrice-v2.mse-export-template/icon.png