diff --git a/fonts/FontLibrary.as b/fonts/FontLibrary.as
new file mode 100644
index 00000000..7985ab5c
--- /dev/null
+++ b/fonts/FontLibrary.as
@@ -0,0 +1,9 @@
+package {
+	import flash.display.Sprite;
+	public class FontLibrary extends Sprite {
+		[Embed(source="fonts/DejaVuSans.ttf", fontFamily="DejaVu", fontWeight="normal", mimeType="application/x-font-truetype")]
+		public static var DejaVu:Class;
+
+	}
+
+}
diff --git a/net/systemeD/halcyon/fonts/DejaVuSans-Bold.ttf b/fonts/fonts/DejaVuSans-Bold.ttf
similarity index 100%
rename from net/systemeD/halcyon/fonts/DejaVuSans-Bold.ttf
rename to fonts/fonts/DejaVuSans-Bold.ttf
diff --git a/net/systemeD/halcyon/fonts/DejaVuSans-BoldOblique.ttf b/fonts/fonts/DejaVuSans-BoldOblique.ttf
similarity index 100%
rename from net/systemeD/halcyon/fonts/DejaVuSans-BoldOblique.ttf
rename to fonts/fonts/DejaVuSans-BoldOblique.ttf
diff --git a/net/systemeD/halcyon/fonts/DejaVuSans-ExtraLight.ttf b/fonts/fonts/DejaVuSans-ExtraLight.ttf
similarity index 100%
rename from net/systemeD/halcyon/fonts/DejaVuSans-ExtraLight.ttf
rename to fonts/fonts/DejaVuSans-ExtraLight.ttf
diff --git a/net/systemeD/halcyon/fonts/DejaVuSans-Oblique.ttf b/fonts/fonts/DejaVuSans-Oblique.ttf
similarity index 100%
rename from net/systemeD/halcyon/fonts/DejaVuSans-Oblique.ttf
rename to fonts/fonts/DejaVuSans-Oblique.ttf
diff --git a/net/systemeD/halcyon/fonts/DejaVuSans.ttf b/fonts/fonts/DejaVuSans.ttf
similarity index 100%
rename from net/systemeD/halcyon/fonts/DejaVuSans.ttf
rename to fonts/fonts/DejaVuSans.ttf
diff --git a/net/systemeD/halcyon/fonts/DejaVuSansCondensed-Bold.ttf b/fonts/fonts/DejaVuSansCondensed-Bold.ttf
similarity index 100%
rename from net/systemeD/halcyon/fonts/DejaVuSansCondensed-Bold.ttf
rename to fonts/fonts/DejaVuSansCondensed-Bold.ttf
diff --git a/net/systemeD/halcyon/fonts/DejaVuSansCondensed-BoldOblique.ttf b/fonts/fonts/DejaVuSansCondensed-BoldOblique.ttf
similarity index 100%
rename from net/systemeD/halcyon/fonts/DejaVuSansCondensed-BoldOblique.ttf
rename to fonts/fonts/DejaVuSansCondensed-BoldOblique.ttf
diff --git a/net/systemeD/halcyon/fonts/DejaVuSansCondensed-Oblique.ttf b/fonts/fonts/DejaVuSansCondensed-Oblique.ttf
similarity index 100%
rename from net/systemeD/halcyon/fonts/DejaVuSansCondensed-Oblique.ttf
rename to fonts/fonts/DejaVuSansCondensed-Oblique.ttf
diff --git a/net/systemeD/halcyon/fonts/DejaVuSansCondensed.ttf b/fonts/fonts/DejaVuSansCondensed.ttf
similarity index 100%
rename from net/systemeD/halcyon/fonts/DejaVuSansCondensed.ttf
rename to fonts/fonts/DejaVuSansCondensed.ttf
diff --git a/net/systemeD/halcyon/fonts/DejaVuSansMono-Bold.ttf b/fonts/fonts/DejaVuSansMono-Bold.ttf
similarity index 100%
rename from net/systemeD/halcyon/fonts/DejaVuSansMono-Bold.ttf
rename to fonts/fonts/DejaVuSansMono-Bold.ttf
diff --git a/net/systemeD/halcyon/fonts/DejaVuSansMono-BoldOblique.ttf b/fonts/fonts/DejaVuSansMono-BoldOblique.ttf
similarity index 100%
rename from net/systemeD/halcyon/fonts/DejaVuSansMono-BoldOblique.ttf
rename to fonts/fonts/DejaVuSansMono-BoldOblique.ttf
diff --git a/net/systemeD/halcyon/fonts/DejaVuSansMono-Oblique.ttf b/fonts/fonts/DejaVuSansMono-Oblique.ttf
similarity index 100%
rename from net/systemeD/halcyon/fonts/DejaVuSansMono-Oblique.ttf
rename to fonts/fonts/DejaVuSansMono-Oblique.ttf
diff --git a/net/systemeD/halcyon/fonts/DejaVuSansMono.ttf b/fonts/fonts/DejaVuSansMono.ttf
similarity index 100%
rename from net/systemeD/halcyon/fonts/DejaVuSansMono.ttf
rename to fonts/fonts/DejaVuSansMono.ttf
diff --git a/net/systemeD/halcyon/fonts/DejaVuSerif-Bold.ttf b/fonts/fonts/DejaVuSerif-Bold.ttf
similarity index 100%
rename from net/systemeD/halcyon/fonts/DejaVuSerif-Bold.ttf
rename to fonts/fonts/DejaVuSerif-Bold.ttf
diff --git a/net/systemeD/halcyon/fonts/DejaVuSerif-BoldItalic.ttf b/fonts/fonts/DejaVuSerif-BoldItalic.ttf
similarity index 100%
rename from net/systemeD/halcyon/fonts/DejaVuSerif-BoldItalic.ttf
rename to fonts/fonts/DejaVuSerif-BoldItalic.ttf
diff --git a/net/systemeD/halcyon/fonts/DejaVuSerif-Italic.ttf b/fonts/fonts/DejaVuSerif-Italic.ttf
similarity index 100%
rename from net/systemeD/halcyon/fonts/DejaVuSerif-Italic.ttf
rename to fonts/fonts/DejaVuSerif-Italic.ttf
diff --git a/net/systemeD/halcyon/fonts/DejaVuSerif.ttf b/fonts/fonts/DejaVuSerif.ttf
similarity index 100%
rename from net/systemeD/halcyon/fonts/DejaVuSerif.ttf
rename to fonts/fonts/DejaVuSerif.ttf
diff --git a/net/systemeD/halcyon/fonts/DejaVuSerifCondensed-Bold.ttf b/fonts/fonts/DejaVuSerifCondensed-Bold.ttf
similarity index 100%
rename from net/systemeD/halcyon/fonts/DejaVuSerifCondensed-Bold.ttf
rename to fonts/fonts/DejaVuSerifCondensed-Bold.ttf
diff --git a/net/systemeD/halcyon/fonts/DejaVuSerifCondensed-BoldItalic.ttf b/fonts/fonts/DejaVuSerifCondensed-BoldItalic.ttf
similarity index 100%
rename from net/systemeD/halcyon/fonts/DejaVuSerifCondensed-BoldItalic.ttf
rename to fonts/fonts/DejaVuSerifCondensed-BoldItalic.ttf
diff --git a/net/systemeD/halcyon/fonts/DejaVuSerifCondensed-Italic.ttf b/fonts/fonts/DejaVuSerifCondensed-Italic.ttf
similarity index 100%
rename from net/systemeD/halcyon/fonts/DejaVuSerifCondensed-Italic.ttf
rename to fonts/fonts/DejaVuSerifCondensed-Italic.ttf
diff --git a/net/systemeD/halcyon/fonts/DejaVuSerifCondensed.ttf b/fonts/fonts/DejaVuSerifCondensed.ttf
similarity index 100%
rename from net/systemeD/halcyon/fonts/DejaVuSerifCondensed.ttf
rename to fonts/fonts/DejaVuSerifCondensed.ttf
diff --git a/halcyon_viewer.as b/halcyon_viewer.as
index 36f7c502..df1a13a2 100755
--- a/halcyon_viewer.as
+++ b/halcyon_viewer.as
@@ -27,7 +27,7 @@ package {
 			t.multiline=true;
 			addChild(t);
 			Globals.vars.debug=t;
-			t.visible = true;
+			t.visible = false;
 
 			theMap = new Map(this.loaderInfo.parameters);
             theMap.updateSize(stage.stageWidth, stage.stageHeight);
diff --git a/net/systemeD/halcyon/Map.as b/net/systemeD/halcyon/Map.as
index 02229ff9..09346c00 100755
--- a/net/systemeD/halcyon/Map.as
+++ b/net/systemeD/halcyon/Map.as
@@ -2,11 +2,13 @@ package net.systemeD.halcyon {
 
 	import flash.text.TextField;
 	import flash.display.DisplayObjectContainer;
+	import flash.display.Loader;
 	import flash.display.Sprite;
 	import flash.display.Shape;
 	import flash.display.Stage;
 	import flash.display.BitmapData;
 	import flash.display.LoaderInfo;
+	import flash.text.Font;
 	import flash.utils.ByteArray;
 	import flash.events.*;
 	import flash.net.*;
@@ -99,7 +101,6 @@ package net.systemeD.halcyon {
             connection.addEventListener(Connection.NEW_WAY, newWayCreated);
             connection.addEventListener(Connection.NEW_POI, newPOICreated);
 			connection.getEnvironment(new Responder(gotEnvironment,connectionError));
-
         }
 
         private function getPaintSprite():Sprite {
@@ -109,6 +110,15 @@ package net.systemeD.halcyon {
         }
 
 		public function gotEnvironment(r:Object):void {
+			var loader:Loader = new Loader();
+			loader.contentLoaderInfo.addEventListener(Event.COMPLETE, gotFont);
+			loader.load(new URLRequest("FontLibrary.swf"));
+		}
+		
+		public function gotFont(r:Event):void {
+			var FontLibrary:Class = r.target.applicationDomain.getDefinition("FontLibrary") as Class;
+			Font.registerFont(FontLibrary.DejaVu);
+
 			if (initparams.hasOwnProperty('lat')) {
 				// parameters sent from HTML
 				init(initparams['lat'],
@@ -311,7 +321,6 @@ package net.systemeD.halcyon {
 		}
         
 		public function mouseUpHandler(event:MouseEvent):void {
-addDebug("up");
 			if (!dragging) { return; }
 			dragging=false;
 			updateCoords(x,y);
diff --git a/net/systemeD/halcyon/POI.as b/net/systemeD/halcyon/POI.as
index f1e6a504..ad0b40c0 100644
--- a/net/systemeD/halcyon/POI.as
+++ b/net/systemeD/halcyon/POI.as
@@ -18,7 +18,7 @@ package net.systemeD.halcyon {
 		private var iconname:String='';				// name of icon
 
 		public static const DEFAULT_TEXTFIELD_PARAMS:Object = {
-			embedFonts: true,
+//			embedFonts: true,
 			antiAliasType: AntiAliasType.ADVANCED,
 			gridFitType: GridFitType.NONE
 		};
diff --git a/net/systemeD/halcyon/WayUI.as b/net/systemeD/halcyon/WayUI.as
index 48a0efc6..fe0527ae 100755
--- a/net/systemeD/halcyon/WayUI.as
+++ b/net/systemeD/halcyon/WayUI.as
@@ -29,8 +29,6 @@ package net.systemeD.halcyon {
 			antiAliasType: AntiAliasType.ADVANCED,
 			gridFitType: GridFitType.NONE
 		};
-//		[Embed(source="fonts/DejaVuSans.ttf", fontFamily="DejaVu", fontWeight="normal", mimeType="application/x-font-truetype")]
-//		public static var DejaVu:Class;
 		public var nameformat:TextFormat;
 
 
@@ -316,10 +314,10 @@ package net.systemeD.halcyon {
 
 		private function rotatedLetter(char:String, t:Number, w:Number, h:Number, a:Number, o:Number):TextField {
 			var tf:TextField = new TextField();
-			tf.embedFonts = true;
             tf.mouseEnabled = false;
             tf.mouseWheelEnabled = false;
 			tf.defaultTextFormat = nameformat;
+			tf.embedFonts = true;
 			tf.text = char;
 			tf.width = tf.textWidth+4;
 			tf.height = tf.textHeight+4;
diff --git a/net/systemeD/halcyon/styleparser/TextStyle.as b/net/systemeD/halcyon/styleparser/TextStyle.as
index 056e87c2..eb2b2a50 100644
--- a/net/systemeD/halcyon/styleparser/TextStyle.as
+++ b/net/systemeD/halcyon/styleparser/TextStyle.as
@@ -23,7 +23,7 @@ package net.systemeD.halcyon.styleparser {
 		public var sublayer:uint=0;
 
 		public function getTextFormat():TextFormat {
-			return new TextFormat(font_name   ? font_name : "_sans",
+			return new TextFormat(font_name   ? font_name : "DejaVu",
 								  text_size   ? text_size : 8,
 								  text_colour ? text_colour: 0,
 								  font_bold   ? font_bold : false,
@@ -41,7 +41,7 @@ package net.systemeD.halcyon.styleparser {
 			var tf:TextField = new TextField();
 			var n:TextFormat = getTextFormat();
 			n.align = "center";
-//			tf.embedFonts = true;
+			tf.embedFonts = true;
 			tf.defaultTextFormat = n;
 			tf.text = a;
 			if (text_width) {
diff --git a/resources/FontLibrary.swf b/resources/FontLibrary.swf
new file mode 100644
index 00000000..104c8c95
Binary files /dev/null and b/resources/FontLibrary.swf differ