diff --git a/.gitignore b/.gitignore
index 4d7f6458..d3638e5f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
 # See editor/config-sample.js for an example
 editor/config.js
 editor/custom.css
+build/
+editor/svgedit.compiled.js
diff --git a/editor/svg-editor.html b/editor/svg-editor.html
index dab8e6f8..1e16af07 100644
--- a/editor/svg-editor.html
+++ b/editor/svg-editor.html
@@ -102,7 +102,7 @@ by creating the following file and adding by calls to svgEditor.setConfig -->
 			<div id="layer_down" class="layer_button"  title="Move Layer Down"></div>
 			<div id="layer_moreopts" class="layer_button"  title="More Options"></div>
 		</fieldset>
-		
+
 		<table id="layerlist">
 			<tr class="layer">
 				<td class="layervis"></td>
@@ -123,40 +123,40 @@ by creating the following file and adding by calls to svgEditor.setConfig -->
 		<div id="logo"></div>
 		<div class="dropdown"></div>
 	</div>
-		
-	<div id="main_menu"> 
-	
+
+	<div id="main_menu">
+
 		<!-- File-like buttons: New, Save, Source -->
 		<ul>
 			<li id="tool_clear">
 				<div></div>
 				New Image (N)
 			</li>
-			
+
 			<li id="tool_open" style="display:none;">
 				<div id="fileinputs">
 					<div></div>
 				</div>
 				Open SVG
 			</li>
-			
+
 			<li id="tool_import" style="display:none;">
 				<div id="fileinputs_import">
 					<div></div>
 				</div>
 				Import Image
 			</li>
-			
+
 			<li id="tool_save">
 				<div></div>
 				Save Image (S)
 			</li>
-			
+
 			<li id="tool_export">
 				<div></div>
 				Export
 			</li>
-			
+
 			<li id="tool_docprops">
 				<div></div>
 				Document Properties (D)
@@ -193,7 +193,7 @@ by creating the following file and adding by calls to svgEditor.setConfig -->
 		<div class="push_button tool_button_disabled" id="tool_undo" title="Undo [Z]"></div>
 		<div class="push_button tool_button_disabled" id="tool_redo" title="Redo [Y]"></div>
 	</div>
-	
+
 	<!-- Buttons when a single element is selected -->
 	<div id="selected_panel">
 		<div class="toolset">
@@ -221,7 +221,7 @@ by creating the following file and adding by calls to svgEditor.setConfig -->
 			<span id="angleLabel" class="icon_label"></span>
 			<input id="angle" size="2" value="0" type="text"/>
 		</label>
-		
+
 		<div class="toolset" id="tool_blur" title="Change gaussian blur value">
 			<label>
 				<span id="blurLabel" class="icon_label"></span>
@@ -234,11 +234,11 @@ by creating the following file and adding by calls to svgEditor.setConfig -->
 				</ul>
 			</div>
 		</div>
-		
+
 		<div class="dropdown toolset" id="tool_position" title="Align Element to Page">
 				<div id="cur_position" class="icon_label"></div>
 				<button></button>
-		</div>		
+		</div>
 
 		<div id="xy_panel" class="toolset">
 			<label>
@@ -249,7 +249,7 @@ by creating the following file and adding by calls to svgEditor.setConfig -->
 			</label>
 		</div>
 	</div>
-	
+
 	<!-- Buttons when multiple elements are selected -->
 	<div id="multiselected_panel">
 		<div class="tool_sep"></div>
@@ -264,7 +264,7 @@ by creating the following file and adding by calls to svgEditor.setConfig -->
 		<div class="push_button" id="tool_aligntop" title="Align Top"></div>
 		<div class="push_button" id="tool_alignmiddle" title="Align Middle"></div>
 		<div class="push_button" id="tool_alignbottom" title="Align Bottom"></div>
-		<label id="tool_align_relative"> 
+		<label id="tool_align_relative">
 			<span id="relativeToLabel">relative to:</span>
 			<select id="align_relative_to" title="Align relative to ...">
 			<option id="selected_objects" value="selected">selected objects</option>
@@ -373,7 +373,7 @@ by creating the following file and adding by calls to svgEditor.setConfig -->
 			<div class="tool_button" id="tool_bold" title="Bold Text [B]"><span></span>B</div>
 			<div class="tool_button" id="tool_italic" title="Italic Text [I]"><span></span>i</div>
 		</div>
-		
+
 		<div class="toolset" id="tool_font_family">
 			<label>
 				<!-- Font family -->
@@ -395,7 +395,7 @@ by creating the following file and adding by calls to svgEditor.setConfig -->
 			<span id="font_sizeLabel" class="icon_label"></span>
 			<input id="font_size" size="3" value="0" type="text"/>
 		</label>
-		
+
 		<!-- Not visible, but still used -->
 		<input id="text" type="text" size="35"/>
 	</div>
@@ -411,11 +411,11 @@ by creating the following file and adding by calls to svgEditor.setConfig -->
 			<input id="g_title" data-attr="title" size="10" type="text"/>
 		</label>
 	</div>
-	
+
 	<div id="use_panel">
 		<div class="push_button" id="tool_unlink_use" title="Break link to reference element (make unique)"></div>
 	</div>
-	
+
 	<div id="g_panel">
 		<div class="push_button" id="tool_ungroup" title="Ungroup Elements [G]"></div>
 	</div>
@@ -425,9 +425,9 @@ by creating the following file and adding by calls to svgEditor.setConfig -->
 		<label id="tool_link_url" title="Set link URL (leave empty to remove)">
 			<span id="linkLabel" class="icon_label"></span>
 			<input id="link_url" type="text" size="35"/>
-		</label>	
+		</label>
 	</div>
-	
+
 	<div id="path_node_panel">
 		<div class="tool_sep"></div>
 		<div class="tool_button push_button_pressed" id="tool_node_link" title="Link Control Points"></div>
@@ -438,7 +438,7 @@ by creating the following file and adding by calls to svgEditor.setConfig -->
 		<label id="tool_node_y">y:
 			<input id="path_node_y" class="attr_changer" title="Change node's y coordinate" size="3" data-attr="y"/>
 		</label>
-		
+
 		<select id="seg_type" title="Change Segment type">
 			<option id="straight_segments" selected="selected" value="4">Straight</option>
 			<option id="curve_segments" value="6">Curve</option>
@@ -450,7 +450,7 @@ by creating the following file and adding by calls to svgEditor.setConfig -->
 	</div>
 </div> <!-- tools_top -->
 	<div id="cur_context_panel">
-		
+
 	</div>
 
 
@@ -468,7 +468,7 @@ by creating the following file and adding by calls to svgEditor.setConfig -->
 	<div class="tool_button" id="tool_text" title="Text Tool"></div>
 	<div class="tool_button" id="tool_image" title="Image Tool"></div>
 	<div class="tool_button" id="tool_zoom" title="Zoom Tool [Ctrl+Up/Down]"></div>
-	
+
 	<div style="display: none">
 		<div id="tool_rect" title="Rectangle"></div>
 		<div id="tool_square" title="Square"></div>
@@ -508,7 +508,7 @@ by creating the following file and adding by calls to svgEditor.setConfig -->
 
 	<div id="tools_bottom_2">
 		<div id="color_tools">
-			
+
 			<div class="color_tool" id="tool_fill">
 				<label class="icon_label" for="fill_color" title="Change fill color"></label>
 				<div class="color_block">
@@ -516,20 +516,20 @@ by creating the following file and adding by calls to svgEditor.setConfig -->
 					<div id="fill_color" class="color_block"></div>
 				</div>
 			</div>
-		
+
 			<div class="color_tool" id="tool_stroke">
 				<label class="icon_label" title="Change stroke color"></label>
 				<div class="color_block">
 					<div id="stroke_bg"></div>
 					<div id="stroke_color" class="color_block" title="Change stroke color"></div>
 				</div>
-				
+
 				<label class="stroke_label">
 					<input id="stroke_width" title="Change stroke width by 1, shift-click to change by 0.1" size="2" value="5" type="text" data-attr="Stroke Width"/>
 				</label>
 
 				<div id="toggle_stroke_tools" title="Show/hide more stroke tools"></div>
-				
+
 				<label class="stroke_tool">
 					<select id="stroke_style" title="Change stroke dash style">
 						<option selected="selected" value="none">&#8212;</option>
@@ -544,7 +544,7 @@ by creating the following file and adding by calls to svgEditor.setConfig -->
 					<div id="cur_linejoin" title="Linejoin: Miter"></div>
 					<button></button>
  				</div>
- 				
+
  				<div class="stroke_tool dropdown" id="stroke_linecap">
 					<div id="cur_linecap" title="Linecap: Butt"></div>
 					<button></button>
@@ -585,13 +585,13 @@ by creating the following file and adding by calls to svgEditor.setConfig -->
 		<li class="tool_button" id="linejoin_round" title="Linejoin: Round"></li>
 		<li class="tool_button" id="linejoin_bevel" title="Linejoin: Bevel"></li>
 	</ul>
-	
+
 	<ul id="linecap_opts">
 		<li class="tool_button current" id="linecap_butt" title="Linecap: Butt"></li>
 		<li class="tool_button" id="linecap_square" title="Linecap: Square"></li>
 		<li class="tool_button" id="linecap_round" title="Linecap: Round"></li>
 	</ul>
-	
+
 	<ul id="position_opts" class="optcols3">
 		<li class="push_button" id="tool_posleft" title="Align Left"></li>
 		<li class="push_button" id="tool_poscenter" title="Align Center"></li>
@@ -705,6 +705,7 @@ by creating the following file and adding by calls to svgEditor.setConfig -->
 					<option id="lang_sk" value="sk">Slovenčina</option>
 					<option id="lang_sl" value="sl">Slovenščina</option>
 					<option id="lang_zh-TW" value="zh-TW">繁體中文</option>
+					<option id="lang_zh-CN" value="zh-CN">简体中文</option>
 				</select>
 			</label>
 
@@ -748,7 +749,7 @@ by creating the following file and adding by calls to svgEditor.setConfig -->
 					</select>
 				</label>
 				<!-- Should this be an export option instead? -->
-<!-- 
+<!--
 				<span id="svginfo_unit_system">Unit System:</span>
 				<label>
 					<input type="radio" name="unit_system" value="single" checked="checked"/>
@@ -757,7 +758,7 @@ by creating the following file and adding by calls to svgEditor.setConfig -->
 				</label>
 				<label>
 					<input type="radio" name="unit_system" value="multi"/>
-					<span id="svginfo_multi_units">Multiple CSS units</span> 
+					<span id="svginfo_multi_units">Multiple CSS units</span>
 					<small id="svginfo_single_type_unit_sub">Attributes can be given different CSS units, which may lead to inconsistant results among viewers.</small>
 				</label>
  -->