diff --git a/data/chs.mse-locale/locale b/data/chs.mse-locale/locale
index 6119f03c..c6b3dc63 100644
--- a/data/chs.mse-locale/locale
+++ b/data/chs.mse-locale/locale
@@ -1,4 +1,4 @@
-mse version: 0.3.6
+mse version: 0.3.7
 installer group: translations/Simplified Chinese
 full name: 简体中文 (Simplified Chinese)
 version: 2008-07-03
@@ -75,6 +75,7 @@ menu:
 	style tab:		风格选择	F7
 	keywords tab:		关键词	F8
 	stats tab:		统计结果	F9
+#_ADD	random pack tab:	&Random Packs
 	
 	help:			帮助
 	index:			索引...	F1
@@ -182,12 +183,21 @@ help:
 	style tab:		改变卡牌样式
 	keywords tab:		定义本套牌额外的关键词
 	stats tab:		显示本套牌的统计情况
+#_ADD	random pack tab:	Try how the set works out in practice by generating random booster packs.
 	
 	help:		
 	index:			
 	website:			
 	about:				
 	
+	# Cards panel
+#_ADD	collapse notes:		Hide the card notes box
+#_ADD	expand notes:		Show the card notes box
+	# Random pack panel
+#_ADD	random seed:		Different packs will be generated each time.
+#_ADD	fixed seed:			Using the same seed number gives the same 'random' packs.
+#_ADD	seed:				Seed number for the random generator. Using the same seed number gives the same 'random' packs.
+	
 	# Preferences
 	app language:
 		注意: 你必须重新启动MSE才能使语言修改生效
@@ -273,6 +283,7 @@ tool:
 	style tab:		风格样式
 	keywords tab:		关键词
 	stats tab:		统计结果
+#_ADD	random pack tab:	Random
 	
 	# symbol editor
 	store symbol:		储存
@@ -317,6 +328,7 @@ tooltip:
 	style tab:		风格样式	
 	keywords tab:		关键词
 	stats tab:		统计结果
+#_ADD	random pack tab:	Random packs
 	
 	new set:		新建套牌
 	open set:		打开套牌
@@ -407,6 +419,11 @@ label:
 	# Style tab
 	styling options:	样式选项
 	
+	# Random pack panel
+#_ADD	pack selection:		Pack selection
+#_ADD	pack totals:		Totals
+#_ADD	seed:				Seed
+	
 	# Open dialogs
 	all files		全部文件
 	
@@ -464,9 +481,23 @@ label:
 	original:		原始:
 	result:			结果:
 	size:			大小
+#_ADD	original size:			&Original Size
+#_ADD	size to fit:			Size to &Fit
+#_ADD	force to fit:			F&orce to Fit
+#_ADD	custom size:			&Custom Size
 	selection:		选取
+#_ADD	selection left:			&Left
+#_ADD	selection top:			&Top
+#_ADD	selection width:		&Width
+#_ADD	selection height:		&Height
 	zoom:			缩放
+#_ADD	fix aspect ratio:		Fix aspect ratio (width/height)
+#_ADD	zoom amount:			Zoom
+#_ADD	zoom amount x:			Zoom &X
+#_ADD	zoom amount y:			Zoom &Y
+#_ADD	zoom %:					%
 	filter:			过滤
+#_ADD	sharpen filter:			&Sharpen filter
 	
 	# Auto replace
 	auto match:		匹配
@@ -503,6 +534,11 @@ button:
 	insert parameter:	插入参数...
 	refer parameter:	提交参数...
 	
+	# Random pack panel
+#_ADD	generate pack:		&Generate Pack
+#_ADD	random seed:		&Random Seed
+#_ADD	fixed seed:			&Fixed Seed
+	
 	# Welcome
 	new set:		新建套牌
 	open set:		打开套牌
@@ -717,6 +753,7 @@ error:
 		推荐你升级到最新版本
 		浏览官方网站 http:://magicseteditor.sourceforge.net/
 	word list type not found:	词语列表类型 %s 没有找到 （从<word-list> 标签中）
+#_ADD	pack item not found:				The pack item "%s" was not found (from a pack type)
 	
 	# Update checking
 	checking updates failed:	检查更新失败。
@@ -768,6 +805,7 @@ type:
 	set:			套牌
 	stylesheet:		样式表
 	export template:export  模板
+#_ADD	symbol:			symbol
 	card:			卡牌
 	cards:			多张卡牌
 	field:			区域
@@ -798,8 +836,8 @@ type:
 	points:			多个控制点
 
 ############################################################## Magic
-game:
-	magic:
+package:
+	magic.mse-game:
 		# Card fields
 		name:		名称
 		cc:		总费用
@@ -849,11 +887,7 @@ game:
 		left align artist:		画家左对齐
 		inverted common symbol:		反转普通系列符号
 		
-stylesheet:
-	magic-new:
-		
-symbol font:
-	magic-mana-small:
+	magic-mana-*.mse-symbol-font:
 		# note: reminder/shortcut must start with a space, otherwise it is used as a shortcut
 		#       so typing T *anywhere* would insert a symbol (which would be bad)
 		menu item T:		横置符号	 T
@@ -901,62 +935,4 @@ symbol font:
 		menu item B/G/W:	黑/绿/白 法术力	 B/G/W
 		menu item R/W/U:	红/白/蓝 法术力	 R/W/U
 		menu item G/U/B:	绿/蓝/黑 法术力	 G/U/B
-		menu item number hybrids:	数字混合法术力
-		menu item 2/W:	2/W
-		menu item 2/U:	2/U
-		menu item 2/B:	2/B
-		menu item 2/R:	2/R
-		menu item 2/G:	2/G
-	magic-mana-large:
-		# Exactly the same
-		menu item T:		横置符号	 T
-		menu item Q:		重置符号	 Q
-		menu item W:		白色法术力	 W
-		menu item U:		蓝色法术力	 U
-		menu item B:		黑色法术力	 B
-		menu item R:		红色法术力	 R
-		menu item G:		绿色法术力	 G
-		menu item S:		雪境法术力	 S
-		menu item X:		可变法术力 X	 X
-		menu item Y:		可变法术力 Y	 Y
-		menu item Z:		可变法术力 Z	 Z
-		menu item I:		无限法术力	 I
-		menu item colorless:	无色法术力...
-		title colorless:	无色法术力
-		message colorless:	输入无色法术力数量:
-		menu item half:		一半法术力
-		menu item |W:		白色法术力	 |W
-		menu item |U:		蓝色法术力	 |U
-		menu item |B:		黑色法术力	 |B
-		menu item |R:		红色法术力	 |R
-		menu item |G:		绿色法术力	 |G
-		menu item |S:		雪境法术力	 |S
-		menu item 1/2:		无色法术力	1/2
-		menu item hybrid:	混合法术力（双色）
-		menu item W/U:		白/蓝 法术力	 W/U
-		menu item U/B:		蓝/黑 法术力	 U/B
-		menu item B/R:		黑/红 法术力	 B/R
-		menu item R/G:		红/绿 法术力	 R/G
-		menu item G/W:		绿/白 法术力	 G/W
-		menu item W/B:		白/黑 法术力	 W/B
-		menu item U/R:		蓝/红 法术力	 U/R
-		menu item B/G:		黑/绿 法术力	 B/G
-		menu item R/W:		红/白 法术力	 R/W
-		menu item G/U:		绿/蓝 法术力	 G/U
-		menu item hybrid 3:	混合法术力（三色）
-		menu item W/U/B:	白/蓝/黑 法术力	 W/U/B
-		menu item U/B/R:	蓝/黑/红 法术力	 U/B/R
-		menu item B/R/G:	黑/红/绿 法术力	 B/R/G
-		menu item R/G/W:	红/绿/白 法术力	 R/G/W
-		menu item G/W/U:	绿/白/蓝 法术力	 G/W/U
-		menu item W/B/R:	白/黑/红 法术力	 W/B/R
-		menu item U/R/G:	蓝/红/绿 法术力	 U/R/G
-		menu item B/G/W:	黑/绿/白 法术力	 B/G/W
-		menu item R/W/U:	红/白/蓝 法术力	 R/W/U
-		menu item G/U/B:	绿/蓝/黑 法术力	 G/U/B
-		menu item number hybrids:	数字混合法术力
-		menu item 2/W:	2/W
-		menu item 2/U:	2/U
-		menu item 2/B:	2/B
-		menu item 2/R:	2/R
-		menu item 2/G:	2/G
+
diff --git a/data/de.mse-locale/locale b/data/de.mse-locale/locale
index 0d532a65..a1b56f6f 100644
--- a/data/de.mse-locale/locale
+++ b/data/de.mse-locale/locale
@@ -1,4 +1,4 @@
-mse version: 0.3.6
+mse version: 0.3.7
 installer group: translations/Deutsch
 full name: Deutsch
 version: 2008-07-24
@@ -15,9 +15,9 @@ menu:
 	export html:			&HTML...
 	export image:			Kartenb&ild...
 	export images:			Alle Kartenbilder...
-	check updates:		Nach Updates schauen...
 	export apprentice:		&Apprentice...
 	export mws:				Magic &Workstation...
+	check updates:		Nach Updates schauen...
 	print preview:		Druckvorschau...
 	print:				&Drucken...	Ctrl+P
 	reload data:		Daten neuladen	Ctrl+F5
@@ -75,6 +75,7 @@ menu:
 	style tab:			Aussehen	F7
 	keywords tab:		Fähigkeiten	F8
 	stats tab:			S&tatistik	F9
+#_ADD	random pack tab:	&Random Packs
 	
 	help:			&Hilfe
 	index:				&Index...	F1
@@ -182,12 +183,21 @@ help:
 	style tab:			Ändere das Aussehen der Karten
 	keywords tab:		Füge Fähigkeiten für diese Edition hinzu
 	stats tab:			Zeigt eine Statistik über diese Edition an
+#_ADD	random pack tab:	Try how the set works out in practice by generating random booster packs.
 	
 	help:
 	index:				
 	website:			
 	about:				
 	
+	# Cards panel
+#_ADD	collapse notes:		Hide the card notes box
+#_ADD	expand notes:		Show the card notes box
+	# Random pack panel
+#_ADD	random seed:		Different packs will be generated each time.
+#_ADD	fixed seed:			Using the same seed number gives the same 'random' packs.
+#_ADD	seed:				Seed number for the random generator. Using the same seed number gives the same 'random' packs.
+	
 	# Preferences
 	app language:
 		Bitte starten Sie MSE neu, damit die Änderungen wirksam werden.
@@ -273,6 +283,7 @@ tool:
 	style tab:			Aussehen
 	keywords tab:		Fähigkeiten
 	stats tab:			Statistik
+#_ADD	random pack tab:	Random
 	
 	# symbol editor
 	store symbol:		Übernehmen
@@ -317,6 +328,7 @@ tooltip:
 	style tab:			
 	keywords tab:		
 	stats tab:				
+#_ADD	random pack tab:	Random packs
 	
 	new set:			Neue Edition
 	open set:			Edition öffnen
@@ -407,6 +419,11 @@ label:
 	# Style tab
 	styling options:	Einstellungen zum Aussehen
 	
+	# Random pack panel
+#_ADD	pack selection:		Pack selection
+#_ADD	pack totals:		Totals
+#_ADD	seed:				Seed
+	
 	# Open dialogs
 	all files			Alle Dateien
 	
@@ -464,9 +481,23 @@ label:
 	original:			Original:
 	result:				Result:
 	size:				Größe
+#_ADD	original size:			&Original Size
+#_ADD	size to fit:			Size to &Fit
+#_ADD	force to fit:			F&orce to Fit
+#_ADD	custom size:			&Custom Size
 	selection:			Auswahl
+#_ADD	selection left:			&Left
+#_ADD	selection top:			&Top
+#_ADD	selection width:		&Width
+#_ADD	selection height:		&Height
 	zoom:				Zoom
+#_ADD	fix aspect ratio:		Fix aspect ratio (width/height)
+#_ADD	zoom amount:			Zoom
+#_ADD	zoom amount x:			Zoom &X
+#_ADD	zoom amount y:			Zoom &Y
+#_ADD	zoom %:					%
 	filter:				Filter
+#_ADD	sharpen filter:			&Sharpen filter
 	
 	# Auto replace
 	auto match:			Auswählen
@@ -503,6 +534,11 @@ button:
 	insert parameter:	Fähigkeit einfügen...
 	refer parameter:	Fähigkeit verwenden...
 	
+	# Random pack panel
+#_ADD	generate pack:		&Generate Pack
+#_ADD	random seed:		&Random Seed
+#_ADD	fixed seed:			&Fixed Seed
+	
 	# Welcome
 	new set:			Neue Edition
 	open set:			Edition öffnen
@@ -544,6 +580,7 @@ button:
 	whole word:			Nur ganze Wörter akzeptieren
 	
 	# Update checker
+	# Old style update checker  (NOTE: this will be removed in a feature version)
 	close:				&Beenden
 	
 	# Packages window
@@ -592,7 +629,6 @@ title:
 	export cancelled:		Export abgebrochen
 	export html:		Exportieren als HTML
 	save html:			Exportieren als HTML
-
 	# auto replace
 	auto replaces:		Automatisches Ersetzen
 	
@@ -674,9 +710,9 @@ error:
 		%s
 	package not found:			Package nicht gefunden: '%s'
 	package out of date:		Package '%s' (Version %s) ist nicht kompatibel, Version %s wird benötigt.
+	package too new:			Package '%s' (Version %s) ist nicht kompatibel mit Version %s, Version %s wird benötigt.
 	unable to open output file:	Fehler beim Speichern, kann Datei nicht öffnen
 	unable to store file:		Fehler beim Speichern, kann Datei nicht speichern
-	package too new:			Package '%s' (Version %s) ist nicht kompatibel mit Version %s, Version %s wird benötigt.
 	dependency not given:
 		Das Package '%s' verwendet Dateien vom Package '%s', aber es besitzt kein Abhängigkeitsverhältnis.
 		Bitte fügen Sie folgendes ein:
@@ -718,6 +754,7 @@ error:
 		Bitte laden Sie sich die neuste Version unter 
 		http:://magicseteditor.sourceforge.net/ herunter.
 	word list type not found:			%s ist nicht bei <Wortliste> gelistet
+#_ADD	pack item not found:				The pack item "%s" was not found (from a pack type)
 	
 	# Update checking
 	checking updates failed:			Update schlug fehl.
@@ -769,6 +806,7 @@ type:
 	set:			set
 	stylesheet:		stylesheet
 	export template:export template
+#_ADD	symbol:			symbol
 	card:			card
 	cards:			cards
 	field:			field
@@ -799,8 +837,8 @@ type:
 	points:			points
 
 ############################################################## Magic
-game:
-	magic:
+package:
+	magic.mse-game:
 		# Card fields
 		name:		Name
 		cc:			Manakosten
@@ -812,11 +850,8 @@ game:
 		# Set info
 		
 		# descriptions/help text
-stylesheet:
-	magic-new:
 		
-symbol font:
-	magic-mana-small:
+	magic-mana-*.mse-symbol-font:
 		# note: reminder/shortcut must start with a space, otherwise it is used as a shortcut
 		#       so typing T *anywhere* would insert a symbol (which would be bad)
 		menu item T:			&Tap Symbol	 T
@@ -830,51 +865,7 @@ symbol font:
 		menu item X:			Variables Mana &X	 X
 		menu item Y:			Variables Mana &Y	 Y
 		menu item Z:			Variables Mana &Z	 Z
-		menu item colorless:	&Farbloses Mana...
-		title colorless:		Farbloses Mana
-		message colorless:		Gib die Mana-Anzahl ein:
-		menu item half:				&Halbes Mana
-		menu item |W:				&Weiß	 |W
-		menu item |U:				Bla&u	 |U
-		menu item |B:				&Schwarz	 |B
-		menu item |R:				&Rot	 |R
-		menu item |G:				&Grün	 |G
-		menu item |S:				&Schnee	 |S
-		menu item 1/2:				&Farblos	1/2
-		menu item hybrid:		H&ybrid Mana (zweifarbig)
-		menu item W/U:				Weiß/Blau 	 W/U
-		menu item U/B:				Blau/Schwarz 	 U/B
-		menu item B/R:				Schwarz/Rot 	 B/R
-		menu item R/G:				Rot/Grün 	 R/G
-		menu item G/W:				Grün/Weiß 	 G/W
-		menu item W/B:				Weiß/Schwarz 	 W/B
-		menu item U/R:				Blau/Rot 	 U/R
-		menu item B/G:				Schwarz/Grün 	 B/G
-		menu item R/W:				Rot/Weiß 	 R/W
-		menu item G/U:				Grün/Blau 	 G/U
-		menu item hybrid 3:		H&ybrid Mana (dreifarbig)
-		menu item W/U/B:			Weiß/Blau/Schwarz 	 W/U/B
-		menu item U/B/R:			Blau/Schwarz/Rot 	 U/B/R
-		menu item B/R/G:			Schwarz/Rot/Grün 	 B/R/G
-		menu item R/G/W:			Rot/Grün/Weiß 	 R/G/W
-		menu item G/W/U:			Grün/Weiß/Blau 	 G/W/U
-		menu item W/B/R:			Weiß/Schwarz/Rot 	 W/B/R
-		menu item U/R/G:			Blau/Rot/Grün 	 U/R/G
-		menu item B/G/W:			Schwarz/Grün/Weiß 	 B/G/W
-		menu item R/W/U:			Rot/Weiß/Blau 	 R/W/U
-		menu item G/U/B:			Grün/Blau/Schwarz 	 G/U/B
-	magic-mana-large:
-		# Exactly the same
-		menu item T:			&Tap symbol	 T
-		menu item W:			&Weißes Mana	 W
-		menu item U:			Bl&aues Mana	 U
-		menu item B:			&Schwarzes Mana	 B
-		menu item R:			&Rotes Mana	 R
-		menu item G:			&Grünes Mana	 G
-		menu item S:			&Schnee Mana	 S
-		menu item X:			Variables Mana &X	 X
-		menu item Y:			Variables Mana &Y	 Y
-		menu item Z:			Variables Mana &Z	 Z
+#_ADD		menu item I:			&Infinite mana	I
 		menu item colorless:	&Farbloses Mana...
 		title colorless:		Farbloses Mana
 		message colorless:		Gib die Mana-Anzahl ein:
diff --git a/data/es.mse-locale/locale b/data/es.mse-locale/locale
index 5f5bca56..aa09c9f6 100644
--- a/data/es.mse-locale/locale
+++ b/data/es.mse-locale/locale
@@ -1,4 +1,4 @@
-mse version: 0.3.6
+mse version: 0.3.7
 installer group: translations/Español
 full name: Español
 version: 2008-05-31
@@ -75,6 +75,7 @@ menu:
 	style tab:			St&yle	F7
 	keywords tab:		&Palabras clave	F8
 	stats tab:			E&stadísticas	F9
+#_ADD	random pack tab:	&Random Packs
 	
 	help:			&Ayuda
 	index:				&Índice...	F1
@@ -182,12 +183,21 @@ help:
 	style tab:			Cambia el estilo de las cartas
 	keywords tab:		Define palabras clave extra para este set
 	stats tab:			Muestra las estadísticas de las cartas en el set
+#_ADD	random pack tab:	Try how the set works out in practice by generating random booster packs.
 	
 	help:
 	index:				
 	website:			
 	about:				
 	
+	# Cards panel
+#_ADD	collapse notes:		Hide the card notes box
+#_ADD	expand notes:		Show the card notes box
+	# Random pack panel
+#_ADD	random seed:		Different packs will be generated each time.
+#_ADD	fixed seed:			Using the same seed number gives the same 'random' packs.
+#_ADD	seed:				Seed number for the random generator. Using the same seed number gives the same 'random' packs.
+	
 	# Preferences
 	app language:
 		Note: Debes reiniciar MSE para que los cambios hagan efecto.
@@ -273,6 +283,7 @@ tool:
 	style tab:			Estilo
 	keywords tab:		Palabras clave
 	stats tab:			Estadísticas
+#_ADD	random pack tab:	Random
 	
 	# symbol editor
 	store symbol:		Almacenar
@@ -317,6 +328,7 @@ tooltip:
 	style tab:			
 	keywords tab:		
 	stats tab:			
+#_ADD	random pack tab:	Random packs
 	
 	new set:			Nuevo set
 	open set:			Abrir set
@@ -407,6 +419,11 @@ label:
 	# Style tab
 	styling options:	Opciones de estilo
 	
+	# Random pack panel
+#_ADD	pack selection:		Pack selection
+#_ADD	pack totals:		Totals
+#_ADD	seed:				Seed
+	
 	# Open dialogs
 	all files			Todos los archivos
 	
@@ -464,9 +481,23 @@ label:
 	original:			Original:
 	result:				Resultado:
 	size:				Tamaño
+#_ADD	original size:			&Original Size
+#_ADD	size to fit:			Size to &Fit
+#_ADD	force to fit:			F&orce to Fit
+#_ADD	custom size:			&Custom Size
 	selection:			Selección
+#_ADD	selection left:			&Left
+#_ADD	selection top:			&Top
+#_ADD	selection width:		&Width
+#_ADD	selection height:		&Height
 	zoom:				Zoom
+#_ADD	fix aspect ratio:		Fix aspect ratio (width/height)
+#_ADD	zoom amount:			Zoom
+#_ADD	zoom amount x:			Zoom &X
+#_ADD	zoom amount y:			Zoom &Y
+#_ADD	zoom %:					%
 	filter:				Filtro
+#_ADD	sharpen filter:			&Sharpen filter
 	
 	# Auto replace
 	auto match:			Match
@@ -503,6 +534,11 @@ button:
 	insert parameter:	Insertar parámetro...
 	refer parameter:	Usar parámetro...
 	
+	# Random pack panel
+#_ADD	generate pack:		&Generate Pack
+#_ADD	random seed:		&Random Seed
+#_ADD	fixed seed:			&Fixed Seed
+	
 	# Welcome
 	new set:			Nuevo set
 	open set:			Abrir set
@@ -717,6 +753,7 @@ error:
 		It is recommended that you upgrade to the latest version.
 		Visit http:://magicseteditor.sourceforge.net/
 	word list type not found:			The word list type %s was not found (from a <word-list> tag)
+#_ADD	pack item not found:				The pack item "%s" was not found (from a pack type)
 	
 	# Update checking
 	checking updates failed:			Checking updates failed.
@@ -768,6 +805,7 @@ type:
 	set:			set
 	stylesheet:		estilo
 	export template:plantilla de exportación
+#_ADD	symbol:			symbol
 	card:			carta
 	cards:			cartas
 	field:			field
@@ -798,8 +836,8 @@ type:
 	points:			puntos
 
 ############################################################## Magic
-game:
-	magic:
+package:
+	magic.mse-game:
 		# Card fields
 		name:		Nombre
 		cc:			CC
@@ -811,11 +849,8 @@ game:
 		# Set info
 		
 		# descriptions/help text
-stylesheet:
-	magic-new:
 		
-symbol font:
-	magic-mana-small:
+	magic-mana-*.mse-symbol-font:
 		# note: reminder/shortcut must start with a space, otherwise it is used as a shortcut
 		#       so typing T *anywhere* would insert a symbol (which would be bad)
 		menu item T:			&Símbolo de girar	 T
@@ -829,51 +864,7 @@ symbol font:
 		menu item X:			Maná variable &X	 X
 		menu item Y:			Maná variable &Y	 Y
 		menu item Z:			Maná variable &Z	 Z
-		menu item colorless:	&Maná incoloro...
-		title colorless:		Maná incoloro
-		message colorless:		Introducir cantidad de maná incoloro:
-		menu item half:				&Medio maná
-		menu item |W:				&Blanco	 |W
-		menu item |U:				Az&ul	 |U
-		menu item |B:				&Negro	 |B
-		menu item |R:				&Rojo	 |R
-		menu item |G:				&Verde	 |G
-		menu item |S:				&Nevado	 |S
-		menu item 1/2:				&Incoloro	1/2
-		menu item hybrid:		Maná híbrido (dos colores)
-		menu item W/U:				Maná Blanco/Azul	 W/U
-		menu item U/B:				Maná Azul/Negro	 U/B
-		menu item B/R:				Maná Negro/Rojo	 B/R
-		menu item R/G:				Maná Rojo/Verde	 R/G
-		menu item G/W:				Maná Verde/Blanco	 G/W
-		menu item W/B:				Maná Blanco/Negro	 W/B
-		menu item U/R:				Maná Azul/Rojo	 U/R
-		menu item B/G:				Maná Negro/Verde	 B/G
-		menu item R/W:				Maná Rojo/Blanco	 R/W
-		menu item G/U:				Maná Verde/Azul	 G/U
-		menu item hybrid 3:		Maná híbrido (tres colores)
-		menu item W/U/B:			Maná Blanco/Azul/Negro	 W/U/B
-		menu item U/B/R:			Maná Azul/Negro/Rojo	 U/B/R
-		menu item B/R/G:			Maná Negro/Rojo/Verde	 B/R/G
-		menu item R/G/W:			Maná Rojo/Verde/Blanco	 R/G/W
-		menu item G/W/U:			Maná Verde/Blanco/Azul	 G/W/U
-		menu item W/B/R:			Maná Blanco/Negro/Rojo	 W/B/R
-		menu item U/R/G:			Maná Azul/Rojo/Verde	 U/R/G
-		menu item B/G/W:			Maná Negro/Verde/Blanco	 B/G/W
-		menu item R/W/U:			Maná Rojo/Blanco/Azul	 R/W/U
-		menu item G/U/B:			Maná Verde/Azul/Negro	 G/U/B
-	magic-mana-large:
-		# Exactly the same
-		menu item T:			&Símbolo de girar	 T
-		menu item W:			&Maná blanco	 W
-		menu item U:			Maná az&ul	 U
-		menu item B:			&Maná negro	 B
-		menu item R:			&Maná rojo	 R
-		menu item G:			&Maná verde	 G
-		menu item S:			&Maná nevado	 S
-		menu item X:			Maná variable &X	 X
-		menu item Y:			Maná variable &Y	 Y
-		menu item Z:			Maná variable &Z	 Z
+#_ADD		menu item I:			&Infinite mana	I
 		menu item colorless:	&Maná incoloro...
 		title colorless:		Maná incoloro
 		message colorless:		Introducir cantidad de maná incoloro:
diff --git a/data/fr.mse-locale/locale b/data/fr.mse-locale/locale
index 9e390083..6904c594 100644
--- a/data/fr.mse-locale/locale
+++ b/data/fr.mse-locale/locale
@@ -1,4 +1,4 @@
-mse version: 0.3.6
+mse version: 0.3.7
 installer group: translations/Français
 full name: Français
 version: 2008-05-31
@@ -75,6 +75,7 @@ menu:
 	style tab:			St&yle	F7
 	keywords tab:		&Mot-clef	F8
 	stats tab:			S&tatistiques	F9
+#_ADD	random pack tab:	&Random Packs
 	
 	help:			&Aide
 	index:				&Index...	F1
@@ -182,12 +183,21 @@ help:
 	style tab:			Change the style of cards
 	keywords tab:		Define extra keywords for this set
 	stats tab:			Show statistics about the cards in the set
+#_ADD	random pack tab:	Try how the set works out in practice by generating random booster packs.
 	
 	help:
 	index:				
 	website:			
 	about:				
 	
+	# Cards panel
+#_ADD	collapse notes:		Hide the card notes box
+#_ADD	expand notes:		Show the card notes box
+	# Random pack panel
+#_ADD	random seed:		Different packs will be generated each time.
+#_ADD	fixed seed:			Using the same seed number gives the same 'random' packs.
+#_ADD	seed:				Seed number for the random generator. Using the same seed number gives the same 'random' packs.
+	
 	# Preferences
 	app language:
 		Note: You must restart MSE for the changes to take effect.
@@ -273,6 +283,7 @@ tool:
 	style tab:			Style
 	keywords tab:		Keywords
 	stats tab:			Statistics
+#_ADD	random pack tab:	Random
 	
 	# symbol editor
 	store symbol:		Store
@@ -317,6 +328,7 @@ tooltip:
 	style tab:			
 	keywords tab:		
 	stats tab:			
+#_ADD	random pack tab:	Random packs
 	
 	new set:			New set
 	open set:			Open set
@@ -407,6 +419,11 @@ label:
 	# Style tab
 	styling options:	Styling options
 	
+	# Random pack panel
+#_ADD	pack selection:		Pack selection
+#_ADD	pack totals:		Totals
+#_ADD	seed:				Seed
+	
 	# Open dialogs
 	all files			All files
 	
@@ -464,9 +481,23 @@ label:
 	original:			Original:
 	result:				Result:
 	size:				Size
+#_ADD	original size:			&Original Size
+#_ADD	size to fit:			Size to &Fit
+#_ADD	force to fit:			F&orce to Fit
+#_ADD	custom size:			&Custom Size
 	selection:			Selection
+#_ADD	selection left:			&Left
+#_ADD	selection top:			&Top
+#_ADD	selection width:		&Width
+#_ADD	selection height:		&Height
 	zoom:				Zoom
+#_ADD	fix aspect ratio:		Fix aspect ratio (width/height)
+#_ADD	zoom amount:			Zoom
+#_ADD	zoom amount x:			Zoom &X
+#_ADD	zoom amount y:			Zoom &Y
+#_ADD	zoom %:					%
 	filter:				Filter
+#_ADD	sharpen filter:			&Sharpen filter
 	
 	# Auto replace
 	auto match:			Match
@@ -503,6 +534,11 @@ button:
 	insert parameter:	Insert Parameter...
 	refer parameter:	Use Parameter...
 	
+	# Random pack panel
+#_ADD	generate pack:		&Generate Pack
+#_ADD	random seed:		&Random Seed
+#_ADD	fixed seed:			&Fixed Seed
+	
 	# Welcome
 	new set:			New set
 	open set:			Open set
@@ -717,6 +753,7 @@ error:
 		It is recommended that you upgrade to the latest version.
 		Visit http:://magicseteditor.sourceforge.net/
 	word list type not found:			The word list type %s was not found (from a <word-list> tag)
+#_ADD	pack item not found:				The pack item "%s" was not found (from a pack type)
 	
 	# Update checking
 	checking updates failed:			Checking updates failed.
@@ -768,6 +805,7 @@ type:
 	set:			set
 	stylesheet:		stylesheet
 	export template:export template
+#_ADD	symbol:			symbol
 	card:			card
 	cards:			cards
 	field:			field
@@ -798,8 +836,8 @@ type:
 	points:			points
 
 ############################################################## Magic
-game:
-	magic:
+package:
+	magic.mse-game:
 		# Card fields
 		name:		Nom
 		cc:			CC
@@ -811,11 +849,8 @@ game:
 		# Set info
 		
 		# descriptions/help text
-stylesheet:
-	magic-new:
 		
-symbol font:
-	magic-mana-small:
+	magic-mana-*.mse-symbol-font:
 		# note: reminder/shortcut must start with a space, otherwise it is used as a shortcut
 		#       so typing T *anywhere* would insert a symbol (which would be bad)
 		menu item T:			&Tap symbol	 T
@@ -829,51 +864,7 @@ symbol font:
 		menu item X:			Mana Variable &X	 X
 		menu item Y:			Mana Variable &Y	 Y
 		menu item Z:			Mana Variable &Z	 Z
-		menu item colorless:	&Colorless mana...
-		title colorless:		Mana Incolore
-		message colorless:		Entrez le montant de mana incolore:
-		menu item half:				&Demi mana
-		menu item |W:				&Blanc	 |W
-		menu item |U:				Bl&ue	 |U
-		menu item |B:				&Noir	 |B
-		menu item |R:				&Rouge	 |R
-		menu item |G:				&Vert	 |G
-		menu item |S:				&Neigeux	 |S
-		menu item 1/2:				&Sans Couleur	1/2
-		menu item hybrid:		Mana H&ybride (Deux couleurs)
-		menu item W/U:				mana Blanc/Bleu	 W/U
-		menu item U/B:				mana Bleu/Noir	 U/B
-		menu item B/R:				mana Noir/Rouge	 B/R
-		menu item R/G:				mana Rouge/Vert	 R/G
-		menu item G/W:				mana Vert/Blanc	 G/W
-		menu item W/B:				mana Blanc/Noir	 W/B
-		menu item U/R:				mana Bleu/Rouge	 U/R
-		menu item B/G:				mana Noir/Vert	 B/G
-		menu item R/W:				mana Rouge/Blanc	 R/W
-		menu item G/U:				mana Vert/Bleu	 G/U
-		menu item hybrid 3:		Mana H&ybride (trois couleurs)
-		menu item W/U/B:			mana Blanc/Bleu/Noir	 W/U/B
-		menu item U/B/R:			mana Bleu/Noir/Rouge	 U/B/R
-		menu item B/R/G:			mana Noir/Rouge/Vert	 B/R/G
-		menu item R/G/W:			mana Rouge/Vert/Blanc	 R/G/W
-		menu item G/W/U:			mana Vert/Blanc/Bleu	 G/W/U
-		menu item W/B/R:			mana Blanc/Noir/Rouge	 W/B/R
-		menu item U/R/G:			mana Bleu/Rouge/Vert	 U/R/G
-		menu item B/G/W:			mana Noir/Vert/Blanc	 B/G/W
-		menu item R/W/U:			mana Rouge/Blanc/Bleu	 R/W/U
-		menu item G/U/B:			mana Vert/Bleu/Noir	 G/U/B
-	magic-mana-large:
-		# Exactly the same
-		menu item T:			&Tap symbol	 T
-		menu item W:			Mana &Blanc	 W
-		menu item U:			Mana Bl&ue	 U
-		menu item B:			Mana &Noir	 B
-		menu item R:			mana &Rouge	 R
-		menu item G:			Mana &Vert	 G
-		menu item S:			Mana &neigeux	 S
-		menu item X:			Mana Variable &X	 X
-		menu item Y:			Mana Variable &Y	 Y
-		menu item Z:			Mana Variable &Z	 Z
+#_ADD		menu item I:			&Infinite mana	I
 		menu item colorless:	&Colorless mana...
 		title colorless:		Mana Incolore
 		message colorless:		Entrez le montant de mana incolore:
diff --git a/data/it.mse-locale/locale b/data/it.mse-locale/locale
index 5f183214..774629c0 100644
--- a/data/it.mse-locale/locale
+++ b/data/it.mse-locale/locale
@@ -1,4 +1,4 @@
-mse version: 0.3.6
+mse version: 0.3.7
 installer group: translations/Italiano
 full name: Italiano
 version: 2008-04-01
@@ -67,7 +67,7 @@ menu:
 	stack:				&Stacked Barre	3
 	scatter:			&Dispersione	4
 	scatter pie:		S&catter-Pie plot	5
-	# TODO: Translate ^^^^^
+#_DEL	# TODO: Translate ^^^^^
 	
 	window:			&Finestre
 	new window:			&Nuova Finestra
@@ -76,6 +76,7 @@ menu:
 	style tab:			St&ile	F7
 	keywords tab:		&Parole chiave	F8
 	stats tab:			S&tatistiche	F9
+#_ADD	random pack tab:	&Random Packs
 	
 	help:			&Aiuto
 	index:				&Indice...	F1
@@ -183,12 +184,21 @@ help:
 	style tab:			Cambia lo stile delle carte
 	keywords tab:		Definisci parole chiave aggiuntive per questo set
 	stats tab:			Mostra le statistiche delle carte del set
+#_ADD	random pack tab:	Try how the set works out in practice by generating random booster packs.
 	
 	help:
 	index:				
 	website:			
 	about:				
 	
+	# Cards panel
+#_ADD	collapse notes:		Hide the card notes box
+#_ADD	expand notes:		Show the card notes box
+	# Random pack panel
+#_ADD	random seed:		Different packs will be generated each time.
+#_ADD	fixed seed:			Using the same seed number gives the same 'random' packs.
+#_ADD	seed:				Seed number for the random generator. Using the same seed number gives the same 'random' packs.
+	
 	# Preferences
 	app language:
 		Nota: Devi riavviare MSE perchè le modifiche abbiano effetto.
@@ -273,6 +283,7 @@ tool:
 	style tab:			Stile
 	keywords tab:		Keywords
 	stats tab:			Statistiche
+#_ADD	random pack tab:	Random
 	
 	# symbol editor
 	store symbol:		Usa
@@ -317,6 +328,7 @@ tooltip:
 	style tab:			
 	keywords tab:		
 	stats tab:			
+#_ADD	random pack tab:	Random packs
 	
 	new set:			Nuovo set
 	open set:			Apri set
@@ -407,6 +419,11 @@ label:
 	# Style tab
 	styling options:		Opzioni stile
 
+	# Random pack panel
+#_ADD	pack selection:		Pack selection
+#_ADD	pack totals:		Totals
+#_ADD	seed:				Seed
+	
 	# Open dialogs
 	all files			Tutti i file
 	
@@ -464,9 +481,23 @@ label:
 	original:			Originale:
 	result:				Risultato:
 	size:				Dimensioni
+#_ADD	original size:			&Original Size
+#_ADD	size to fit:			Size to &Fit
+#_ADD	force to fit:			F&orce to Fit
+#_ADD	custom size:			&Custom Size
 	selection:			Selezione
+#_ADD	selection left:			&Left
+#_ADD	selection top:			&Top
+#_ADD	selection width:		&Width
+#_ADD	selection height:		&Height
 	zoom:				Zoom
+#_ADD	fix aspect ratio:		Fix aspect ratio (width/height)
+#_ADD	zoom amount:			Zoom
+#_ADD	zoom amount x:			Zoom &X
+#_ADD	zoom amount y:			Zoom &Y
+#_ADD	zoom %:					%
 	filter:				Filtro
+#_ADD	sharpen filter:			&Sharpen filter
 	
 	# Auto replace
 	auto match:			Trova
@@ -503,6 +534,11 @@ button:
 	insert parameter:	Inserisci Parametro...
 	refer parameter:	Usa Parametro...
 	
+	# Random pack panel
+#_ADD	generate pack:		&Generate Pack
+#_ADD	random seed:		&Random Seed
+#_ADD	fixed seed:			&Fixed Seed
+	
 	# Welcome
 	new set:			Nuovo set
 	open set:			Apri set
@@ -717,6 +753,7 @@ error:
 		Si raccomanda di aggiornare il programma alla versione più recente.
 		Visita http:://magicseteditor.sourceforge.net/
 	word list type not found:			The word list type %s was not found (from a <word-list> tag)
+#_ADD	pack item not found:				The pack item "%s" was not found (from a pack type)
 	
 	# Update checking
 	checking updates failed:			Controllo degli aggiornamenti fallito.
@@ -761,13 +798,15 @@ type:
 	image:			immagine
 	nil:			nullo
 	
-	# Object types ?power
+#_DEL	# Object types ?power
+#_ADD	# Object types
 	package:		pacchetto
 	locale:			traduzione
 	game:			gioco
 	set:			set
 	stylesheet:		stile
 	export template:modello di esportazione
+#_ADD	symbol:			symbol
 	card:			carta
 	cards:			carte
 	field:			campo
@@ -798,8 +837,8 @@ type:
 	points:			punti
 
 ############################################################## Magic
-game:
-	magic:
+package:
+	magic.mse-game:
 		# Card fields
 		name:		Nome
 		cc:		CC
@@ -821,7 +860,7 @@ game:
 		sort special rarity: Ordina rarità speciali
 		mark errors: Segna errori
 		use gradient multicolor: Usa gradienti per multicolori 
-
+ 
 		# Style
 		colored mana symbols: 	Simboli mana colorati
 		artifact style:		Stile artefatti
@@ -835,11 +874,8 @@ game:
 
 		
 		# descriptions/help text
-stylesheet:
-	magic-new:
 		
-symbol font:
-	magic-mana-small:
+	magic-mana-*.mse-symbol-font:
 		# note: reminder/shortcut must start with a space, otherwise it is used as a shortcut
 		#       so typing T *anywhere* would insert a symbol (which would be bad)
 		menu item T:			&Simbolo TAP	 T
@@ -853,51 +889,7 @@ symbol font:
 		menu item X:			Variable mana &X	 X
 		menu item Y:			Variable mana &Y	 Y
 		menu item Z:			Variable mana &Z	 Z
-		menu item colorless:	&Mana Incolore...
-		title colorless:		Mana Incolore
-		message colorless:		Inserisci quantità di mana incolore:
-		menu item half:				&Mezzo mana
-		menu item |W:				&Bianco	 |W
-		menu item |U:				Bl&u	 |U
-		menu item |B:				&Nero	 |B
-		menu item |R:				&Rosso	 |R
-		menu item |G:				&Verde	 |G
-		menu item |S:				&Neve	 |S
-		menu item 1/2:				&Incolore	1/2
-		menu item hybrid:		M&ana ibrido (due colori)
-		menu item W/U:			Mana Bianco/Blu	 W/U
-		menu item U/B:			Mana Blu/Nero	 U/B
-		menu item B/R:			Mana Nero/Rosso	 B/R
-		menu item R/G:			Mana Rosso/Verde	 R/G
-		menu item G/W:			Mana Verde/Bianco	 G/W
-		menu item W/B:			Mana Bianco/Nero	 W/B
-		menu item U/R:			Mana Blu/Rosso	 U/R
-		menu item B/G:			Mana Nero/Verde	 B/G
-		menu item R/W:			Mana Rosso/Bianco	 R/W
-		menu item G/U:			Mana Verde/Blu	 G/U
-		menu item hybrid 3:		Mana Ibrido (tre colori)
-		menu item W/U/B:			Mana Bianco/Blu/Nero	 W/U/B
-		menu item U/B/R:			Mana Blu/Nero/Rosso	 U/B/R
-		menu item B/R/G:			Mana Nero/Rosso/Verde	 B/R/G
-		menu item R/G/W:			Mana Rosso/Verde/Bianco	 R/G/W
-		menu item G/W/U:			Mana Verde/Bianco/Blu	 G/W/U
-		menu item W/B/R:			Mana Bianco/Nero/Rosso	 W/B/R
-		menu item U/R/G:			Mana Blu/Rosso/Verde	 U/R/G
-		menu item B/G/W:			Mana Nero/Verde/Bianco	 B/G/W
-		menu item R/W/U:			Mana Rosso/Bianco/Blu	 R/W/U
-		menu item G/U/B:			Mana Verde/Blu/Nero	 G/U/B
-	magic-mana-large:
-		# Exactly the same
-		menu item T:			&Simbolo TAP	 T
-		menu item W:			&Mana Bianco	 W
-		menu item U:			Ma&na Blu	 U
-		menu item B:			&Mana Nero	 B
-		menu item R:			&Mana Rosso	 R
-		menu item G:			&Mana Verde	 G
-		menu item S:			&Mana Neve	 S
-		menu item X:			Variable mana &X	 X
-		menu item Y:			Variable mana &Y	 Y
-		menu item Z:			Variable mana &Z	 Z
+#_ADD		menu item I:			&Infinite mana	I
 		menu item colorless:	&Mana Incolore...
 		title colorless:		Mana Incolore
 		message colorless:		Inserisci quantità di mana incolore:
diff --git a/data/jp.mse-locale/locale b/data/jp.mse-locale/locale
index d1def667..dbf435f1 100644
--- a/data/jp.mse-locale/locale
+++ b/data/jp.mse-locale/locale
@@ -1,4 +1,4 @@
-mse version: 0.3.6
+mse version: 0.3.7
 installer group: translations/Japanese
 full name: 日本語 (Japanese)
 version: 2008-06-25
@@ -75,6 +75,7 @@ menu:
 	style tab:			スタイル	F7
 	keywords tab:		&キーワード		F8
 	stats tab:			統計	F9
+#_ADD	random pack tab:	&Random Packs
 	
 	help:			&ヘルプ
 	index:				&索引...	F1
@@ -182,12 +183,21 @@ help:
 	style tab:			現在のカードのスタイルを変更します。
 	keywords tab:		現在のセットのためのキーワード能力を定義します。
 	stats tab:			現在のセットの統計を表示します。
+#_ADD	random pack tab:	Try how the set works out in practice by generating random booster packs.
 	
 	help:
 	index:				
 	website:			
 	about:				
 	
+	# Cards panel
+#_ADD	collapse notes:		Hide the card notes box
+#_ADD	expand notes:		Show the card notes box
+	# Random pack panel
+#_ADD	random seed:		Different packs will be generated each time.
+#_ADD	fixed seed:			Using the same seed number gives the same 'random' packs.
+#_ADD	seed:				Seed number for the random generator. Using the same seed number gives the same 'random' packs.
+	
 	# Preferences
 	app language:
 		注： 変更を適用するためにはMagic Set Editorを再起動する必要があります。
@@ -273,6 +283,7 @@ tool:
 	style tab:			スタイル
 	keywords tab:		キーワード
 	stats tab:			統計値
+#_ADD	random pack tab:	Random
 	
 	# symbol editor
 	store symbol:		使います
@@ -317,6 +328,7 @@ tooltip:
 	style tab:			
 	keywords tab:		
 	stats tab:			
+#_ADD	random pack tab:	Random packs
 	
 	new set:			新規作成
 	open set:			開く
@@ -407,6 +419,11 @@ label:
 	# Style tab
 	styling options:	スタイル・オプション
 	
+	# Random pack panel
+#_ADD	pack selection:		Pack selection
+#_ADD	pack totals:		Totals
+#_ADD	seed:				Seed
+	
 	# Open dialogs
 	all files			全てのファイル
 	
@@ -464,9 +481,23 @@ label:
 	original:			オリジナル：
 	result:				結果：
 	size:				サイズ
+#_ADD	original size:			&Original Size
+#_ADD	size to fit:			Size to &Fit
+#_ADD	force to fit:			F&orce to Fit
+#_ADD	custom size:			&Custom Size
 	selection:			選択
+#_ADD	selection left:			&Left
+#_ADD	selection top:			&Top
+#_ADD	selection width:		&Width
+#_ADD	selection height:		&Height
 	zoom:				ズーム
+#_ADD	fix aspect ratio:		Fix aspect ratio (width/height)
+#_ADD	zoom amount:			Zoom
+#_ADD	zoom amount x:			Zoom &X
+#_ADD	zoom amount y:			Zoom &Y
+#_ADD	zoom %:					%
 	filter:				フィルター
+#_ADD	sharpen filter:			&Sharpen filter
 	
 	# Auto replace
 	auto match:			適合
@@ -503,6 +534,11 @@ button:
 	insert parameter:	パラメータの挿入...
 	refer parameter:	パラメータを使用する...
 	
+	# Random pack panel
+#_ADD	generate pack:		&Generate Pack
+#_ADD	random seed:		&Random Seed
+#_ADD	fixed seed:			&Fixed Seed
+	
 	# Welcome
 	new set:			新規作成
 	open set:			セットを開く
@@ -535,9 +571,6 @@ button:
 	number:				番号をファイル名に加える
 	number overwrite:	以前にエクスポートしたファイルに上書き、番号をファイル名に加える
 	
-	# Update checker
-	close:				&閉じる
-	
 	# Auto replace
 	use auto replace:	自動置換を使用する
 	add item:			&追加
@@ -546,12 +579,18 @@ button:
 	enabled:			可能なもの
 	whole word:			適合するものだけ
 
+	# Old style update checker  (NOTE: this will be removed in a feature version)
+	close:				&閉じる
+	
 	# Packages window
 	keep package:			&は変更しないで
 	don't install package:	&はインストールしないで
 	install package:		&インストール
 	upgrade package:		&アップグレード
 	remove package:			&取り外す
+#_ADD	install group:			&Install All
+#_ADD	upgrade group:			&Upgrade All
+#_ADD	remove group:			&Remove All
 
 ############################################################## Titles in the GUI
 title:
@@ -647,7 +686,6 @@ action:
 	change symmetry type:	変化対称タイプ
 	change symmetry copies:	数の反映
 	
-
 ############################################################## Error messages
 error:
 	# General
@@ -713,6 +751,7 @@ error:
 		あなたは最新のバージョンにアップグレードするように勧められます。
 		http::を訪問してください　/　magicseteditor.sourceforge.net　/
 	word list type not found:			リストタイプという語　%s　(<word-list>タグから)見つからなかった
+#_ADD	pack item not found:				The pack item "%s" was not found (from a pack type)
 	
 	# Update checking
 	checking updates failed:			アップデートが失敗したか調べます。
@@ -722,6 +761,7 @@ error:
 	dimension not found:				ディメンションはありません '%s'
 
 	# Package update window
+#	checking updates:					アップデートを調べます。
 	can't download installer:
 			インストーラのパッケージをダウンロードできませんでした。 %s 〜から %s.
 		何もがインストールされています。
@@ -734,10 +774,6 @@ error:
 	remove packages modified:
 		これが削除さ %s パッケージは、 %s それらをインストールした後が変更されています。
 		削除して元に戻すことはできません。
-	
-	# Package update window
-#	checking updates:					アップデートを調べます。
-
 	install packages successful:	%s パッケージが正常にインストールします。
 	remove packages successful:		%s パッケージが正常に削除されます。
 	change packages successful:		%s パッケージが正常に変更されました。
@@ -759,10 +795,13 @@ type:
 	nil:			何も
 	
 	# Object types
+#_ADD	package:		package
+#_ADD	locale:			translation
 	game:			ゲーム
 	set:			セット
 	stylesheet:		スタイルシート
 	export template:輸出テンプレート
+#_ADD	symbol:			symbol
 	card:			カード
 	cards:			カード
 	field:			フィールド
@@ -794,8 +833,8 @@ type:
 		
 
 ############################################################## Magic
-game:
-	magic:
+package:
+	magic.mse-game:
 		# Card fields
 		name:		名前
 		cc:			マナ・コスト
@@ -807,14 +846,12 @@ game:
 		# Set info
 		
 		# descriptions/help text
-stylesheet:
-	magic-new:
 		
-symbol font:
-	magic-mana-small:
+	magic-mana-*.mse-symbol-font:
 		# note: reminder/shortcut must start with a space, otherwise it is used as a shortcut
 		#       so typing T *anywhere* would insert a symbol (which would be bad)
 		menu item T:			タップ・シンボル(&T)	 T
+#_ADD		menu item Q:			&Untap symbol	 Q
 		menu item W:			白マナ(&W)	 W
 		menu item U:			青マナ(&U)	 U
 		menu item B:			黒マナ(&B)	 B
@@ -824,51 +861,7 @@ symbol font:
 		menu item X:			不特定マナ・シンボル(&X)	 X
 		menu item Y:			不特定マナ・シンボル(&Y)	 Y
 		menu item Z:			不特定マナ・シンボル(&Z)	 Z
-		menu item colorless:	無色マナ(&C)...
-		title colorless:		無色マナ(&C)
-		message colorless:		任意の数の無色マナ
-		menu item half:				半分のマナ・シンボル(&H)
-		menu item |W:				白マナ(&W)	 |W
-		menu item |U:				青マナ(&U)	 |U
-		menu item |B:				黒マナ(&B)	 |B
-		menu item |R:				赤マナ(&R)	 |R
-		menu item |G:				緑マナ(&G)	 |G
-		menu item |S:				氷雪マナ(&S)	 |S
-		menu item 1/2:				無色マナ(&C)	1/2
-		menu item hybrid:		2色の混成マナ・シンボル(&Y)
-		menu item W/U:				白/青 マナ	 W/U
-		menu item U/B:				青/黒 マナ	 U/B
-		menu item B/R:				黒/赤 マナ	 B/R
-		menu item R/G:				赤/緑 マナ	 R/G
-		menu item G/W:				緑/白 マナ	 G/W
-		menu item W/B:				白/黒 マナ	 W/B
-		menu item U/R:				青/赤 マナ	 U/R
-		menu item B/G:				黒/緑 マナ	 B/G
-		menu item R/W:				赤/白 マナ	 R/W
-		menu item G/U:				緑/青 マナ	 G/U
-		menu item hybrid 3:		3色の混成マナ・シンボル(&Y)
-		menu item W/U/B:			白/青/黒 マナ	 W/U/B
-		menu item U/B/R:			青/黒/赤 マナ	 U/B/R
-		menu item B/R/G:			黒/赤/緑 マナ	 B/R/G
-		menu item R/G/W:			赤/緑/白 マナ	 R/G/W
-		menu item G/W/U:			緑/白/青 マナ	 G/W/U
-		menu item W/B/R:			白/黒/赤 マナ	 W/B/R
-		menu item U/R/G:			青/赤/緑 マナ	 U/R/G
-		menu item B/G/W:			黒/緑/白 マナ	 B/G/W
-		menu item R/W/U:			赤/白/青 マナ	 R/W/U
-		menu item G/U/B:			緑/青/黒 マナ	 G/U/B
-	magic-mana-large:
-		# Exactly the same
-		menu item T:			タップ・シンボル(&T)	 T
-		menu item W:			白マナ(&W)	 W
-		menu item U:			青マナ(&U)	 U
-		menu item B:			黒マナ(&B)	 B
-		menu item R:			赤マナ(&R)	 R
-		menu item G:			緑マナ(&G)	 G
-		menu item S:			氷雪マナ(&S)	 S
-		menu item X:			不特定マナ・シンボル(&X)	 X
-		menu item Y:			不特定マナ・シンボル(&Y)	 Y
-		menu item Z:			不特定マナ・シンボル(&Z)	 Z
+#_ADD		menu item I:			&Infinite mana	I
 		menu item colorless:	無色マナ(&C)...
 		title colorless:		無色マナ(&C)
 		message colorless:		任意の数の無色マナ