diff --git a/backends/barcode/Backends.cpp b/backends/barcode/Backends.cpp
index f72f712..f2525ba 100644
--- a/backends/barcode/Backends.cpp
+++ b/backends/barcode/Backends.cpp
@@ -27,502 +27,505 @@
 #include "glbarcode/Factory.h"
 
 
-namespace glabels::barcode
+namespace glabels
 {
-	
-	//
-	// Static data
-	//
-	QStringList Backends::mBackendIdList;
-	QMap<QString,QString> Backends::mBackendNameMap;
-
-	QList<Style> Backends::mStyleList;
-	
-
-	Backends::Backends()
+	namespace barcode
 	{
-		registerStyle( "code39", "", tr("Code 39"),
-		               true, true, true, true, "1234567890", true, 10 );
+	
+		//
+		// Static data
+		//
+		QStringList Backends::mBackendIdList;
+		QMap<QString,QString> Backends::mBackendNameMap;
 
-		registerStyle( "code39ext", "", tr("Code 39 Extended"),
-		               true, true, true, true, "1234567890", true, 10 );
+		QList<Style> Backends::mStyleList;
+	
 
-		registerStyle( "upc-a", "", tr("UPC-A"),
-		               true, false, true, false, "12345678901", false, 11 );
+		Backends::Backends()
+		{
+			registerStyle( "code39", "", tr("Code 39"),
+			               true, true, true, true, "1234567890", true, 10 );
 
-		registerStyle( "ean-13", "", tr("EAN-13"),
-		               true, false, true, false, "123456789012", false, 12 );
+			registerStyle( "code39ext", "", tr("Code 39 Extended"),
+			               true, true, true, true, "1234567890", true, 10 );
 
-		registerStyle( "postnet", "", tr("POSTNET (any)"),
-		               false, false, true, false, "12345-6789-12", false, 11 );
+			registerStyle( "upc-a", "", tr("UPC-A"),
+			               true, false, true, false, "12345678901", false, 11 );
 
-		registerStyle( "postnet-5", "", tr("POSTNET-5 (ZIP only)"),
-		               false, false, true, false, "12345", false, 5 );
+			registerStyle( "ean-13", "", tr("EAN-13"),
+			               true, false, true, false, "123456789012", false, 12 );
 
-		registerStyle( "postnet-9", "", tr("POSTNET-9 (ZIP+4)"),
-		               false, false, true, false, "12345-6789", false, 9 );
+			registerStyle( "postnet", "", tr("POSTNET (any)"),
+			               false, false, true, false, "12345-6789-12", false, 11 );
 
-		registerStyle( "postnet-11", "", tr("POSTNET-11 (DPBC)"),
-		               false, false, true, false, "12345-6789-12", false, 11 );
+			registerStyle( "postnet-5", "", tr("POSTNET-5 (ZIP only)"),
+			               false, false, true, false, "12345", false, 5 );
 
-		registerStyle( "cepnet", "", tr("CEPNET"),
-		               false, false, true, false, "12345-678", false, 8 );
+			registerStyle( "postnet-9", "", tr("POSTNET-9 (ZIP+4)"),
+			               false, false, true, false, "12345-6789", false, 9 );
 
-		registerStyle( "onecode", "", tr("USPS Intelligent Mail"),
-		               false, false, true, false, "12345678901234567890", false, 20 );
+			registerStyle( "postnet-11", "", tr("POSTNET-11 (DPBC)"),
+			               false, false, true, false, "12345-6789-12", false, 11 );
 
-		registerStyle( "datamatrix", "", tr("IEC16022 (DataMatrix)"),
-		               false, false, true, false, "1234567890AB", false, 12 );
+			registerStyle( "cepnet", "", tr("CEPNET"),
+			               false, false, true, false, "12345-678", false, 8 );
+
+			registerStyle( "onecode", "", tr("USPS Intelligent Mail"),
+			               false, false, true, false, "12345678901234567890", false, 20 );
+
+			registerStyle( "datamatrix", "", tr("IEC16022 (DataMatrix)"),
+			               false, false, true, false, "1234567890AB", false, 12 );
 
 #if HAVE_GNU_BARCODE
-		//
-		// GNU Barcode backend
-		//
-		registerBackend( "gnu-barcode", "GNU Barcode" );
+			//
+			// GNU Barcode backend
+			//
+			registerBackend( "gnu-barcode", "GNU Barcode" );
 		
-		glbarcode::Factory::registerType( "gnu-barcode::ean",      GnuBarcode::Ean::create );
-		glbarcode::Factory::registerType( "gnu-barcode::ean-8",    GnuBarcode::Ean8::create );
-		glbarcode::Factory::registerType( "gnu-barcode::ean-8+2",  GnuBarcode::Ean8_2::create );
-		glbarcode::Factory::registerType( "gnu-barcode::ean-8+5",  GnuBarcode::Ean8_5::create );
-		glbarcode::Factory::registerType( "gnu-barcode::ean-13",   GnuBarcode::Ean13::create );
-		glbarcode::Factory::registerType( "gnu-barcode::ean-13+2", GnuBarcode::Ean13_2::create );
-		glbarcode::Factory::registerType( "gnu-barcode::ean-13+5", GnuBarcode::Ean13_5::create );
-		glbarcode::Factory::registerType( "gnu-barcode::upc",      GnuBarcode::Upc::create );
-		glbarcode::Factory::registerType( "gnu-barcode::upc-a",    GnuBarcode::UpcA::create );
-		glbarcode::Factory::registerType( "gnu-barcode::upc-a+2",  GnuBarcode::UpcA_2::create );
-		glbarcode::Factory::registerType( "gnu-barcode::upc-a+5",  GnuBarcode::UpcA_5::create );
-		glbarcode::Factory::registerType( "gnu-barcode::upc-e",    GnuBarcode::UpcE::create );
-		glbarcode::Factory::registerType( "gnu-barcode::upc-e+2",  GnuBarcode::UpcE_2::create );
-		glbarcode::Factory::registerType( "gnu-barcode::upc-e+5",  GnuBarcode::UpcE_5::create );
-		glbarcode::Factory::registerType( "gnu-barcode::isbn",     GnuBarcode::Isbn::create );
-		glbarcode::Factory::registerType( "gnu-barcode::isbn+5",   GnuBarcode::Isbn_5::create );
-		glbarcode::Factory::registerType( "gnu-barcode::code39",   GnuBarcode::Code39::create );
-		glbarcode::Factory::registerType( "gnu-barcode::code128",  GnuBarcode::Code128::create );
-		glbarcode::Factory::registerType( "gnu-barcode::code128c", GnuBarcode::Code128C::create );
-		glbarcode::Factory::registerType( "gnu-barcode::code128b", GnuBarcode::Code128B::create );
-		glbarcode::Factory::registerType( "gnu-barcode::i25",      GnuBarcode::I25::create );
-		glbarcode::Factory::registerType( "gnu-barcode::cbr",      GnuBarcode::Cbr::create );
-		glbarcode::Factory::registerType( "gnu-barcode::msi",      GnuBarcode::Msi::create );
-		glbarcode::Factory::registerType( "gnu-barcode::pls",      GnuBarcode::Pls::create );
-		glbarcode::Factory::registerType( "gnu-barcode::code93",   GnuBarcode::Code93::create );
+			glbarcode::Factory::registerType( "gnu-barcode::ean",      GnuBarcode::Ean::create );
+			glbarcode::Factory::registerType( "gnu-barcode::ean-8",    GnuBarcode::Ean8::create );
+			glbarcode::Factory::registerType( "gnu-barcode::ean-8+2",  GnuBarcode::Ean8_2::create );
+			glbarcode::Factory::registerType( "gnu-barcode::ean-8+5",  GnuBarcode::Ean8_5::create );
+			glbarcode::Factory::registerType( "gnu-barcode::ean-13",   GnuBarcode::Ean13::create );
+			glbarcode::Factory::registerType( "gnu-barcode::ean-13+2", GnuBarcode::Ean13_2::create );
+			glbarcode::Factory::registerType( "gnu-barcode::ean-13+5", GnuBarcode::Ean13_5::create );
+			glbarcode::Factory::registerType( "gnu-barcode::upc",      GnuBarcode::Upc::create );
+			glbarcode::Factory::registerType( "gnu-barcode::upc-a",    GnuBarcode::UpcA::create );
+			glbarcode::Factory::registerType( "gnu-barcode::upc-a+2",  GnuBarcode::UpcA_2::create );
+			glbarcode::Factory::registerType( "gnu-barcode::upc-a+5",  GnuBarcode::UpcA_5::create );
+			glbarcode::Factory::registerType( "gnu-barcode::upc-e",    GnuBarcode::UpcE::create );
+			glbarcode::Factory::registerType( "gnu-barcode::upc-e+2",  GnuBarcode::UpcE_2::create );
+			glbarcode::Factory::registerType( "gnu-barcode::upc-e+5",  GnuBarcode::UpcE_5::create );
+			glbarcode::Factory::registerType( "gnu-barcode::isbn",     GnuBarcode::Isbn::create );
+			glbarcode::Factory::registerType( "gnu-barcode::isbn+5",   GnuBarcode::Isbn_5::create );
+			glbarcode::Factory::registerType( "gnu-barcode::code39",   GnuBarcode::Code39::create );
+			glbarcode::Factory::registerType( "gnu-barcode::code128",  GnuBarcode::Code128::create );
+			glbarcode::Factory::registerType( "gnu-barcode::code128c", GnuBarcode::Code128C::create );
+			glbarcode::Factory::registerType( "gnu-barcode::code128b", GnuBarcode::Code128B::create );
+			glbarcode::Factory::registerType( "gnu-barcode::i25",      GnuBarcode::I25::create );
+			glbarcode::Factory::registerType( "gnu-barcode::cbr",      GnuBarcode::Cbr::create );
+			glbarcode::Factory::registerType( "gnu-barcode::msi",      GnuBarcode::Msi::create );
+			glbarcode::Factory::registerType( "gnu-barcode::pls",      GnuBarcode::Pls::create );
+			glbarcode::Factory::registerType( "gnu-barcode::code93",   GnuBarcode::Code93::create );
 
-		registerStyle( "ean", "gnu-barcode", tr("EAN (any)"),
-		               true, true, true, false, "000000000000 00000", false, 17 );
-		registerStyle( "ean-8", "gnu-barcode", tr("EAN-8"),
-		               true, true, true, false, "0000000", false, 7 );
-		registerStyle( "ean-8+2", "gnu-barcode", tr("EAN-8+2"),
-		               true, true, true, false, "0000000 00", false, 9 );
-		registerStyle( "ean-8+5", "gnu-barcode", tr("EAN-8+5"),
-		               true, true, true, false, "0000000 00000", false, 12 );
-		registerStyle( "ean-13", "gnu-barcode", tr("EAN-13"),
-		               true, true, true, false, "000000000000", false, 12 );
-		registerStyle( "ean-13+2", "gnu-barcode", tr("EAN-13+2"),
-		               true, true, true, false, "000000000000 00", false, 14 );
-		registerStyle( "ean-13+5", "gnu-barcode", tr("EAN-13+5"),
-		               true, true, true, false, "000000000000 00000", false, 17 );
-		registerStyle( "upc", "gnu-barcode", tr("UPC (UPC-A or UPC-E)"),
-		                true, true, true, false, "00000000000 00000", false, 16 );
-		registerStyle( "upc-a", "gnu-barcode", tr("UPC-A"),
-		                true, true, true, false, "00000000000", false, 11 );
-		registerStyle( "upc-a+2", "gnu-barcode", tr("UPC-A +2"),
-		                true, true, true, false, "00000000000 00", false, 13 );
-		registerStyle( "upc-a+5", "gnu-barcode", tr("UPC-A +5"),
-		                true, true, true, false, "00000000000 00000", false, 16 );
-		registerStyle( "upc-e", "gnu-barcode", tr("UPC-E"),
-		                true, true, true, false, "000000", false, 6 );
-		registerStyle( "upc-e+2", "gnu-barcode", tr("UPC-E +2"),
-		                true, true, true, false, "000000 00", false, 8 );
-		registerStyle( "upc-e+5", "gnu-barcode", tr("UPC-E +5"),
-		                true, true, true, false, "000000 00000", false, 11 );
-		registerStyle( "isbn", "gnu-barcode", tr("ISBN"),
-		                true, true, true, true, "0-00000-000-0", false, 10 );
-		registerStyle( "isbn+5", "gnu-barcode", tr("ISBN +5"),
-		                true, true, true, true, "0-00000-000-0 00000", false, 15 );
-		registerStyle( "code39", "gnu-barcode", tr("Code 39"),
-		                true, true, true, true, "0000000000", true, 10 );
-		registerStyle( "code128", "gnu-barcode", tr("Code 128"),
-		                true, true, true, true, "0000000000", true, 10 );
-		registerStyle( "code128c", "gnu-barcode", tr("Code 128C"),
-		                true, true, true, false, "0000000000", true, 10 );
-		registerStyle( "code128b", "gnu-barcode", tr("Code 128B"),
-		                true, true, true, true, "0000000000", true, 10 );
-		registerStyle( "i25", "gnu-barcode", tr("Interleaved 2 of 5"),
-		                true, true, true, true, "0000000000", true, 10 );
-		registerStyle( "cbr", "gnu-barcode", tr("Codabar"),
-		                true, true, true, true, "0000000000", true, 10 );
-		registerStyle( "msi", "gnu-barcode", tr("MSI"),
-		                true, true, true, true, "0000000000", true, 10 );
-		registerStyle( "pls", "gnu-barcode", tr("Plessey"),
-		                true, true, true, true, "0000000000", true, 10 );
-		registerStyle( "code93", "gnu-barcode", tr("Code 93"),
-		                true, true, true, false, "0000000000", true, 10 );
+			registerStyle( "ean", "gnu-barcode", tr("EAN (any)"),
+			               true, true, true, false, "000000000000 00000", false, 17 );
+			registerStyle( "ean-8", "gnu-barcode", tr("EAN-8"),
+			               true, true, true, false, "0000000", false, 7 );
+			registerStyle( "ean-8+2", "gnu-barcode", tr("EAN-8+2"),
+			               true, true, true, false, "0000000 00", false, 9 );
+			registerStyle( "ean-8+5", "gnu-barcode", tr("EAN-8+5"),
+			               true, true, true, false, "0000000 00000", false, 12 );
+			registerStyle( "ean-13", "gnu-barcode", tr("EAN-13"),
+			               true, true, true, false, "000000000000", false, 12 );
+			registerStyle( "ean-13+2", "gnu-barcode", tr("EAN-13+2"),
+			               true, true, true, false, "000000000000 00", false, 14 );
+			registerStyle( "ean-13+5", "gnu-barcode", tr("EAN-13+5"),
+			               true, true, true, false, "000000000000 00000", false, 17 );
+			registerStyle( "upc", "gnu-barcode", tr("UPC (UPC-A or UPC-E)"),
+			               true, true, true, false, "00000000000 00000", false, 16 );
+			registerStyle( "upc-a", "gnu-barcode", tr("UPC-A"),
+			               true, true, true, false, "00000000000", false, 11 );
+			registerStyle( "upc-a+2", "gnu-barcode", tr("UPC-A +2"),
+			               true, true, true, false, "00000000000 00", false, 13 );
+			registerStyle( "upc-a+5", "gnu-barcode", tr("UPC-A +5"),
+			               true, true, true, false, "00000000000 00000", false, 16 );
+			registerStyle( "upc-e", "gnu-barcode", tr("UPC-E"),
+			               true, true, true, false, "000000", false, 6 );
+			registerStyle( "upc-e+2", "gnu-barcode", tr("UPC-E +2"),
+			               true, true, true, false, "000000 00", false, 8 );
+			registerStyle( "upc-e+5", "gnu-barcode", tr("UPC-E +5"),
+			               true, true, true, false, "000000 00000", false, 11 );
+			registerStyle( "isbn", "gnu-barcode", tr("ISBN"),
+			               true, true, true, true, "0-00000-000-0", false, 10 );
+			registerStyle( "isbn+5", "gnu-barcode", tr("ISBN +5"),
+			               true, true, true, true, "0-00000-000-0 00000", false, 15 );
+			registerStyle( "code39", "gnu-barcode", tr("Code 39"),
+			               true, true, true, true, "0000000000", true, 10 );
+			registerStyle( "code128", "gnu-barcode", tr("Code 128"),
+			               true, true, true, true, "0000000000", true, 10 );
+			registerStyle( "code128c", "gnu-barcode", tr("Code 128C"),
+			               true, true, true, false, "0000000000", true, 10 );
+			registerStyle( "code128b", "gnu-barcode", tr("Code 128B"),
+			               true, true, true, true, "0000000000", true, 10 );
+			registerStyle( "i25", "gnu-barcode", tr("Interleaved 2 of 5"),
+			               true, true, true, true, "0000000000", true, 10 );
+			registerStyle( "cbr", "gnu-barcode", tr("Codabar"),
+			               true, true, true, true, "0000000000", true, 10 );
+			registerStyle( "msi", "gnu-barcode", tr("MSI"),
+			               true, true, true, true, "0000000000", true, 10 );
+			registerStyle( "pls", "gnu-barcode", tr("Plessey"),
+			               true, true, true, true, "0000000000", true, 10 );
+			registerStyle( "code93", "gnu-barcode", tr("Code 93"),
+			               true, true, true, false, "0000000000", true, 10 );
 #endif // HAVE_GNU_BARCODE
 
 #if HAVE_QRENCODE
-		//
-		// Libqrencode backend
-		//
-		registerBackend( "qrencode", "QREncode" );
+			//
+			// Libqrencode backend
+			//
+			registerBackend( "qrencode", "QREncode" );
 		
-		glbarcode::Factory::registerType( "qrencode::qrcode", QrEncode::QrCode::create );
+			glbarcode::Factory::registerType( "qrencode::qrcode", QrEncode::QrCode::create );
 
-		registerStyle( "qrcode", "qrencode", tr("IEC18004 (QRCode)"),
-		               false, false, true, false, "1234567890AB", false, 12 );
+			registerStyle( "qrcode", "qrencode", tr("IEC18004 (QRCode)"),
+			               false, false, true, false, "1234567890AB", false, 12 );
 #endif // HAVE_QRENCODE
 
 #if HAVE_ZINT
-		//
-		// Zint barcode backend
-		//
-		registerBackend( "zint", "Zint" );
+			//
+			// Zint barcode backend
+			//
+			registerBackend( "zint", "Zint" );
 		
-		glbarcode::Factory::registerType( "zint::ausp",      Zint::AusP::create );
-		glbarcode::Factory::registerType( "zint::ausrp",     Zint::AusRP::create );
-		glbarcode::Factory::registerType( "zint::ausrt",     Zint::AusRT::create );
-		glbarcode::Factory::registerType( "zint::ausrd",     Zint::AusRD::create );
-		glbarcode::Factory::registerType( "zint::aztec",     Zint::Aztec::create );
-		glbarcode::Factory::registerType( "zint::azrun",     Zint::Azrun::create );
-		glbarcode::Factory::registerType( "zint::cbr",       Zint::Cbr::create );
-		glbarcode::Factory::registerType( "zint::code1",     Zint::Code1::create );
-		glbarcode::Factory::registerType( "zint::code11",    Zint::Code11::create );
-		glbarcode::Factory::registerType( "zint::c16k",      Zint::C16k::create );
-		glbarcode::Factory::registerType( "zint::c25m",      Zint::C25m::create );
-		glbarcode::Factory::registerType( "zint::c25i",      Zint::C25i::create );
-		glbarcode::Factory::registerType( "zint::c25dl",     Zint::C25dl::create );
-		glbarcode::Factory::registerType( "zint::code32",    Zint::Code32::create );
-		glbarcode::Factory::registerType( "zint::code39",    Zint::Code39::create );
-		glbarcode::Factory::registerType( "zint::code39e",   Zint::Code39e::create );
-		glbarcode::Factory::registerType( "zint::code49",    Zint::Code49::create );
-		glbarcode::Factory::registerType( "zint::code93",    Zint::Code93::create );
-		glbarcode::Factory::registerType( "zint::code128",   Zint::Code128::create );
-		glbarcode::Factory::registerType( "zint::code128b",  Zint::Code128b::create );
-		glbarcode::Factory::registerType( "zint::daft",      Zint::Daft::create );
-		glbarcode::Factory::registerType( "zint::dmtx",      Zint::Dmtx::create );
-		glbarcode::Factory::registerType( "zint::dpl",       Zint::Dpl::create );
-		glbarcode::Factory::registerType( "zint::dpi",       Zint::Dpi::create );
-		glbarcode::Factory::registerType( "zint::kix",       Zint::Kix::create );
-		glbarcode::Factory::registerType( "zint::ean",       Zint::Ean::create );
-		glbarcode::Factory::registerType( "zint::gmtx",      Zint::Gmtx::create );
-		glbarcode::Factory::registerType( "zint::gs1128",    Zint::Gs1128::create );
-		glbarcode::Factory::registerType( "zint::rss14",     Zint::Rss14::create );
-		glbarcode::Factory::registerType( "zint::rssltd",    Zint::Rssltd::create );
-		glbarcode::Factory::registerType( "zint::rssexp",    Zint::Rssexp::create );
-		glbarcode::Factory::registerType( "zint::rsss",      Zint::Rsss::create );
-		glbarcode::Factory::registerType( "zint::rssso",     Zint::Rssso::create );
-		glbarcode::Factory::registerType( "zint::rssse",     Zint::Rssse::create );
-		glbarcode::Factory::registerType( "zint::hibc128",   Zint::Hibc128::create );
-		glbarcode::Factory::registerType( "zint::hibc39",    Zint::Hibc39::create );
-		glbarcode::Factory::registerType( "zint::hibcdm",    Zint::Hibcdm::create );
-		glbarcode::Factory::registerType( "zint::hibcqr",    Zint::Hibcqr::create );
-		glbarcode::Factory::registerType( "zint::hibcpdf",   Zint::Hibcpdf::create );
-		glbarcode::Factory::registerType( "zint::hibcmpdf",  Zint::Hibcmpdf::create );
-		glbarcode::Factory::registerType( "zint::hibcaz",    Zint::Hibcaz::create );
-		glbarcode::Factory::registerType( "zint::i25",       Zint::I25::create );
-		glbarcode::Factory::registerType( "zint::isbn",      Zint::Isbn::create );
-		glbarcode::Factory::registerType( "zint::itf14",     Zint::Itf14::create );
-		glbarcode::Factory::registerType( "zint::japan",     Zint::Japan::create );
-		glbarcode::Factory::registerType( "zint::korea",     Zint::Korea::create );
-		glbarcode::Factory::registerType( "zint::logm",      Zint::Logm::create );
-		glbarcode::Factory::registerType( "zint::maxi",      Zint::Maxi::create );
-		glbarcode::Factory::registerType( "zint::mpdf",      Zint::Mpdf::create );
-		glbarcode::Factory::registerType( "zint::mqr",       Zint::Mqr::create );
-		glbarcode::Factory::registerType( "zint::msi",       Zint::Msi::create );
-		glbarcode::Factory::registerType( "zint::nve",       Zint::Nve::create );
-		glbarcode::Factory::registerType( "zint::pdf",       Zint::Pdf::create );
-		glbarcode::Factory::registerType( "zint::pdft",      Zint::Pdft::create );
-		glbarcode::Factory::registerType( "zint::plan",      Zint::Plan::create );
-		glbarcode::Factory::registerType( "zint::postnet",   Zint::Postnet::create );
-		glbarcode::Factory::registerType( "zint::pharma",    Zint::Pharma::create );
-		glbarcode::Factory::registerType( "zint::pharma2",   Zint::Pharma2::create );
-		glbarcode::Factory::registerType( "zint::pzn",       Zint::Pzn::create );
-		glbarcode::Factory::registerType( "zint::qr",        Zint::Qr::create );
-		glbarcode::Factory::registerType( "zint::rm4",       Zint::Rm4::create );
-		glbarcode::Factory::registerType( "zint::tele",      Zint::Tele::create );
-		glbarcode::Factory::registerType( "zint::telex",     Zint::Telex::create );
-		glbarcode::Factory::registerType( "zint::upc-a",     Zint::UpcA::create );
-		glbarcode::Factory::registerType( "zint::upc-e",     Zint::UpcE::create );
-		glbarcode::Factory::registerType( "zint::usps",      Zint::Usps::create );
-		glbarcode::Factory::registerType( "zint::pls",       Zint::Pls::create );
+			glbarcode::Factory::registerType( "zint::ausp",      Zint::AusP::create );
+			glbarcode::Factory::registerType( "zint::ausrp",     Zint::AusRP::create );
+			glbarcode::Factory::registerType( "zint::ausrt",     Zint::AusRT::create );
+			glbarcode::Factory::registerType( "zint::ausrd",     Zint::AusRD::create );
+			glbarcode::Factory::registerType( "zint::aztec",     Zint::Aztec::create );
+			glbarcode::Factory::registerType( "zint::azrun",     Zint::Azrun::create );
+			glbarcode::Factory::registerType( "zint::cbr",       Zint::Cbr::create );
+			glbarcode::Factory::registerType( "zint::code1",     Zint::Code1::create );
+			glbarcode::Factory::registerType( "zint::code11",    Zint::Code11::create );
+			glbarcode::Factory::registerType( "zint::c16k",      Zint::C16k::create );
+			glbarcode::Factory::registerType( "zint::c25m",      Zint::C25m::create );
+			glbarcode::Factory::registerType( "zint::c25i",      Zint::C25i::create );
+			glbarcode::Factory::registerType( "zint::c25dl",     Zint::C25dl::create );
+			glbarcode::Factory::registerType( "zint::code32",    Zint::Code32::create );
+			glbarcode::Factory::registerType( "zint::code39",    Zint::Code39::create );
+			glbarcode::Factory::registerType( "zint::code39e",   Zint::Code39e::create );
+			glbarcode::Factory::registerType( "zint::code49",    Zint::Code49::create );
+			glbarcode::Factory::registerType( "zint::code93",    Zint::Code93::create );
+			glbarcode::Factory::registerType( "zint::code128",   Zint::Code128::create );
+			glbarcode::Factory::registerType( "zint::code128b",  Zint::Code128b::create );
+			glbarcode::Factory::registerType( "zint::daft",      Zint::Daft::create );
+			glbarcode::Factory::registerType( "zint::dmtx",      Zint::Dmtx::create );
+			glbarcode::Factory::registerType( "zint::dpl",       Zint::Dpl::create );
+			glbarcode::Factory::registerType( "zint::dpi",       Zint::Dpi::create );
+			glbarcode::Factory::registerType( "zint::kix",       Zint::Kix::create );
+			glbarcode::Factory::registerType( "zint::ean",       Zint::Ean::create );
+			glbarcode::Factory::registerType( "zint::gmtx",      Zint::Gmtx::create );
+			glbarcode::Factory::registerType( "zint::gs1128",    Zint::Gs1128::create );
+			glbarcode::Factory::registerType( "zint::rss14",     Zint::Rss14::create );
+			glbarcode::Factory::registerType( "zint::rssltd",    Zint::Rssltd::create );
+			glbarcode::Factory::registerType( "zint::rssexp",    Zint::Rssexp::create );
+			glbarcode::Factory::registerType( "zint::rsss",      Zint::Rsss::create );
+			glbarcode::Factory::registerType( "zint::rssso",     Zint::Rssso::create );
+			glbarcode::Factory::registerType( "zint::rssse",     Zint::Rssse::create );
+			glbarcode::Factory::registerType( "zint::hibc128",   Zint::Hibc128::create );
+			glbarcode::Factory::registerType( "zint::hibc39",    Zint::Hibc39::create );
+			glbarcode::Factory::registerType( "zint::hibcdm",    Zint::Hibcdm::create );
+			glbarcode::Factory::registerType( "zint::hibcqr",    Zint::Hibcqr::create );
+			glbarcode::Factory::registerType( "zint::hibcpdf",   Zint::Hibcpdf::create );
+			glbarcode::Factory::registerType( "zint::hibcmpdf",  Zint::Hibcmpdf::create );
+			glbarcode::Factory::registerType( "zint::hibcaz",    Zint::Hibcaz::create );
+			glbarcode::Factory::registerType( "zint::i25",       Zint::I25::create );
+			glbarcode::Factory::registerType( "zint::isbn",      Zint::Isbn::create );
+			glbarcode::Factory::registerType( "zint::itf14",     Zint::Itf14::create );
+			glbarcode::Factory::registerType( "zint::japan",     Zint::Japan::create );
+			glbarcode::Factory::registerType( "zint::korea",     Zint::Korea::create );
+			glbarcode::Factory::registerType( "zint::logm",      Zint::Logm::create );
+			glbarcode::Factory::registerType( "zint::maxi",      Zint::Maxi::create );
+			glbarcode::Factory::registerType( "zint::mpdf",      Zint::Mpdf::create );
+			glbarcode::Factory::registerType( "zint::mqr",       Zint::Mqr::create );
+			glbarcode::Factory::registerType( "zint::msi",       Zint::Msi::create );
+			glbarcode::Factory::registerType( "zint::nve",       Zint::Nve::create );
+			glbarcode::Factory::registerType( "zint::pdf",       Zint::Pdf::create );
+			glbarcode::Factory::registerType( "zint::pdft",      Zint::Pdft::create );
+			glbarcode::Factory::registerType( "zint::plan",      Zint::Plan::create );
+			glbarcode::Factory::registerType( "zint::postnet",   Zint::Postnet::create );
+			glbarcode::Factory::registerType( "zint::pharma",    Zint::Pharma::create );
+			glbarcode::Factory::registerType( "zint::pharma2",   Zint::Pharma2::create );
+			glbarcode::Factory::registerType( "zint::pzn",       Zint::Pzn::create );
+			glbarcode::Factory::registerType( "zint::qr",        Zint::Qr::create );
+			glbarcode::Factory::registerType( "zint::rm4",       Zint::Rm4::create );
+			glbarcode::Factory::registerType( "zint::tele",      Zint::Tele::create );
+			glbarcode::Factory::registerType( "zint::telex",     Zint::Telex::create );
+			glbarcode::Factory::registerType( "zint::upc-a",     Zint::UpcA::create );
+			glbarcode::Factory::registerType( "zint::upc-e",     Zint::UpcE::create );
+			glbarcode::Factory::registerType( "zint::usps",      Zint::Usps::create );
+			glbarcode::Factory::registerType( "zint::pls",       Zint::Pls::create );
 
-		registerStyle( "ausp", "zint", tr("Austraila Post Standard"),
-		               false, false, true, false, "12345678901234567890123", true, 23 );
+			registerStyle( "ausp", "zint", tr("Austraila Post Standard"),
+			               false, false, true, false, "12345678901234567890123", true, 23 );
 
-		registerStyle( "ausrp", "zint", tr("Australia Post Reply Paid"),
-		                false, false, true, false, "12345678", true, 8 );
+			registerStyle( "ausrp", "zint", tr("Australia Post Reply Paid"),
+			               false, false, true, false, "12345678", true, 8 );
 
-		registerStyle( "ausrt", "zint", tr("Australia Post Route Code"),
-		                false, false, true, false, "12345678", true, 8 );
+			registerStyle( "ausrt", "zint", tr("Australia Post Route Code"),
+			               false, false, true, false, "12345678", true, 8 );
 
-		registerStyle( "ausrd", "zint", tr("Australia Post Redirect"),
-		                false, false, true, false, "12345678", true, 8 );
+			registerStyle( "ausrd", "zint", tr("Australia Post Redirect"),
+			               false, false, true, false, "12345678", true, 8 );
 
-		registerStyle( "aztec", "zint", tr("Aztec Code"),
-		                false, false, true, false, "1234567890", true, 10 );
+			registerStyle( "aztec", "zint", tr("Aztec Code"),
+			               false, false, true, false, "1234567890", true, 10 );
           
-		registerStyle( "azrun", "zint", tr("Aztec Rune"),
-		                false, false, true, false, "255", true, 3 );
+			registerStyle( "azrun", "zint", tr("Aztec Rune"),
+			               false, false, true, false, "255", true, 3 );
 
-		registerStyle( "cbr", "zint", tr("Codabar"),
-		                true, true, true, false, "ABCDABCDAB", true, 10 );
+			registerStyle( "cbr", "zint", tr("Codabar"),
+			               true, true, true, false, "ABCDABCDAB", true, 10 );
 
-		registerStyle( "code1", "zint", tr("Code One"), 
-		                false, false, true, false, "0000000000", true, 10 );
+			registerStyle( "code1", "zint", tr("Code One"), 
+			               false, false, true, false, "0000000000", true, 10 );
 
-		registerStyle( "code11", "zint", tr("Code 11"),
-		                true, true, true, false, "0000000000", true, 10 );
+			registerStyle( "code11", "zint", tr("Code 11"),
+			               true, true, true, false, "0000000000", true, 10 );
           
-		registerStyle( "c16k", "zint", tr("Code 16K"),
-		                false, false, true, false, "0000000000", true, 10 );
+			registerStyle( "c16k", "zint", tr("Code 16K"),
+			               false, false, true, false, "0000000000", true, 10 );
           
-		registerStyle( "c25m", "zint", tr("Code 2 of 5 Matrix"), 
-		                true, true, true, false, "0000000000", true, 10 );
+			registerStyle( "c25m", "zint", tr("Code 2 of 5 Matrix"), 
+			               true, true, true, false, "0000000000", true, 10 );
           
-		registerStyle( "c25i", "zint", tr("Code 2 of 5 IATA"), 
-		                true, true, true, false, "0000000000", true, 10 );
+			registerStyle( "c25i", "zint", tr("Code 2 of 5 IATA"), 
+			               true, true, true, false, "0000000000", true, 10 );
           
-		registerStyle( "c25dl", "zint", tr("Code 2 of 5 Data Logic"), 
-		                true, true, true, false, "0000000000", true, 10 );
+			registerStyle( "c25dl", "zint", tr("Code 2 of 5 Data Logic"), 
+			               true, true, true, false, "0000000000", true, 10 );
 
-		registerStyle( "code32", "zint", tr("Code 32 (Italian Pharmacode)"), 
-		                true, true, true, false, "12345678", true, 8 );
+			registerStyle( "code32", "zint", tr("Code 32 (Italian Pharmacode)"), 
+			               true, true, true, false, "12345678", true, 8 );
 
-		registerStyle( "code39", "zint", tr("Code 39"),
-		                true, true, false, false, "0000000000", true, 10 );
+			registerStyle( "code39", "zint", tr("Code 39"),
+			               true, true, false, false, "0000000000", true, 10 );
           
-		registerStyle( "code39e", "zint", tr("Code 39 Extended"), 
-		                true, true, true, false, "0000000000", true, 10 );
+			registerStyle( "code39e", "zint", tr("Code 39 Extended"), 
+			               true, true, true, false, "0000000000", true, 10 );
 
-		registerStyle( "code49", "zint", tr("Code 49"),
-		                false, false, true, false, "0000000000", true, 10 );
+			registerStyle( "code49", "zint", tr("Code 49"),
+			               false, false, true, false, "0000000000", true, 10 );
 
-		registerStyle( "code93", "zint", tr("Code 93"),
-		                true, true, true, false, "0000000000", true, 10 );
+			registerStyle( "code93", "zint", tr("Code 93"),
+			               true, true, true, false, "0000000000", true, 10 );
 
-		registerStyle( "code128", "zint", tr("Code 128"),
-		                true, true, true, false, "0000000000", true, 10 );
+			registerStyle( "code128", "zint", tr("Code 128"),
+			               true, true, true, false, "0000000000", true, 10 );
           
-		registerStyle( "code128b", "zint", tr("Code 128 (Mode C supression)"),
-		                true, true, true, false, "0000000000", true, 10 );
+			registerStyle( "code128b", "zint", tr("Code 128 (Mode C supression)"),
+			               true, true, true, false, "0000000000", true, 10 );
           
-		registerStyle( "daft", "zint", tr("DAFT Code"),
-		                false, false, false, false, "DAFTDAFTDAFTDAFT", true, 16 );
+			registerStyle( "daft", "zint", tr("DAFT Code"),
+			               false, false, false, false, "DAFTDAFTDAFTDAFT", true, 16 );
 
-		registerStyle( "dmtx", "zint", tr("Data Matrix"),
-		                false, false, true, false, "0000000000", true, 10 );
+			registerStyle( "dmtx", "zint", tr("Data Matrix"),
+			               false, false, true, false, "0000000000", true, 10 );
 
-		registerStyle( "dpl", "zint", tr("Deutsche Post Leitcode"),
-		                true, true, true, false, "1234567890123", true, 13 );
+			registerStyle( "dpl", "zint", tr("Deutsche Post Leitcode"),
+			               true, true, true, false, "1234567890123", true, 13 );
           
-		registerStyle( "dpi", "zint", tr("Deutsche Post Identcode"),
-		                true, true, true, false, "12345678901", true, 11 );
+			registerStyle( "dpi", "zint", tr("Deutsche Post Identcode"),
+			               true, true, true, false, "12345678901", true, 11 );
           
-		registerStyle( "kix", "zint", tr("Dutch Post KIX Code"),
-		                false, false, true, false, "0000000000", true, 10 );
+			registerStyle( "kix", "zint", tr("Dutch Post KIX Code"),
+			               false, false, true, false, "0000000000", true, 10 );
 
-		registerStyle( "ean", "zint", tr("EAN"),
-		                true, true, true, false, "1234567890123", false, 13 );
+			registerStyle( "ean", "zint", tr("EAN"),
+			               true, true, true, false, "1234567890123", false, 13 );
 
-		registerStyle( "gmtx", "zint", tr("Grid Matrix"), 
-		                false, false, true, false, "0000000000", true, 10 );
+			registerStyle( "gmtx", "zint", tr("Grid Matrix"), 
+			               false, false, true, false, "0000000000", true, 10 );
 
-		registerStyle( "gs1-128", "zint", tr("GS1-128"),
-		                true, true, true, false, "[01]12345678901234", false, 18 );
+			registerStyle( "gs1-128", "zint", tr("GS1-128"),
+			               true, true, true, false, "[01]12345678901234", false, 18 );
 
-		registerStyle( "rss14", "zint", tr("GS1 DataBar-14"),
-		                true, true, true, false, "1234567890123", true, 13 );
+			registerStyle( "rss14", "zint", tr("GS1 DataBar-14"),
+			               true, true, true, false, "1234567890123", true, 13 );
           
-		registerStyle( "rssltd", "zint", "GS1 DataBar-14 Limited", 
-		                true, true, true, false, "1234567890123", true, 13 );
+			registerStyle( "rssltd", "zint", "GS1 DataBar-14 Limited", 
+			               true, true, true, false, "1234567890123", true, 13 );
           
-		registerStyle( "rssexp", "zint", "GS1 DataBar Extended", 
-		                true, true, true, false, "[01]12345678901234", false, 18 );
+			registerStyle( "rssexp", "zint", "GS1 DataBar Extended", 
+			               true, true, true, false, "[01]12345678901234", false, 18 );
           
-		registerStyle( "rsss", "zint", tr("GS1 DataBar-14 Stacked"),
-		                false, false, true, false, "0000000000", true, 10 );
+			registerStyle( "rsss", "zint", tr("GS1 DataBar-14 Stacked"),
+			               false, false, true, false, "0000000000", true, 10 );
 
-		registerStyle( "rssso", "zint", tr("GS1 DataBar-14 Stacked Omni."),
-		                false, false, true, false, "0000000000", true, 10 );
+			registerStyle( "rssso", "zint", tr("GS1 DataBar-14 Stacked Omni."),
+			               false, false, true, false, "0000000000", true, 10 );
 
-		registerStyle( "rssse", "zint", tr("GS1 DataBar Extended Stacked"),
-		                false, false, true, false, "[01]12345678901234", false, 18 );
+			registerStyle( "rssse", "zint", tr("GS1 DataBar Extended Stacked"),
+			               false, false, true, false, "[01]12345678901234", false, 18 );
 
-		registerStyle( "hibc128", "zint", tr("HIBC Code 128"),
-		                true, true, true, false, "0000000000", true, 10 );
+			registerStyle( "hibc128", "zint", tr("HIBC Code 128"),
+			               true, true, true, false, "0000000000", true, 10 );
 
-		registerStyle( "hibc39", "zint", tr("HIBC Code 39"),
-		                true, true, true, false, "0000000000", true, 10 );
+			registerStyle( "hibc39", "zint", tr("HIBC Code 39"),
+			               true, true, true, false, "0000000000", true, 10 );
 
-		registerStyle( "hibcdm", "zint", tr("HIBC Data Matrix"),
-		                false, false, true, false, "0000000000", true, 10 );
+			registerStyle( "hibcdm", "zint", tr("HIBC Data Matrix"),
+			               false, false, true, false, "0000000000", true, 10 );
 
-		registerStyle( "hibcqr", "zint", tr("HIBC QR Code"),
-		                false, false, true, false, "0000000000", true, 10 );
+			registerStyle( "hibcqr", "zint", tr("HIBC QR Code"),
+			               false, false, true, false, "0000000000", true, 10 );
 
-		registerStyle( "hibcpdf", "zint", tr("HIBC PDF417"),
-		                false, false, true, false, "0000000000", true, 10 );
+			registerStyle( "hibcpdf", "zint", tr("HIBC PDF417"),
+			               false, false, true, false, "0000000000", true, 10 );
 
-		registerStyle( "hibcmpdf", "zint", tr("HIBC Micro PDF417"),
-		                false, false, true, false, "0000000000", true, 10 );
+			registerStyle( "hibcmpdf", "zint", tr("HIBC Micro PDF417"),
+			               false, false, true, false, "0000000000", true, 10 );
 
-		registerStyle( "hibcaz", "zint", tr("HIBC Aztec Code"),
-		                true, true, true, false, "0000000000", true, 10 );
+			registerStyle( "hibcaz", "zint", tr("HIBC Aztec Code"),
+			               true, true, true, false, "0000000000", true, 10 );
 
-		registerStyle( "i25", "zint", tr("Interleaved 2 of 5"),
-		                true, true, true, false, "0000000000", true, 10 );
+			registerStyle( "i25", "zint", tr("Interleaved 2 of 5"),
+			               true, true, true, false, "0000000000", true, 10 );
 
-		registerStyle( "isbn", "zint", tr("ISBN"),
-		                true, true, true, false, "123456789", false, 9 );
+			registerStyle( "isbn", "zint", tr("ISBN"),
+			               true, true, true, false, "123456789", false, 9 );
 
-		registerStyle( "itf14", "zint", tr("ITF-14"),
-		                true, true, true, false, "0000000000", true, 10 );
+			registerStyle( "itf14", "zint", tr("ITF-14"),
+			               true, true, true, false, "0000000000", true, 10 );
 
-		registerStyle( "japan", "zint", tr("Japanese Postal"),
-		                false, false, true, false, "0000000000", true, 10 );
+			registerStyle( "japan", "zint", tr("Japanese Postal"),
+			               false, false, true, false, "0000000000", true, 10 );
 
-		registerStyle( "korea", "zint", tr("Korean Postal"),
-		                true, true, true, false, "123456", false, 6 );
+			registerStyle( "korea", "zint", tr("Korean Postal"),
+			               true, true, true, false, "123456", false, 6 );
 
-		registerStyle( "logm", "zint", tr("LOGMARS"),
-		                true, true, true, false, "0000000000", true, 10 );
+			registerStyle( "logm", "zint", tr("LOGMARS"),
+			               true, true, true, false, "0000000000", true, 10 );
 
-		registerStyle( "maxi", "zint", tr("Maxicode"),
-		                false, false, false, false, "0000000000", true, 10 );
+			registerStyle( "maxi", "zint", tr("Maxicode"),
+			               false, false, false, false, "0000000000", true, 10 );
 
-		registerStyle( "mpdf", "zint", tr("Micro PDF417"),
-		                false, false, true, false, "0000000000", true, 10 );
+			registerStyle( "mpdf", "zint", tr("Micro PDF417"),
+			               false, false, true, false, "0000000000", true, 10 );
 
-		registerStyle( "mqr", "zint", tr("Micro QR Code"),
-		                false, false, true, false, "0000000000", true, 10 );
+			registerStyle( "mqr", "zint", tr("Micro QR Code"),
+			               false, false, true, false, "0000000000", true, 10 );
 
-		registerStyle( "msi", "zint", tr("MSI Plessey"),
-		                true, true, true, false, "0000000000", true, 10 );
+			registerStyle( "msi", "zint", tr("MSI Plessey"),
+			               true, true, true, false, "0000000000", true, 10 );
 
-		registerStyle( "nve", "zint", tr("NVE-18"),
-		                true, true, true, false, "12345678901234567", false, 17 );
+			registerStyle( "nve", "zint", tr("NVE-18"),
+			               true, true, true, false, "12345678901234567", false, 17 );
 
-		registerStyle( "pdf", "zint", tr("PDF417"),
-		                false, false, true, false, "0000000000", true, 10 );
+			registerStyle( "pdf", "zint", tr("PDF417"),
+			               false, false, true, false, "0000000000", true, 10 );
 
-		registerStyle( "pdft", "zint", tr("PDF417 Truncated"),
-		                false, false, true, false, "0000000000", true, 10 );
+			registerStyle( "pdft", "zint", tr("PDF417 Truncated"),
+			               false, false, true, false, "0000000000", true, 10 );
 
-		registerStyle( "plan", "zint", tr("PLANET"),
-		                false, false, true, false, "0000000000", true, 10 );
+			registerStyle( "plan", "zint", tr("PLANET"),
+			               false, false, true, false, "0000000000", true, 10 );
 
-		registerStyle( "postnet", "zint", tr("PostNet"),
-		                true, true, true, false, "0000000000", true, 10 );
+			registerStyle( "postnet", "zint", tr("PostNet"),
+			               true, true, true, false, "0000000000", true, 10 );
 
-		registerStyle( "pharma", "zint", tr("Pharmacode"),
-		                false, false, true, false, "123456", false, 6 );
+			registerStyle( "pharma", "zint", tr("Pharmacode"),
+			               false, false, true, false, "123456", false, 6 );
 
-		registerStyle( "pharma2", "zint", tr("Pharmacode 2-track"),
-		                false, false, true, false, "12345678", false, 8 );
+			registerStyle( "pharma2", "zint", tr("Pharmacode 2-track"),
+			               false, false, true, false, "12345678", false, 8 );
 
-		registerStyle( "pzn", "zint", tr("Pharmazentral Nummer (PZN)"),
-		                true, true, true, false, "123456", false, 6 );
+			registerStyle( "pzn", "zint", tr("Pharmazentral Nummer (PZN)"),
+			               true, true, true, false, "123456", false, 6 );
 
-		registerStyle( "qr", "zint", tr("QR Code"),
-		                true, true, true, false, "0000000000", true, 10 );
+			registerStyle( "qr", "zint", tr("QR Code"),
+			               true, true, true, false, "0000000000", true, 10 );
 
-		registerStyle( "rm4", "zint", tr("Royal Mail 4-State"),
-		                false, false, true, false, "0000000000", true, 10 );
+			registerStyle( "rm4", "zint", tr("Royal Mail 4-State"),
+			               false, false, true, false, "0000000000", true, 10 );
 
-		registerStyle( "tele", "zint", tr("Telepen"),
-		                true, true, true, false, "0000000000", true, 10 );
+			registerStyle( "tele", "zint", tr("Telepen"),
+			               true, true, true, false, "0000000000", true, 10 );
 
-		registerStyle( "telex", "zint", tr("Telepen Numeric"),
-		                true, true, true, false, "0000000000", true, 10 );
+			registerStyle( "telex", "zint", tr("Telepen Numeric"),
+			               true, true, true, false, "0000000000", true, 10 );
 
-		registerStyle( "upc-a", "zint", tr("UPC-A"), 
-		                true, true, true, false, "12345678901", false, 11 );
+			registerStyle( "upc-a", "zint", tr("UPC-A"), 
+			               true, true, true, false, "12345678901", false, 11 );
           
-		registerStyle( "upc-e", "zint", tr("UPC-E"), 
-		                true, true, true, false, "1234567", false, 7 );
+			registerStyle( "upc-e", "zint", tr("UPC-E"), 
+			               true, true, true, false, "1234567", false, 7 );
           
-		registerStyle( "usps", "zint", tr("USPS One Code"),
-		                false, false, true, false, "12345678901234567890", true, 20 );
+			registerStyle( "usps", "zint", tr("USPS One Code"),
+			               false, false, true, false, "12345678901234567890", true, 20 );
 
-		registerStyle( "pls", "zint", tr("UK Plessey"),
-		                true, true, true, false, "0000000000", true, 10 );
+			registerStyle( "pls", "zint", tr("UK Plessey"),
+			               true, true, true, false, "0000000000", true, 10 );
 #endif // HAVE_ZINT
 
-	}
-
-
-	void Backends::init()
-	{
-		static Backends* singletonInstance = nullptr;
-                
-		if ( singletonInstance == nullptr )
-		{
-			singletonInstance = new Backends();
 		}
-	}
 
 
-	const QStringList& Backends::backendList()
-	{
-		return mBackendIdList;
-	}
-
-	
-	QString Backends::backendName( const QString& backendId )
-	{
-		return mBackendNameMap[ backendId ];
-	}
-
-	
-	const QList<Style>& Backends::styleList()
-	{
-		return mStyleList;
-	}
-
-
-	const Style& Backends::defaultStyle()
-	{
-		return mStyleList[0];
-	}
-
-
-	const Style& Backends::style( const QString& backendId, const QString& StyleId )
-	{
-		foreach ( const Style& bcStyle, mStyleList )
+		void Backends::init()
 		{
-			if ( (bcStyle.backendId() == backendId) && (bcStyle.id() == StyleId) )
+			static Backends* singletonInstance = nullptr;
+                
+			if ( singletonInstance == nullptr )
 			{
-				return bcStyle;
+				singletonInstance = new Backends();
 			}
 		}
 
-		return defaultStyle();
-	}
+
+		const QStringList& Backends::backendList()
+		{
+			return mBackendIdList;
+		}
+
+	
+		QString Backends::backendName( const QString& backendId )
+		{
+			return mBackendNameMap[ backendId ];
+		}
+
+	
+		const QList<Style>& Backends::styleList()
+		{
+			return mStyleList;
+		}
 
 
-	void Backends::registerBackend( const QString& backendId, const QString& backendName )
-	{
-		mBackendIdList.append( backendId );
-		mBackendNameMap[ backendId ] = backendName;
-	}
+		const Style& Backends::defaultStyle()
+		{
+			return mStyleList[0];
+		}
 
 
-	void Backends::registerStyle( const QString& id,
-	                              const QString& backendId,
-	                              const QString& name,
-	                              bool           canText,
-	                              bool           textOptional,
-	                              bool           canChecksum,
-	                              bool           checksumOptional,
-	                              const QString& defaultDigits,
-	                              bool           canFreeForm,
-	                              int            preferedN )
-	{
-		Style style( id, backendId, name,
-		             canText, textOptional,
-		             canChecksum, checksumOptional,
-		             defaultDigits,
-		             canFreeForm, preferedN );
+		const Style& Backends::style( const QString& backendId, const QString& StyleId )
+		{
+			foreach ( const Style& bcStyle, mStyleList )
+			{
+				if ( (bcStyle.backendId() == backendId) && (bcStyle.id() == StyleId) )
+				{
+					return bcStyle;
+				}
+			}
 
-		mStyleList.append( style );
-	}
+			return defaultStyle();
+		}
 
-} // namespace glabels::barcode
+
+		void Backends::registerBackend( const QString& backendId, const QString& backendName )
+		{
+			mBackendIdList.append( backendId );
+			mBackendNameMap[ backendId ] = backendName;
+		}
+
+
+		void Backends::registerStyle( const QString& id,
+		                              const QString& backendId,
+		                              const QString& name,
+		                              bool           canText,
+		                              bool           textOptional,
+		                              bool           canChecksum,
+		                              bool           checksumOptional,
+		                              const QString& defaultDigits,
+		                              bool           canFreeForm,
+		                              int            preferedN )
+		{
+			Style style( id, backendId, name,
+			             canText, textOptional,
+			             canChecksum, checksumOptional,
+			             defaultDigits,
+			             canFreeForm, preferedN );
+
+			mStyleList.append( style );
+		}
+
+	} // namespace barcode
+} //namespace glabels
diff --git a/backends/barcode/Backends.h b/backends/barcode/Backends.h
index 46d5ca0..0329400 100644
--- a/backends/barcode/Backends.h
+++ b/backends/barcode/Backends.h
@@ -30,65 +30,68 @@
 #include <QString>
 
 
-namespace glabels::barcode
+namespace glabels
 {
-	
-	///
-	///  Backends Database
-	///
-	class Backends : public QObject
+	namespace barcode
 	{
-		Q_OBJECT
+	
+		///
+		///  Backends Database
+		///
+		class Backends : public QObject
+		{
+			Q_OBJECT
 
 	  
-		/////////////////////////////////
-		// Life Cycle
-		/////////////////////////////////
-	private:
-		Backends();
+			/////////////////////////////////
+			// Life Cycle
+			/////////////////////////////////
+		private:
+			Backends();
 
-	public:
-		static void init();
+		public:
+			static void init();
 
-		/////////////////////////////////
-		// Public Methods
-		/////////////////////////////////
-	public:
-		static const QStringList& backendList();
-		static QString backendName( const QString& backendId );
-		static const QList<Style>& styleList();
-		static const Style& defaultStyle();
-		static const Style& style( const QString& backendId, const QString& StyleId );
+			/////////////////////////////////
+			// Public Methods
+			/////////////////////////////////
+		public:
+			static const QStringList& backendList();
+			static QString backendName( const QString& backendId );
+			static const QList<Style>& styleList();
+			static const Style& defaultStyle();
+			static const Style& style( const QString& backendId, const QString& StyleId );
 
 
-		/////////////////////////////////
-		// Private Methods
-		/////////////////////////////////
-	private:
-		static void registerBackend( const QString &backendId, const QString &backendName );
+			/////////////////////////////////
+			// Private Methods
+			/////////////////////////////////
+		private:
+			static void registerBackend( const QString &backendId, const QString &backendName );
 
-		static void registerStyle( const QString& id,
-		                           const QString& backendId,
-		                           const QString& name,
-		                           bool           canText,
-		                           bool           textOptional,
-		                           bool           canChecksum,
-		                           bool           checksumOptional,
-		                           const QString& defaultDigits,
-		                           bool           canFreeForm,
-		                           int            preferedN );
+			static void registerStyle( const QString& id,
+			                           const QString& backendId,
+			                           const QString& name,
+			                           bool           canText,
+			                           bool           textOptional,
+			                           bool           canChecksum,
+			                           bool           checksumOptional,
+			                           const QString& defaultDigits,
+			                           bool           canFreeForm,
+			                           int            preferedN );
 
 
-		/////////////////////////////////
-		// Private Members
-		/////////////////////////////////
-		static QStringList mBackendIdList;
-		static QMap<QString,QString> mBackendNameMap;
+			/////////////////////////////////
+			// Private Members
+			/////////////////////////////////
+			static QStringList mBackendIdList;
+			static QMap<QString,QString> mBackendNameMap;
 
-		static QList<Style> mStyleList;
+			static QList<Style> mStyleList;
 
-	};
+		};
 
+	}
 }
 
 
diff --git a/backends/barcode/GnuBarcode.cpp b/backends/barcode/GnuBarcode.cpp
index 699f596..fb57662 100644
--- a/backends/barcode/GnuBarcode.cpp
+++ b/backends/barcode/GnuBarcode.cpp
@@ -34,872 +34,875 @@ namespace
 }
 
 
-namespace glabels::barcode
+namespace glabels
 {
-	namespace GnuBarcode
+	namespace barcode
 	{
-
-		bool Base::isAscii( const std::string& data ) const
+		namespace GnuBarcode
 		{
-			for ( unsigned int i = 0; i < data.size(); i++ )
-			{
-				if ( (data[i] & 0x80) != 0 )
-				{
-					return false;
-				}
-			}
 
-			return true;			
-		}
+			bool Base::isAscii( const std::string& data ) const
+			{
+				for ( unsigned int i = 0; i < data.size(); i++ )
+				{
+					if ( (data[i] & 0x80) != 0 )
+					{
+						return false;
+					}
+				}
+
+				return true;			
+			}
 		
 			
-		bool Base::isNumericLengthValid( const std::string& data,
-		                                 unsigned int       nMin,
-		                                 unsigned int       nMax ) const
-		{
-			unsigned int n = 0;
-
-			for ( unsigned int i = 0; i < data.size(); i++ )
+			bool Base::isNumericLengthValid( const std::string& data,
+			                                 unsigned int       nMin,
+			                                 unsigned int       nMax ) const
 			{
-				if ( isdigit(data[i]) )
-				{
-					n++;
-				}
-			}
+				unsigned int n = 0;
 
-			return (n >= nMin) && (n <= nMax);
-		}
+				for ( unsigned int i = 0; i < data.size(); i++ )
+				{
+					if ( isdigit(data[i]) )
+					{
+						n++;
+					}
+				}
+
+				return (n >= nMin) && (n <= nMax);
+			}
 		
 
-		bool Base::isNumericLength1Valid( const std::string& data,
-		                                  unsigned int       nMin,
-		                                  unsigned int       nMax ) const
-		{
-			unsigned int n = 0;
-
-			for ( unsigned int i = 0; !isspace(data[i]) && (i < data.size()); i++ )
+			bool Base::isNumericLength1Valid( const std::string& data,
+			                                  unsigned int       nMin,
+			                                  unsigned int       nMax ) const
 			{
-				if ( isdigit(data[i]) )
-				{
-					n++;
-				}
-				else if ( !isspace(data[i]) )
-				{
-					return false;
-				}
-			}
+				unsigned int n = 0;
 
-			return (n >= nMin) && (n <= nMax);
-		}
+				for ( unsigned int i = 0; !isspace(data[i]) && (i < data.size()); i++ )
+				{
+					if ( isdigit(data[i]) )
+					{
+						n++;
+					}
+					else if ( !isspace(data[i]) )
+					{
+						return false;
+					}
+				}
+
+				return (n >= nMin) && (n <= nMax);
+			}
 		
 
-		bool Base::isNumericLength2Valid( const std::string& data,
-		                                  unsigned int       nMin,
-		                                  unsigned int       nMax ) const
-		{
-			unsigned int i;
-			unsigned int n = 0;
-
-			for ( i = 0; !isspace(data[i]) && (i < data.size()); i++ )
+			bool Base::isNumericLength2Valid( const std::string& data,
+			                                  unsigned int       nMin,
+			                                  unsigned int       nMax ) const
 			{
-				/* Skip over 1st string */
-			}
+				unsigned int i;
+				unsigned int n = 0;
 
-			for ( i++ /* skip space */ ; i < data.size(); i++ )
-			{
-				if ( isdigit(data[i]) )
+				for ( i = 0; !isspace(data[i]) && (i < data.size()); i++ )
 				{
-					n++;
+					/* Skip over 1st string */
 				}
-				else
+
+				for ( i++ /* skip space */ ; i < data.size(); i++ )
 				{
-					return false;
-				}
-			}
-
-			return (n >= nMin) && (n <= nMax);
-		}
-		
-			
-		void Base::vectorize( const std::string& encodedData,
-		                      const std::string& displayText,
-		                      const std::string& cookedData,
-		                      double&            w,
-		                      double&            h )
-		{
-			/*
-			 * First encode using GNU Barcode library.
-			 */
-			Barcode_Item* bci = Barcode_Create( (char*)cookedData.c_str() );
-
-			bci->scalef = 0;
-			bci->width  = (int)w;
-			bci->height = (int)h;
-
-			bci->flags = flags;
-			if ( !showText() )
-			{
-				bci->flags |= BARCODE_NO_ASCII;
-			}
-			if ( !checksum() )
-			{
-				bci->flags |= BARCODE_NO_CHECKSUM;
-			}
-
-			Barcode_Encode( bci, flags );
-
-			if ( (bci->partial == nullptr) || (bci->textinfo == nullptr) )
-			{
-				Barcode_Delete( bci );
-				setIsDataValid( false );
-				return;
-			}
-
-
-			/*
-			 * Now do the actual vectorization.
-			 *
-			 * This code is based on the postscript renderer (ps.c) from the GNU barcode library:
-			 *
-			 *     Copyright (C) 1999 Alessaandro Rubini (rubini@gnu.org)
-			 *     Copyright (C) 1999 Prosa Srl. (prosa@prosa.it)
-			 */
-			if (bci->width > (2*bci->margin))
-			{
-				bci->width -= 2*bci->margin;
-			}
-			if (bci->height > (2*bci->margin))
-			{
-				bci->height -= 2*bci->margin;
-			}
-
-			/* First calculate barlen */
-			int barlen = bci->partial[0] - '0';
-			for ( int i = 1; bci->partial[i] != 0; i++ )
-			{
-				if ( isdigit(bci->partial[i]) )
-				{
-					barlen += bci->partial[i] - '0';
-				}
-				else
-				{
-					if ( (bci->partial[i] != '+') && (bci->partial[i] != '-') )
+					if ( isdigit(data[i]) )
 					{
-						barlen += bci->partial[i] - 'a' + 1;
-					}
-				}
-			}
-
-			/* The scale factor depends on bar length */
-			double scalef = 1;
-			if ( bci->scalef == 0 )
-			{
-				if ( bci->width == 0 )
-				{
-					bci->width = barlen; /* default */
-				}
-				scalef = bci->scalef = (double)bci->width / (double)barlen;
-				if ( scalef < 0.5 )
-				{
-					scalef = 0.5;
-				}
-			}
-
-			/* The width defaults to "just enough" */
-			bci->width = (int)( barlen * scalef + 1 );
-
-			/* But it can be too small, in this case enlarge and center the area */
-			if ( bci->width < (int)(barlen * scalef) )
-			{
-				int wid = (int)( barlen * scalef + 1);
-				bci->xoff -= (wid - bci->width)/2 ;
-				bci->width = wid;
-				/* Can't extend too far on the left */
-				if (bci->xoff < 0)
-				{
-					bci->width += -bci->xoff;
-					bci->xoff = 0;
-				}
-			}
-
-			/* The height defaults to 80 points (rescaled) */
-			if ( bci->height == 0 )
-			{
-				bci->height = (int)( 80 * scalef );
-			}
-
-			/* If too small (5 + text), reduce the scale factor and center */
-			int i = 5 + 10 * ( ((bci->flags & BARCODE_NO_ASCII)==0) ? 1 : 0 );
-			if ( bci->height < (int)(i * scalef) )
-			{
-				bci->height = (int)( i * scalef );
-			}
-
-			/* Now traverse the code string and create a list of lines */
-			char mode = '-'; /* text below bars */
-			double x = bci->margin + (bci->partial[0] - '0') * scalef;
-			i = 1;
-			for ( int ip = 1; bci->partial[ip] != 0; ip++, i++)
-			{
-				/* special cases: '+' and '-' */
-				if ( bci->partial[ip] == '+' || bci->partial[ip] == '-' )
-				{
-					mode = bci->partial[ip];        /* don't count it */
-					i++;
-					continue;
-				}
-				/* j is the width of this bar/space */
-				int j;
-				if ( isdigit(bci->partial[ip]) )
-				{
-					j = bci->partial[ip] - '0';
-				}
-				else
-				{
-					j = bci->partial[ip] - 'a' + 1;
-				}
-				if ( (i % 2) != 0 )
-				{
-					/* bar */
-					double x0 = x;
-					double y0 = bci->margin;
-					double yr = bci->height;
-					if ( (bci->flags & BARCODE_NO_ASCII) == 0 )
-					{
-						/* leave space for text */
-						if (mode == '-')
-						{
-							/* text below bars: 10 or 5 points */
-							yr -= (isdigit(bci->partial[ip]) ? 10 : 5) * scalef;
-						}
-						else
-						{
-							/* '+' */
-							/* above bars: 10 or 0 from bottom,
-							   and 10 from top */
-							y0 += 10 * scalef;
-							yr -= (isdigit(bci->partial[ip]) ? 20 : 10) * scalef;
-						}
-					}
-					addBox( x0, y0, (j * scalef) - INK_BLEED, yr );
-				}
-				x += j * scalef;
-
-			}
-
-			/* Now the text */
-			mode = '-';                /* reinstantiate default */
-			if ( (bci->flags & BARCODE_NO_ASCII) == 0 )
-			{
-				int len = strlen( bci->textinfo );
-				for ( int i = 0; i < len; i++ )
-				{
-					if ( bci->textinfo[i] == ' ' )
-					{
-						continue;
-					}
-					if ( (bci->textinfo[i] == '+') || (bci->textinfo[i] == '-') )
-					{
-						mode = bci->textinfo[i];
-						continue;
-					}
-					double f1, f2;
-					char   c;
-					if ( sscanf( &bci->textinfo[i], "%lf:%lf:%c", &f1, &f2, &c) != 3 )
-					{
-						qDebug() << "Impossible data:" << QString(&bci->textinfo[i]);
-						continue;
-					}
-					f2 *= FONT_SCALE;
-					double x0 = f1*scalef + bci->margin + 0.4*f2*scalef;
-					double y0;
-					if (mode == '-')
-					{
-						y0 = bci->margin + bci->height - 8*scalef + 0.75*f2*scalef;
+						n++;
 					}
 					else
 					{
-						y0 = bci->margin + 0.75*f2*scalef;
-					}
-					addText( x0, y0, f2*scalef, QString(c).toStdString() );
-
-					/* skip past the substring we just read. */
-					while ( (bci->textinfo[i] != ' ') && (bci->textinfo[i] != 0) )
-					{
-						i++;
+						return false;
 					}
 				}
+
+				return (n >= nMin) && (n <= nMax);
+			}
+		
+			
+			void Base::vectorize( const std::string& encodedData,
+			                      const std::string& displayText,
+			                      const std::string& cookedData,
+			                      double&            w,
+			                      double&            h )
+			{
+				/*
+				 * First encode using GNU Barcode library.
+				 */
+				Barcode_Item* bci = Barcode_Create( (char*)cookedData.c_str() );
+
+				bci->scalef = 0;
+				bci->width  = (int)w;
+				bci->height = (int)h;
+
+				bci->flags = flags;
+				if ( !showText() )
+				{
+					bci->flags |= BARCODE_NO_ASCII;
+				}
+				if ( !checksum() )
+				{
+					bci->flags |= BARCODE_NO_CHECKSUM;
+				}
+
+				Barcode_Encode( bci, flags );
+
+				if ( (bci->partial == nullptr) || (bci->textinfo == nullptr) )
+				{
+					Barcode_Delete( bci );
+					setIsDataValid( false );
+					return;
+				}
+
+
+				/*
+				 * Now do the actual vectorization.
+				 *
+				 * This code is based on the postscript renderer (ps.c) from the GNU barcode library:
+				 *
+				 *     Copyright (C) 1999 Alessaandro Rubini (rubini@gnu.org)
+				 *     Copyright (C) 1999 Prosa Srl. (prosa@prosa.it)
+				 */
+				if (bci->width > (2*bci->margin))
+				{
+					bci->width -= 2*bci->margin;
+				}
+				if (bci->height > (2*bci->margin))
+				{
+					bci->height -= 2*bci->margin;
+				}
+
+				/* First calculate barlen */
+				int barlen = bci->partial[0] - '0';
+				for ( int i = 1; bci->partial[i] != 0; i++ )
+				{
+					if ( isdigit(bci->partial[i]) )
+					{
+						barlen += bci->partial[i] - '0';
+					}
+					else
+					{
+						if ( (bci->partial[i] != '+') && (bci->partial[i] != '-') )
+						{
+							barlen += bci->partial[i] - 'a' + 1;
+						}
+					}
+				}
+
+				/* The scale factor depends on bar length */
+				double scalef = 1;
+				if ( bci->scalef == 0 )
+				{
+					if ( bci->width == 0 )
+					{
+						bci->width = barlen; /* default */
+					}
+					scalef = bci->scalef = (double)bci->width / (double)barlen;
+					if ( scalef < 0.5 )
+					{
+						scalef = 0.5;
+					}
+				}
+
+				/* The width defaults to "just enough" */
+				bci->width = (int)( barlen * scalef + 1 );
+
+				/* But it can be too small, in this case enlarge and center the area */
+				if ( bci->width < (int)(barlen * scalef) )
+				{
+					int wid = (int)( barlen * scalef + 1);
+					bci->xoff -= (wid - bci->width)/2 ;
+					bci->width = wid;
+					/* Can't extend too far on the left */
+					if (bci->xoff < 0)
+					{
+						bci->width += -bci->xoff;
+						bci->xoff = 0;
+					}
+				}
+
+				/* The height defaults to 80 points (rescaled) */
+				if ( bci->height == 0 )
+				{
+					bci->height = (int)( 80 * scalef );
+				}
+
+				/* If too small (5 + text), reduce the scale factor and center */
+				int i = 5 + 10 * ( ((bci->flags & BARCODE_NO_ASCII)==0) ? 1 : 0 );
+				if ( bci->height < (int)(i * scalef) )
+				{
+					bci->height = (int)( i * scalef );
+				}
+
+				/* Now traverse the code string and create a list of lines */
+				char mode = '-'; /* text below bars */
+				double x = bci->margin + (bci->partial[0] - '0') * scalef;
+				i = 1;
+				for ( int ip = 1; bci->partial[ip] != 0; ip++, i++)
+				{
+					/* special cases: '+' and '-' */
+					if ( bci->partial[ip] == '+' || bci->partial[ip] == '-' )
+					{
+						mode = bci->partial[ip];        /* don't count it */
+						i++;
+						continue;
+					}
+					/* j is the width of this bar/space */
+					int j;
+					if ( isdigit(bci->partial[ip]) )
+					{
+						j = bci->partial[ip] - '0';
+					}
+					else
+					{
+						j = bci->partial[ip] - 'a' + 1;
+					}
+					if ( (i % 2) != 0 )
+					{
+						/* bar */
+						double x0 = x;
+						double y0 = bci->margin;
+						double yr = bci->height;
+						if ( (bci->flags & BARCODE_NO_ASCII) == 0 )
+						{
+							/* leave space for text */
+							if (mode == '-')
+							{
+								/* text below bars: 10 or 5 points */
+								yr -= (isdigit(bci->partial[ip]) ? 10 : 5) * scalef;
+							}
+							else
+							{
+								/* '+' */
+								/* above bars: 10 or 0 from bottom,
+								   and 10 from top */
+								y0 += 10 * scalef;
+								yr -= (isdigit(bci->partial[ip]) ? 20 : 10) * scalef;
+							}
+						}
+						addBox( x0, y0, (j * scalef) - INK_BLEED, yr );
+					}
+					x += j * scalef;
+
+				}
+
+				/* Now the text */
+				mode = '-';                /* reinstantiate default */
+				if ( (bci->flags & BARCODE_NO_ASCII) == 0 )
+				{
+					int len = strlen( bci->textinfo );
+					for ( int i = 0; i < len; i++ )
+					{
+						if ( bci->textinfo[i] == ' ' )
+						{
+							continue;
+						}
+						if ( (bci->textinfo[i] == '+') || (bci->textinfo[i] == '-') )
+						{
+							mode = bci->textinfo[i];
+							continue;
+						}
+						double f1, f2;
+						char   c;
+						if ( sscanf( &bci->textinfo[i], "%lf:%lf:%c", &f1, &f2, &c) != 3 )
+						{
+							qDebug() << "Impossible data:" << QString(&bci->textinfo[i]);
+							continue;
+						}
+						f2 *= FONT_SCALE;
+						double x0 = f1*scalef + bci->margin + 0.4*f2*scalef;
+						double y0;
+						if (mode == '-')
+						{
+							y0 = bci->margin + bci->height - 8*scalef + 0.75*f2*scalef;
+						}
+						else
+						{
+							y0 = bci->margin + 0.75*f2*scalef;
+						}
+						addText( x0, y0, f2*scalef, QString(c).toStdString() );
+
+						/* skip past the substring we just read. */
+						while ( (bci->textinfo[i] != ' ') && (bci->textinfo[i] != 0) )
+						{
+							i++;
+						}
+					}
+				}
+
+				/* Fill in other info */
+				w = bci->width  + 2.0*bci->margin;
+				h = bci->height + 2.0*bci->margin;
+
+				/* Cleanup */
+				Barcode_Delete( bci );
 			}
 
-			/* Fill in other info */
-			w = bci->width  + 2.0*bci->margin;
-			h = bci->height + 2.0*bci->margin;
-
-			/* Cleanup */
-			Barcode_Delete( bci );
-		}
 
-
-		//////////////////////////////////////////////////////
-		// EAN Barcode (Any)
-		//////////////////////////////////////////////////////
-		glbarcode::Barcode* Ean::create()
-		{
-			return new Ean();
-		}
+			//////////////////////////////////////////////////////
+			// EAN Barcode (Any)
+			//////////////////////////////////////////////////////
+			glbarcode::Barcode* Ean::create()
+			{
+				return new Ean();
+			}
 
 		
-		bool Ean::validate( const std::string& rawData )
-		{
-			return (      isNumericLengthValid(  rawData,  7,  8 )
-			         ||   isNumericLengthValid(  rawData, 12, 13 )
-			         || ( isNumericLength1Valid( rawData,  7,  8 ) && isNumericLength2Valid( rawData, 2, 2 ) )
-			         || ( isNumericLength1Valid( rawData,  7,  8 ) && isNumericLength2Valid( rawData, 5, 5 ) )
-			         || ( isNumericLength1Valid( rawData, 12, 13 ) && isNumericLength2Valid( rawData, 2, 2 ) )
-			         || ( isNumericLength1Valid( rawData, 12, 13 ) && isNumericLength2Valid( rawData, 5, 5 ) ) );
-		}
+			bool Ean::validate( const std::string& rawData )
+			{
+				return (      isNumericLengthValid(  rawData,  7,  8 )
+				              ||   isNumericLengthValid(  rawData, 12, 13 )
+				              || ( isNumericLength1Valid( rawData,  7,  8 ) && isNumericLength2Valid( rawData, 2, 2 ) )
+				              || ( isNumericLength1Valid( rawData,  7,  8 ) && isNumericLength2Valid( rawData, 5, 5 ) )
+				              || ( isNumericLength1Valid( rawData, 12, 13 ) && isNumericLength2Valid( rawData, 2, 2 ) )
+				              || ( isNumericLength1Valid( rawData, 12, 13 ) && isNumericLength2Valid( rawData, 5, 5 ) ) );
+			}
 
 		
-		std::string Ean::encode( const std::string& cookedData )
-		{
-			flags = BARCODE_EAN;
-			return ""; // Actual encoding is done in vectorize
-		}
+			std::string Ean::encode( const std::string& cookedData )
+			{
+				flags = BARCODE_EAN;
+				return ""; // Actual encoding is done in vectorize
+			}
 		
 
-		//////////////////////////////////////////////////////
-		// EAN-8 Barcode
-		//////////////////////////////////////////////////////
-		glbarcode::Barcode* Ean8::create()
-		{
-			return new Ean8();
-		}
+			//////////////////////////////////////////////////////
+			// EAN-8 Barcode
+			//////////////////////////////////////////////////////
+			glbarcode::Barcode* Ean8::create()
+			{
+				return new Ean8();
+			}
 
 		
-		bool Ean8::validate( const std::string& rawData )
-		{
-			return isNumericLengthValid(  rawData,  7,  8 );
-		}
+			bool Ean8::validate( const std::string& rawData )
+			{
+				return isNumericLengthValid(  rawData,  7,  8 );
+			}
 
 		
-		std::string Ean8::encode( const std::string& cookedData )
-		{
-			flags = BARCODE_EAN;
-			return ""; // Actual encoding is done in vectorize
-		}
+			std::string Ean8::encode( const std::string& cookedData )
+			{
+				flags = BARCODE_EAN;
+				return ""; // Actual encoding is done in vectorize
+			}
 		
 
-		//////////////////////////////////////////////////////
-		// EAN-8+2 Barcode
-		//////////////////////////////////////////////////////
-		glbarcode::Barcode* Ean8_2::create()
-		{
-			return new Ean8_2();
-		}
+			//////////////////////////////////////////////////////
+			// EAN-8+2 Barcode
+			//////////////////////////////////////////////////////
+			glbarcode::Barcode* Ean8_2::create()
+			{
+				return new Ean8_2();
+			}
 
 		
-		bool Ean8_2::validate( const std::string& rawData )
-		{
-			return isNumericLength1Valid( rawData,  7,  8 ) && isNumericLength2Valid( rawData, 2, 2 );
-		}
+			bool Ean8_2::validate( const std::string& rawData )
+			{
+				return isNumericLength1Valid( rawData,  7,  8 ) && isNumericLength2Valid( rawData, 2, 2 );
+			}
 
 		
-		std::string Ean8_2::encode( const std::string& cookedData )
-		{
-			flags = BARCODE_EAN;
-			return ""; // Actual encoding is done in vectorize
-		}
+			std::string Ean8_2::encode( const std::string& cookedData )
+			{
+				flags = BARCODE_EAN;
+				return ""; // Actual encoding is done in vectorize
+			}
 		
 
-		//////////////////////////////////////////////////////
-		// EAN-8+5 Barcode
-		//////////////////////////////////////////////////////
-		glbarcode::Barcode* Ean8_5::create()
-		{
-			return new Ean8_5();
-		}
+			//////////////////////////////////////////////////////
+			// EAN-8+5 Barcode
+			//////////////////////////////////////////////////////
+			glbarcode::Barcode* Ean8_5::create()
+			{
+				return new Ean8_5();
+			}
 
 		
-		bool Ean8_5::validate( const std::string& rawData )
-		{
-			return isNumericLength1Valid( rawData,  7,  8 ) && isNumericLength2Valid( rawData, 5, 5 );
-		}
+			bool Ean8_5::validate( const std::string& rawData )
+			{
+				return isNumericLength1Valid( rawData,  7,  8 ) && isNumericLength2Valid( rawData, 5, 5 );
+			}
 
 		
-		std::string Ean8_5::encode( const std::string& cookedData )
-		{
-			flags = BARCODE_EAN;
-			return ""; // Actual encoding is done in vectorize
-		}
+			std::string Ean8_5::encode( const std::string& cookedData )
+			{
+				flags = BARCODE_EAN;
+				return ""; // Actual encoding is done in vectorize
+			}
 		
 
-		//////////////////////////////////////////////////////
-		// EAN-13 Barcode
-		//////////////////////////////////////////////////////
-		glbarcode::Barcode* Ean13::create()
-		{
-			return new Ean13();
-		}
+			//////////////////////////////////////////////////////
+			// EAN-13 Barcode
+			//////////////////////////////////////////////////////
+			glbarcode::Barcode* Ean13::create()
+			{
+				return new Ean13();
+			}
 
 		
-		bool Ean13::validate( const std::string& rawData )
-		{
-			return isNumericLengthValid(  rawData, 12, 13 );
-		}
+			bool Ean13::validate( const std::string& rawData )
+			{
+				return isNumericLengthValid(  rawData, 12, 13 );
+			}
 
 		
-		std::string Ean13::encode( const std::string& cookedData )
-		{
-			flags = BARCODE_EAN;
-			return ""; // Actual encoding is done in vectorize
-		}
+			std::string Ean13::encode( const std::string& cookedData )
+			{
+				flags = BARCODE_EAN;
+				return ""; // Actual encoding is done in vectorize
+			}
 		
 
-		//////////////////////////////////////////////////////
-		// EAN-13+2 Barcode
-		//////////////////////////////////////////////////////
-		glbarcode::Barcode* Ean13_2::create()
-		{
-			return new Ean13_2();
-		}
+			//////////////////////////////////////////////////////
+			// EAN-13+2 Barcode
+			//////////////////////////////////////////////////////
+			glbarcode::Barcode* Ean13_2::create()
+			{
+				return new Ean13_2();
+			}
 
 		
-		bool Ean13_2::validate( const std::string& rawData )
-		{
-			return isNumericLength1Valid( rawData, 12, 13 ) && isNumericLength2Valid( rawData, 2, 2 );
-		}
+			bool Ean13_2::validate( const std::string& rawData )
+			{
+				return isNumericLength1Valid( rawData, 12, 13 ) && isNumericLength2Valid( rawData, 2, 2 );
+			}
 
 		
-		std::string Ean13_2::encode( const std::string& cookedData )
-		{
-			flags = BARCODE_EAN;
-			return ""; // Actual encoding is done in vectorize
-		}
+			std::string Ean13_2::encode( const std::string& cookedData )
+			{
+				flags = BARCODE_EAN;
+				return ""; // Actual encoding is done in vectorize
+			}
 		
 
-		//////////////////////////////////////////////////////
-		// EAN-13+5 Barcode
-		//////////////////////////////////////////////////////
-		glbarcode::Barcode* Ean13_5::create()
-		{
-			return new Ean13_5();
-		}
+			//////////////////////////////////////////////////////
+			// EAN-13+5 Barcode
+			//////////////////////////////////////////////////////
+			glbarcode::Barcode* Ean13_5::create()
+			{
+				return new Ean13_5();
+			}
 
 		
-		bool Ean13_5::validate( const std::string& rawData )
-		{
-			return isNumericLength1Valid( rawData, 12, 13 ) && isNumericLength2Valid( rawData, 5, 5 );
-		}
+			bool Ean13_5::validate( const std::string& rawData )
+			{
+				return isNumericLength1Valid( rawData, 12, 13 ) && isNumericLength2Valid( rawData, 5, 5 );
+			}
 
 		
-		std::string Ean13_5::encode( const std::string& cookedData )
-		{
-			flags = BARCODE_EAN;
-			return ""; // Actual encoding is done in vectorize
-		}
+			std::string Ean13_5::encode( const std::string& cookedData )
+			{
+				flags = BARCODE_EAN;
+				return ""; // Actual encoding is done in vectorize
+			}
 		
 
-		//////////////////////////////////////////////////////
-		// UPC Barcode (Any)
-		//////////////////////////////////////////////////////
-		glbarcode::Barcode* Upc::create()
-		{
-			return new Upc();
-		}
+			//////////////////////////////////////////////////////
+			// UPC Barcode (Any)
+			//////////////////////////////////////////////////////
+			glbarcode::Barcode* Upc::create()
+			{
+				return new Upc();
+			}
 
 		
-		bool Upc::validate( const std::string& rawData )
-		{
-			return      isNumericLengthValid( rawData, 6, 8 )
-				||  isNumericLengthValid( rawData, 11, 12 )
-				|| (isNumericLength1Valid( rawData, 6, 8 ) && isNumericLength2Valid( rawData, 2, 2 ))
-				|| (isNumericLength1Valid( rawData, 6, 8 ) && isNumericLength2Valid( rawData, 5, 5 ))
-				|| (isNumericLength1Valid( rawData, 11, 12 ) && isNumericLength2Valid( rawData, 2, 2 ))
-				|| (isNumericLength1Valid( rawData, 11, 12 ) && isNumericLength2Valid( rawData, 5, 5 ));
-		}
+			bool Upc::validate( const std::string& rawData )
+			{
+				return      isNumericLengthValid( rawData, 6, 8 )
+					||  isNumericLengthValid( rawData, 11, 12 )
+					|| (isNumericLength1Valid( rawData, 6, 8 ) && isNumericLength2Valid( rawData, 2, 2 ))
+					|| (isNumericLength1Valid( rawData, 6, 8 ) && isNumericLength2Valid( rawData, 5, 5 ))
+					|| (isNumericLength1Valid( rawData, 11, 12 ) && isNumericLength2Valid( rawData, 2, 2 ))
+					|| (isNumericLength1Valid( rawData, 11, 12 ) && isNumericLength2Valid( rawData, 5, 5 ));
+			}
 
 		
-		std::string Upc::encode( const std::string& cookedData )
-		{
-			flags = BARCODE_UPC;
-			return ""; // Actual encoding is done in vectorize
-		}
+			std::string Upc::encode( const std::string& cookedData )
+			{
+				flags = BARCODE_UPC;
+				return ""; // Actual encoding is done in vectorize
+			}
 		
 
-		//////////////////////////////////////////////////////
-		// UPC-A Barcode
-		//////////////////////////////////////////////////////
-		glbarcode::Barcode* UpcA::create()
-		{
-			return new UpcA();
-		}
+			//////////////////////////////////////////////////////
+			// UPC-A Barcode
+			//////////////////////////////////////////////////////
+			glbarcode::Barcode* UpcA::create()
+			{
+				return new UpcA();
+			}
 
 		
-		bool UpcA::validate( const std::string& rawData )
-		{
-			return isNumericLengthValid( rawData, 11, 12 );
-		}
+			bool UpcA::validate( const std::string& rawData )
+			{
+				return isNumericLengthValid( rawData, 11, 12 );
+			}
 
 		
-		std::string UpcA::encode( const std::string& cookedData )
-		{
-			flags = BARCODE_UPC;
-			return ""; // Actual encoding is done in vectorize
-		}
+			std::string UpcA::encode( const std::string& cookedData )
+			{
+				flags = BARCODE_UPC;
+				return ""; // Actual encoding is done in vectorize
+			}
 		
 
-		//////////////////////////////////////////////////////
-		// UPC-A+2 Barcode
-		//////////////////////////////////////////////////////
-		glbarcode::Barcode* UpcA_2::create()
-		{
-			return new UpcA_2();
-		}
+			//////////////////////////////////////////////////////
+			// UPC-A+2 Barcode
+			//////////////////////////////////////////////////////
+			glbarcode::Barcode* UpcA_2::create()
+			{
+				return new UpcA_2();
+			}
 
 		
-		bool UpcA_2::validate( const std::string& rawData )
-		{
-			return isNumericLength1Valid( rawData, 11, 12 ) && isNumericLength2Valid( rawData, 2, 2 );
-		}
+			bool UpcA_2::validate( const std::string& rawData )
+			{
+				return isNumericLength1Valid( rawData, 11, 12 ) && isNumericLength2Valid( rawData, 2, 2 );
+			}
 
 		
-		std::string UpcA_2::encode( const std::string& cookedData )
-		{
-			flags = BARCODE_UPC;
-			return ""; // Actual encoding is done in vectorize
-		}
+			std::string UpcA_2::encode( const std::string& cookedData )
+			{
+				flags = BARCODE_UPC;
+				return ""; // Actual encoding is done in vectorize
+			}
 		
 
-		//////////////////////////////////////////////////////
-		// UPC-A+5 Barcode
-		//////////////////////////////////////////////////////
-		glbarcode::Barcode* UpcA_5::create()
-		{
-			return new UpcA_5();
-		}
+			//////////////////////////////////////////////////////
+			// UPC-A+5 Barcode
+			//////////////////////////////////////////////////////
+			glbarcode::Barcode* UpcA_5::create()
+			{
+				return new UpcA_5();
+			}
 
 		
-		bool UpcA_5::validate( const std::string& rawData )
-		{
-			return isNumericLength1Valid( rawData, 11, 12 ) && isNumericLength2Valid( rawData, 5, 5 );
-		}
+			bool UpcA_5::validate( const std::string& rawData )
+			{
+				return isNumericLength1Valid( rawData, 11, 12 ) && isNumericLength2Valid( rawData, 5, 5 );
+			}
 
 		
-		std::string UpcA_5::encode( const std::string& cookedData )
-		{
-			flags = BARCODE_UPC;
-			return ""; // Actual encoding is done in vectorize
-		}
+			std::string UpcA_5::encode( const std::string& cookedData )
+			{
+				flags = BARCODE_UPC;
+				return ""; // Actual encoding is done in vectorize
+			}
 		
 
-		//////////////////////////////////////////////////////
-		// UPC-E Barcode
-		//////////////////////////////////////////////////////
-		glbarcode::Barcode* UpcE::create()
-		{
-			return new UpcE();
-		}
+			//////////////////////////////////////////////////////
+			// UPC-E Barcode
+			//////////////////////////////////////////////////////
+			glbarcode::Barcode* UpcE::create()
+			{
+				return new UpcE();
+			}
 
 		
-		bool UpcE::validate( const std::string& rawData )
-		{
-			return isNumericLengthValid( rawData, 6, 8 );
-		}
+			bool UpcE::validate( const std::string& rawData )
+			{
+				return isNumericLengthValid( rawData, 6, 8 );
+			}
 
 		
-		std::string UpcE::encode( const std::string& cookedData )
-		{
-			flags = BARCODE_UPC;
-			return ""; // Actual encoding is done in vectorize
-		}
+			std::string UpcE::encode( const std::string& cookedData )
+			{
+				flags = BARCODE_UPC;
+				return ""; // Actual encoding is done in vectorize
+			}
 		
 
-		//////////////////////////////////////////////////////
-		// UPC-E+2 Barcode
-		//////////////////////////////////////////////////////
-		glbarcode::Barcode* UpcE_2::create()
-		{
-			return new UpcE_2();
-		}
+			//////////////////////////////////////////////////////
+			// UPC-E+2 Barcode
+			//////////////////////////////////////////////////////
+			glbarcode::Barcode* UpcE_2::create()
+			{
+				return new UpcE_2();
+			}
 
 		
-		bool UpcE_2::validate( const std::string& rawData )
-		{
-			return isNumericLength1Valid( rawData, 6, 8 ) && isNumericLength2Valid( rawData, 2, 2 );
-		}
+			bool UpcE_2::validate( const std::string& rawData )
+			{
+				return isNumericLength1Valid( rawData, 6, 8 ) && isNumericLength2Valid( rawData, 2, 2 );
+			}
 
 		
-		std::string UpcE_2::encode( const std::string& cookedData )
-		{
-			flags = BARCODE_UPC;
-			return ""; // Actual encoding is done in vectorize
-		}
+			std::string UpcE_2::encode( const std::string& cookedData )
+			{
+				flags = BARCODE_UPC;
+				return ""; // Actual encoding is done in vectorize
+			}
 		
 
-		//////////////////////////////////////////////////////
-		// UPC-E+5 Barcode
-		//////////////////////////////////////////////////////
-		glbarcode::Barcode* UpcE_5::create()
-		{
-			return new UpcE_5();
-		}
+			//////////////////////////////////////////////////////
+			// UPC-E+5 Barcode
+			//////////////////////////////////////////////////////
+			glbarcode::Barcode* UpcE_5::create()
+			{
+				return new UpcE_5();
+			}
 
 		
-		bool UpcE_5::validate( const std::string& rawData )
-		{
-			return isNumericLength1Valid( rawData, 6, 8 ) && isNumericLength2Valid( rawData, 5, 5 );
-		}
+			bool UpcE_5::validate( const std::string& rawData )
+			{
+				return isNumericLength1Valid( rawData, 6, 8 ) && isNumericLength2Valid( rawData, 5, 5 );
+			}
 
 		
-		std::string UpcE_5::encode( const std::string& cookedData )
-		{
-			flags = BARCODE_UPC;
-			return ""; // Actual encoding is done in vectorize
-		}
+			std::string UpcE_5::encode( const std::string& cookedData )
+			{
+				flags = BARCODE_UPC;
+				return ""; // Actual encoding is done in vectorize
+			}
 		
 
-		//////////////////////////////////////////////////////
-		// ISBN Barcode
-		//////////////////////////////////////////////////////
-		glbarcode::Barcode* Isbn::create()
-		{
-			return new Isbn();
-		}
+			//////////////////////////////////////////////////////
+			// ISBN Barcode
+			//////////////////////////////////////////////////////
+			glbarcode::Barcode* Isbn::create()
+			{
+				return new Isbn();
+			}
 
 		
-		bool Isbn::validate( const std::string& rawData )
-		{
-			return isNumericLengthValid( rawData, 9, 10 );
-		}
+			bool Isbn::validate( const std::string& rawData )
+			{
+				return isNumericLengthValid( rawData, 9, 10 );
+			}
 
 		
-		std::string Isbn::encode( const std::string& cookedData )
-		{
-			flags = BARCODE_ISBN;
-			return ""; // Actual encoding is done in vectorize
-		}
+			std::string Isbn::encode( const std::string& cookedData )
+			{
+				flags = BARCODE_ISBN;
+				return ""; // Actual encoding is done in vectorize
+			}
 		
 
-		//////////////////////////////////////////////////////
-		// ISBN+5 Barcode
-		//////////////////////////////////////////////////////
-		glbarcode::Barcode* Isbn_5::create()
-		{
-			return new Isbn_5();
-		}
+			//////////////////////////////////////////////////////
+			// ISBN+5 Barcode
+			//////////////////////////////////////////////////////
+			glbarcode::Barcode* Isbn_5::create()
+			{
+				return new Isbn_5();
+			}
 
 		
-		bool Isbn_5::validate( const std::string& rawData )
-		{
-			return isNumericLength1Valid( rawData, 9, 10 ) && isNumericLength2Valid( rawData, 5, 5 );
-		}
+			bool Isbn_5::validate( const std::string& rawData )
+			{
+				return isNumericLength1Valid( rawData, 9, 10 ) && isNumericLength2Valid( rawData, 5, 5 );
+			}
 
 		
-		std::string Isbn_5::encode( const std::string& cookedData )
-		{
-			flags = BARCODE_ISBN;
-			return ""; // Actual encoding is done in vectorize
-		}
+			std::string Isbn_5::encode( const std::string& cookedData )
+			{
+				flags = BARCODE_ISBN;
+				return ""; // Actual encoding is done in vectorize
+			}
 		
 
-		//////////////////////////////////////////////////////
-		// Code39 Barcode
-		//////////////////////////////////////////////////////
-		glbarcode::Barcode* Code39::create()
-		{
-			return new Code39();
-		}
+			//////////////////////////////////////////////////////
+			// Code39 Barcode
+			//////////////////////////////////////////////////////
+			glbarcode::Barcode* Code39::create()
+			{
+				return new Code39();
+			}
 
 		
-		bool Code39::validate( const std::string& rawData )
-		{
-			return isAscii( rawData );
-		}
+			bool Code39::validate( const std::string& rawData )
+			{
+				return isAscii( rawData );
+			}
 
 		
-		std::string Code39::encode( const std::string& cookedData )
-		{
-			flags = BARCODE_39;
-			return ""; // Actual encoding is done in vectorize
-		}
+			std::string Code39::encode( const std::string& cookedData )
+			{
+				flags = BARCODE_39;
+				return ""; // Actual encoding is done in vectorize
+			}
 		
 
-		//////////////////////////////////////////////////////
-		// Code128 Barcode
-		//////////////////////////////////////////////////////
-		glbarcode::Barcode* Code128::create()
-		{
-			return new Code128();
-		}
+			//////////////////////////////////////////////////////
+			// Code128 Barcode
+			//////////////////////////////////////////////////////
+			glbarcode::Barcode* Code128::create()
+			{
+				return new Code128();
+			}
 
 		
-		bool Code128::validate( const std::string& rawData )
-		{
-			return isAscii( rawData );
-		}
+			bool Code128::validate( const std::string& rawData )
+			{
+				return isAscii( rawData );
+			}
 
 		
-		std::string Code128::encode( const std::string& cookedData )
-		{
-			flags = BARCODE_128;
-			return ""; // Actual encoding is done in vectorize
-		}
+			std::string Code128::encode( const std::string& cookedData )
+			{
+				flags = BARCODE_128;
+				return ""; // Actual encoding is done in vectorize
+			}
 		
 
-		//////////////////////////////////////////////////////
-		// Code128C Barcode
-		//////////////////////////////////////////////////////
-		glbarcode::Barcode* Code128C::create()
-		{
-			return new Code128C();
-		}
+			//////////////////////////////////////////////////////
+			// Code128C Barcode
+			//////////////////////////////////////////////////////
+			glbarcode::Barcode* Code128C::create()
+			{
+				return new Code128C();
+			}
 
 		
-		bool Code128C::validate( const std::string& rawData )
-		{
-			return isAscii( rawData );
-		}
+			bool Code128C::validate( const std::string& rawData )
+			{
+				return isAscii( rawData );
+			}
 
 		
-		std::string Code128C::encode( const std::string& cookedData )
-		{
-			flags = BARCODE_128C;
-			return ""; // Actual encoding is done in vectorize
-		}
+			std::string Code128C::encode( const std::string& cookedData )
+			{
+				flags = BARCODE_128C;
+				return ""; // Actual encoding is done in vectorize
+			}
 		
 
-		//////////////////////////////////////////////////////
-		// Code128B Barcode
-		//////////////////////////////////////////////////////
-		glbarcode::Barcode* Code128B::create()
-		{
-			return new Code128B();
-		}
+			//////////////////////////////////////////////////////
+			// Code128B Barcode
+			//////////////////////////////////////////////////////
+			glbarcode::Barcode* Code128B::create()
+			{
+				return new Code128B();
+			}
 
 		
-		bool Code128B::validate( const std::string& rawData )
-		{
-			return isAscii( rawData );
-		}
+			bool Code128B::validate( const std::string& rawData )
+			{
+				return isAscii( rawData );
+			}
 
 		
-		std::string Code128B::encode( const std::string& cookedData )
-		{
-			flags = BARCODE_128B;
-			return ""; // Actual encoding is done in vectorize
-		}
+			std::string Code128B::encode( const std::string& cookedData )
+			{
+				flags = BARCODE_128B;
+				return ""; // Actual encoding is done in vectorize
+			}
 		
 
-		//////////////////////////////////////////////////////
-		// I25 Barcode
-		//////////////////////////////////////////////////////
-		glbarcode::Barcode* I25::create()
-		{
-			return new I25();
-		}
+			//////////////////////////////////////////////////////
+			// I25 Barcode
+			//////////////////////////////////////////////////////
+			glbarcode::Barcode* I25::create()
+			{
+				return new I25();
+			}
 
 		
-		bool I25::validate( const std::string& rawData )
-		{
-			return isAscii( rawData );
-		}
+			bool I25::validate( const std::string& rawData )
+			{
+				return isAscii( rawData );
+			}
 
 		
-		std::string I25::encode( const std::string& cookedData )
-		{
-			flags = BARCODE_I25;
-			return ""; // Actual encoding is done in vectorize
-		}
+			std::string I25::encode( const std::string& cookedData )
+			{
+				flags = BARCODE_I25;
+				return ""; // Actual encoding is done in vectorize
+			}
 		
 
-		//////////////////////////////////////////////////////
-		// CBR Barcode
-		//////////////////////////////////////////////////////
-		glbarcode::Barcode* Cbr::create()
-		{
-			return new Cbr();
-		}
+			//////////////////////////////////////////////////////
+			// CBR Barcode
+			//////////////////////////////////////////////////////
+			glbarcode::Barcode* Cbr::create()
+			{
+				return new Cbr();
+			}
 
 		
-		bool Cbr::validate( const std::string& rawData )
-		{
-			return isAscii( rawData );
-		}
+			bool Cbr::validate( const std::string& rawData )
+			{
+				return isAscii( rawData );
+			}
 
 		
-		std::string Cbr::encode( const std::string& cookedData )
-		{
-			flags = BARCODE_CBR;
-			return ""; // Actual encoding is done in vectorize
-		}
+			std::string Cbr::encode( const std::string& cookedData )
+			{
+				flags = BARCODE_CBR;
+				return ""; // Actual encoding is done in vectorize
+			}
 		
 
-		//////////////////////////////////////////////////////
-		// MSI Barcode
-		//////////////////////////////////////////////////////
-		glbarcode::Barcode* Msi::create()
-		{
-			return new Msi();
-		}
+			//////////////////////////////////////////////////////
+			// MSI Barcode
+			//////////////////////////////////////////////////////
+			glbarcode::Barcode* Msi::create()
+			{
+				return new Msi();
+			}
 
 		
-		bool Msi::validate( const std::string& rawData )
-		{
-			return isAscii( rawData );
-		}
+			bool Msi::validate( const std::string& rawData )
+			{
+				return isAscii( rawData );
+			}
 
 		
-		std::string Msi::encode( const std::string& cookedData )
-		{
-			flags = BARCODE_MSI;
-			return ""; // Actual encoding is done in vectorize
-		}
+			std::string Msi::encode( const std::string& cookedData )
+			{
+				flags = BARCODE_MSI;
+				return ""; // Actual encoding is done in vectorize
+			}
 		
 
-		//////////////////////////////////////////////////////
-		// PLS Barcode
-		//////////////////////////////////////////////////////
-		glbarcode::Barcode* Pls::create()
-		{
-			return new Pls();
-		}
+			//////////////////////////////////////////////////////
+			// PLS Barcode
+			//////////////////////////////////////////////////////
+			glbarcode::Barcode* Pls::create()
+			{
+				return new Pls();
+			}
 
 		
-		bool Pls::validate( const std::string& rawData )
-		{
-			return isAscii( rawData );
-		}
+			bool Pls::validate( const std::string& rawData )
+			{
+				return isAscii( rawData );
+			}
 
 		
-		std::string Pls::encode( const std::string& cookedData )
-		{
-			flags = BARCODE_PLS;
-			return ""; // Actual encoding is done in vectorize
-		}
+			std::string Pls::encode( const std::string& cookedData )
+			{
+				flags = BARCODE_PLS;
+				return ""; // Actual encoding is done in vectorize
+			}
 		
 
-		//////////////////////////////////////////////////////
-		// Code93 Barcode
-		//////////////////////////////////////////////////////
-		glbarcode::Barcode* Code93::create()
-		{
-			return new Code93();
-		}
+			//////////////////////////////////////////////////////
+			// Code93 Barcode
+			//////////////////////////////////////////////////////
+			glbarcode::Barcode* Code93::create()
+			{
+				return new Code93();
+			}
 
 		
-		bool Code93::validate( const std::string& rawData )
-		{
-			return isAscii( rawData );
-		}
+			bool Code93::validate( const std::string& rawData )
+			{
+				return isAscii( rawData );
+			}
 
 		
-		std::string Code93::encode( const std::string& cookedData )
-		{
-			flags = BARCODE_93;
-			return ""; // Actual encoding is done in vectorize
-		}
+			std::string Code93::encode( const std::string& cookedData )
+			{
+				flags = BARCODE_93;
+				return ""; // Actual encoding is done in vectorize
+			}
 		
 
+		}
 	}
 }
 
diff --git a/backends/barcode/GnuBarcode.h b/backends/barcode/GnuBarcode.h
index 25117ed..0fca7ae 100644
--- a/backends/barcode/GnuBarcode.h
+++ b/backends/barcode/GnuBarcode.h
@@ -26,392 +26,395 @@
 #include "glbarcode/Barcode1dBase.h"
 
 
-namespace glabels::barcode
+namespace glabels
 {
-	namespace GnuBarcode
+	namespace barcode
 	{
-
-		/**
-		 * GnuBarcode::Base base class for all GNU Barcodes
-		 *
-		 * Implements glbarcode::Barcode1dBase.
-		 */
-		class Base : public glbarcode::Barcode1dBase
+		namespace GnuBarcode
 		{
-		protected:
-			int flags;
+
+			/**
+			 * GnuBarcode::Base base class for all GNU Barcodes
+			 *
+			 * Implements glbarcode::Barcode1dBase.
+			 */
+			class Base : public glbarcode::Barcode1dBase
+			{
+			protected:
+				int flags;
 			
-			bool isAscii( const std::string& data ) const;
+				bool isAscii( const std::string& data ) const;
 			
-			bool isNumericLengthValid( const std::string& data,
-			                           unsigned int       nMin,
-			                           unsigned int       nMax ) const;
+				bool isNumericLengthValid( const std::string& data,
+				                           unsigned int       nMin,
+				                           unsigned int       nMax ) const;
 
-			bool isNumericLength1Valid( const std::string& data,
-			                            unsigned int       nMin,
-			                            unsigned int       nMax ) const;
+				bool isNumericLength1Valid( const std::string& data,
+				                            unsigned int       nMin,
+				                            unsigned int       nMax ) const;
 
-			bool isNumericLength2Valid( const std::string& data,
-			                            unsigned int       nMin,
-			                            unsigned int       nMax ) const;
+				bool isNumericLength2Valid( const std::string& data,
+				                            unsigned int       nMin,
+				                            unsigned int       nMax ) const;
 			
-			void vectorize( const std::string& encodedData,
-			                const std::string& displayText,
-			                const std::string& cookedData,
-			                double&            w,
-			                double&            h ) override;
-		};
+				void vectorize( const std::string& encodedData,
+				                const std::string& displayText,
+				                const std::string& cookedData,
+				                double&            w,
+				                double&            h ) override;
+			};
 
 
-		/**
-		 * EAN Barcode (Any)
-		 */
-		class Ean : public Base
-		{
-		public:
-			static Barcode* create();
+			/**
+			 * EAN Barcode (Any)
+			 */
+			class Ean : public Base
+			{
+			public:
+				static Barcode* create();
 			
-		protected:
-			bool validate( const std::string& rawData ) override;
-			std::string encode( const std::string& cookedData ) override;
-		};
+			protected:
+				bool validate( const std::string& rawData ) override;
+				std::string encode( const std::string& cookedData ) override;
+			};
 
 
-		/**
-		 * EAN-8 Barcode
-		 */
-		class Ean8 : public Base
-		{
-		public:
-			static Barcode* create();
+			/**
+			 * EAN-8 Barcode
+			 */
+			class Ean8 : public Base
+			{
+			public:
+				static Barcode* create();
 			
-		protected:
-			bool validate( const std::string& rawData ) override;
-			std::string encode( const std::string& cookedData ) override;
-		};
+			protected:
+				bool validate( const std::string& rawData ) override;
+				std::string encode( const std::string& cookedData ) override;
+			};
 
 
-		/**
-		 * EAN-8+2 Barcode
-		 */
-		class Ean8_2 : public Base
-		{
-		public:
-			static Barcode* create();
+			/**
+			 * EAN-8+2 Barcode
+			 */
+			class Ean8_2 : public Base
+			{
+			public:
+				static Barcode* create();
 			
-		protected:
-			bool validate( const std::string& rawData ) override;
-			std::string encode( const std::string& cookedData ) override;
-		};
+			protected:
+				bool validate( const std::string& rawData ) override;
+				std::string encode( const std::string& cookedData ) override;
+			};
 
 
-		/**
-		 * EAN-8+5 Barcode
-		 */
-		class Ean8_5 : public Base
-		{
-		public:
-			static Barcode* create();
+			/**
+			 * EAN-8+5 Barcode
+			 */
+			class Ean8_5 : public Base
+			{
+			public:
+				static Barcode* create();
 			
-		protected:
-			bool validate( const std::string& rawData ) override;
-			std::string encode( const std::string& cookedData ) override;
-		};
+			protected:
+				bool validate( const std::string& rawData ) override;
+				std::string encode( const std::string& cookedData ) override;
+			};
 
 
-		/**
-		 * EAN-13 Barcode
-		 */
-		class Ean13 : public Base
-		{
-		public:
-			static Barcode* create();
+			/**
+			 * EAN-13 Barcode
+			 */
+			class Ean13 : public Base
+			{
+			public:
+				static Barcode* create();
 			
-		protected:
-			bool validate( const std::string& rawData ) override;
-			std::string encode( const std::string& cookedData ) override;
-		};
+			protected:
+				bool validate( const std::string& rawData ) override;
+				std::string encode( const std::string& cookedData ) override;
+			};
 
 
-		/**
-		 * EAN-13+2 Barcode
-		 */
-		class Ean13_2 : public Base
-		{
-		public:
-			static Barcode* create();
+			/**
+			 * EAN-13+2 Barcode
+			 */
+			class Ean13_2 : public Base
+			{
+			public:
+				static Barcode* create();
 			
-		protected:
-			bool validate( const std::string& rawData ) override;
-			std::string encode( const std::string& cookedData ) override;
-		};
+			protected:
+				bool validate( const std::string& rawData ) override;
+				std::string encode( const std::string& cookedData ) override;
+			};
 
 
-		/**
-		 * EAN-13+5 Barcode
-		 */
-		class Ean13_5 : public Base
-		{
-		public:
-			static Barcode* create();
+			/**
+			 * EAN-13+5 Barcode
+			 */
+			class Ean13_5 : public Base
+			{
+			public:
+				static Barcode* create();
 			
-		protected:
-			bool validate( const std::string& rawData ) override;
-			std::string encode( const std::string& cookedData ) override;
-		};
+			protected:
+				bool validate( const std::string& rawData ) override;
+				std::string encode( const std::string& cookedData ) override;
+			};
 
 
-		/**
-		 * UPC Barcode (Any)
-		 */
-		class Upc : public Base
-		{
-		public:
-			static Barcode* create();
+			/**
+			 * UPC Barcode (Any)
+			 */
+			class Upc : public Base
+			{
+			public:
+				static Barcode* create();
 			
-		protected:
-			bool validate( const std::string& rawData ) override;
-			std::string encode( const std::string& cookedData ) override;
-		};
+			protected:
+				bool validate( const std::string& rawData ) override;
+				std::string encode( const std::string& cookedData ) override;
+			};
 
 
-		/**
-		 * UPC-A Barcode
-		 */
-		class UpcA : public Base
-		{
-		public:
-			static Barcode* create();
+			/**
+			 * UPC-A Barcode
+			 */
+			class UpcA : public Base
+			{
+			public:
+				static Barcode* create();
 			
-		protected:
-			bool validate( const std::string& rawData ) override;
-			std::string encode( const std::string& cookedData ) override;
-		};
+			protected:
+				bool validate( const std::string& rawData ) override;
+				std::string encode( const std::string& cookedData ) override;
+			};
 
 
-		/**
-		 * UPC-A+2 Barcode
-		 */
-		class UpcA_2 : public Base
-		{
-		public:
-			static Barcode* create();
+			/**
+			 * UPC-A+2 Barcode
+			 */
+			class UpcA_2 : public Base
+			{
+			public:
+				static Barcode* create();
 			
-		protected:
-			bool validate( const std::string& rawData ) override;
-			std::string encode( const std::string& cookedData ) override;
-		};
+			protected:
+				bool validate( const std::string& rawData ) override;
+				std::string encode( const std::string& cookedData ) override;
+			};
 
 
-		/**
-		 * UPC-A+5 Barcode
-		 */
-		class UpcA_5 : public Base
-		{
-		public:
-			static Barcode* create();
+			/**
+			 * UPC-A+5 Barcode
+			 */
+			class UpcA_5 : public Base
+			{
+			public:
+				static Barcode* create();
 			
-		protected:
-			bool validate( const std::string& rawData ) override;
-			std::string encode( const std::string& cookedData ) override;
-		};
+			protected:
+				bool validate( const std::string& rawData ) override;
+				std::string encode( const std::string& cookedData ) override;
+			};
 
 
-		/**
-		 * UPC-E Barcode
-		 */
-		class UpcE : public Base
-		{
-		public:
-			static Barcode* create();
+			/**
+			 * UPC-E Barcode
+			 */
+			class UpcE : public Base
+			{
+			public:
+				static Barcode* create();
 			
-		protected:
-			bool validate( const std::string& rawData ) override;
-			std::string encode( const std::string& cookedData ) override;
-		};
+			protected:
+				bool validate( const std::string& rawData ) override;
+				std::string encode( const std::string& cookedData ) override;
+			};
 
 
-		/**
-		 * UPC-E+2 Barcode
-		 */
-		class UpcE_2 : public Base
-		{
-		public:
-			static Barcode* create();
+			/**
+			 * UPC-E+2 Barcode
+			 */
+			class UpcE_2 : public Base
+			{
+			public:
+				static Barcode* create();
 			
-		protected:
-			bool validate( const std::string& rawData ) override;
-			std::string encode( const std::string& cookedData ) override;
-		};
+			protected:
+				bool validate( const std::string& rawData ) override;
+				std::string encode( const std::string& cookedData ) override;
+			};
 
 
-		/**
-		 * UPC-E+5 Barcode
-		 */
-		class UpcE_5 : public Base
-		{
-		public:
-			static Barcode* create();
+			/**
+			 * UPC-E+5 Barcode
+			 */
+			class UpcE_5 : public Base
+			{
+			public:
+				static Barcode* create();
 			
-		protected:
-			bool validate( const std::string& rawData ) override;
-			std::string encode( const std::string& cookedData ) override;
-		};
+			protected:
+				bool validate( const std::string& rawData ) override;
+				std::string encode( const std::string& cookedData ) override;
+			};
 
 
-		/**
-		 * ISBN Barcode
-		 */
-		class Isbn : public Base
-		{
-		public:
-			static Barcode* create();
+			/**
+			 * ISBN Barcode
+			 */
+			class Isbn : public Base
+			{
+			public:
+				static Barcode* create();
 			
-		protected:
-			bool validate( const std::string& rawData ) override;
-			std::string encode( const std::string& cookedData ) override;
-		};
+			protected:
+				bool validate( const std::string& rawData ) override;
+				std::string encode( const std::string& cookedData ) override;
+			};
 
 
-		/**
-		 * ISBN+5 Barcode
-		 */
-		class Isbn_5 : public Base
-		{
-		public:
-			static Barcode* create();
+			/**
+			 * ISBN+5 Barcode
+			 */
+			class Isbn_5 : public Base
+			{
+			public:
+				static Barcode* create();
 			
-		protected:
-			bool validate( const std::string& rawData ) override;
-			std::string encode( const std::string& cookedData ) override;
-		};
+			protected:
+				bool validate( const std::string& rawData ) override;
+				std::string encode( const std::string& cookedData ) override;
+			};
 
 
-		/**
-		 * Code39 Barcode
-		 */
-		class Code39 : public Base
-		{
-		public:
-			static Barcode* create();
+			/**
+			 * Code39 Barcode
+			 */
+			class Code39 : public Base
+			{
+			public:
+				static Barcode* create();
 			
-		protected:
-			bool validate( const std::string& rawData ) override;
-			std::string encode( const std::string& cookedData ) override;
-		};
+			protected:
+				bool validate( const std::string& rawData ) override;
+				std::string encode( const std::string& cookedData ) override;
+			};
 
 
-		/**
-		 * Code128 Barcode
-		 */
-		class Code128 : public Base
-		{
-		public:
-			static Barcode* create();
+			/**
+			 * Code128 Barcode
+			 */
+			class Code128 : public Base
+			{
+			public:
+				static Barcode* create();
 			
-		protected:
-			bool validate( const std::string& rawData ) override;
-			std::string encode( const std::string& cookedData ) override;
-		};
+			protected:
+				bool validate( const std::string& rawData ) override;
+				std::string encode( const std::string& cookedData ) override;
+			};
 
 
-		/**
-		 * Code128C Barcode
-		 */
-		class Code128C : public Base
-		{
-		public:
-			static Barcode* create();
+			/**
+			 * Code128C Barcode
+			 */
+			class Code128C : public Base
+			{
+			public:
+				static Barcode* create();
 			
-		protected:
-			bool validate( const std::string& rawData ) override;
-			std::string encode( const std::string& cookedData ) override;
-		};
+			protected:
+				bool validate( const std::string& rawData ) override;
+				std::string encode( const std::string& cookedData ) override;
+			};
 
 
-		/**
-		 * Code128B Barcode
-		 */
-		class Code128B : public Base
-		{
-		public:
-			static Barcode* create();
+			/**
+			 * Code128B Barcode
+			 */
+			class Code128B : public Base
+			{
+			public:
+				static Barcode* create();
 			
-		protected:
-			bool validate( const std::string& rawData ) override;
-			std::string encode( const std::string& cookedData ) override;
-		};
+			protected:
+				bool validate( const std::string& rawData ) override;
+				std::string encode( const std::string& cookedData ) override;
+			};
 
 
-		/**
-		 * I25 Barcode
-		 */
-		class I25 : public Base
-		{
-		public:
-			static Barcode* create();
+			/**
+			 * I25 Barcode
+			 */
+			class I25 : public Base
+			{
+			public:
+				static Barcode* create();
 			
-		protected:
-			bool validate( const std::string& rawData ) override;
-			std::string encode( const std::string& cookedData ) override;
-		};
+			protected:
+				bool validate( const std::string& rawData ) override;
+				std::string encode( const std::string& cookedData ) override;
+			};
 
 
-		/**
-		 * CBR Barcode
-		 */
-		class Cbr : public Base
-		{
-		public:
-			static Barcode* create();
+			/**
+			 * CBR Barcode
+			 */
+			class Cbr : public Base
+			{
+			public:
+				static Barcode* create();
 			
-		protected:
-			bool validate( const std::string& rawData ) override;
-			std::string encode( const std::string& cookedData ) override;
-		};
+			protected:
+				bool validate( const std::string& rawData ) override;
+				std::string encode( const std::string& cookedData ) override;
+			};
 
 
-		/**
-		 * MSI Barcode
-		 */
-		class Msi : public Base
-		{
-		public:
-			static Barcode* create();
+			/**
+			 * MSI Barcode
+			 */
+			class Msi : public Base
+			{
+			public:
+				static Barcode* create();
 			
-		protected:
-			bool validate( const std::string& rawData ) override;
-			std::string encode( const std::string& cookedData ) override;
-		};
+			protected:
+				bool validate( const std::string& rawData ) override;
+				std::string encode( const std::string& cookedData ) override;
+			};
 
 
-		/**
-		 * PLS Barcode
-		 */
-		class Pls : public Base
-		{
-		public:
-			static Barcode* create();
+			/**
+			 * PLS Barcode
+			 */
+			class Pls : public Base
+			{
+			public:
+				static Barcode* create();
 			
-		protected:
-			bool validate( const std::string& rawData ) override;
-			std::string encode( const std::string& cookedData ) override;
-		};
+			protected:
+				bool validate( const std::string& rawData ) override;
+				std::string encode( const std::string& cookedData ) override;
+			};
 
 
-		/**
-		 * Code93 Barcode
-		 */
-		class Code93 : public Base
-		{
-		public:
-			static Barcode* create();
+			/**
+			 * Code93 Barcode
+			 */
+			class Code93 : public Base
+			{
+			public:
+				static Barcode* create();
 			
-		protected:
-			bool validate( const std::string& rawData ) override;
-			std::string encode( const std::string& cookedData ) override;
-		};
+			protected:
+				bool validate( const std::string& rawData ) override;
+				std::string encode( const std::string& cookedData ) override;
+			};
 
+		}
 	}
 }
 
diff --git a/backends/barcode/QrEncode.cpp b/backends/barcode/QrEncode.cpp
index af59601..543f0bf 100644
--- a/backends/barcode/QrEncode.cpp
+++ b/backends/barcode/QrEncode.cpp
@@ -25,65 +25,69 @@
 #include <qrencode.h>
 
 
-namespace glabels::barcode
+namespace glabels
 {
-	namespace QrEncode
+	namespace barcode
 	{
-
-		/*
-		 * Static QrCode barcode creation method
-		 */
-		glbarcode::Barcode* QrCode::create()
+		namespace QrEncode
 		{
-			return new QrCode();
-		}
 
-
-		/*
-		 * QrCode data validation, implements glbarcode::Barcode2dBase::validate()
-		 */
-		bool QrCode::validate( const std::string& rawData )
-		{
-			if ( rawData.size() == 0 )
+			/*
+			 * Static QrCode barcode creation method
+			 */
+			glbarcode::Barcode* QrCode::create()
 			{
-				return false;
-			}
-			return true;
-		}
-
-
-		/*
-		 * QrCode data encoding, implements glbarcode::Barcode2dBase::encode()
-		 */
-		bool QrCode::encode( const std::string& cookedData, glbarcode::Matrix<bool>& encodedData )
-		{
-			QRcode *qrcode = QRcode_encodeString( cookedData.c_str(), 0, QR_ECLEVEL_M, QR_MODE_8, 1 );
-			if ( qrcode == NULL )
-			{
-				return false;
+				return new QrCode();
 			}
 
 
-			int w = qrcode->width;
-			encodedData.resize( w, w );
-		
-		
-			for ( int iy = 0; iy < w; iy++ )
+			/*
+			 * QrCode data validation, implements glbarcode::Barcode2dBase::validate()
+			 */
+			bool QrCode::validate( const std::string& rawData )
 			{
-				for ( int ix = 0; ix < w; ix++ )
+				if ( rawData.size() == 0 )
 				{
-					encodedData[iy][ix] = qrcode->data[ iy*w + ix ] & 0x01;
+					return false;
 				}
+				return true;
 			}
 
 
-			QRcode_free( qrcode );
-			QRcode_clearCache();
+			/*
+			 * QrCode data encoding, implements glbarcode::Barcode2dBase::encode()
+			 */
+			bool QrCode::encode( const std::string& cookedData, glbarcode::Matrix<bool>& encodedData )
+			{
+				QRcode *qrcode = QRcode_encodeString( cookedData.c_str(), 0, QR_ECLEVEL_M, QR_MODE_8, 1 );
+				if ( qrcode == NULL )
+				{
+					return false;
+				}
+
+
+				int w = qrcode->width;
+				encodedData.resize( w, w );
+		
+		
+				for ( int iy = 0; iy < w; iy++ )
+				{
+					for ( int ix = 0; ix < w; ix++ )
+					{
+						encodedData[iy][ix] = qrcode->data[ iy*w + ix ] & 0x01;
+					}
+				}
+
+
+				QRcode_free( qrcode );
+				QRcode_clearCache();
+
+				return true;
+			}
 
-			return true;
 		}
-
 	}
 }
 
+
 #endif // HAVE_QRENCODE
diff --git a/backends/barcode/QrEncode.h b/backends/barcode/QrEncode.h
index da58a8c..3ff3030 100644
--- a/backends/barcode/QrEncode.h
+++ b/backends/barcode/QrEncode.h
@@ -26,28 +26,31 @@
 #include "glbarcode/Barcode2dBase.h"
 
 
-namespace glabels::barcode
+namespace glabels
 {
-	namespace QrEncode
+	namespace barcode
 	{
-
-		/**
-		 * QrEncode::QrCode QR Code Barcode
-		 *
-		 * Implements glbarcode::Barcode2dBase.
-		 */
-		class QrCode : public glbarcode::Barcode2dBase
+		namespace QrEncode
 		{
-		public:
-			static Barcode* create();
 
-		private:
-			bool validate( const std::string& rawData ) override;
+			/**
+			 * QrEncode::QrCode QR Code Barcode
+			 *
+			 * Implements glbarcode::Barcode2dBase.
+			 */
+			class QrCode : public glbarcode::Barcode2dBase
+			{
+			public:
+				static Barcode* create();
 
-			bool encode( const std::string&       cookedData,
-			             glbarcode::Matrix<bool>& encodedData ) override;
-		};
+			private:
+				bool validate( const std::string& rawData ) override;
 
+				bool encode( const std::string&       cookedData,
+				             glbarcode::Matrix<bool>& encodedData ) override;
+			};
+
+		}
 	}
 }
 
diff --git a/backends/barcode/Style.cpp b/backends/barcode/Style.cpp
index 27c1269..59e5ff7 100644
--- a/backends/barcode/Style.cpp
+++ b/backends/barcode/Style.cpp
@@ -21,184 +21,187 @@
 #include "Style.h"
 
 
-namespace glabels::barcode
+namespace glabels
 {
+	namespace barcode
+	{
 	
-	///
-	/// Default Constructor
-	///
-	Style::Style ()
-		: mId( "" ),
-		  mBackendId( "" ),
-		  mName( "" ),
-		  mCanText( false ),
-		  mTextOptional( false ),
-		  mCanChecksum( false ),
-		  mChecksumOptional( false ),
-		  mDefaultDigits( "" ),
-		  mCanFreeform( false ),
-		  mPreferedN( 0 )
-	{
-		// empty
-	}
+		///
+		/// Default Constructor
+		///
+		Style::Style ()
+			: mId( "" ),
+			  mBackendId( "" ),
+			  mName( "" ),
+			  mCanText( false ),
+			  mTextOptional( false ),
+			  mCanChecksum( false ),
+			  mChecksumOptional( false ),
+			  mDefaultDigits( "" ),
+			  mCanFreeform( false ),
+			  mPreferedN( 0 )
+		{
+			// empty
+		}
 
 
-	///
-	/// Constructor From Data
-	///
-	Style::Style ( const QString& id,
-	               const QString& backendId,
-	               const QString& name,
-	               bool           canText,
-	               bool           textOptional,
-	               bool           canChecksum,
-	               bool           checksumOptional,
-	               const QString& defaultDigits,
-	               bool           canFreeform,
-	               int            preferedN )
-	: mId( id ),
-	  mBackendId( backendId ),
-	  mName( name ),
-	  mCanText( canText ),
-	  mTextOptional( textOptional ),
-	  mCanChecksum( canChecksum ),
-	  mChecksumOptional( checksumOptional ),
-	  mDefaultDigits( defaultDigits ),
-	  mCanFreeform( canFreeform ),
-	  mPreferedN( preferedN )
-	{
-		// empty
-	}
+		///
+		/// Constructor From Data
+		///
+		Style::Style ( const QString& id,
+		               const QString& backendId,
+		               const QString& name,
+		               bool           canText,
+		               bool           textOptional,
+		               bool           canChecksum,
+		               bool           checksumOptional,
+		               const QString& defaultDigits,
+		               bool           canFreeform,
+		               int            preferedN )
+			: mId( id ),
+			  mBackendId( backendId ),
+			  mName( name ),
+			  mCanText( canText ),
+			mTextOptional( textOptional ),
+			mCanChecksum( canChecksum ),
+			mChecksumOptional( checksumOptional ),
+			mDefaultDigits( defaultDigits ),
+			mCanFreeform( canFreeform ),
+			mPreferedN( preferedN )
+		{
+			// empty
+		}
 
 
-	///
-	/// ID Property Getter
-	///
-	const QString& Style::id() const
-	{
-		return mId;
-	}
-
-
-	///
-	/// Full ID Property Getter
-	///
-	QString Style::fullId() const
-	{
-		if ( mBackendId == "" )
+		///
+		/// ID Property Getter
+		///
+		const QString& Style::id() const
 		{
 			return mId;
 		}
-		else
+
+
+		///
+		/// Full ID Property Getter
+		///
+		QString Style::fullId() const
 		{
-			return mBackendId + "::" + mId;
+			if ( mBackendId == "" )
+			{
+				return mId;
+			}
+			else
+			{
+				return mBackendId + "::" + mId;
+			}
 		}
-	}
 
 
-	///
-	/// Backend ID Property Getter
-	///
-	const QString& Style::backendId() const
-	{
-		return mBackendId;
-	}
-
-
-	///
-	/// Name Property Getter
-	///
-	const QString& Style::name() const
-	{
-		return mName;
-	}
-
-
-	///
-	/// Can Text Property Getter
-	///
-	bool Style::canText() const
-	{
-		return mCanText;
-	}
-
-
-	///
-	/// Text Optional Property Getter
-	///
-	bool Style::textOptional() const
-	{
-		return mTextOptional;
-	}
-
-
-	///
-	/// Can Checksum Property Getter
-	///
-	bool Style::canChecksum() const
-	{
-		return mCanChecksum;
-	}
-
-
-	///
-	/// Checksum Optional Property Getter
-	///
-	bool Style::checksumOptional() const
-	{
-		return mChecksumOptional;
-	}
-
-
-	///
-	/// Default Digits Property Getter
-	///
-	const QString& Style::defaultDigits() const
-	{
-		return mDefaultDigits;
-	}
-
-
-	///
-	/// Can Freeform Property Getter
-	///
-	bool Style::canFreeform() const
-	{
-		return mCanFreeform;
-	}
-
-
-	///
-	/// Prefered N Property Getter
-	///
-	int Style::preferedN() const
-	{
-		return mPreferedN;
-	}
-
-
-	///
-	/// Generate Example Digits
-	///
-	QString Style::exampleDigits( int n ) const
-	{
-		if ( mCanFreeform )
+		///
+		/// Backend ID Property Getter
+		///
+		const QString& Style::backendId() const
 		{
-			return QString( qMax( n, 1 ), QChar('0') );
+			return mBackendId;
 		}
-		else
+
+
+		///
+		/// Name Property Getter
+		///
+		const QString& Style::name() const
+		{
+			return mName;
+		}
+
+
+		///
+		/// Can Text Property Getter
+		///
+		bool Style::canText() const
+		{
+			return mCanText;
+		}
+
+
+		///
+		/// Text Optional Property Getter
+		///
+		bool Style::textOptional() const
+		{
+			return mTextOptional;
+		}
+
+
+		///
+		/// Can Checksum Property Getter
+		///
+		bool Style::canChecksum() const
+		{
+			return mCanChecksum;
+		}
+
+
+		///
+		/// Checksum Optional Property Getter
+		///
+		bool Style::checksumOptional() const
+		{
+			return mChecksumOptional;
+		}
+
+
+		///
+		/// Default Digits Property Getter
+		///
+		const QString& Style::defaultDigits() const
 		{
 			return mDefaultDigits;
 		}
-	}
 
 
-	///
-	/// "Not equals" operator
-	///
-	bool Style::operator!=( const Style& other ) const
-	{
-		return mId != other.mId;
-	}
+		///
+		/// Can Freeform Property Getter
+		///
+		bool Style::canFreeform() const
+		{
+			return mCanFreeform;
+		}
+
+
+		///
+		/// Prefered N Property Getter
+		///
+		int Style::preferedN() const
+		{
+			return mPreferedN;
+		}
+
+
+		///
+		/// Generate Example Digits
+		///
+		QString Style::exampleDigits( int n ) const
+		{
+			if ( mCanFreeform )
+			{
+				return QString( qMax( n, 1 ), QChar('0') );
+			}
+			else
+			{
+				return mDefaultDigits;
+			}
+		}
+
+
+		///
+		/// "Not equals" operator
+		///
+		bool Style::operator!=( const Style& other ) const
+		{
+			return mId != other.mId;
+		}
 	
-} // namespace glabels::barcode
+	} // namespace barcode
+} // namespace glabels
diff --git a/backends/barcode/Style.h b/backends/barcode/Style.h
index 8d92808..db9e037 100644
--- a/backends/barcode/Style.h
+++ b/backends/barcode/Style.h
@@ -25,90 +25,93 @@
 #include <QString>
 
 
-namespace glabels::barcode
+namespace glabels
 {
-	
-	///
-	///  Style Type
-	///
-	class Style
+	namespace barcode
 	{
+	
+		///
+		///  Style Type
+		///
+		class Style
+		{
 
-		/////////////////////////////////
-		// Life Cycle
-		/////////////////////////////////
-	public:
-		Style ();
+			/////////////////////////////////
+			// Life Cycle
+			/////////////////////////////////
+		public:
+			Style ();
 
-		Style ( const QString& id,
-		        const QString& backendId,
-		        const QString& name,
-		        bool           canText,
-		        bool           textOptional,
-		        bool           canChecksum,
-		        bool           checksumOptional,
-		        const QString& defaultDigits,
-		        bool           canFreeform,
-		        int            preferedN );
+			Style ( const QString& id,
+			        const QString& backendId,
+			        const QString& name,
+			        bool           canText,
+			        bool           textOptional,
+			        bool           canChecksum,
+			        bool           checksumOptional,
+			        const QString& defaultDigits,
+			        bool           canFreeform,
+			        int            preferedN );
 
 
-		/////////////////////////////////
-		// Properties
-		/////////////////////////////////
-		const QString& id() const;
+			/////////////////////////////////
+			// Properties
+			/////////////////////////////////
+			const QString& id() const;
 
-		QString fullId() const;
+			QString fullId() const;
 
-		const QString& backendId() const;
+			const QString& backendId() const;
 
-		const QString& name() const;
+			const QString& name() const;
 
-		bool canText() const;
+			bool canText() const;
 
-		bool textOptional() const;
+			bool textOptional() const;
 
-		bool canChecksum() const;
+			bool canChecksum() const;
 
-		bool checksumOptional() const;
+			bool checksumOptional() const;
 
-		const QString& defaultDigits() const;
+			const QString& defaultDigits() const;
 
-		bool canFreeform() const;
+			bool canFreeform() const;
 
-		int preferedN() const;
+			int preferedN() const;
 
 
-		/////////////////////////////////
-		// Methods
-		/////////////////////////////////
-	public:
-		QString exampleDigits( int n ) const;
+			/////////////////////////////////
+			// Methods
+			/////////////////////////////////
+		public:
+			QString exampleDigits( int n ) const;
 
 
-		/////////////////////////////////
-		// Operators
-		/////////////////////////////////
-	public:
-		bool operator!=( const Style& other ) const;
+			/////////////////////////////////
+			// Operators
+			/////////////////////////////////
+		public:
+			bool operator!=( const Style& other ) const;
 
 
-		/////////////////////////////////
-		// Private Data
-		/////////////////////////////////
-	private:
-		QString mId;
-		QString mBackendId;
-		QString mName;
-		bool    mCanText;
-		bool    mTextOptional;
-		bool    mCanChecksum;
-		bool    mChecksumOptional;
-		QString mDefaultDigits;
-		bool    mCanFreeform;
-		int     mPreferedN;
+			/////////////////////////////////
+			// Private Data
+			/////////////////////////////////
+		private:
+			QString mId;
+			QString mBackendId;
+			QString mName;
+			bool    mCanText;
+			bool    mTextOptional;
+			bool    mCanChecksum;
+			bool    mChecksumOptional;
+			QString mDefaultDigits;
+			bool    mCanFreeform;
+			int     mPreferedN;
 
-	};
+		};
 
+	}
 }
 
 
diff --git a/backends/barcode/Zint.cpp b/backends/barcode/Zint.cpp
index f4d374b..e0785e6 100644
--- a/backends/barcode/Zint.cpp
+++ b/backends/barcode/Zint.cpp
@@ -34,1172 +34,1176 @@ namespace
 }
 
 
-namespace glabels::barcode
+namespace glabels
 {
-	namespace Zint
+	namespace barcode
 	{
-
-
-		//
-		// Zint barcode data validation method
-		//
-		bool Base::validate( const std::string& rawData )
+		namespace Zint
 		{
-			return rawData.size() != 0;
-		}
+
+
+			//
+			// Zint barcode data validation method
+			//
+			bool Base::validate( const std::string& rawData )
+			{
+				return rawData.size() != 0;
+			}
 
 		
-		//
-		// Zint barcode data vectorization method
-		//
-		void Base::vectorize( const std::string& encodedData,
-		                      const std::string& displayText,
-		                      const std::string& cookedData,
-		                      double&            w,
-		                      double&            h )
-		{
-			/*
-			 * First encode using Zint barcode library.
-			 */
-			if ( w == 0 )
+			//
+			// Zint barcode data vectorization method
+			//
+			void Base::vectorize( const std::string& encodedData,
+			                      const std::string& displayText,
+			                      const std::string& cookedData,
+			                      double&            w,
+			                      double&            h )
 			{
-				w = W_PTS_DEFAULT;
-			}
-			if ( h == 0 )
-			{
-				h = H_PTS_DEFAULT;
-			}
-
-			zint_symbol* symbol = ZBarcode_Create();;
-
-			symbol->symbology = symbology;
-
-			if ( ZBarcode_Encode( symbol, (unsigned char*)(cookedData.c_str()), 0 ) != 0 )
-			{
-				qDebug() << "Zint::ZBarcode_Encode: " << QString(symbol->errtxt);
-				setIsDataValid( false );
-				return;
-			}
-
-			symbol->show_hrt = showText();
-
-			if ( ZBarcode_Render( symbol, (float)w, (float)h ) == 0 )
-			{
-				qDebug() << "Zint::ZBarcode_Render: " << QString(symbol->errtxt);
-				setIsDataValid( false );
-				return;
-			}
-
-
-			/*
-			 * Now do the actual vectorization.
-			 */
-			zint_render *render = symbol->rendered;
-
-			setWidth( render->width );
-			setHeight( render->height );
-
-			for ( zint_render_line *zline = render->lines; zline != nullptr; zline = zline->next )
-			{
-				addBox( zline->x, zline->y, zline->width, zline->length );
-			}
-
-			for ( zint_render_ring *zring = render->rings; zring != nullptr; zring = zring->next )
-			{
-				addRing( zring->x, zring->y, zring->radius, zring->line_width );
-			}
-
-			for ( zint_render_hexagon *zhexagon = render->hexagons; zhexagon != nullptr; zhexagon = zhexagon->next )
-			{
-				addHexagon( zhexagon->x, zhexagon->y, 2.89 );
-			}
-
-			if( showText() )
-			{
-				for ( zint_render_string *zstring = render->strings; zstring != nullptr; zstring = zstring->next )
+				/*
+				 * First encode using Zint barcode library.
+				 */
+				if ( w == 0 )
 				{
-					double fsize = FONT_SCALE*zstring->fsize;
-					addText( zstring->x, zstring->y+0.75*fsize, fsize, QString((char*)(zstring->text)).toStdString() );
+					w = W_PTS_DEFAULT;
 				}
+				if ( h == 0 )
+				{
+					h = H_PTS_DEFAULT;
+				}
+
+				zint_symbol* symbol = ZBarcode_Create();;
+
+				symbol->symbology = symbology;
+
+				if ( ZBarcode_Encode( symbol, (unsigned char*)(cookedData.c_str()), 0 ) != 0 )
+				{
+					qDebug() << "Zint::ZBarcode_Encode: " << QString(symbol->errtxt);
+					setIsDataValid( false );
+					return;
+				}
+
+				symbol->show_hrt = showText();
+
+				if ( ZBarcode_Render( symbol, (float)w, (float)h ) == 0 )
+				{
+					qDebug() << "Zint::ZBarcode_Render: " << QString(symbol->errtxt);
+					setIsDataValid( false );
+					return;
+				}
+
+
+				/*
+				 * Now do the actual vectorization.
+				 */
+				zint_render *render = symbol->rendered;
+
+				setWidth( render->width );
+				setHeight( render->height );
+
+				for ( zint_render_line *zline = render->lines; zline != nullptr; zline = zline->next )
+				{
+					addBox( zline->x, zline->y, zline->width, zline->length );
+				}
+
+				for ( zint_render_ring *zring = render->rings; zring != nullptr; zring = zring->next )
+				{
+					addRing( zring->x, zring->y, zring->radius, zring->line_width );
+				}
+
+				for ( zint_render_hexagon *zhexagon = render->hexagons; zhexagon != nullptr; zhexagon = zhexagon->next )
+				{
+					addHexagon( zhexagon->x, zhexagon->y, 2.89 );
+				}
+
+				if( showText() )
+				{
+					for ( zint_render_string *zstring = render->strings; zstring != nullptr; zstring = zstring->next )
+					{
+						double fsize = FONT_SCALE*zstring->fsize;
+						addText( zstring->x, zstring->y+0.75*fsize, fsize, QString((char*)(zstring->text)).toStdString() );
+					}
+				}
+
+				ZBarcode_Delete( symbol );
 			}
 
-			ZBarcode_Delete( symbol );
-		}
-
 
-		//////////////////////////////////////////////////////
-		// AusP Barcode
-		//////////////////////////////////////////////////////
-		glbarcode::Barcode* AusP::create()
-		{
-			return new AusP();
-		}
+			//////////////////////////////////////////////////////
+			// AusP Barcode
+			//////////////////////////////////////////////////////
+			glbarcode::Barcode* AusP::create()
+			{
+				return new AusP();
+			}
 
 		
-		std::string AusP::encode( const std::string& cookedData )
-		{
-			symbology = BARCODE_AUSPOST;
-			return ""; // Actual encoding is done in vectorize
-		}
+			std::string AusP::encode( const std::string& cookedData )
+			{
+				symbology = BARCODE_AUSPOST;
+				return ""; // Actual encoding is done in vectorize
+			}
 		
 
-		//////////////////////////////////////////////////////
-		// AusRP Barcode
-		//////////////////////////////////////////////////////
-		glbarcode::Barcode* AusRP::create()
-		{
-			return new AusRP();
-		}
+			//////////////////////////////////////////////////////
+			// AusRP Barcode
+			//////////////////////////////////////////////////////
+			glbarcode::Barcode* AusRP::create()
+			{
+				return new AusRP();
+			}
 
 		
-		std::string AusRP::encode( const std::string& cookedData )
-		{
-			symbology = BARCODE_AUSREPLY;
-			return ""; // Actual encoding is done in vectorize
-		}
+			std::string AusRP::encode( const std::string& cookedData )
+			{
+				symbology = BARCODE_AUSREPLY;
+				return ""; // Actual encoding is done in vectorize
+			}
 		
 
-		//////////////////////////////////////////////////////
-		// AusRT Barcode
-		//////////////////////////////////////////////////////
-		glbarcode::Barcode* AusRT::create()
-		{
-			return new AusRT();
-		}
+			//////////////////////////////////////////////////////
+			// AusRT Barcode
+			//////////////////////////////////////////////////////
+			glbarcode::Barcode* AusRT::create()
+			{
+				return new AusRT();
+			}
 
 		
-		std::string AusRT::encode( const std::string& cookedData )
-		{
-			symbology = BARCODE_AUSROUTE;
-			return ""; // Actual encoding is done in vectorize
-		}
+			std::string AusRT::encode( const std::string& cookedData )
+			{
+				symbology = BARCODE_AUSROUTE;
+				return ""; // Actual encoding is done in vectorize
+			}
 		
 
-		//////////////////////////////////////////////////////
-		// AusRD Barcode
-		//////////////////////////////////////////////////////
-		glbarcode::Barcode* AusRD::create()
-		{
-			return new AusRD();
-		}
+			//////////////////////////////////////////////////////
+			// AusRD Barcode
+			//////////////////////////////////////////////////////
+			glbarcode::Barcode* AusRD::create()
+			{
+				return new AusRD();
+			}
 
 		
-		std::string AusRD::encode( const std::string& cookedData )
-		{
-			symbology = BARCODE_AUSREDIRECT;
-			return ""; // Actual encoding is done in vectorize
-		}
+			std::string AusRD::encode( const std::string& cookedData )
+			{
+				symbology = BARCODE_AUSREDIRECT;
+				return ""; // Actual encoding is done in vectorize
+			}
 		
 
-		//////////////////////////////////////////////////////
-		// Aztec Barcode
-		//////////////////////////////////////////////////////
-		glbarcode::Barcode* Aztec::create()
-		{
-			return new Aztec();
-		}
+			//////////////////////////////////////////////////////
+			// Aztec Barcode
+			//////////////////////////////////////////////////////
+			glbarcode::Barcode* Aztec::create()
+			{
+				return new Aztec();
+			}
 
 		
-		std::string Aztec::encode( const std::string& cookedData )
-		{
-			symbology = BARCODE_AZTEC;
-			return ""; // Actual encoding is done in vectorize
-		}
+			std::string Aztec::encode( const std::string& cookedData )
+			{
+				symbology = BARCODE_AZTEC;
+				return ""; // Actual encoding is done in vectorize
+			}
 		
 
-		//////////////////////////////////////////////////////
-		// Azrun Barcode
-		//////////////////////////////////////////////////////
-		glbarcode::Barcode* Azrun::create()
-		{
-			return new Azrun();
-		}
+			//////////////////////////////////////////////////////
+			// Azrun Barcode
+			//////////////////////////////////////////////////////
+			glbarcode::Barcode* Azrun::create()
+			{
+				return new Azrun();
+			}
 
 		
-		std::string Azrun::encode( const std::string& cookedData )
-		{
-			symbology = BARCODE_AZRUNE;
-			return ""; // Actual encoding is done in vectorize
-		}
+			std::string Azrun::encode( const std::string& cookedData )
+			{
+				symbology = BARCODE_AZRUNE;
+				return ""; // Actual encoding is done in vectorize
+			}
 		
 
-		//////////////////////////////////////////////////////
-		// Cbr Barcode
-		//////////////////////////////////////////////////////
-		glbarcode::Barcode* Cbr::create()
-		{
-			return new Cbr();
-		}
+			//////////////////////////////////////////////////////
+			// Cbr Barcode
+			//////////////////////////////////////////////////////
+			glbarcode::Barcode* Cbr::create()
+			{
+				return new Cbr();
+			}
 
 		
-		std::string Cbr::encode( const std::string& cookedData )
-		{
-			symbology = BARCODE_CODABAR;
-			return ""; // Actual encoding is done in vectorize
-		}
+			std::string Cbr::encode( const std::string& cookedData )
+			{
+				symbology = BARCODE_CODABAR;
+				return ""; // Actual encoding is done in vectorize
+			}
 		
 
-		//////////////////////////////////////////////////////
-		// Code1 Barcode
-		//////////////////////////////////////////////////////
-		glbarcode::Barcode* Code1::create()
-		{
-			return new Code1();
-		}
+			//////////////////////////////////////////////////////
+			// Code1 Barcode
+			//////////////////////////////////////////////////////
+			glbarcode::Barcode* Code1::create()
+			{
+				return new Code1();
+			}
 
 		
-		std::string Code1::encode( const std::string& cookedData )
-		{
-			symbology = BARCODE_CODEONE;
-			return ""; // Actual encoding is done in vectorize
-		}
+			std::string Code1::encode( const std::string& cookedData )
+			{
+				symbology = BARCODE_CODEONE;
+				return ""; // Actual encoding is done in vectorize
+			}
 		
 
-		//////////////////////////////////////////////////////
-		// Code11 Barcode
-		//////////////////////////////////////////////////////
-		glbarcode::Barcode* Code11::create()
-		{
-			return new Code11();
-		}
+			//////////////////////////////////////////////////////
+			// Code11 Barcode
+			//////////////////////////////////////////////////////
+			glbarcode::Barcode* Code11::create()
+			{
+				return new Code11();
+			}
 
 		
-		std::string Code11::encode( const std::string& cookedData )
-		{
-			symbology = BARCODE_CODE11;
-			return ""; // Actual encoding is done in vectorize
-		}
+			std::string Code11::encode( const std::string& cookedData )
+			{
+				symbology = BARCODE_CODE11;
+				return ""; // Actual encoding is done in vectorize
+			}
 		
 
-		//////////////////////////////////////////////////////
-		// C16k Barcode
-		//////////////////////////////////////////////////////
-		glbarcode::Barcode* C16k::create()
-		{
-			return new C16k();
-		}
+			//////////////////////////////////////////////////////
+			// C16k Barcode
+			//////////////////////////////////////////////////////
+			glbarcode::Barcode* C16k::create()
+			{
+				return new C16k();
+			}
 
 		
-		std::string C16k::encode( const std::string& cookedData )
-		{
-			symbology = BARCODE_CODE16K;
-			return ""; // Actual encoding is done in vectorize
-		}
+			std::string C16k::encode( const std::string& cookedData )
+			{
+				symbology = BARCODE_CODE16K;
+				return ""; // Actual encoding is done in vectorize
+			}
 		
 
-		//////////////////////////////////////////////////////
-		// C25m Barcode
-		//////////////////////////////////////////////////////
-		glbarcode::Barcode* C25m::create()
-		{
-			return new C25m();
-		}
+			//////////////////////////////////////////////////////
+			// C25m Barcode
+			//////////////////////////////////////////////////////
+			glbarcode::Barcode* C25m::create()
+			{
+				return new C25m();
+			}
 
 		
-		std::string C25m::encode( const std::string& cookedData )
-		{
-			symbology = BARCODE_C25MATRIX;
-			return ""; // Actual encoding is done in vectorize
-		}
+			std::string C25m::encode( const std::string& cookedData )
+			{
+				symbology = BARCODE_C25MATRIX;
+				return ""; // Actual encoding is done in vectorize
+			}
 		
 
-		//////////////////////////////////////////////////////
-		// C25i Barcode
-		//////////////////////////////////////////////////////
-		glbarcode::Barcode* C25i::create()
-		{
-			return new C25i();
-		}
+			//////////////////////////////////////////////////////
+			// C25i Barcode
+			//////////////////////////////////////////////////////
+			glbarcode::Barcode* C25i::create()
+			{
+				return new C25i();
+			}
 
 		
-		std::string C25i::encode( const std::string& cookedData )
-		{
-			symbology = BARCODE_C25IATA;
-			return ""; // Actual encoding is done in vectorize
-		}
+			std::string C25i::encode( const std::string& cookedData )
+			{
+				symbology = BARCODE_C25IATA;
+				return ""; // Actual encoding is done in vectorize
+			}
 		
 
-		//////////////////////////////////////////////////////
-		// C25dl Barcode
-		//////////////////////////////////////////////////////
-		glbarcode::Barcode* C25dl::create()
-		{
-			return new C25dl();
-		}
+			//////////////////////////////////////////////////////
+			// C25dl Barcode
+			//////////////////////////////////////////////////////
+			glbarcode::Barcode* C25dl::create()
+			{
+				return new C25dl();
+			}
 
 		
-		std::string C25dl::encode( const std::string& cookedData )
-		{
-			symbology = BARCODE_C25LOGIC;
-			return ""; // Actual encoding is done in vectorize
-		}
+			std::string C25dl::encode( const std::string& cookedData )
+			{
+				symbology = BARCODE_C25LOGIC;
+				return ""; // Actual encoding is done in vectorize
+			}
 		
 
-		//////////////////////////////////////////////////////
-		// Code32 Barcode
-		//////////////////////////////////////////////////////
-		glbarcode::Barcode* Code32::create()
-		{
-			return new Code32();
-		}
+			//////////////////////////////////////////////////////
+			// Code32 Barcode
+			//////////////////////////////////////////////////////
+			glbarcode::Barcode* Code32::create()
+			{
+				return new Code32();
+			}
 
 		
-		std::string Code32::encode( const std::string& cookedData )
-		{
-			symbology = BARCODE_CODE32;
-			return ""; // Actual encoding is done in vectorize
-		}
+			std::string Code32::encode( const std::string& cookedData )
+			{
+				symbology = BARCODE_CODE32;
+				return ""; // Actual encoding is done in vectorize
+			}
 		
 
-		//////////////////////////////////////////////////////
-		// Code39 Barcode
-		//////////////////////////////////////////////////////
-		glbarcode::Barcode* Code39::create()
-		{
-			return new Code39();
-		}
+			//////////////////////////////////////////////////////
+			// Code39 Barcode
+			//////////////////////////////////////////////////////
+			glbarcode::Barcode* Code39::create()
+			{
+				return new Code39();
+			}
 
 		
-		std::string Code39::encode( const std::string& cookedData )
-		{
-			symbology = BARCODE_CODE39;
-			return ""; // Actual encoding is done in vectorize
-		}
+			std::string Code39::encode( const std::string& cookedData )
+			{
+				symbology = BARCODE_CODE39;
+				return ""; // Actual encoding is done in vectorize
+			}
 		
 
-		//////////////////////////////////////////////////////
-		// Code39e Barcode
-		//////////////////////////////////////////////////////
-		glbarcode::Barcode* Code39e::create()
-		{
-			return new Code39e();
-		}
+			//////////////////////////////////////////////////////
+			// Code39e Barcode
+			//////////////////////////////////////////////////////
+			glbarcode::Barcode* Code39e::create()
+			{
+				return new Code39e();
+			}
 
 		
-		std::string Code39e::encode( const std::string& cookedData )
-		{
-			symbology = BARCODE_EXCODE39;
-			return ""; // Actual encoding is done in vectorize
-		}
+			std::string Code39e::encode( const std::string& cookedData )
+			{
+				symbology = BARCODE_EXCODE39;
+				return ""; // Actual encoding is done in vectorize
+			}
 		
 
-		//////////////////////////////////////////////////////
-		// Code49 Barcode
-		//////////////////////////////////////////////////////
-		glbarcode::Barcode* Code49::create()
-		{
-			return new Code49();
-		}
+			//////////////////////////////////////////////////////
+			// Code49 Barcode
+			//////////////////////////////////////////////////////
+			glbarcode::Barcode* Code49::create()
+			{
+				return new Code49();
+			}
 
 		
-		std::string Code49::encode( const std::string& cookedData )
-		{
-			symbology = BARCODE_CODE49;
-			return ""; // Actual encoding is done in vectorize
-		}
+			std::string Code49::encode( const std::string& cookedData )
+			{
+				symbology = BARCODE_CODE49;
+				return ""; // Actual encoding is done in vectorize
+			}
 		
 
-		//////////////////////////////////////////////////////
-		// Code93 Barcode
-		//////////////////////////////////////////////////////
-		glbarcode::Barcode* Code93::create()
-		{
-			return new Code93();
-		}
+			//////////////////////////////////////////////////////
+			// Code93 Barcode
+			//////////////////////////////////////////////////////
+			glbarcode::Barcode* Code93::create()
+			{
+				return new Code93();
+			}
 
 		
-		std::string Code93::encode( const std::string& cookedData )
-		{
-			symbology = BARCODE_CODE93;
-			return ""; // Actual encoding is done in vectorize
-		}
+			std::string Code93::encode( const std::string& cookedData )
+			{
+				symbology = BARCODE_CODE93;
+				return ""; // Actual encoding is done in vectorize
+			}
 		
 
-		//////////////////////////////////////////////////////
-		// Code128 Barcode
-		//////////////////////////////////////////////////////
-		glbarcode::Barcode* Code128::create()
-		{
-			return new Code128();
-		}
+			//////////////////////////////////////////////////////
+			// Code128 Barcode
+			//////////////////////////////////////////////////////
+			glbarcode::Barcode* Code128::create()
+			{
+				return new Code128();
+			}
 
 		
-		std::string Code128::encode( const std::string& cookedData )
-		{
-			symbology = BARCODE_CODE128;
-			return ""; // Actual encoding is done in vectorize
-		}
+			std::string Code128::encode( const std::string& cookedData )
+			{
+				symbology = BARCODE_CODE128;
+				return ""; // Actual encoding is done in vectorize
+			}
 		
 
-		//////////////////////////////////////////////////////
-		// Code128b Barcode
-		//////////////////////////////////////////////////////
-		glbarcode::Barcode* Code128b::create()
-		{
-			return new Code128b();
-		}
+			//////////////////////////////////////////////////////
+			// Code128b Barcode
+			//////////////////////////////////////////////////////
+			glbarcode::Barcode* Code128b::create()
+			{
+				return new Code128b();
+			}
 
 		
-		std::string Code128b::encode( const std::string& cookedData )
-		{
-			symbology = BARCODE_CODE128B;
-			return ""; // Actual encoding is done in vectorize
-		}
+			std::string Code128b::encode( const std::string& cookedData )
+			{
+				symbology = BARCODE_CODE128B;
+				return ""; // Actual encoding is done in vectorize
+			}
 		
 
-		//////////////////////////////////////////////////////
-		// Daft Barcode
-		//////////////////////////////////////////////////////
-		glbarcode::Barcode* Daft::create()
-		{
-			return new Daft();
-		}
+			//////////////////////////////////////////////////////
+			// Daft Barcode
+			//////////////////////////////////////////////////////
+			glbarcode::Barcode* Daft::create()
+			{
+				return new Daft();
+			}
 
 		
-		std::string Daft::encode( const std::string& cookedData )
-		{
-			symbology = BARCODE_DAFT;
-			return ""; // Actual encoding is done in vectorize
-		}
+			std::string Daft::encode( const std::string& cookedData )
+			{
+				symbology = BARCODE_DAFT;
+				return ""; // Actual encoding is done in vectorize
+			}
 		
 
-		//////////////////////////////////////////////////////
-		// Dmtx Barcode
-		//////////////////////////////////////////////////////
-		glbarcode::Barcode* Dmtx::create()
-		{
-			return new Dmtx();
-		}
+			//////////////////////////////////////////////////////
+			// Dmtx Barcode
+			//////////////////////////////////////////////////////
+			glbarcode::Barcode* Dmtx::create()
+			{
+				return new Dmtx();
+			}
 
 		
-		std::string Dmtx::encode( const std::string& cookedData )
-		{
-			symbology = BARCODE_DATAMATRIX;
-			return ""; // Actual encoding is done in vectorize
-		}
+			std::string Dmtx::encode( const std::string& cookedData )
+			{
+				symbology = BARCODE_DATAMATRIX;
+				return ""; // Actual encoding is done in vectorize
+			}
 		
 
-		//////////////////////////////////////////////////////
-		// Dpl Barcode
-		//////////////////////////////////////////////////////
-		glbarcode::Barcode* Dpl::create()
-		{
-			return new Dpl();
-		}
+			//////////////////////////////////////////////////////
+			// Dpl Barcode
+			//////////////////////////////////////////////////////
+			glbarcode::Barcode* Dpl::create()
+			{
+				return new Dpl();
+			}
 
 		
-		std::string Dpl::encode( const std::string& cookedData )
-		{
-			symbology = BARCODE_DPLEIT;
-			return ""; // Actual encoding is done in vectorize
-		}
+			std::string Dpl::encode( const std::string& cookedData )
+			{
+				symbology = BARCODE_DPLEIT;
+				return ""; // Actual encoding is done in vectorize
+			}
 		
 
-		//////////////////////////////////////////////////////
-		// Dpi Barcode
-		//////////////////////////////////////////////////////
-		glbarcode::Barcode* Dpi::create()
-		{
-			return new Dpi();
-		}
+			//////////////////////////////////////////////////////
+			// Dpi Barcode
+			//////////////////////////////////////////////////////
+			glbarcode::Barcode* Dpi::create()
+			{
+				return new Dpi();
+			}
 
 		
-		std::string Dpi::encode( const std::string& cookedData )
-		{
-			symbology = BARCODE_DPIDENT;
-			return ""; // Actual encoding is done in vectorize
-		}
+			std::string Dpi::encode( const std::string& cookedData )
+			{
+				symbology = BARCODE_DPIDENT;
+				return ""; // Actual encoding is done in vectorize
+			}
 		
 
-		//////////////////////////////////////////////////////
-		// Kix Barcode
-		//////////////////////////////////////////////////////
-		glbarcode::Barcode* Kix::create()
-		{
-			return new Kix();
-		}
+			//////////////////////////////////////////////////////
+			// Kix Barcode
+			//////////////////////////////////////////////////////
+			glbarcode::Barcode* Kix::create()
+			{
+				return new Kix();
+			}
 
 		
-		std::string Kix::encode( const std::string& cookedData )
-		{
-			symbology = BARCODE_KIX;
-			return ""; // Actual encoding is done in vectorize
-		}
+			std::string Kix::encode( const std::string& cookedData )
+			{
+				symbology = BARCODE_KIX;
+				return ""; // Actual encoding is done in vectorize
+			}
 		
 
-		//////////////////////////////////////////////////////
-		// Ean Barcode
-		//////////////////////////////////////////////////////
-		glbarcode::Barcode* Ean::create()
-		{
-			return new Ean();
-		}
+			//////////////////////////////////////////////////////
+			// Ean Barcode
+			//////////////////////////////////////////////////////
+			glbarcode::Barcode* Ean::create()
+			{
+				return new Ean();
+			}
 
 		
-		std::string Ean::encode( const std::string& cookedData )
-		{
-			symbology = BARCODE_EANX;
-			return ""; // Actual encoding is done in vectorize
-		}
+			std::string Ean::encode( const std::string& cookedData )
+			{
+				symbology = BARCODE_EANX;
+				return ""; // Actual encoding is done in vectorize
+			}
 		
 
-		//////////////////////////////////////////////////////
-		// Hibc128 Barcode
-		//////////////////////////////////////////////////////
-		glbarcode::Barcode* Hibc128::create()
-		{
-			return new Hibc128();
-		}
+			//////////////////////////////////////////////////////
+			// Hibc128 Barcode
+			//////////////////////////////////////////////////////
+			glbarcode::Barcode* Hibc128::create()
+			{
+				return new Hibc128();
+			}
 
 		
-		std::string Hibc128::encode( const std::string& cookedData )
-		{
-			symbology = BARCODE_HIBC_128;
-			return ""; // Actual encoding is done in vectorize
-		}
+			std::string Hibc128::encode( const std::string& cookedData )
+			{
+				symbology = BARCODE_HIBC_128;
+				return ""; // Actual encoding is done in vectorize
+			}
 		
 
-		//////////////////////////////////////////////////////
-		// Hibc39 Barcode
-		//////////////////////////////////////////////////////
-		glbarcode::Barcode* Hibc39::create()
-		{
-			return new Hibc39();
-		}
+			//////////////////////////////////////////////////////
+			// Hibc39 Barcode
+			//////////////////////////////////////////////////////
+			glbarcode::Barcode* Hibc39::create()
+			{
+				return new Hibc39();
+			}
 
 		
-		std::string Hibc39::encode( const std::string& cookedData )
-		{
-			symbology = BARCODE_HIBC_39;
-			return ""; // Actual encoding is done in vectorize
-		}
+			std::string Hibc39::encode( const std::string& cookedData )
+			{
+				symbology = BARCODE_HIBC_39;
+				return ""; // Actual encoding is done in vectorize
+			}
 		
 
-		//////////////////////////////////////////////////////
-		// Hibcdm Barcode
-		//////////////////////////////////////////////////////
-		glbarcode::Barcode* Hibcdm::create()
-		{
-			return new Hibcdm();
-		}
+			//////////////////////////////////////////////////////
+			// Hibcdm Barcode
+			//////////////////////////////////////////////////////
+			glbarcode::Barcode* Hibcdm::create()
+			{
+				return new Hibcdm();
+			}
 
 		
-		std::string Hibcdm::encode( const std::string& cookedData )
-		{
-			symbology = BARCODE_HIBC_DM;
-			return ""; // Actual encoding is done in vectorize
-		}
+			std::string Hibcdm::encode( const std::string& cookedData )
+			{
+				symbology = BARCODE_HIBC_DM;
+				return ""; // Actual encoding is done in vectorize
+			}
 		
 
-		//////////////////////////////////////////////////////
-		// Hibcqr Barcode
-		//////////////////////////////////////////////////////
-		glbarcode::Barcode* Hibcqr::create()
-		{
-			return new Hibcqr();
-		}
+			//////////////////////////////////////////////////////
+			// Hibcqr Barcode
+			//////////////////////////////////////////////////////
+			glbarcode::Barcode* Hibcqr::create()
+			{
+				return new Hibcqr();
+			}
 
 		
-		std::string Hibcqr::encode( const std::string& cookedData )
-		{
-			symbology = BARCODE_HIBC_QR;
-			return ""; // Actual encoding is done in vectorize
-		}
+			std::string Hibcqr::encode( const std::string& cookedData )
+			{
+				symbology = BARCODE_HIBC_QR;
+				return ""; // Actual encoding is done in vectorize
+			}
 		
 
-		//////////////////////////////////////////////////////
-		// Hibcpdf Barcode
-		//////////////////////////////////////////////////////
-		glbarcode::Barcode* Hibcpdf::create()
-		{
-			return new Hibcpdf();
-		}
+			//////////////////////////////////////////////////////
+			// Hibcpdf Barcode
+			//////////////////////////////////////////////////////
+			glbarcode::Barcode* Hibcpdf::create()
+			{
+				return new Hibcpdf();
+			}
 
 		
-		std::string Hibcpdf::encode( const std::string& cookedData )
-		{
-			symbology = BARCODE_HIBC_PDF;
-			return ""; // Actual encoding is done in vectorize
-		}
+			std::string Hibcpdf::encode( const std::string& cookedData )
+			{
+				symbology = BARCODE_HIBC_PDF;
+				return ""; // Actual encoding is done in vectorize
+			}
 		
 
-		//////////////////////////////////////////////////////
-		// Hibcmpdf Barcode
-		//////////////////////////////////////////////////////
-		glbarcode::Barcode* Hibcmpdf::create()
-		{
-			return new Hibcmpdf();
-		}
+			//////////////////////////////////////////////////////
+			// Hibcmpdf Barcode
+			//////////////////////////////////////////////////////
+			glbarcode::Barcode* Hibcmpdf::create()
+			{
+				return new Hibcmpdf();
+			}
 
 		
-		std::string Hibcmpdf::encode( const std::string& cookedData )
-		{
-			symbology = BARCODE_HIBC_MICPDF;
-			return ""; // Actual encoding is done in vectorize
-		}
+			std::string Hibcmpdf::encode( const std::string& cookedData )
+			{
+				symbology = BARCODE_HIBC_MICPDF;
+				return ""; // Actual encoding is done in vectorize
+			}
 		
 
-		//////////////////////////////////////////////////////
-		// Hibcaz Barcode
-		//////////////////////////////////////////////////////
-		glbarcode::Barcode* Hibcaz::create()
-		{
-			return new Hibcaz();
-		}
+			//////////////////////////////////////////////////////
+			// Hibcaz Barcode
+			//////////////////////////////////////////////////////
+			glbarcode::Barcode* Hibcaz::create()
+			{
+				return new Hibcaz();
+			}
 
 		
-		std::string Hibcaz::encode( const std::string& cookedData )
-		{
-			symbology = BARCODE_HIBC_AZTEC;
-			return ""; // Actual encoding is done in vectorize
-		}
+			std::string Hibcaz::encode( const std::string& cookedData )
+			{
+				symbology = BARCODE_HIBC_AZTEC;
+				return ""; // Actual encoding is done in vectorize
+			}
 		
 
-		//////////////////////////////////////////////////////
-		// I25 Barcode
-		//////////////////////////////////////////////////////
-		glbarcode::Barcode* I25::create()
-		{
-			return new I25();
-		}
+			//////////////////////////////////////////////////////
+			// I25 Barcode
+			//////////////////////////////////////////////////////
+			glbarcode::Barcode* I25::create()
+			{
+				return new I25();
+			}
 
 		
-		std::string I25::encode( const std::string& cookedData )
-		{
-			symbology = BARCODE_C25INTER;
-			return ""; // Actual encoding is done in vectorize
-		}
+			std::string I25::encode( const std::string& cookedData )
+			{
+				symbology = BARCODE_C25INTER;
+				return ""; // Actual encoding is done in vectorize
+			}
 		
 
-		//////////////////////////////////////////////////////
-		// Isbn Barcode
-		//////////////////////////////////////////////////////
-		glbarcode::Barcode* Isbn::create()
-		{
-			return new Isbn();
-		}
+			//////////////////////////////////////////////////////
+			// Isbn Barcode
+			//////////////////////////////////////////////////////
+			glbarcode::Barcode* Isbn::create()
+			{
+				return new Isbn();
+			}
 
 		
-		std::string Isbn::encode( const std::string& cookedData )
-		{
-			symbology = BARCODE_ISBNX;
-			return ""; // Actual encoding is done in vectorize
-		}
+			std::string Isbn::encode( const std::string& cookedData )
+			{
+				symbology = BARCODE_ISBNX;
+				return ""; // Actual encoding is done in vectorize
+			}
 		
 
-		//////////////////////////////////////////////////////
-		// Itf14 Barcode
-		//////////////////////////////////////////////////////
-		glbarcode::Barcode* Itf14::create()
-		{
-			return new Itf14();
-		}
+			//////////////////////////////////////////////////////
+			// Itf14 Barcode
+			//////////////////////////////////////////////////////
+			glbarcode::Barcode* Itf14::create()
+			{
+				return new Itf14();
+			}
 
 		
-		std::string Itf14::encode( const std::string& cookedData )
-		{
-			symbology = BARCODE_ITF14;
-			return ""; // Actual encoding is done in vectorize
-		}
+			std::string Itf14::encode( const std::string& cookedData )
+			{
+				symbology = BARCODE_ITF14;
+				return ""; // Actual encoding is done in vectorize
+			}
 		
 
-		//////////////////////////////////////////////////////
-		// Gmtx Barcode
-		//////////////////////////////////////////////////////
-		glbarcode::Barcode* Gmtx::create()
-		{
-			return new Gmtx();
-		}
+			//////////////////////////////////////////////////////
+			// Gmtx Barcode
+			//////////////////////////////////////////////////////
+			glbarcode::Barcode* Gmtx::create()
+			{
+				return new Gmtx();
+			}
 
 		
-		std::string Gmtx::encode( const std::string& cookedData )
-		{
-			symbology = BARCODE_GRIDMATRIX;
-			return ""; // Actual encoding is done in vectorize
-		}
+			std::string Gmtx::encode( const std::string& cookedData )
+			{
+				symbology = BARCODE_GRIDMATRIX;
+				return ""; // Actual encoding is done in vectorize
+			}
 		
 
-		//////////////////////////////////////////////////////
-		// Gs1128 Barcode
-		//////////////////////////////////////////////////////
-		glbarcode::Barcode* Gs1128::create()
-		{
-			return new Gs1128();
-		}
+			//////////////////////////////////////////////////////
+			// Gs1128 Barcode
+			//////////////////////////////////////////////////////
+			glbarcode::Barcode* Gs1128::create()
+			{
+				return new Gs1128();
+			}
 
 		
-		std::string Gs1128::encode( const std::string& cookedData )
-		{
-			symbology = BARCODE_EAN128;
-			return ""; // Actual encoding is done in vectorize
-		}
+			std::string Gs1128::encode( const std::string& cookedData )
+			{
+				symbology = BARCODE_EAN128;
+				return ""; // Actual encoding is done in vectorize
+			}
 		
 
-		//////////////////////////////////////////////////////
-		// Logm Barcode
-		//////////////////////////////////////////////////////
-		glbarcode::Barcode* Logm::create()
-		{
-			return new Logm();
-		}
+			//////////////////////////////////////////////////////
+			// Logm Barcode
+			//////////////////////////////////////////////////////
+			glbarcode::Barcode* Logm::create()
+			{
+				return new Logm();
+			}
 
 		
-		std::string Logm::encode( const std::string& cookedData )
-		{
-			symbology = BARCODE_LOGMARS;
-			return ""; // Actual encoding is done in vectorize
-		}
+			std::string Logm::encode( const std::string& cookedData )
+			{
+				symbology = BARCODE_LOGMARS;
+				return ""; // Actual encoding is done in vectorize
+			}
 		
 
-		//////////////////////////////////////////////////////
-		// Rss14 Barcode
-		//////////////////////////////////////////////////////
-		glbarcode::Barcode* Rss14::create()
-		{
-			return new Rss14();
-		}
+			//////////////////////////////////////////////////////
+			// Rss14 Barcode
+			//////////////////////////////////////////////////////
+			glbarcode::Barcode* Rss14::create()
+			{
+				return new Rss14();
+			}
 
 		
-		std::string Rss14::encode( const std::string& cookedData )
-		{
-			symbology = BARCODE_RSS14;
-			return ""; // Actual encoding is done in vectorize
-		}
+			std::string Rss14::encode( const std::string& cookedData )
+			{
+				symbology = BARCODE_RSS14;
+				return ""; // Actual encoding is done in vectorize
+			}
 		
 
-		//////////////////////////////////////////////////////
-		// Rssltd Barcode
-		//////////////////////////////////////////////////////
-		glbarcode::Barcode* Rssltd::create()
-		{
-			return new Rssltd();
-		}
+			//////////////////////////////////////////////////////
+			// Rssltd Barcode
+			//////////////////////////////////////////////////////
+			glbarcode::Barcode* Rssltd::create()
+			{
+				return new Rssltd();
+			}
 
 		
-		std::string Rssltd::encode( const std::string& cookedData )
-		{
-			symbology = BARCODE_RSS_LTD;
-			return ""; // Actual encoding is done in vectorize
-		}
+			std::string Rssltd::encode( const std::string& cookedData )
+			{
+				symbology = BARCODE_RSS_LTD;
+				return ""; // Actual encoding is done in vectorize
+			}
 		
 
-		//////////////////////////////////////////////////////
-		// Rssexp Barcode
-		//////////////////////////////////////////////////////
-		glbarcode::Barcode* Rssexp::create()
-		{
-			return new Rssexp();
-		}
+			//////////////////////////////////////////////////////
+			// Rssexp Barcode
+			//////////////////////////////////////////////////////
+			glbarcode::Barcode* Rssexp::create()
+			{
+				return new Rssexp();
+			}
 
 		
-		std::string Rssexp::encode( const std::string& cookedData )
-		{
-			symbology = BARCODE_RSS_EXP;
-			return ""; // Actual encoding is done in vectorize
-		}
+			std::string Rssexp::encode( const std::string& cookedData )
+			{
+				symbology = BARCODE_RSS_EXP;
+				return ""; // Actual encoding is done in vectorize
+			}
 		
 
-		//////////////////////////////////////////////////////
-		// Rsss Barcode
-		//////////////////////////////////////////////////////
-		glbarcode::Barcode* Rsss::create()
-		{
-			return new Rsss();
-		}
+			//////////////////////////////////////////////////////
+			// Rsss Barcode
+			//////////////////////////////////////////////////////
+			glbarcode::Barcode* Rsss::create()
+			{
+				return new Rsss();
+			}
 
 		
-		std::string Rsss::encode( const std::string& cookedData )
-		{
-			symbology = BARCODE_RSS14STACK;
-			return ""; // Actual encoding is done in vectorize
-		}
+			std::string Rsss::encode( const std::string& cookedData )
+			{
+				symbology = BARCODE_RSS14STACK;
+				return ""; // Actual encoding is done in vectorize
+			}
 		
 
-		//////////////////////////////////////////////////////
-		// Rssso Barcode
-		//////////////////////////////////////////////////////
-		glbarcode::Barcode* Rssso::create()
-		{
-			return new Rssso();
-		}
+			//////////////////////////////////////////////////////
+			// Rssso Barcode
+			//////////////////////////////////////////////////////
+			glbarcode::Barcode* Rssso::create()
+			{
+				return new Rssso();
+			}
 
 		
-		std::string Rssso::encode( const std::string& cookedData )
-		{
-			symbology = BARCODE_RSS14STACK_OMNI;
-			return ""; // Actual encoding is done in vectorize
-		}
+			std::string Rssso::encode( const std::string& cookedData )
+			{
+				symbology = BARCODE_RSS14STACK_OMNI;
+				return ""; // Actual encoding is done in vectorize
+			}
 		
 
-		//////////////////////////////////////////////////////
-		// Rssse Barcode
-		//////////////////////////////////////////////////////
-		glbarcode::Barcode* Rssse::create()
-		{
-			return new Rssse();
-		}
+			//////////////////////////////////////////////////////
+			// Rssse Barcode
+			//////////////////////////////////////////////////////
+			glbarcode::Barcode* Rssse::create()
+			{
+				return new Rssse();
+			}
 
 		
-		std::string Rssse::encode( const std::string& cookedData )
-		{
-			symbology = BARCODE_RSS_EXPSTACK;
-			return ""; // Actual encoding is done in vectorize
-		}
+			std::string Rssse::encode( const std::string& cookedData )
+			{
+				symbology = BARCODE_RSS_EXPSTACK;
+				return ""; // Actual encoding is done in vectorize
+			}
 		
 
-		//////////////////////////////////////////////////////
-		// Pharma Barcode
-		//////////////////////////////////////////////////////
-		glbarcode::Barcode* Pharma::create()
-		{
-			return new Pharma();
-		}
+			//////////////////////////////////////////////////////
+			// Pharma Barcode
+			//////////////////////////////////////////////////////
+			glbarcode::Barcode* Pharma::create()
+			{
+				return new Pharma();
+			}
 
 		
-		std::string Pharma::encode( const std::string& cookedData )
-		{
-			symbology = BARCODE_PHARMA;
-			return ""; // Actual encoding is done in vectorize
-		}
+			std::string Pharma::encode( const std::string& cookedData )
+			{
+				symbology = BARCODE_PHARMA;
+				return ""; // Actual encoding is done in vectorize
+			}
 		
 
-		//////////////////////////////////////////////////////
-		// Pharma2 Barcode
-		//////////////////////////////////////////////////////
-		glbarcode::Barcode* Pharma2::create()
-		{
-			return new Pharma2();
-		}
+			//////////////////////////////////////////////////////
+			// Pharma2 Barcode
+			//////////////////////////////////////////////////////
+			glbarcode::Barcode* Pharma2::create()
+			{
+				return new Pharma2();
+			}
 
 		
-		std::string Pharma2::encode( const std::string& cookedData )
-		{
-			symbology = BARCODE_PHARMA_TWO;
-			return ""; // Actual encoding is done in vectorize
-		}
+			std::string Pharma2::encode( const std::string& cookedData )
+			{
+				symbology = BARCODE_PHARMA_TWO;
+				return ""; // Actual encoding is done in vectorize
+			}
 		
 
-		//////////////////////////////////////////////////////
-		// Pzn Barcode
-		//////////////////////////////////////////////////////
-		glbarcode::Barcode* Pzn::create()
-		{
-			return new Pzn();
-		}
+			//////////////////////////////////////////////////////
+			// Pzn Barcode
+			//////////////////////////////////////////////////////
+			glbarcode::Barcode* Pzn::create()
+			{
+				return new Pzn();
+			}
 
 		
-		std::string Pzn::encode( const std::string& cookedData )
-		{
-			symbology = BARCODE_PZN;
-			return ""; // Actual encoding is done in vectorize
-		}
+			std::string Pzn::encode( const std::string& cookedData )
+			{
+				symbology = BARCODE_PZN;
+				return ""; // Actual encoding is done in vectorize
+			}
 		
 
-		//////////////////////////////////////////////////////
-		// Tele Barcode
-		//////////////////////////////////////////////////////
-		glbarcode::Barcode* Tele::create()
-		{
-			return new Tele();
-		}
+			//////////////////////////////////////////////////////
+			// Tele Barcode
+			//////////////////////////////////////////////////////
+			glbarcode::Barcode* Tele::create()
+			{
+				return new Tele();
+			}
 
 		
-		std::string Tele::encode( const std::string& cookedData )
-		{
-			symbology = BARCODE_TELEPEN;
-			return ""; // Actual encoding is done in vectorize
-		}
+			std::string Tele::encode( const std::string& cookedData )
+			{
+				symbology = BARCODE_TELEPEN;
+				return ""; // Actual encoding is done in vectorize
+			}
 		
 
-		//////////////////////////////////////////////////////
-		// Telex Barcode
-		//////////////////////////////////////////////////////
-		glbarcode::Barcode* Telex::create()
-		{
-			return new Telex();
-		}
+			//////////////////////////////////////////////////////
+			// Telex Barcode
+			//////////////////////////////////////////////////////
+			glbarcode::Barcode* Telex::create()
+			{
+				return new Telex();
+			}
 
 		
-		std::string Telex::encode( const std::string& cookedData )
-		{
-			symbology = BARCODE_TELEPEN_NUM;
-			return ""; // Actual encoding is done in vectorize
-		}
+			std::string Telex::encode( const std::string& cookedData )
+			{
+				symbology = BARCODE_TELEPEN_NUM;
+				return ""; // Actual encoding is done in vectorize
+			}
 		
 
-		//////////////////////////////////////////////////////
-		// Japan Barcode
-		//////////////////////////////////////////////////////
-		glbarcode::Barcode* Japan::create()
-		{
-			return new Japan();
-		}
+			//////////////////////////////////////////////////////
+			// Japan Barcode
+			//////////////////////////////////////////////////////
+			glbarcode::Barcode* Japan::create()
+			{
+				return new Japan();
+			}
 
 		
-		std::string Japan::encode( const std::string& cookedData )
-		{
-			symbology = BARCODE_JAPANPOST;
-			return ""; // Actual encoding is done in vectorize
-		}
+			std::string Japan::encode( const std::string& cookedData )
+			{
+				symbology = BARCODE_JAPANPOST;
+				return ""; // Actual encoding is done in vectorize
+			}
 		
 
-		//////////////////////////////////////////////////////
-		// Korea Barcode
-		//////////////////////////////////////////////////////
-		glbarcode::Barcode* Korea::create()
-		{
-			return new Korea();
-		}
+			//////////////////////////////////////////////////////
+			// Korea Barcode
+			//////////////////////////////////////////////////////
+			glbarcode::Barcode* Korea::create()
+			{
+				return new Korea();
+			}
 
 		
-		std::string Korea::encode( const std::string& cookedData )
-		{
-			symbology = BARCODE_KOREAPOST;
-			return ""; // Actual encoding is done in vectorize
-		}
+			std::string Korea::encode( const std::string& cookedData )
+			{
+				symbology = BARCODE_KOREAPOST;
+				return ""; // Actual encoding is done in vectorize
+			}
 		
 
-		//////////////////////////////////////////////////////
-		// Maxi Barcode
-		//////////////////////////////////////////////////////
-		glbarcode::Barcode* Maxi::create()
-		{
-			return new Maxi();
-		}
+			//////////////////////////////////////////////////////
+			// Maxi Barcode
+			//////////////////////////////////////////////////////
+			glbarcode::Barcode* Maxi::create()
+			{
+				return new Maxi();
+			}
 
 		
-		std::string Maxi::encode( const std::string& cookedData )
-		{
-			symbology = BARCODE_MAXICODE;
-			return ""; // Actual encoding is done in vectorize
-		}
+			std::string Maxi::encode( const std::string& cookedData )
+			{
+				symbology = BARCODE_MAXICODE;
+				return ""; // Actual encoding is done in vectorize
+			}
 		
 
-		//////////////////////////////////////////////////////
-		// Mpdf Barcode
-		//////////////////////////////////////////////////////
-		glbarcode::Barcode* Mpdf::create()
-		{
-			return new Mpdf();
-		}
+			//////////////////////////////////////////////////////
+			// Mpdf Barcode
+			//////////////////////////////////////////////////////
+			glbarcode::Barcode* Mpdf::create()
+			{
+				return new Mpdf();
+			}
 
 		
-		std::string Mpdf::encode( const std::string& cookedData )
-		{
-			symbology = BARCODE_MICROPDF417;
-			return ""; // Actual encoding is done in vectorize
-		}
+			std::string Mpdf::encode( const std::string& cookedData )
+			{
+				symbology = BARCODE_MICROPDF417;
+				return ""; // Actual encoding is done in vectorize
+			}
 		
 
-		//////////////////////////////////////////////////////
-		// Msi Barcode
-		//////////////////////////////////////////////////////
-		glbarcode::Barcode* Msi::create()
-		{
-			return new Msi();
-		}
+			//////////////////////////////////////////////////////
+			// Msi Barcode
+			//////////////////////////////////////////////////////
+			glbarcode::Barcode* Msi::create()
+			{
+				return new Msi();
+			}
 
 		
-		std::string Msi::encode( const std::string& cookedData )
-		{
-			symbology = BARCODE_MSI_PLESSEY;
-			return ""; // Actual encoding is done in vectorize
-		}
+			std::string Msi::encode( const std::string& cookedData )
+			{
+				symbology = BARCODE_MSI_PLESSEY;
+				return ""; // Actual encoding is done in vectorize
+			}
 		
 
-		//////////////////////////////////////////////////////
-		// Mqr Barcode
-		//////////////////////////////////////////////////////
-		glbarcode::Barcode* Mqr::create()
-		{
-			return new Mqr();
-		}
+			//////////////////////////////////////////////////////
+			// Mqr Barcode
+			//////////////////////////////////////////////////////
+			glbarcode::Barcode* Mqr::create()
+			{
+				return new Mqr();
+			}
 
 		
-		std::string Mqr::encode( const std::string& cookedData )
-		{
-			symbology = BARCODE_MICROQR;
-			return ""; // Actual encoding is done in vectorize
-		}
+			std::string Mqr::encode( const std::string& cookedData )
+			{
+				symbology = BARCODE_MICROQR;
+				return ""; // Actual encoding is done in vectorize
+			}
 		
 
-		//////////////////////////////////////////////////////
-		// Nve Barcode
-		//////////////////////////////////////////////////////
-		glbarcode::Barcode* Nve::create()
-		{
-			return new Nve();
-		}
+			//////////////////////////////////////////////////////
+			// Nve Barcode
+			//////////////////////////////////////////////////////
+			glbarcode::Barcode* Nve::create()
+			{
+				return new Nve();
+			}
 
 		
-		std::string Nve::encode( const std::string& cookedData )
-		{
-			symbology = BARCODE_NVE18;
-			return ""; // Actual encoding is done in vectorize
-		}
+			std::string Nve::encode( const std::string& cookedData )
+			{
+				symbology = BARCODE_NVE18;
+				return ""; // Actual encoding is done in vectorize
+			}
 		
 
-		//////////////////////////////////////////////////////
-		// Plan Barcode
-		//////////////////////////////////////////////////////
-		glbarcode::Barcode* Plan::create()
-		{
-			return new Plan();
-		}
+			//////////////////////////////////////////////////////
+			// Plan Barcode
+			//////////////////////////////////////////////////////
+			glbarcode::Barcode* Plan::create()
+			{
+				return new Plan();
+			}
 
 		
-		std::string Plan::encode( const std::string& cookedData )
-		{
-			symbology = BARCODE_PLANET;
-			return ""; // Actual encoding is done in vectorize
-		}
+			std::string Plan::encode( const std::string& cookedData )
+			{
+				symbology = BARCODE_PLANET;
+				return ""; // Actual encoding is done in vectorize
+			}
 		
 
-		//////////////////////////////////////////////////////
-		// Postnet Barcode
-		//////////////////////////////////////////////////////
-		glbarcode::Barcode* Postnet::create()
-		{
-			return new Postnet();
-		}
+			//////////////////////////////////////////////////////
+			// Postnet Barcode
+			//////////////////////////////////////////////////////
+			glbarcode::Barcode* Postnet::create()
+			{
+				return new Postnet();
+			}
 
 		
-		std::string Postnet::encode( const std::string& cookedData )
-		{
-			symbology = BARCODE_POSTNET;
-			return ""; // Actual encoding is done in vectorize
-		}
+			std::string Postnet::encode( const std::string& cookedData )
+			{
+				symbology = BARCODE_POSTNET;
+				return ""; // Actual encoding is done in vectorize
+			}
 		
 
-		//////////////////////////////////////////////////////
-		// Pdf Barcode
-		//////////////////////////////////////////////////////
-		glbarcode::Barcode* Pdf::create()
-		{
-			return new Pdf();
-		}
+			//////////////////////////////////////////////////////
+			// Pdf Barcode
+			//////////////////////////////////////////////////////
+			glbarcode::Barcode* Pdf::create()
+			{
+				return new Pdf();
+			}
 
 		
-		std::string Pdf::encode( const std::string& cookedData )
-		{
-			symbology = BARCODE_PDF417;
-			return ""; // Actual encoding is done in vectorize
-		}
+			std::string Pdf::encode( const std::string& cookedData )
+			{
+				symbology = BARCODE_PDF417;
+				return ""; // Actual encoding is done in vectorize
+			}
 		
 
-		//////////////////////////////////////////////////////
-		// Pdft Barcode
-		//////////////////////////////////////////////////////
-		glbarcode::Barcode* Pdft::create()
-		{
-			return new Pdft();
-		}
+			//////////////////////////////////////////////////////
+			// Pdft Barcode
+			//////////////////////////////////////////////////////
+			glbarcode::Barcode* Pdft::create()
+			{
+				return new Pdft();
+			}
 
 		
-		std::string Pdft::encode( const std::string& cookedData )
-		{
-			symbology = BARCODE_PDF417TRUNC;
-			return ""; // Actual encoding is done in vectorize
-		}
+			std::string Pdft::encode( const std::string& cookedData )
+			{
+				symbology = BARCODE_PDF417TRUNC;
+				return ""; // Actual encoding is done in vectorize
+			}
 		
 
-		//////////////////////////////////////////////////////
-		// Qr Barcode
-		//////////////////////////////////////////////////////
-		glbarcode::Barcode* Qr::create()
-		{
-			return new Qr();
-		}
+			//////////////////////////////////////////////////////
+			// Qr Barcode
+			//////////////////////////////////////////////////////
+			glbarcode::Barcode* Qr::create()
+			{
+				return new Qr();
+			}
 
 		
-		std::string Qr::encode( const std::string& cookedData )
-		{
-			symbology = BARCODE_QRCODE;
-			return ""; // Actual encoding is done in vectorize
-		}
+			std::string Qr::encode( const std::string& cookedData )
+			{
+				symbology = BARCODE_QRCODE;
+				return ""; // Actual encoding is done in vectorize
+			}
 		
 
-		//////////////////////////////////////////////////////
-		// Rm4 Barcode
-		//////////////////////////////////////////////////////
-		glbarcode::Barcode* Rm4::create()
-		{
-			return new Rm4();
-		}
+			//////////////////////////////////////////////////////
+			// Rm4 Barcode
+			//////////////////////////////////////////////////////
+			glbarcode::Barcode* Rm4::create()
+			{
+				return new Rm4();
+			}
 
 		
-		std::string Rm4::encode( const std::string& cookedData )
-		{
-			symbology = BARCODE_RM4SCC;
-			return ""; // Actual encoding is done in vectorize
-		}
+			std::string Rm4::encode( const std::string& cookedData )
+			{
+				symbology = BARCODE_RM4SCC;
+				return ""; // Actual encoding is done in vectorize
+			}
 		
 
-		//////////////////////////////////////////////////////
-		// UpcA Barcode
-		//////////////////////////////////////////////////////
-		glbarcode::Barcode* UpcA::create()
-		{
-			return new UpcA();
-		}
+			//////////////////////////////////////////////////////
+			// UpcA Barcode
+			//////////////////////////////////////////////////////
+			glbarcode::Barcode* UpcA::create()
+			{
+				return new UpcA();
+			}
 
 		
-		std::string UpcA::encode( const std::string& cookedData )
-		{
-			symbology = BARCODE_UPCA;
-			return ""; // Actual encoding is done in vectorize
-		}
+			std::string UpcA::encode( const std::string& cookedData )
+			{
+				symbology = BARCODE_UPCA;
+				return ""; // Actual encoding is done in vectorize
+			}
 		
 
-		//////////////////////////////////////////////////////
-		// UpcE Barcode
-		//////////////////////////////////////////////////////
-		glbarcode::Barcode* UpcE::create()
-		{
-			return new UpcE();
-		}
+			//////////////////////////////////////////////////////
+			// UpcE Barcode
+			//////////////////////////////////////////////////////
+			glbarcode::Barcode* UpcE::create()
+			{
+				return new UpcE();
+			}
 
 		
-		std::string UpcE::encode( const std::string& cookedData )
-		{
-			symbology = BARCODE_UPCE;
-			return ""; // Actual encoding is done in vectorize
-		}
+			std::string UpcE::encode( const std::string& cookedData )
+			{
+				symbology = BARCODE_UPCE;
+				return ""; // Actual encoding is done in vectorize
+			}
 		
 
-		//////////////////////////////////////////////////////
-		// Usps Barcode
-		//////////////////////////////////////////////////////
-		glbarcode::Barcode* Usps::create()
-		{
-			return new Usps();
-		}
+			//////////////////////////////////////////////////////
+			// Usps Barcode
+			//////////////////////////////////////////////////////
+			glbarcode::Barcode* Usps::create()
+			{
+				return new Usps();
+			}
 
 		
-		std::string Usps::encode( const std::string& cookedData )
-		{
-			symbology = BARCODE_ONECODE;
-			return ""; // Actual encoding is done in vectorize
-		}
+			std::string Usps::encode( const std::string& cookedData )
+			{
+				symbology = BARCODE_ONECODE;
+				return ""; // Actual encoding is done in vectorize
+			}
 		
 
-		//////////////////////////////////////////////////////
-		// Pls Barcode
-		//////////////////////////////////////////////////////
-		glbarcode::Barcode* Pls::create()
-		{
-			return new Pls();
-		}
+			//////////////////////////////////////////////////////
+			// Pls Barcode
+			//////////////////////////////////////////////////////
+			glbarcode::Barcode* Pls::create()
+			{
+				return new Pls();
+			}
 
 		
-		std::string Pls::encode( const std::string& cookedData )
-		{
-			symbology = BARCODE_PLESSEY;
-			return ""; // Actual encoding is done in vectorize
-		}
+			std::string Pls::encode( const std::string& cookedData )
+			{
+				symbology = BARCODE_PLESSEY;
+				return ""; // Actual encoding is done in vectorize
+			}
 		
 
+		}
 	}
 }
 
-#endif // HAVE_GNU_BARCODE
+
+#endif // HAVE_ZINT
diff --git a/backends/barcode/Zint.h b/backends/barcode/Zint.h
index 3c0d08e..c238b3c 100644
--- a/backends/barcode/Zint.h
+++ b/backends/barcode/Zint.h
@@ -26,903 +26,906 @@
 #include "glbarcode/Barcode1dBase.h"
 
 
-namespace glabels::barcode
+namespace glabels
 {
-	namespace Zint
+	namespace barcode
 	{
-
-		/**
-		 * Zint::Base base class for all Zint barcodes
-		 *
-		 * Implements glbarcode::Barcode1dBase.
-		 */
-		class Base : public glbarcode::Barcode1dBase
-		{
-		protected:
-			int symbology;
-			
-			
-			bool validate( const std::string& rawData ) override;
-
-			void vectorize( const std::string& encodedData,
-			                const std::string& displayText,
-			                const std::string& cookedData,
-			                double&            w,
-			                double&            h ) override;
-		};
-
-
-		/**
-		 * AusP Barcode
-		 */
-		class AusP : public Base
-		{
-		public:
-			static Barcode* create();
-			
-		protected:
-			std::string encode( const std::string& cookedData ) override;
-		};
-
-
-		/**
-		 * AusRP Barcode
-		 */
-		class AusRP : public Base
-		{
-		public:
-			static Barcode* create();
-			
-		protected:
-			std::string encode( const std::string& cookedData ) override;
-		};
-
-
-		/**
-		 * AusRT Barcode
-		 */
-		class AusRT : public Base
-		{
-		public:
-			static Barcode* create();
-			
-		protected:
-			std::string encode( const std::string& cookedData ) override;
-		};
-
-
-		/**
-		 * AusRD Barcode
-		 */
-		class AusRD : public Base
-		{
-		public:
-			static Barcode* create();
-			
-		protected:
-			std::string encode( const std::string& cookedData ) override;
-		};
-
-
-		/**
-		 * Aztec Barcode
-		 */
-		class Aztec : public Base
-		{
-		public:
-			static Barcode* create();
-			
-		protected:
-			std::string encode( const std::string& cookedData ) override;
-		};
-
-
-		/**
-		 * Azrun Barcode
-		 */
-		class Azrun : public Base
-		{
-		public:
-			static Barcode* create();
-			
-		protected:
-			std::string encode( const std::string& cookedData ) override;
-		};
-
-
-		/**
-		 * Cbr Barcode
-		 */
-		class Cbr : public Base
-		{
-		public:
-			static Barcode* create();
-			
-		protected:
-			std::string encode( const std::string& cookedData ) override;
-		};
-
-
-		/**
-		 * Code1 Barcode
-		 */
-		class Code1 : public Base
-		{
-		public:
-			static Barcode* create();
-			
-		protected:
-			std::string encode( const std::string& cookedData ) override;
-		};
-
-
-		/**
-		 * Code11 Barcode
-		 */
-		class Code11 : public Base
-		{
-		public:
-			static Barcode* create();
-			
-		protected:
-			std::string encode( const std::string& cookedData ) override;
-		};
-
-
-		/**
-		 * C16k Barcode
-		 */
-		class C16k : public Base
-		{
-		public:
-			static Barcode* create();
-			
-		protected:
-			std::string encode( const std::string& cookedData ) override;
-		};
-
-
-		/**
-		 * C25m Barcode
-		 */
-		class C25m : public Base
-		{
-		public:
-			static Barcode* create();
-			
-		protected:
-			std::string encode( const std::string& cookedData ) override;
-		};
-
-
-		/**
-		 * C25i Barcode
-		 */
-		class C25i : public Base
-		{
-		public:
-			static Barcode* create();
-			
-		protected:
-			std::string encode( const std::string& cookedData ) override;
-		};
-
-
-		/**
-		 * C25dl Barcode
-		 */
-		class C25dl : public Base
-		{
-		public:
-			static Barcode* create();
-			
-		protected:
-			std::string encode( const std::string& cookedData ) override;
-		};
-
-
-		/**
-		 * Code32 Barcode
-		 */
-		class Code32 : public Base
-		{
-		public:
-			static Barcode* create();
-			
-		protected:
-			std::string encode( const std::string& cookedData ) override;
-		};
-
-
-		/**
-		 * Code39 Barcode
-		 */
-		class Code39 : public Base
-		{
-		public:
-			static Barcode* create();
-			
-		protected:
-			std::string encode( const std::string& cookedData ) override;
-		};
-
-
-		/**
-		 * Code39e Barcode
-		 */
-		class Code39e : public Base
-		{
-		public:
-			static Barcode* create();
-			
-		protected:
-			std::string encode( const std::string& cookedData ) override;
-		};
-
-
-		/**
-		 * Code49 Barcode
-		 */
-		class Code49 : public Base
-		{
-		public:
-			static Barcode* create();
-			
-		protected:
-			std::string encode( const std::string& cookedData ) override;
-		};
-
-
-		/**
-		 * Code93 Barcode
-		 */
-		class Code93 : public Base
-		{
-		public:
-			static Barcode* create();
-			
-		protected:
-			std::string encode( const std::string& cookedData ) override;
-		};
-
-
-		/**
-		 * Code128 Barcode
-		 */
-		class Code128 : public Base
-		{
-		public:
-			static Barcode* create();
-			
-		protected:
-			std::string encode( const std::string& cookedData ) override;
-		};
-
-
-		/**
-		 * Code128b Barcode
-		 */
-		class Code128b : public Base
-		{
-		public:
-			static Barcode* create();
-			
-		protected:
-			std::string encode( const std::string& cookedData ) override;
-		};
-
-
-		/**
-		 * Daft Barcode
-		 */
-		class Daft : public Base
-		{
-		public:
-			static Barcode* create();
-			
-		protected:
-			std::string encode( const std::string& cookedData ) override;
-		};
-
-
-		/**
-		 * Dmtx Barcode
-		 */
-		class Dmtx : public Base
-		{
-		public:
-			static Barcode* create();
-			
-		protected:
-			std::string encode( const std::string& cookedData ) override;
-		};
-
-
-		/**
-		 * Dpl Barcode
-		 */
-		class Dpl : public Base
-		{
-		public:
-			static Barcode* create();
-			
-		protected:
-			std::string encode( const std::string& cookedData ) override;
-		};
-
-
-		/**
-		 * Dpi Barcode
-		 */
-		class Dpi : public Base
-		{
-		public:
-			static Barcode* create();
-			
-		protected:
-			std::string encode( const std::string& cookedData ) override;
-		};
-
-
-		/**
-		 * Kix Barcode
-		 */
-		class Kix : public Base
-		{
-		public:
-			static Barcode* create();
-			
-		protected:
-			std::string encode( const std::string& cookedData ) override;
-		};
-
-
-		/**
-		 * Ean Barcode
-		 */
-		class Ean : public Base
-		{
-		public:
-			static Barcode* create();
-			
-		protected:
-			std::string encode( const std::string& cookedData ) override;
-		};
-
-
-		/**
-		 * Hibc128 Barcode
-		 */
-		class Hibc128 : public Base
-		{
-		public:
-			static Barcode* create();
-			
-		protected:
-			std::string encode( const std::string& cookedData ) override;
-		};
-
-
-		/**
-		 * Hibc39 Barcode
-		 */
-		class Hibc39 : public Base
-		{
-		public:
-			static Barcode* create();
-			
-		protected:
-			std::string encode( const std::string& cookedData ) override;
-		};
-
-
-		/**
-		 * Hibcdm Barcode
-		 */
-		class Hibcdm : public Base
-		{
-		public:
-			static Barcode* create();
-			
-		protected:
-			std::string encode( const std::string& cookedData ) override;
-		};
-
-
-		/**
-		 * Hibcqr Barcode
-		 */
-		class Hibcqr : public Base
-		{
-		public:
-			static Barcode* create();
-			
-		protected:
-			std::string encode( const std::string& cookedData ) override;
-		};
-
-
-		/**
-		 * Hibcpdf Barcode
-		 */
-		class Hibcpdf : public Base
-		{
-		public:
-			static Barcode* create();
-			
-		protected:
-			std::string encode( const std::string& cookedData ) override;
-		};
-
-
-		/**
-		 * Hibcmpdf Barcode
-		 */
-		class Hibcmpdf : public Base
-		{
-		public:
-			static Barcode* create();
-			
-		protected:
-			std::string encode( const std::string& cookedData ) override;
-		};
-
-
-		/**
-		 * Hibcaz Barcode
-		 */
-		class Hibcaz : public Base
-		{
-		public:
-			static Barcode* create();
-			
-		protected:
-			std::string encode( const std::string& cookedData ) override;
-		};
-
-
-		/**
-		 * I25 Barcode
-		 */
-		class I25 : public Base
-		{
-		public:
-			static Barcode* create();
-			
-		protected:
-			std::string encode( const std::string& cookedData ) override;
-		};
-
-
-		/**
-		 * Isbn Barcode
-		 */
-		class Isbn : public Base
-		{
-		public:
-			static Barcode* create();
-			
-		protected:
-			std::string encode( const std::string& cookedData ) override;
-		};
-
-
-		/**
-		 * Itf14 Barcode
-		 */
-		class Itf14 : public Base
-		{
-		public:
-			static Barcode* create();
-			
-		protected:
-			std::string encode( const std::string& cookedData ) override;
-		};
-
-
-		/**
-		 * Gmtx Barcode
-		 */
-		class Gmtx : public Base
-		{
-		public:
-			static Barcode* create();
-			
-		protected:
-			std::string encode( const std::string& cookedData ) override;
-		};
-
-
-		/**
-		 * Gs1128 Barcode
-		 */
-		class Gs1128 : public Base
-		{
-		public:
-			static Barcode* create();
-			
-		protected:
-			std::string encode( const std::string& cookedData ) override;
-		};
-
-
-		/**
-		 * Logm Barcode
-		 */
-		class Logm : public Base
-		{
-		public:
-			static Barcode* create();
-			
-		protected:
-			std::string encode( const std::string& cookedData ) override;
-		};
-
-
-		/**
-		 * Rss14 Barcode
-		 */
-		class Rss14 : public Base
-		{
-		public:
-			static Barcode* create();
-			
-		protected:
-			std::string encode( const std::string& cookedData ) override;
-		};
-
-
-		/**
-		 * Rssltd Barcode
-		 */
-		class Rssltd : public Base
-		{
-		public:
-			static Barcode* create();
-			
-		protected:
-			std::string encode( const std::string& cookedData ) override;
-		};
-
-
-		/**
-		 * Rssexp Barcode
-		 */
-		class Rssexp : public Base
-		{
-		public:
-			static Barcode* create();
-			
-		protected:
-			std::string encode( const std::string& cookedData ) override;
-		};
-
-
-		/**
-		 * Rsss Barcode
-		 */
-		class Rsss : public Base
-		{
-		public:
-			static Barcode* create();
-			
-		protected:
-			std::string encode( const std::string& cookedData ) override;
-		};
-
-
-		/**
-		 * Rssso Barcode
-		 */
-		class Rssso : public Base
-		{
-		public:
-			static Barcode* create();
-			
-		protected:
-			std::string encode( const std::string& cookedData ) override;
-		};
-
-
-		/**
-		 * Rssse Barcode
-		 */
-		class Rssse : public Base
-		{
-		public:
-			static Barcode* create();
-			
-		protected:
-			std::string encode( const std::string& cookedData ) override;
-		};
-
-
-		/**
-		 * Pharma Barcode
-		 */
-		class Pharma : public Base
-		{
-		public:
-			static Barcode* create();
-			
-		protected:
-			std::string encode( const std::string& cookedData ) override;
-		};
-
-
-		/**
-		 * Pharma2 Barcode
-		 */
-		class Pharma2 : public Base
-		{
-		public:
-			static Barcode* create();
-			
-		protected:
-			std::string encode( const std::string& cookedData ) override;
-		};
-
-
-		/**
-		 * Pzn Barcode
-		 */
-		class Pzn : public Base
-		{
-		public:
-			static Barcode* create();
-			
-		protected:
-			std::string encode( const std::string& cookedData ) override;
-		};
-
-
-		/**
-		 * Tele Barcode
-		 */
-		class Tele : public Base
-		{
-		public:
-			static Barcode* create();
-			
-		protected:
-			std::string encode( const std::string& cookedData ) override;
-		};
-
-
-		/**
-		 * Telex Barcode
-		 */
-		class Telex : public Base
-		{
-		public:
-			static Barcode* create();
-			
-		protected:
-			std::string encode( const std::string& cookedData ) override;
-		};
-
-
-		/**
-		 * Japan Barcode
-		 */
-		class Japan : public Base
-		{
-		public:
-			static Barcode* create();
-			
-		protected:
-			std::string encode( const std::string& cookedData ) override;
-		};
-
-
-		/**
-		 * Korea Barcode
-		 */
-		class Korea : public Base
-		{
-		public:
-			static Barcode* create();
-			
-		protected:
-			std::string encode( const std::string& cookedData ) override;
-		};
-
-
-		/**
-		 * Maxi Barcode
-		 */
-		class Maxi : public Base
-		{
-		public:
-			static Barcode* create();
-			
-		protected:
-			std::string encode( const std::string& cookedData ) override;
-		};
-
-
-		/**
-		 * Mpdf Barcode
-		 */
-		class Mpdf : public Base
-		{
-		public:
-			static Barcode* create();
-			
-		protected:
-			std::string encode( const std::string& cookedData ) override;
-		};
-
-
-		/**
-		 * Msi Barcode
-		 */
-		class Msi : public Base
-		{
-		public:
-			static Barcode* create();
-			
-		protected:
-			std::string encode( const std::string& cookedData ) override;
-		};
-
-
-		/**
-		 * Mqr Barcode
-		 */
-		class Mqr : public Base
-		{
-		public:
-			static Barcode* create();
-			
-		protected:
-			std::string encode( const std::string& cookedData ) override;
-		};
-
-
-		/**
-		 * Nve Barcode
-		 */
-		class Nve : public Base
-		{
-		public:
-			static Barcode* create();
-			
-		protected:
-			std::string encode( const std::string& cookedData ) override;
-		};
-
-
-		/**
-		 * Plan Barcode
-		 */
-		class Plan : public Base
-		{
-		public:
-			static Barcode* create();
-			
-		protected:
-			std::string encode( const std::string& cookedData ) override;
-		};
-
-
-		/**
-		 * Postnet Barcode
-		 */
-		class Postnet : public Base
-		{
-		public:
-			static Barcode* create();
-			
-		protected:
-			std::string encode( const std::string& cookedData ) override;
-		};
-
-
-		/**
-		 * Pdf Barcode
-		 */
-		class Pdf : public Base
-		{
-		public:
-			static Barcode* create();
-			
-		protected:
-			std::string encode( const std::string& cookedData ) override;
-		};
-
-
-		/**
-		 * Pdft Barcode
-		 */
-		class Pdft : public Base
-		{
-		public:
-			static Barcode* create();
-			
-		protected:
-			std::string encode( const std::string& cookedData ) override;
-		};
-
-
-		/**
-		 * Qr Barcode
-		 */
-		class Qr : public Base
-		{
-		public:
-			static Barcode* create();
-			
-		protected:
-			std::string encode( const std::string& cookedData ) override;
-		};
-
-
-		/**
-		 * Rm4 Barcode
-		 */
-		class Rm4 : public Base
+		namespace Zint
 		{
-		public:
-			static Barcode* create();
-			
-		protected:
-			std::string encode( const std::string& cookedData ) override;
-		};
-
 
-		/**
-		 * UpcA Barcode
-		 */
-		class UpcA : public Base
-		{
-		public:
-			static Barcode* create();
+			/**
+			 * Zint::Base base class for all Zint barcodes
+			 *
+			 * Implements glbarcode::Barcode1dBase.
+			 */
+			class Base : public glbarcode::Barcode1dBase
+			{
+			protected:
+				int symbology;
+			
+			
+				bool validate( const std::string& rawData ) override;
+
+				void vectorize( const std::string& encodedData,
+				                const std::string& displayText,
+				                const std::string& cookedData,
+				                double&            w,
+				                double&            h ) override;
+			};
+
+
+			/**
+			 * AusP Barcode
+			 */
+			class AusP : public Base
+			{
+			public:
+				static Barcode* create();
+			
+			protected:
+				std::string encode( const std::string& cookedData ) override;
+			};
+
+
+			/**
+			 * AusRP Barcode
+			 */
+			class AusRP : public Base
+			{
+			public:
+				static Barcode* create();
+			
+			protected:
+				std::string encode( const std::string& cookedData ) override;
+			};
+
+
+			/**
+			 * AusRT Barcode
+			 */
+			class AusRT : public Base
+			{
+			public:
+				static Barcode* create();
+			
+			protected:
+				std::string encode( const std::string& cookedData ) override;
+			};
+
+
+			/**
+			 * AusRD Barcode
+			 */
+			class AusRD : public Base
+			{
+			public:
+				static Barcode* create();
+			
+			protected:
+				std::string encode( const std::string& cookedData ) override;
+			};
+
+
+			/**
+			 * Aztec Barcode
+			 */
+			class Aztec : public Base
+			{
+			public:
+				static Barcode* create();
+			
+			protected:
+				std::string encode( const std::string& cookedData ) override;
+			};
+
+
+			/**
+			 * Azrun Barcode
+			 */
+			class Azrun : public Base
+			{
+			public:
+				static Barcode* create();
+			
+			protected:
+				std::string encode( const std::string& cookedData ) override;
+			};
+
+
+			/**
+			 * Cbr Barcode
+			 */
+			class Cbr : public Base
+			{
+			public:
+				static Barcode* create();
+			
+			protected:
+				std::string encode( const std::string& cookedData ) override;
+			};
+
+
+			/**
+			 * Code1 Barcode
+			 */
+			class Code1 : public Base
+			{
+			public:
+				static Barcode* create();
+			
+			protected:
+				std::string encode( const std::string& cookedData ) override;
+			};
+
+
+			/**
+			 * Code11 Barcode
+			 */
+			class Code11 : public Base
+			{
+			public:
+				static Barcode* create();
+			
+			protected:
+				std::string encode( const std::string& cookedData ) override;
+			};
+
+
+			/**
+			 * C16k Barcode
+			 */
+			class C16k : public Base
+			{
+			public:
+				static Barcode* create();
+			
+			protected:
+				std::string encode( const std::string& cookedData ) override;
+			};
+
+
+			/**
+			 * C25m Barcode
+			 */
+			class C25m : public Base
+			{
+			public:
+				static Barcode* create();
+			
+			protected:
+				std::string encode( const std::string& cookedData ) override;
+			};
+
+
+			/**
+			 * C25i Barcode
+			 */
+			class C25i : public Base
+			{
+			public:
+				static Barcode* create();
+			
+			protected:
+				std::string encode( const std::string& cookedData ) override;
+			};
+
+
+			/**
+			 * C25dl Barcode
+			 */
+			class C25dl : public Base
+			{
+			public:
+				static Barcode* create();
+			
+			protected:
+				std::string encode( const std::string& cookedData ) override;
+			};
+
+
+			/**
+			 * Code32 Barcode
+			 */
+			class Code32 : public Base
+			{
+			public:
+				static Barcode* create();
+			
+			protected:
+				std::string encode( const std::string& cookedData ) override;
+			};
+
+
+			/**
+			 * Code39 Barcode
+			 */
+			class Code39 : public Base
+			{
+			public:
+				static Barcode* create();
+			
+			protected:
+				std::string encode( const std::string& cookedData ) override;
+			};
+
+
+			/**
+			 * Code39e Barcode
+			 */
+			class Code39e : public Base
+			{
+			public:
+				static Barcode* create();
+			
+			protected:
+				std::string encode( const std::string& cookedData ) override;
+			};
+
+
+			/**
+			 * Code49 Barcode
+			 */
+			class Code49 : public Base
+			{
+			public:
+				static Barcode* create();
+			
+			protected:
+				std::string encode( const std::string& cookedData ) override;
+			};
+
+
+			/**
+			 * Code93 Barcode
+			 */
+			class Code93 : public Base
+			{
+			public:
+				static Barcode* create();
+			
+			protected:
+				std::string encode( const std::string& cookedData ) override;
+			};
+
+
+			/**
+			 * Code128 Barcode
+			 */
+			class Code128 : public Base
+			{
+			public:
+				static Barcode* create();
+			
+			protected:
+				std::string encode( const std::string& cookedData ) override;
+			};
+
+
+			/**
+			 * Code128b Barcode
+			 */
+			class Code128b : public Base
+			{
+			public:
+				static Barcode* create();
+			
+			protected:
+				std::string encode( const std::string& cookedData ) override;
+			};
+
+
+			/**
+			 * Daft Barcode
+			 */
+			class Daft : public Base
+			{
+			public:
+				static Barcode* create();
+			
+			protected:
+				std::string encode( const std::string& cookedData ) override;
+			};
+
+
+			/**
+			 * Dmtx Barcode
+			 */
+			class Dmtx : public Base
+			{
+			public:
+				static Barcode* create();
+			
+			protected:
+				std::string encode( const std::string& cookedData ) override;
+			};
+
+
+			/**
+			 * Dpl Barcode
+			 */
+			class Dpl : public Base
+			{
+			public:
+				static Barcode* create();
+			
+			protected:
+				std::string encode( const std::string& cookedData ) override;
+			};
+
+
+			/**
+			 * Dpi Barcode
+			 */
+			class Dpi : public Base
+			{
+			public:
+				static Barcode* create();
+			
+			protected:
+				std::string encode( const std::string& cookedData ) override;
+			};
+
+
+			/**
+			 * Kix Barcode
+			 */
+			class Kix : public Base
+			{
+			public:
+				static Barcode* create();
+			
+			protected:
+				std::string encode( const std::string& cookedData ) override;
+			};
+
+
+			/**
+			 * Ean Barcode
+			 */
+			class Ean : public Base
+			{
+			public:
+				static Barcode* create();
+			
+			protected:
+				std::string encode( const std::string& cookedData ) override;
+			};
+
+
+			/**
+			 * Hibc128 Barcode
+			 */
+			class Hibc128 : public Base
+			{
+			public:
+				static Barcode* create();
+			
+			protected:
+				std::string encode( const std::string& cookedData ) override;
+			};
+
+
+			/**
+			 * Hibc39 Barcode
+			 */
+			class Hibc39 : public Base
+			{
+			public:
+				static Barcode* create();
+			
+			protected:
+				std::string encode( const std::string& cookedData ) override;
+			};
+
+
+			/**
+			 * Hibcdm Barcode
+			 */
+			class Hibcdm : public Base
+			{
+			public:
+				static Barcode* create();
+			
+			protected:
+				std::string encode( const std::string& cookedData ) override;
+			};
+
+
+			/**
+			 * Hibcqr Barcode
+			 */
+			class Hibcqr : public Base
+			{
+			public:
+				static Barcode* create();
+			
+			protected:
+				std::string encode( const std::string& cookedData ) override;
+			};
+
+
+			/**
+			 * Hibcpdf Barcode
+			 */
+			class Hibcpdf : public Base
+			{
+			public:
+				static Barcode* create();
+			
+			protected:
+				std::string encode( const std::string& cookedData ) override;
+			};
+
+
+			/**
+			 * Hibcmpdf Barcode
+			 */
+			class Hibcmpdf : public Base
+			{
+			public:
+				static Barcode* create();
+			
+			protected:
+				std::string encode( const std::string& cookedData ) override;
+			};
+
+
+			/**
+			 * Hibcaz Barcode
+			 */
+			class Hibcaz : public Base
+			{
+			public:
+				static Barcode* create();
+			
+			protected:
+				std::string encode( const std::string& cookedData ) override;
+			};
+
+
+			/**
+			 * I25 Barcode
+			 */
+			class I25 : public Base
+			{
+			public:
+				static Barcode* create();
+			
+			protected:
+				std::string encode( const std::string& cookedData ) override;
+			};
+
+
+			/**
+			 * Isbn Barcode
+			 */
+			class Isbn : public Base
+			{
+			public:
+				static Barcode* create();
+			
+			protected:
+				std::string encode( const std::string& cookedData ) override;
+			};
+
+
+			/**
+			 * Itf14 Barcode
+			 */
+			class Itf14 : public Base
+			{
+			public:
+				static Barcode* create();
+			
+			protected:
+				std::string encode( const std::string& cookedData ) override;
+			};
+
+
+			/**
+			 * Gmtx Barcode
+			 */
+			class Gmtx : public Base
+			{
+			public:
+				static Barcode* create();
+			
+			protected:
+				std::string encode( const std::string& cookedData ) override;
+			};
+
+
+			/**
+			 * Gs1128 Barcode
+			 */
+			class Gs1128 : public Base
+			{
+			public:
+				static Barcode* create();
+			
+			protected:
+				std::string encode( const std::string& cookedData ) override;
+			};
+
+
+			/**
+			 * Logm Barcode
+			 */
+			class Logm : public Base
+			{
+			public:
+				static Barcode* create();
+			
+			protected:
+				std::string encode( const std::string& cookedData ) override;
+			};
+
+
+			/**
+			 * Rss14 Barcode
+			 */
+			class Rss14 : public Base
+			{
+			public:
+				static Barcode* create();
+			
+			protected:
+				std::string encode( const std::string& cookedData ) override;
+			};
+
+
+			/**
+			 * Rssltd Barcode
+			 */
+			class Rssltd : public Base
+			{
+			public:
+				static Barcode* create();
+			
+			protected:
+				std::string encode( const std::string& cookedData ) override;
+			};
+
+
+			/**
+			 * Rssexp Barcode
+			 */
+			class Rssexp : public Base
+			{
+			public:
+				static Barcode* create();
+			
+			protected:
+				std::string encode( const std::string& cookedData ) override;
+			};
+
+
+			/**
+			 * Rsss Barcode
+			 */
+			class Rsss : public Base
+			{
+			public:
+				static Barcode* create();
+			
+			protected:
+				std::string encode( const std::string& cookedData ) override;
+			};
+
+
+			/**
+			 * Rssso Barcode
+			 */
+			class Rssso : public Base
+			{
+			public:
+				static Barcode* create();
+			
+			protected:
+				std::string encode( const std::string& cookedData ) override;
+			};
+
+
+			/**
+			 * Rssse Barcode
+			 */
+			class Rssse : public Base
+			{
+			public:
+				static Barcode* create();
+			
+			protected:
+				std::string encode( const std::string& cookedData ) override;
+			};
+
+
+			/**
+			 * Pharma Barcode
+			 */
+			class Pharma : public Base
+			{
+			public:
+				static Barcode* create();
+			
+			protected:
+				std::string encode( const std::string& cookedData ) override;
+			};
+
+
+			/**
+			 * Pharma2 Barcode
+			 */
+			class Pharma2 : public Base
+			{
+			public:
+				static Barcode* create();
+			
+			protected:
+				std::string encode( const std::string& cookedData ) override;
+			};
+
+
+			/**
+			 * Pzn Barcode
+			 */
+			class Pzn : public Base
+			{
+			public:
+				static Barcode* create();
+			
+			protected:
+				std::string encode( const std::string& cookedData ) override;
+			};
+
+
+			/**
+			 * Tele Barcode
+			 */
+			class Tele : public Base
+			{
+			public:
+				static Barcode* create();
+			
+			protected:
+				std::string encode( const std::string& cookedData ) override;
+			};
+
+
+			/**
+			 * Telex Barcode
+			 */
+			class Telex : public Base
+			{
+			public:
+				static Barcode* create();
+			
+			protected:
+				std::string encode( const std::string& cookedData ) override;
+			};
+
+
+			/**
+			 * Japan Barcode
+			 */
+			class Japan : public Base
+			{
+			public:
+				static Barcode* create();
+			
+			protected:
+				std::string encode( const std::string& cookedData ) override;
+			};
+
+
+			/**
+			 * Korea Barcode
+			 */
+			class Korea : public Base
+			{
+			public:
+				static Barcode* create();
+			
+			protected:
+				std::string encode( const std::string& cookedData ) override;
+			};
+
+
+			/**
+			 * Maxi Barcode
+			 */
+			class Maxi : public Base
+			{
+			public:
+				static Barcode* create();
+			
+			protected:
+				std::string encode( const std::string& cookedData ) override;
+			};
+
+
+			/**
+			 * Mpdf Barcode
+			 */
+			class Mpdf : public Base
+			{
+			public:
+				static Barcode* create();
+			
+			protected:
+				std::string encode( const std::string& cookedData ) override;
+			};
+
+
+			/**
+			 * Msi Barcode
+			 */
+			class Msi : public Base
+			{
+			public:
+				static Barcode* create();
+			
+			protected:
+				std::string encode( const std::string& cookedData ) override;
+			};
+
+
+			/**
+			 * Mqr Barcode
+			 */
+			class Mqr : public Base
+			{
+			public:
+				static Barcode* create();
+			
+			protected:
+				std::string encode( const std::string& cookedData ) override;
+			};
+
+
+			/**
+			 * Nve Barcode
+			 */
+			class Nve : public Base
+			{
+			public:
+				static Barcode* create();
+			
+			protected:
+				std::string encode( const std::string& cookedData ) override;
+			};
+
+
+			/**
+			 * Plan Barcode
+			 */
+			class Plan : public Base
+			{
+			public:
+				static Barcode* create();
+			
+			protected:
+				std::string encode( const std::string& cookedData ) override;
+			};
+
+
+			/**
+			 * Postnet Barcode
+			 */
+			class Postnet : public Base
+			{
+			public:
+				static Barcode* create();
+			
+			protected:
+				std::string encode( const std::string& cookedData ) override;
+			};
+
+
+			/**
+			 * Pdf Barcode
+			 */
+			class Pdf : public Base
+			{
+			public:
+				static Barcode* create();
+			
+			protected:
+				std::string encode( const std::string& cookedData ) override;
+			};
+
+
+			/**
+			 * Pdft Barcode
+			 */
+			class Pdft : public Base
+			{
+			public:
+				static Barcode* create();
+			
+			protected:
+				std::string encode( const std::string& cookedData ) override;
+			};
+
+
+			/**
+			 * Qr Barcode
+			 */
+			class Qr : public Base
+			{
+			public:
+				static Barcode* create();
+			
+			protected:
+				std::string encode( const std::string& cookedData ) override;
+			};
+
+
+			/**
+			 * Rm4 Barcode
+			 */
+			class Rm4 : public Base
+			{
+			public:
+				static Barcode* create();
+			
+			protected:
+				std::string encode( const std::string& cookedData ) override;
+			};
+
+
+			/**
+			 * UpcA Barcode
+			 */
+			class UpcA : public Base
+			{
+			public:
+				static Barcode* create();
+			
+			protected:
+				std::string encode( const std::string& cookedData ) override;
+			};
+
+
+			/**
+			 * UpcE Barcode
+			 */
+			class UpcE : public Base
+			{
+			public:
+				static Barcode* create();
+			
+			protected:
+				std::string encode( const std::string& cookedData ) override;
+			};
+
+
+			/**
+			 * Usps Barcode
+			 */
+			class Usps : public Base
+			{
+			public:
+				static Barcode* create();
+			
+			protected:
+				std::string encode( const std::string& cookedData ) override;
+			};
+
+
+			/**
+			 * Pls Barcode
+			 */
+			class Pls : public Base
+			{
+			public:
+				static Barcode* create();
 			
-		protected:
-			std::string encode( const std::string& cookedData ) override;
-		};
-
-
-		/**
-		 * UpcE Barcode
-		 */
-		class UpcE : public Base
-		{
-		public:
-			static Barcode* create();
-			
-		protected:
-			std::string encode( const std::string& cookedData ) override;
-		};
-
-
-		/**
-		 * Usps Barcode
-		 */
-		class Usps : public Base
-		{
-		public:
-			static Barcode* create();
-			
-		protected:
-			std::string encode( const std::string& cookedData ) override;
-		};
-
-
-		/**
-		 * Pls Barcode
-		 */
-		class Pls : public Base
-		{
-		public:
-			static Barcode* create();
-			
-		protected:
-			std::string encode( const std::string& cookedData ) override;
-		};
-
-
+			protected:
+				std::string encode( const std::string& cookedData ) override;
+			};
+
+
+		}
 	}
 }
 
diff --git a/backends/merge/Factory.cpp b/backends/merge/Factory.cpp
index 41101bb..ff982f7 100644
--- a/backends/merge/Factory.cpp
+++ b/backends/merge/Factory.cpp
@@ -31,189 +31,192 @@
 #include "TextSemicolonKeys.h"
 
 
-namespace glabels::merge
+namespace glabels
 {
-
-	//
-	// Static data
-	//
-	QMap<QString,Factory::BackendEntry> Factory::mBackendIdMap;
-	QMap<QString,Factory::BackendEntry> Factory::mBackendNameMap;
-	QStringList Factory::mNameList;
-
-
-	///
-	/// Constructor
-	///
-	Factory::Factory()
+	namespace merge
 	{
-		registerBackend( None::id(),
-		                 tr("None"),
-		                 NONE,
-		                 &None::create );
+
+		//
+		// Static data
+		//
+		QMap<QString,Factory::BackendEntry> Factory::mBackendIdMap;
+		QMap<QString,Factory::BackendEntry> Factory::mBackendNameMap;
+		QStringList Factory::mNameList;
+
+
+		///
+		/// Constructor
+		///
+		Factory::Factory()
+		{
+			registerBackend( None::id(),
+			                 tr("None"),
+			                 NONE,
+			                 &None::create );
 	
-		registerBackend( TextCsv::id(),
-		                 tr("Text: Comma Separated Values (CSV)"),
-		                 FILE,
-		                 &TextCsv::create );
+			registerBackend( TextCsv::id(),
+			                 tr("Text: Comma Separated Values (CSV)"),
+			                 FILE,
+			                 &TextCsv::create );
 
-		registerBackend( TextCsvKeys::id(),
-		                 tr("Text: Comma Separated Values (CSV), keys on line 1"),
-		                 FILE,
-		                 &TextCsvKeys::create );
+			registerBackend( TextCsvKeys::id(),
+			                 tr("Text: Comma Separated Values (CSV), keys on line 1"),
+			                 FILE,
+			                 &TextCsvKeys::create );
 
-		registerBackend( TextTsv::id(),
-		                 tr("Text: Tab Separated Values (TSV)"),
-		                 FILE,
-		                 &TextTsv::create );
+			registerBackend( TextTsv::id(),
+			                 tr("Text: Tab Separated Values (TSV)"),
+			                 FILE,
+			                 &TextTsv::create );
 
-		registerBackend( TextTsvKeys::id(),
-		                 tr("Text: Tab Separated Values (TSV), keys on line 1"),
-		                 FILE,
-		                 &TextTsvKeys::create );
+			registerBackend( TextTsvKeys::id(),
+			                 tr("Text: Tab Separated Values (TSV), keys on line 1"),
+			                 FILE,
+			                 &TextTsvKeys::create );
 
-		registerBackend( TextColon::id(),
-		                 tr("Text: Colon Separated Values"),
-		                 FILE,
-		                 &TextColon::create );
+			registerBackend( TextColon::id(),
+			                 tr("Text: Colon Separated Values"),
+			                 FILE,
+			                 &TextColon::create );
 
-		registerBackend( TextColonKeys::id(),
-		                 tr("Text: Colon Separated Values, keys on line 1"),
-		                 FILE,
-		                 &TextColonKeys::create );
+			registerBackend( TextColonKeys::id(),
+			                 tr("Text: Colon Separated Values, keys on line 1"),
+			                 FILE,
+			                 &TextColonKeys::create );
 
-		registerBackend( TextSemicolon::id(),
-		                 tr("Text: Semicolon Separated Values"),
-		                 FILE,
-		                 &TextSemicolon::create );
+			registerBackend( TextSemicolon::id(),
+			                 tr("Text: Semicolon Separated Values"),
+			                 FILE,
+			                 &TextSemicolon::create );
 
-		registerBackend( TextSemicolonKeys::id(),
-		                 tr("Text: Semicolon Separated Values, keys on line 1"),
-		                 FILE,
-		                 &TextSemicolonKeys::create );
-	}
-
-
-	///
-	/// Initialize
-	///
-	void Factory::init()
-	{
-		static Factory* singletonInstance = nullptr;
-		if ( !singletonInstance )
-		{
-			singletonInstance = new Factory();
+			registerBackend( TextSemicolonKeys::id(),
+			                 tr("Text: Semicolon Separated Values, keys on line 1"),
+			                 FILE,
+			                 &TextSemicolonKeys::create );
 		}
-	}
 
 
-	///
-	/// Create Merge object
-	///
-	Merge* Factory::createMerge( const QString& id )
-	{
-		QMap<QString,BackendEntry>::iterator iBackend = mBackendIdMap.find( id );
-		if ( iBackend != mBackendIdMap.end() )
+		///
+		/// Initialize
+		///
+		void Factory::init()
 		{
-			return iBackend->create();
+			static Factory* singletonInstance = nullptr;
+			if ( !singletonInstance )
+			{
+				singletonInstance = new Factory();
+			}
 		}
+
+
+		///
+		/// Create Merge object
+		///
+		Merge* Factory::createMerge( const QString& id )
+		{
+			QMap<QString,BackendEntry>::iterator iBackend = mBackendIdMap.find( id );
+			if ( iBackend != mBackendIdMap.end() )
+			{
+				return iBackend->create();
+			}
 	
-		return None::create();
-	}
-
-
-	///
-	/// Get name list
-	///
-	QStringList Factory::nameList()
-	{
-		return mNameList;
-	}
-
-
-	///
-	/// Convert ID to name
-	///
-	QString Factory::idToName( const QString& id )
-	{
-		if ( mBackendIdMap.contains( id ) )
-		{
-			return mBackendIdMap[id].name;
+			return None::create();
 		}
-		else
-		{
-			return tr("None");
-		}
-	}
 
 
-	///
-	/// Convert name to ID
-	///
-	QString Factory::nameToId( const QString& name )
-	{
-		if ( mBackendNameMap.contains( name ) )
+		///
+		/// Get name list
+		///
+		QStringList Factory::nameList()
 		{
-			return mBackendNameMap[name].id;
+			return mNameList;
 		}
-		else
+
+
+		///
+		/// Convert ID to name
+		///
+		QString Factory::idToName( const QString& id )
 		{
+			if ( mBackendIdMap.contains( id ) )
+			{
+				return mBackendIdMap[id].name;
+			}
+			else
+			{
+				return tr("None");
+			}
+		}
+
+
+		///
+		/// Convert name to ID
+		///
+		QString Factory::nameToId( const QString& name )
+		{
+			if ( mBackendNameMap.contains( name ) )
+			{
+				return mBackendNameMap[name].id;
+			}
+			else
+			{
+				return "None";
+			}
+		}
+
+
+		///
+		/// Convert ID to type
+		///
+		Factory::SourceType Factory::idToType( const QString& id )
+		{
+			if ( mBackendIdMap.contains( id ) )
+			{
+				return mBackendIdMap[id].type;
+			}
+			else
+			{
+				return NONE;
+			}
+		}
+
+
+		///
+		/// Lookup ID from index
+		///
+		QString Factory::indexToId( int index )
+		{
+			if ( (index > 0) && (index < mNameList.size()) )
+			{
+				QString name = mNameList[index];
+			
+				return mBackendNameMap[ name ].id;
+			}
+
 			return "None";
 		}
-	}
 
 
-	///
-	/// Convert ID to type
-	///
-	Factory::SourceType Factory::idToType( const QString& id )
-	{
-		if ( mBackendIdMap.contains( id ) )
+		///
+		/// Register backend
+		///
+		void Factory::registerBackend( const QString& id,
+		                               const QString& name,
+		                               SourceType     type,
+		                               CreateFct      create )
 		{
-			return mBackendIdMap[id].type;
-		}
-		else
-		{
-			return NONE;
-		}
-	}
+			BackendEntry backend;
 
-
-	///
-	/// Lookup ID from index
-	///
-	QString Factory::indexToId( int index )
-	{
-		if ( (index > 0) && (index < mNameList.size()) )
-		{
-			QString name = mNameList[index];
-			
-			return mBackendNameMap[ name ].id;
-		}
-
-		return "None";
-	}
-
-
-	///
-	/// Register backend
-	///
-	void Factory::registerBackend( const QString& id,
-	                               const QString& name,
-	                               SourceType     type,
-	                               CreateFct      create )
-	{
-		BackendEntry backend;
-
-		backend.id     = id;
-		backend.name   = name;
-		backend.type   = type;
-		backend.create = create;
+			backend.id     = id;
+			backend.name   = name;
+			backend.type   = type;
+			backend.create = create;
 	
-		mBackendIdMap[ id ]     = backend;
-		mBackendNameMap[ name ] = backend;
+			mBackendIdMap[ id ]     = backend;
+			mBackendNameMap[ name ] = backend;
 
-		mNameList << name;
-	}
+			mNameList << name;
+		}
 
-} // namespace glabels::merge
+	} // namespace merge
+} // namespace glabels
diff --git a/backends/merge/Factory.h b/backends/merge/Factory.h
index 6275b22..13e81ee 100644
--- a/backends/merge/Factory.h
+++ b/backends/merge/Factory.h
@@ -27,80 +27,83 @@
 #include <QMap>
 
 
-namespace glabels::merge
+namespace glabels
 {
-
-	// Forward references
-	class Merge;
-	
-
-	///
-	/// Factory
-	///
-	class Factory
+	namespace merge
 	{
-		Q_DECLARE_TR_FUNCTIONS(Factory)
+
+		// Forward references
+		class Merge;
 	
 
-		/////////////////////////////////
-		// Source Type
-		/////////////////////////////////
-	public:
-		enum SourceType { NONE, FIXED, FILE };
-		
-		
-		/////////////////////////////////
-		// Life Cycle
-		/////////////////////////////////
-	protected:
-		Factory();
-
-
-		/////////////////////////////////
-		// Static methods
-		/////////////////////////////////
-	public:
-		static void init();
-	
-		static Merge* createMerge( const QString& id );
-
-		static QStringList nameList();
-		static QString idToName( const QString& id );
-		static QString nameToId( const QString& name );
-		static SourceType idToType( const QString& id );
-		static QString indexToId( int index );
-
-
-		/////////////////////////////////
-		// private methods
-		/////////////////////////////////
-	private:
-		typedef Merge* (*CreateFct)();
-	
-		static void registerBackend( const QString& id,
-		                             const QString& name,
-		                             SourceType     type,
-		                             CreateFct      create );
-
-
-		/////////////////////////////////
-		// private data
-		/////////////////////////////////
-		class BackendEntry
+		///
+		/// Factory
+		///
+		class Factory
 		{
-		public:
-			QString    id;
-			QString    name;
-			SourceType type;
-			CreateFct  create;
-		};
+			Q_DECLARE_TR_FUNCTIONS(Factory)
 	
-		static QMap<QString,BackendEntry> mBackendIdMap;
-		static QMap<QString,BackendEntry> mBackendNameMap;
-		
-		static QStringList mNameList;
-	};
 
+			/////////////////////////////////
+			// Source Type
+			/////////////////////////////////
+		public:
+			enum SourceType { NONE, FIXED, FILE };
+		
+		
+			/////////////////////////////////
+			// Life Cycle
+			/////////////////////////////////
+		protected:
+			Factory();
+
+
+			/////////////////////////////////
+			// Static methods
+			/////////////////////////////////
+		public:
+			static void init();
+	
+			static Merge* createMerge( const QString& id );
+
+			static QStringList nameList();
+			static QString idToName( const QString& id );
+			static QString nameToId( const QString& name );
+			static SourceType idToType( const QString& id );
+			static QString indexToId( int index );
+
+
+			/////////////////////////////////
+			// private methods
+			/////////////////////////////////
+		private:
+			typedef Merge* (*CreateFct)();
+	
+			static void registerBackend( const QString& id,
+			                             const QString& name,
+			                             SourceType     type,
+			                             CreateFct      create );
+
+
+			/////////////////////////////////
+			// private data
+			/////////////////////////////////
+			class BackendEntry
+			{
+			public:
+				QString    id;
+				QString    name;
+				SourceType type;
+				CreateFct  create;
+			};
+	
+			static QMap<QString,BackendEntry> mBackendIdMap;
+			static QMap<QString,BackendEntry> mBackendNameMap;
+		
+			static QStringList mNameList;
+		};
+
+	}
 }
 
 
diff --git a/backends/merge/Merge.cpp b/backends/merge/Merge.cpp
index 3051141..2b096b6 100644
--- a/backends/merge/Merge.cpp
+++ b/backends/merge/Merge.cpp
@@ -23,188 +23,191 @@
 #include "Record.h"
 
 
-namespace glabels::merge
+namespace glabels
 {
+	namespace merge
+	{
 	
-	///
-	/// Constructor
-	///
-	Merge::Merge()
-	{
-	}
-
-
-	///
-	/// Constructor
-	///
-	Merge::Merge( const Merge* merge ) : mSource(merge->mSource)
-	{
-		foreach ( Record* record, merge->mRecordList )
+		///
+		/// Constructor
+		///
+		Merge::Merge()
 		{
-			mRecordList << record->clone();
 		}
-	}
 
 
-	///
-	/// Destructor
-	///
-	Merge::~Merge()
-	{
-		foreach ( Record* record, mRecordList )
+		///
+		/// Constructor
+		///
+		Merge::Merge( const Merge* merge ) : mSource(merge->mSource)
 		{
-			delete record;
+			foreach ( Record* record, merge->mRecordList )
+			{
+				mRecordList << record->clone();
+			}
 		}
-		mRecordList.clear();
-	}
 
 
-	///
-	/// Get id
-	///
-	QString Merge::id() const
-	{
-		return mId;
-	}
-
-
-	///
-	/// Get source
-	///
-	QString Merge::source() const
-	{
-		return mSource;
-	}
-
-
-	///
-	/// Set source
-	///
-	void Merge::setSource( const QString& source )
-	{
-		mSource = source;
-
-		// Clear out any old records
-		foreach ( Record* record, mRecordList )
+		///
+		/// Destructor
+		///
+		Merge::~Merge()
 		{
-			delete record;
+			foreach ( Record* record, mRecordList )
+			{
+				delete record;
+			}
+			mRecordList.clear();
 		}
-		mRecordList.clear();
 
-		open();
-		for ( Record* record = readNextRecord(); record != nullptr; record = readNextRecord() )
+
+		///
+		/// Get id
+		///
+		QString Merge::id() const
 		{
-			mRecordList.append( record );
+			return mId;
 		}
-		close();
+
+
+		///
+		/// Get source
+		///
+		QString Merge::source() const
+		{
+			return mSource;
+		}
+
+
+		///
+		/// Set source
+		///
+		void Merge::setSource( const QString& source )
+		{
+			mSource = source;
+
+			// Clear out any old records
+			foreach ( Record* record, mRecordList )
+			{
+				delete record;
+			}
+			mRecordList.clear();
+
+			open();
+			for ( Record* record = readNextRecord(); record != nullptr; record = readNextRecord() )
+			{
+				mRecordList.append( record );
+			}
+			close();
 		
-		emit sourceChanged();
-	}
-
-
-	///
-	/// Get record list
-	///
-	const QList<Record*>& Merge::recordList( ) const
-	{
-		return mRecordList;
-	}
-
-
-	///
-	/// Select matching record
-	///
-	void Merge::select( Record* record )
-	{
-		record->setSelected( true );
-		emit selectionChanged();
-	}
-	
-
-	///
-	/// Unselect matching record
-	///
-	void Merge::unselect( Record* record )
-	{
-		record->setSelected( false );
-		emit selectionChanged();
-	}
-
-	
-	///
-	/// Select/unselect i'th record
-	///
-	void Merge::setSelected( int i, bool state )
-	{
-		if ( (i >= 0) && (i < mRecordList.size()) )
-		{
-			mRecordList[i]->setSelected( state );
-			emit selectionChanged();
+			emit sourceChanged();
 		}
-	}
 
 
-	///
-	/// Select all records
-	///
-	void Merge::selectAll()
-	{
-		foreach ( Record* record, mRecordList )
+		///
+		/// Get record list
+		///
+		const QList<Record*>& Merge::recordList( ) const
+		{
+			return mRecordList;
+		}
+
+
+		///
+		/// Select matching record
+		///
+		void Merge::select( Record* record )
 		{
 			record->setSelected( true );
+			emit selectionChanged();
 		}
-		emit selectionChanged();
-	}
-
 	
-	///
-	/// Unselect all records
-	///
-	void Merge::unselectAll()
-	{
-		foreach ( Record* record, mRecordList )
+
+		///
+		/// Unselect matching record
+		///
+		void Merge::unselect( Record* record )
 		{
 			record->setSelected( false );
+			emit selectionChanged();
 		}
-		emit selectionChanged();
-	}
 
 	
-	///
-	/// Return count of selected records
-	///
-	int Merge::nSelectedRecords() const
-	{
-		int count = 0;
-
-		foreach ( Record* record, mRecordList )
+		///
+		/// Select/unselect i'th record
+		///
+		void Merge::setSelected( int i, bool state )
 		{
-			if ( record->isSelected() )
+			if ( (i >= 0) && (i < mRecordList.size()) )
 			{
-				count++;
+				mRecordList[i]->setSelected( state );
+				emit selectionChanged();
 			}
 		}
 
-		return count;
-	}
 
-
-	///
-	/// Return list of selected records
-	///
-	const QList<Record*> Merge::selectedRecords() const
-	{
-		QList<Record*> list;
-
-		foreach ( Record* record, mRecordList )
+		///
+		/// Select all records
+		///
+		void Merge::selectAll()
 		{
-			if ( record->isSelected() )
+			foreach ( Record* record, mRecordList )
 			{
-				list.append( record );
+				record->setSelected( true );
 			}
+			emit selectionChanged();
 		}
 
-		return list;
-	}
+	
+		///
+		/// Unselect all records
+		///
+		void Merge::unselectAll()
+		{
+			foreach ( Record* record, mRecordList )
+			{
+				record->setSelected( false );
+			}
+			emit selectionChanged();
+		}
 
-} // namespace glabels::merge
+	
+		///
+		/// Return count of selected records
+		///
+		int Merge::nSelectedRecords() const
+		{
+			int count = 0;
+
+			foreach ( Record* record, mRecordList )
+			{
+				if ( record->isSelected() )
+				{
+					count++;
+				}
+			}
+
+			return count;
+		}
+
+
+		///
+		/// Return list of selected records
+		///
+		const QList<Record*> Merge::selectedRecords() const
+		{
+			QList<Record*> list;
+
+			foreach ( Record* record, mRecordList )
+			{
+				if ( record->isSelected() )
+				{
+					list.append( record );
+				}
+			}
+
+			return list;
+		}
+
+	} // namespace merge
+} // namespace glabels
diff --git a/backends/merge/Merge.h b/backends/merge/Merge.h
index 673ad4b..7745a01 100644
--- a/backends/merge/Merge.h
+++ b/backends/merge/Merge.h
@@ -28,92 +28,95 @@
 #include <QList>
 
 
-namespace glabels::merge
+namespace glabels
 {
-
-	// Forward references
-	class Record;
-		
-	
-	///
-	/// Merge Object
-	///
-	struct Merge : QObject
+	namespace merge
 	{
-		Q_OBJECT
 
-
-		/////////////////////////////////
-		// Life Cycle
-		/////////////////////////////////
-	protected:
-		Merge();
-		Merge( const Merge* merge );
-	public:
-		~Merge() override;
-
-
-		/////////////////////////////////
-		// Object duplication
-		/////////////////////////////////
-		virtual Merge* clone() const = 0;
-
-
-		/////////////////////////////////
-		// Properties
-		/////////////////////////////////
-	public:
-		QString id() const;
-		QString source() const;
-		void setSource( const QString& source );
-
-		const QList<Record*>& recordList( void ) const;
-
-
-		/////////////////////////////////
-		// Selection methods
-		/////////////////////////////////
-	public:
-		void select( Record* record );
-		void unselect( Record* record );
-		void setSelected( int i, bool state = true );
-		void selectAll();
-		void unselectAll();
+		// Forward references
+		class Record;
+		
 	
-		int nSelectedRecords() const;
-		const QList<Record*> selectedRecords() const;
+		///
+		/// Merge Object
+		///
+		struct Merge : QObject
+		{
+			Q_OBJECT
 
 
-		/////////////////////////////////
-		// Virtual methods
-		/////////////////////////////////
-	public:
-		virtual QStringList keys() const = 0;
-		virtual QString primaryKey() const = 0;
-	protected:
-		virtual void open() = 0;
-		virtual void close() = 0;
-		virtual Record* readNextRecord() = 0;
+			/////////////////////////////////
+			// Life Cycle
+			/////////////////////////////////
+		protected:
+			Merge();
+			Merge( const Merge* merge );
+		public:
+			~Merge() override;
+
+
+			/////////////////////////////////
+			// Object duplication
+			/////////////////////////////////
+			virtual Merge* clone() const = 0;
+
+
+			/////////////////////////////////
+			// Properties
+			/////////////////////////////////
+		public:
+			QString id() const;
+			QString source() const;
+			void setSource( const QString& source );
+
+			const QList<Record*>& recordList( void ) const;
+
+
+			/////////////////////////////////
+			// Selection methods
+			/////////////////////////////////
+		public:
+			void select( Record* record );
+			void unselect( Record* record );
+			void setSelected( int i, bool state = true );
+			void selectAll();
+			void unselectAll();
+	
+			int nSelectedRecords() const;
+			const QList<Record*> selectedRecords() const;
+
+
+			/////////////////////////////////
+			// Virtual methods
+			/////////////////////////////////
+		public:
+			virtual QStringList keys() const = 0;
+			virtual QString primaryKey() const = 0;
+		protected:
+			virtual void open() = 0;
+			virtual void close() = 0;
+			virtual Record* readNextRecord() = 0;
 		
 
-		/////////////////////////////////
-		// Signals
-		/////////////////////////////////
-	signals:
-		void sourceChanged();
-		void selectionChanged();
+			/////////////////////////////////
+			// Signals
+			/////////////////////////////////
+		signals:
+			void sourceChanged();
+			void selectionChanged();
 		
 
-		/////////////////////////////////
-		// Private data
-		/////////////////////////////////
-	protected:
-		QString             mId;
-	private:
-		QString             mSource;
-		QList<Record*>      mRecordList;
-	};
+			/////////////////////////////////
+			// Private data
+			/////////////////////////////////
+		protected:
+			QString             mId;
+		private:
+			QString             mSource;
+			QList<Record*>      mRecordList;
+		};
 
+	}
 }
 
 
diff --git a/backends/merge/None.cpp b/backends/merge/None.cpp
index 62af9a4..73c4a9c 100644
--- a/backends/merge/None.cpp
+++ b/backends/merge/None.cpp
@@ -21,102 +21,105 @@
 #include "None.h"
 
 
-namespace glabels::merge
+namespace glabels
 {
-
-	///
-	/// Constructor
-	///
-	None::None() : Merge()
+	namespace merge
 	{
-		mId = "None";
-	}
+
+		///
+		/// Constructor
+		///
+		None::None() : Merge()
+		{
+			mId = "None";
+		}
 
 
-	///
-	/// Constructor
-	///
-	None::None( const None* merge ) : Merge( merge )
-	{
-	}
+		///
+		/// Constructor
+		///
+		None::None( const None* merge ) : Merge( merge )
+		{
+		}
 
 
-	///
-	/// Destructor
-	///
-	None::~None()
-	{
-	}
+		///
+		/// Destructor
+		///
+		None::~None()
+		{
+		}
 
 
-	///
-	/// Clone
-	///
-	None* None::clone() const
-	{
-		return new None( this );
-	}
+		///
+		/// Clone
+		///
+		None* None::clone() const
+		{
+			return new None( this );
+		}
 
 
-	///
-	/// Get ID
-	///
-	QString None::id()
-	{
-		return "None";
-	}
+		///
+		/// Get ID
+		///
+		QString None::id()
+		{
+			return "None";
+		}
 
 
-	///
-	/// Create
-	///
-	Merge* None::create()
-	{
-		return new None();
-	}
+		///
+		/// Create
+		///
+		Merge* None::create()
+		{
+			return new None();
+		}
 
 
-	///
-	/// Get key list
-	///
-	QStringList None::keys() const
-	{
-		QStringList emptyList;
-		return emptyList;
-	}
+		///
+		/// Get key list
+		///
+		QStringList None::keys() const
+		{
+			QStringList emptyList;
+			return emptyList;
+		}
 
 
-	///
-	/// Get primary key
-	///
-	QString None::primaryKey() const
-	{
-		return "";
-	}
+		///
+		/// Get primary key
+		///
+		QString None::primaryKey() const
+		{
+			return "";
+		}
 
 
-	///
-	/// Open source
-	///
-	void None::open()
-	{
-	}
+		///
+		/// Open source
+		///
+		void None::open()
+		{
+		}
 
 
-	///
-	/// Close source
-	///
-	void None::close()
-	{
-	}
+		///
+		/// Close source
+		///
+		void None::close()
+		{
+		}
 
 
-	///
-	/// Read next record
-	///
-	Record* None::readNextRecord()
-	{
-		return nullptr;
-	}
+		///
+		/// Read next record
+		///
+		Record* None::readNextRecord()
+		{
+			return nullptr;
+		}
 
-} // namespace glabels::merge
+	} // namespace merge
+} // namespace glabels
diff --git a/backends/merge/None.h b/backends/merge/None.h
index 990a74f..3650cdc 100644
--- a/backends/merge/None.h
+++ b/backends/merge/None.h
@@ -24,51 +24,54 @@
 #include "Merge.h"
 
 
-namespace glabels::merge
+namespace glabels
 {
-
-	///
-	/// None Merge Backend
-	///
-	struct None : public Merge
+	namespace merge
 	{
 
-		/////////////////////////////////
-		// Life Cycle
-		/////////////////////////////////
-	public:
-		None();
-		None( const None* merge );
-		~None() override;
+		///
+		/// None Merge Backend
+		///
+		struct None : public Merge
+		{
+
+			/////////////////////////////////
+			// Life Cycle
+			/////////////////////////////////
+		public:
+			None();
+			None( const None* merge );
+			~None() override;
 
 
-		/////////////////////////////////
-		// Object duplication
-		/////////////////////////////////
-		None* clone() const override;
+			/////////////////////////////////
+			// Object duplication
+			/////////////////////////////////
+			None* clone() const override;
 
 
-		/////////////////////////////////
-		// Static methods
-		/////////////////////////////////
-	public:
-		static QString id();
-		static Merge* create();
+			/////////////////////////////////
+			// Static methods
+			/////////////////////////////////
+		public:
+			static QString id();
+			static Merge* create();
 
 
-		/////////////////////////////////
-		// Implementation of virtual methods
-		/////////////////////////////////
-	public:
-		QStringList keys() const override;
-		QString primaryKey() const override;
-	protected:
-		void open() override;
-		void close() override;
-		Record* readNextRecord() override;
+			/////////////////////////////////
+			// Implementation of virtual methods
+			/////////////////////////////////
+		public:
+			QStringList keys() const override;
+			QString primaryKey() const override;
+		protected:
+			void open() override;
+			void close() override;
+			Record* readNextRecord() override;
 		
-	};
+		};
 
+	}
 }
 
 
diff --git a/backends/merge/Record.cpp b/backends/merge/Record.cpp
index 8d8ef33..49d46e7 100644
--- a/backends/merge/Record.cpp
+++ b/backends/merge/Record.cpp
@@ -21,50 +21,53 @@
 #include "Record.h"
 
 
-namespace glabels::merge
+namespace glabels
 {
-
-	///
-	/// Constructor
-	///
-	Record::Record() : mSelected( true )
+	namespace merge
 	{
-	}
+
+		///
+		/// Constructor
+		///
+		Record::Record() : mSelected( true )
+		{
+		}
 
 
-	///
-	/// Constructor
-	///
-	Record::Record( const Record* record )
-		: QMap<QString,QString>(*record), mSelected(record->mSelected)
-	{
-	}
+		///
+		/// Constructor
+		///
+		Record::Record( const Record* record )
+			: QMap<QString,QString>(*record), mSelected(record->mSelected)
+		{
+		}
 
 
-	///
-	/// Clone
-	///
-	Record* Record::clone() const
-	{
-		return new Record( this );
-	}
+		///
+		/// Clone
+		///
+		Record* Record::clone() const
+		{
+			return new Record( this );
+		}
 
 
-	///
-	/// Is record selected?
-	///
-	bool Record::isSelected() const
-	{
-		return mSelected;
-	}
+		///
+		/// Is record selected?
+		///
+		bool Record::isSelected() const
+		{
+			return mSelected;
+		}
 
 
-	///
-	/// Set selected on not selected
-	///
-	void Record::setSelected( bool value )
-	{
-		mSelected = value;
-	}
+		///
+		/// Set selected on not selected
+		///
+		void Record::setSelected( bool value )
+		{
+			mSelected = value;
+		}
 
-} // namespace glabels::merge
+	} // namespace merge
+} // namespace glabels
diff --git a/backends/merge/Record.h b/backends/merge/Record.h
index 8364743..425f179 100644
--- a/backends/merge/Record.h
+++ b/backends/merge/Record.h
@@ -26,45 +26,48 @@
 #include <QMap>
 
 
-namespace glabels::merge
+namespace glabels
 {
-
-	///
-	/// Merge Record
-	///
-	struct Record : public QMap<QString,QString>
+	namespace merge
 	{
 
-		/////////////////////////////////
-		// Life Cycle
-		/////////////////////////////////
-	public:
-		Record();
-		Record( const Record* record );
+		///
+		/// Merge Record
+		///
+		struct Record : public QMap<QString,QString>
+		{
+
+			/////////////////////////////////
+			// Life Cycle
+			/////////////////////////////////
+		public:
+			Record();
+			Record( const Record* record );
 
 
-		/////////////////////////////////
-		// Object duplication
-		/////////////////////////////////
-		Record* clone() const;
+			/////////////////////////////////
+			// Object duplication
+			/////////////////////////////////
+			Record* clone() const;
 
 
-		/////////////////////////////////
-		// Properties
-		/////////////////////////////////
-	public:
-		bool isSelected() const;
-		void setSelected( bool value );
+			/////////////////////////////////
+			// Properties
+			/////////////////////////////////
+		public:
+			bool isSelected() const;
+			void setSelected( bool value );
 
 
-		/////////////////////////////////
-		// Private data
-		/////////////////////////////////
-	private:
-		bool                  mSelected;
+			/////////////////////////////////
+			// Private data
+			/////////////////////////////////
+		private:
+			bool                  mSelected;
 
-	};
+		};
 
+	}
 }
 
 
diff --git a/backends/merge/Text.cpp b/backends/merge/Text.cpp
index 3a8611d..c7ffce2 100644
--- a/backends/merge/Text.cpp
+++ b/backends/merge/Text.cpp
@@ -25,392 +25,395 @@
 #include <QtDebug>
 
 
-namespace glabels::merge
+namespace glabels
 {
-
-	///
-	/// Constructor
-	///
-	Text::Text( QChar delimiter, bool line1HasKeys )
-		: mDelimeter(delimiter), mLine1HasKeys(line1HasKeys), mNFieldsMax(0)
+	namespace merge
 	{
-	}
 
-
-	///
-	/// Constructor
-	///
-	Text::Text( const Text* merge )
-		: Merge( merge ),
-		  mDelimeter(merge->mDelimeter), mLine1HasKeys(merge->mLine1HasKeys),
-		  mNFieldsMax(merge->mNFieldsMax)
-	{
-	}
-
-
-	///
-	/// Destructor
-	///
-	Text::~Text()
-	{
-	}
-
-
-	///
-	/// Get key list
-	///
-	QStringList Text::keys() const
-	{
-		QStringList keys;
-		for ( int iField = 0; iField < mNFieldsMax; iField++ )
+		///
+		/// Constructor
+		///
+		Text::Text( QChar delimiter, bool line1HasKeys )
+			: mDelimeter(delimiter), mLine1HasKeys(line1HasKeys), mNFieldsMax(0)
 		{
-			keys << keyFromIndex(iField);
 		}
-		return keys;
-	}
 
 
-	///
-	/// Get primary key
-	///
-	QString Text::primaryKey() const
-	{
-		return keyFromIndex(0);
-	}
-
-
-	///
-	/// Open source
-	///
-	void Text::open()
-	{
-		mFile.setFileName( source() );
-		mFile.open( QIODevice::ReadOnly|QIODevice::Text );
-
-		mKeys.clear();
-		mNFieldsMax = 0;
-
-		if ( mLine1HasKeys && mFile.isOpen() )
+		///
+		/// Constructor
+		///
+		Text::Text( const Text* merge )
+			: Merge( merge ),
+			  mDelimeter(merge->mDelimeter), mLine1HasKeys(merge->mLine1HasKeys),
+			  mNFieldsMax(merge->mNFieldsMax)
 		{
-			mKeys = parseLine();
-			if ( (mKeys.size() == 1) && (mKeys[0] == "") )
+		}
+
+
+		///
+		/// Destructor
+		///
+		Text::~Text()
+		{
+		}
+
+
+		///
+		/// Get key list
+		///
+		QStringList Text::keys() const
+		{
+			QStringList keys;
+			for ( int iField = 0; iField < mNFieldsMax; iField++ )
 			{
-				mKeys.clear();
+				keys << keyFromIndex(iField);
+			}
+			return keys;
+		}
+
+
+		///
+		/// Get primary key
+		///
+		QString Text::primaryKey() const
+		{
+			return keyFromIndex(0);
+		}
+
+
+		///
+		/// Open source
+		///
+		void Text::open()
+		{
+			mFile.setFileName( source() );
+			mFile.open( QIODevice::ReadOnly|QIODevice::Text );
+
+			mKeys.clear();
+			mNFieldsMax = 0;
+
+			if ( mLine1HasKeys && mFile.isOpen() )
+			{
+				mKeys = parseLine();
+				if ( (mKeys.size() == 1) && (mKeys[0] == "") )
+				{
+					mKeys.clear();
+				}
+				else
+				{
+					mNFieldsMax = mKeys.size();
+				}
+			}
+		}
+
+
+		///
+		/// Close source
+		///
+		void Text::close()
+		{
+			if ( mFile.isOpen() )
+			{
+				mFile.close();
+			}
+		}
+
+
+		///
+		/// Read next record
+		///
+		Record* Text::readNextRecord()
+		{
+			QStringList values = parseLine();
+			if ( !values.isEmpty() )
+			{
+				Record* record = new Record();
+
+				int iField = 0;
+				foreach ( QString value, values )
+				{
+					(*record)[ keyFromIndex(iField) ] = value;
+					iField++;
+				}
+				mNFieldsMax = std::max( mNFieldsMax, iField );
+
+				return record;
+			}
+			return nullptr;
+		}
+
+
+		///
+		/// Key from field index
+		///
+		QString Text::keyFromIndex( int iField ) const
+		{
+			if ( mLine1HasKeys && ( iField < mKeys.size() ) )
+			{
+				return mKeys[iField];
 			}
 			else
 			{
-				mNFieldsMax = mKeys.size();
+				return QString::number( iField+1 );
 			}
 		}
-	}
 
 
-	///
-	/// Close source
-	///
-	void Text::close()
-	{
-		if ( mFile.isOpen() )
+		///
+		/// Parse line.                                                     
+		///                                                                           
+		/// Attempt to be a robust parser of various CSV (and similar) formats.       
+		///                                                                           
+		/// Based on CSV format described in RFC 4180 section 2.                      
+		///                                                                           
+		/// Additions to RFC 4180 rules:                                              
+		///   - delimeters and other special characters may be "escaped" by a leading 
+		///     backslash (\)                                                         
+		///   - C escape sequences for newline (\n) and tab (\t) are also translated. 
+		///   - if quoted text is not followed by a delimeter, any additional text is 
+		///     concatenated with quoted portion.                                     
+		///                                                                           
+		/// Returns a list of fields.  A blank line is considered a line with one     
+		/// empty field.  Returns an empty list when done.                             
+		///
+		QStringList Text::parseLine()
 		{
-			mFile.close();
-		}
-	}
-
-
-	///
-	/// Read next record
-	///
-	Record* Text::readNextRecord()
-	{
-		QStringList values = parseLine();
-		if ( !values.isEmpty() )
-		{
-			Record* record = new Record();
-
-			int iField = 0;
-			foreach ( QString value, values )
-			{
-				(*record)[ keyFromIndex(iField) ] = value;
-				iField++;
-			}
-			mNFieldsMax = std::max( mNFieldsMax, iField );
-
-			return record;
-		}
-		return nullptr;
-	}
-
-
-	///
-	/// Key from field index
-	///
-	QString Text::keyFromIndex( int iField ) const
-	{
-		if ( mLine1HasKeys && ( iField < mKeys.size() ) )
-		{
-			return mKeys[iField];
-		}
-		else
-		{
-			return QString::number( iField+1 );
-		}
-	}
-
-
-	///
-	/// Parse line.                                                     
-	///                                                                           
-	/// Attempt to be a robust parser of various CSV (and similar) formats.       
-	///                                                                           
-	/// Based on CSV format described in RFC 4180 section 2.                      
-	///                                                                           
-	/// Additions to RFC 4180 rules:                                              
-	///   - delimeters and other special characters may be "escaped" by a leading 
-	///     backslash (\)                                                         
-	///   - C escape sequences for newline (\n) and tab (\t) are also translated. 
-	///   - if quoted text is not followed by a delimeter, any additional text is 
-	///     concatenated with quoted portion.                                     
-	///                                                                           
-	/// Returns a list of fields.  A blank line is considered a line with one     
-	/// empty field.  Returns an empty list when done.                             
-	///
-	QStringList Text::parseLine()
-	{
-		QStringList fields;
+			QStringList fields;
 	
-		enum State
-		{
-			DELIM, QUOTED, QUOTED_QUOTE1, QUOTED_ESCAPED, SIMPLE, SIMPLE_ESCAPED, DONE
-		} state = DELIM;
-
-		QByteArray field;
-	
-		while ( state != DONE )
-		{
-			char c;
-			if ( mFile.getChar( &c ) )
+			enum State
 			{
-				switch (state)
+				DELIM, QUOTED, QUOTED_QUOTE1, QUOTED_ESCAPED, SIMPLE, SIMPLE_ESCAPED, DONE
+			} state = DELIM;
+
+			QByteArray field;
+	
+			while ( state != DONE )
+			{
+				char c;
+				if ( mFile.getChar( &c ) )
 				{
-
-				case DELIM:
-					switch (c)
+					switch (state)
 					{
-					case '\n':
-						/* last field is empty. */
-						fields << "";
-						state = DONE;
-						break;
-					case '\r':
-						/* ignore */
-						state = DELIM;
-						break;
-					case '"':
-						/* start a quoted field. */
-						state = QUOTED;
-						break;
-					case '\\':
-						/* simple field, but 1st character is an escape. */
-						state = SIMPLE_ESCAPED;
-						break;
-					default:
-						if ( c == mDelimeter )
+
+					case DELIM:
+						switch (c)
 						{
-							/* field is empty. */
+						case '\n':
+							/* last field is empty. */
 							fields << "";
+							state = DONE;
+							break;
+						case '\r':
+							/* ignore */
 							state = DELIM;
-						}
-						else
-						{
-							/* begining of a simple field. */
-							field.append( c );
-							state = SIMPLE;
+							break;
+						case '"':
+							/* start a quoted field. */
+							state = QUOTED;
+							break;
+						case '\\':
+							/* simple field, but 1st character is an escape. */
+							state = SIMPLE_ESCAPED;
+							break;
+						default:
+							if ( c == mDelimeter )
+							{
+								/* field is empty. */
+								fields << "";
+								state = DELIM;
+							}
+							else
+							{
+								/* begining of a simple field. */
+								field.append( c );
+								state = SIMPLE;
+							}
+							break;
 						}
 						break;
-					}
-					break;
 
-				case QUOTED:
-					switch (c)
-					{
-					case '"':
-						/* Possible end of field, but could be 1st of a pair. */
-						state = QUOTED_QUOTE1;
-						break;
-					case '\\':
-						/* Escape next character, or special escape, e.g. \n. */
-						state = QUOTED_ESCAPED;
-						break;
-					default:
-						/* Use character literally. */
-						field.append( c );
-						break;
-					}
-					break;
-
-				case QUOTED_QUOTE1:
-					switch (c)
-					{
-					case '\n':
-						/* line ended after quoted item */
-						fields << QString( field );
-						state = DONE;
-						break;
-					case '"':
-						/* second quote, insert and stay quoted. */
-						field.append( c );
-						state = QUOTED;
-						break;
-					case '\r':
-						/* ignore and go to fallback */
-						state = SIMPLE;
-						break;
-					default:
-						if ( c == mDelimeter )
-						{
-							/* end of field. */
-							fields << QString( field );
-							field.clear();
-							state = DELIM;
-						}
-						else
-						{
-							/* fallback if not a delim or another quote. */
-							field.append( c );
-							state = SIMPLE;
-						}
-						break;
-					}
-					break;
-
-				case QUOTED_ESCAPED:
-					switch (c)
-					{
-					case 'n':
-						/* Decode "\n" as newline. */
-						field.append( '\n' );
-						state = QUOTED;
-						break;
-					case 't':
-						/* Decode "\t" as tab. */
-						field.append( '\t' );
-						state = QUOTED;
-						break;
-					default:
-						/* Use character literally. */
-						field.append( c );
-						state = QUOTED;
-						break;
-					}
-					break;
-
-				case SIMPLE:
-					switch (c)
-					{
-					case '\n':
-						/* line ended */
-						fields << QString( field );
-						state = DONE;
-						break;
-					case '\r':
-						/* ignore */
-						state = SIMPLE;
-						break;
-					case '\\':
-						/* Escape next character, or special escape, e.g. \n. */
-						state = SIMPLE_ESCAPED;
-						break;
-					default:
-						if ( c == mDelimeter )
-						{
-							/* end of field. */
-							fields << QString( field );
-							field.clear();
-							state = DELIM;
-						}
-						else
+					case QUOTED:
+						switch (c)
 						{
+						case '"':
+							/* Possible end of field, but could be 1st of a pair. */
+							state = QUOTED_QUOTE1;
+							break;
+						case '\\':
+							/* Escape next character, or special escape, e.g. \n. */
+							state = QUOTED_ESCAPED;
+							break;
+						default:
 							/* Use character literally. */
 							field.append( c );
-							state = SIMPLE;
+							break;
 						}
 						break;
-					}
-					break;
 
-				case SIMPLE_ESCAPED:
-					switch (c)
-					{
-					case 'n':
-						/* Decode "\n" as newline. */
-						field.append( '\n' );
-						state = SIMPLE;
+					case QUOTED_QUOTE1:
+						switch (c)
+						{
+						case '\n':
+							/* line ended after quoted item */
+							fields << QString( field );
+							state = DONE;
+							break;
+						case '"':
+							/* second quote, insert and stay quoted. */
+							field.append( c );
+							state = QUOTED;
+							break;
+						case '\r':
+							/* ignore and go to fallback */
+							state = SIMPLE;
+							break;
+						default:
+							if ( c == mDelimeter )
+							{
+								/* end of field. */
+								fields << QString( field );
+								field.clear();
+								state = DELIM;
+							}
+							else
+							{
+								/* fallback if not a delim or another quote. */
+								field.append( c );
+								state = SIMPLE;
+							}
+							break;
+						}
 						break;
-					case 't':
-						/* Decode "\t" as tab. */
-						field.append( '\t' );
-						state = SIMPLE;
+
+					case QUOTED_ESCAPED:
+						switch (c)
+						{
+						case 'n':
+							/* Decode "\n" as newline. */
+							field.append( '\n' );
+							state = QUOTED;
+							break;
+						case 't':
+							/* Decode "\t" as tab. */
+							field.append( '\t' );
+							state = QUOTED;
+							break;
+						default:
+							/* Use character literally. */
+							field.append( c );
+							state = QUOTED;
+							break;
+						}
 						break;
+
+					case SIMPLE:
+						switch (c)
+						{
+						case '\n':
+							/* line ended */
+							fields << QString( field );
+							state = DONE;
+							break;
+						case '\r':
+							/* ignore */
+							state = SIMPLE;
+							break;
+						case '\\':
+							/* Escape next character, or special escape, e.g. \n. */
+							state = SIMPLE_ESCAPED;
+							break;
+						default:
+							if ( c == mDelimeter )
+							{
+								/* end of field. */
+								fields << QString( field );
+								field.clear();
+								state = DELIM;
+							}
+							else
+							{
+								/* Use character literally. */
+								field.append( c );
+								state = SIMPLE;
+							}
+							break;
+						}
+						break;
+
+					case SIMPLE_ESCAPED:
+						switch (c)
+						{
+						case 'n':
+							/* Decode "\n" as newline. */
+							field.append( '\n' );
+							state = SIMPLE;
+							break;
+						case 't':
+							/* Decode "\t" as tab. */
+							field.append( '\t' );
+							state = SIMPLE;
+							break;
+						default:
+							/* Use character literally. */
+							field.append( (char)c );
+							state = SIMPLE;
+							break;
+						}
+						break;
+
 					default:
-						/* Use character literally. */
-						field.append( (char)c );
-						state = SIMPLE;
+						qWarning( "merge::Text::parseLine()::Should not be reached! #1" );
 						break;
 					}
-					break;
 
-				default:
-					qWarning( "merge::Text::parseLine()::Should not be reached! #1" );
-					break;
 				}
-
-			}
-			else
-			{
-				/* Handle EOF (could also be an error while reading). */
-				switch (state)
+				else
 				{
+					/* Handle EOF (could also be an error while reading). */
+					switch (state)
+					{
 
-				case DELIM:
-					/* EOF, no more lines. */
-					break;
+					case DELIM:
+						/* EOF, no more lines. */
+						break;
 
-				case QUOTED:
-					/* File ended midway through quoted item. Truncate field. */
-					fields << QString( field );
-					break;
+					case QUOTED:
+						/* File ended midway through quoted item. Truncate field. */
+						fields << QString( field );
+						break;
 
-				case QUOTED_QUOTE1:
-					/* File ended after quoted item. */
-					fields << QString( field );
-					break;
+					case QUOTED_QUOTE1:
+						/* File ended after quoted item. */
+						fields << QString( field );
+						break;
 
-				case QUOTED_ESCAPED:
-					/* File ended midway through quoted item. Truncate field. */
-					fields << QString( field );
-					break;
+					case QUOTED_ESCAPED:
+						/* File ended midway through quoted item. Truncate field. */
+						fields << QString( field );
+						break;
 
-				case SIMPLE:
-					/* File ended after simple item. */
-					fields << QString( field );
-					break;
+					case SIMPLE:
+						/* File ended after simple item. */
+						fields << QString( field );
+						break;
 
-				case SIMPLE_ESCAPED:
-					/* File ended midway through escaped item. */
-					fields << QString( field );
-					break;
+					case SIMPLE_ESCAPED:
+						/* File ended midway through escaped item. */
+						fields << QString( field );
+						break;
 
-				default:
-					qWarning( "merge::Text::parseLine()::Should not be reached! #2" );
-					break;
-				}
+					default:
+						qWarning( "merge::Text::parseLine()::Should not be reached! #2" );
+						break;
+					}
 			
-				state = DONE;
+					state = DONE;
+				}
 			}
-		}
 	
 
-		return fields;
-	}
+			return fields;
+		}
 
-} // namespace glabels::merge
+	} // namespace merge
+} // namespace glabels
diff --git a/backends/merge/Text.h b/backends/merge/Text.h
index e37dfa8..7ef602a 100644
--- a/backends/merge/Text.h
+++ b/backends/merge/Text.h
@@ -26,55 +26,58 @@
 #include <QFile>
 
 
-namespace glabels::merge
+namespace glabels
 {
-
-	///
-	/// Text Merge Backend
-	///
-	struct Text : public Merge
+	namespace merge
 	{
 
-		/////////////////////////////////
-		// Life Cycle
-		/////////////////////////////////
-	protected:
-		Text( QChar delimiter, bool line1HasKeys );
-		Text( const Text* merge );
-		~Text() override;
+		///
+		/// Text Merge Backend
+		///
+		struct Text : public Merge
+		{
+
+			/////////////////////////////////
+			// Life Cycle
+			/////////////////////////////////
+		protected:
+			Text( QChar delimiter, bool line1HasKeys );
+			Text( const Text* merge );
+			~Text() override;
 
 
-		/////////////////////////////////
-		// Implementation of virtual methods
-		/////////////////////////////////
-	public:
-		QStringList keys() const override;
-		QString primaryKey() const override;
-	protected:
-		void open() override;
-		void close() override;
-		Record* readNextRecord() override;
+			/////////////////////////////////
+			// Implementation of virtual methods
+			/////////////////////////////////
+		public:
+			QStringList keys() const override;
+			QString primaryKey() const override;
+		protected:
+			void open() override;
+			void close() override;
+			Record* readNextRecord() override;
 
 
-		/////////////////////////////////
-		// Private methods
-		/////////////////////////////////
-		QString keyFromIndex( int iField ) const;
-		QStringList parseLine();
+			/////////////////////////////////
+			// Private methods
+			/////////////////////////////////
+			QString keyFromIndex( int iField ) const;
+			QStringList parseLine();
 	
 
-		/////////////////////////////////
-		// Private data
-		/////////////////////////////////
-	private:
-		QChar mDelimeter;
-		bool  mLine1HasKeys;
+			/////////////////////////////////
+			// Private data
+			/////////////////////////////////
+		private:
+			QChar mDelimeter;
+			bool  mLine1HasKeys;
 
-		QFile          mFile;
-		QStringList    mKeys;
-		int            mNFieldsMax;
-	};
+			QFile          mFile;
+			QStringList    mKeys;
+			int            mNFieldsMax;
+		};
 
+	}
 }
 
 
diff --git a/backends/merge/TextColon.cpp b/backends/merge/TextColon.cpp
index 96f4e59..1de151d 100644
--- a/backends/merge/TextColon.cpp
+++ b/backends/merge/TextColon.cpp
@@ -21,61 +21,64 @@
 #include "TextColon.h"
 
 
-namespace glabels::merge
+namespace glabels
 {
-
-	static const QString ID = "Text/Colon";
-
-
-	///
-	/// Constructor
-	///
-	TextColon::TextColon() : Text(':',false)
+	namespace merge
 	{
-		mId = ID;
-	}
+
+		static const QString ID = "Text/Colon";
 
 
-	///
-	/// Constructor
-	///
-	TextColon::TextColon( const TextColon* merge ) : Text( merge )
-	{
-	}
+		///
+		/// Constructor
+		///
+		TextColon::TextColon() : Text(':',false)
+		{
+			mId = ID;
+		}
 
 
-	///
-	/// Destructor
-	///
-	TextColon::~TextColon()
-	{
-	}
+		///
+		/// Constructor
+		///
+		TextColon::TextColon( const TextColon* merge ) : Text( merge )
+		{
+		}
 
 
-	///
-	/// Clone
-	///
-	TextColon* TextColon::clone() const
-	{
-		return new TextColon( this );
-	}
+		///
+		/// Destructor
+		///
+		TextColon::~TextColon()
+		{
+		}
 
 
-	///
-	/// Get ID
-	///
-	QString TextColon::id()
-	{
-		return ID;
-	}
+		///
+		/// Clone
+		///
+		TextColon* TextColon::clone() const
+		{
+			return new TextColon( this );
+		}
 
 
-	///
-	/// Create
-	///
-	Merge* TextColon::create()
-	{
-		return new TextColon();
-	}
+		///
+		/// Get ID
+		///
+		QString TextColon::id()
+		{
+			return ID;
+		}
 
-} // namespace glabels::merge
+
+		///
+		/// Create
+		///
+		Merge* TextColon::create()
+		{
+			return new TextColon();
+		}
+
+	} // namespace merge
+} // namespace glabels
diff --git a/backends/merge/TextColon.h b/backends/merge/TextColon.h
index 09f9643..2f6af22 100644
--- a/backends/merge/TextColon.h
+++ b/backends/merge/TextColon.h
@@ -25,40 +25,43 @@
 #include "Text.h"
 
 
-namespace glabels::merge
+namespace glabels
 {
-
-	///
-	/// TextColon Merge Backend
-	///
-	struct TextColon : public Text
+	namespace merge
 	{
 
-		/////////////////////////////////
-		// Life Cycle
-		/////////////////////////////////
-	private:
-		TextColon();
-		TextColon( const TextColon* merge );
-		~TextColon() override;
+		///
+		/// TextColon Merge Backend
+		///
+		struct TextColon : public Text
+		{
+
+			/////////////////////////////////
+			// Life Cycle
+			/////////////////////////////////
+		private:
+			TextColon();
+			TextColon( const TextColon* merge );
+			~TextColon() override;
 
 
-		/////////////////////////////////
-		// Object duplication
-		/////////////////////////////////
-	public:
-		TextColon* clone() const override;
+			/////////////////////////////////
+			// Object duplication
+			/////////////////////////////////
+		public:
+			TextColon* clone() const override;
 
 
-		/////////////////////////////////
-		// Static methods
-		/////////////////////////////////
-	public:
-		static QString id();
-		static Merge* create();
+			/////////////////////////////////
+			// Static methods
+			/////////////////////////////////
+		public:
+			static QString id();
+			static Merge* create();
 
-	};
+		};
 
+	}
 }
 
 
diff --git a/backends/merge/TextColonKeys.cpp b/backends/merge/TextColonKeys.cpp
index 6201126..f97883b 100644
--- a/backends/merge/TextColonKeys.cpp
+++ b/backends/merge/TextColonKeys.cpp
@@ -21,61 +21,64 @@
 #include "TextColonKeys.h"
 
 
-namespace glabels::merge
+namespace glabels
 {
+	namespace merge
+	{
 
-	static const QString ID = "Text/Colon/Line1Keys";
+		static const QString ID = "Text/Colon/Line1Keys";
 
 	
-	///
-	/// Constructor
-	///
-	TextColonKeys::TextColonKeys() : Text(':',true)
-	{
-		mId = ID;
-	}
+		///
+		/// Constructor
+		///
+		TextColonKeys::TextColonKeys() : Text(':',true)
+		{
+			mId = ID;
+		}
 
 
-	///
-	/// Constructor
-	///
-	TextColonKeys::TextColonKeys( const TextColonKeys* merge ) : Text( merge )
-	{
-	}
+		///
+		/// Constructor
+		///
+		TextColonKeys::TextColonKeys( const TextColonKeys* merge ) : Text( merge )
+		{
+		}
 
 
-	///
-	/// Destructor
-	///
-	TextColonKeys::~TextColonKeys()
-	{
-	}
+		///
+		/// Destructor
+		///
+		TextColonKeys::~TextColonKeys()
+		{
+		}
 
 
-	///
-	/// Clone
-	///
-	TextColonKeys* TextColonKeys::clone() const
-	{
-		return new TextColonKeys( this );
-	}
+		///
+		/// Clone
+		///
+		TextColonKeys* TextColonKeys::clone() const
+		{
+			return new TextColonKeys( this );
+		}
 
 
-	///
-	/// Get ID
-	///
-	QString TextColonKeys::id()
-	{
-		return ID;
-	}
+		///
+		/// Get ID
+		///
+		QString TextColonKeys::id()
+		{
+			return ID;
+		}
 
 
-	///
-	/// Create
-	///
-	Merge* TextColonKeys::create()
-	{
-		return new TextColonKeys();
-	}
+		///
+		/// Create
+		///
+		Merge* TextColonKeys::create()
+		{
+			return new TextColonKeys();
+		}
 
-} // namespace glabels::merge
+	} // namespace merge
+} // namespace glabels
diff --git a/backends/merge/TextColonKeys.h b/backends/merge/TextColonKeys.h
index c3c84ff..cd2fe09 100644
--- a/backends/merge/TextColonKeys.h
+++ b/backends/merge/TextColonKeys.h
@@ -25,40 +25,43 @@
 #include "Text.h"
 
 
-namespace glabels::merge
+namespace glabels
 {
-
-	///
-	/// TextColonKeys Merge Backend
-	///
-	struct TextColonKeys : public Text
+	namespace merge
 	{
 
-		/////////////////////////////////
-		// Life Cycle
-		/////////////////////////////////
-	private:
-		TextColonKeys();
-		TextColonKeys( const TextColonKeys* merge );
-		~TextColonKeys() override;
+		///
+		/// TextColonKeys Merge Backend
+		///
+		struct TextColonKeys : public Text
+		{
+
+			/////////////////////////////////
+			// Life Cycle
+			/////////////////////////////////
+		private:
+			TextColonKeys();
+			TextColonKeys( const TextColonKeys* merge );
+			~TextColonKeys() override;
 
 
-		/////////////////////////////////
-		// Object duplication
-		/////////////////////////////////
-	public:
-		TextColonKeys* clone() const override;
+			/////////////////////////////////
+			// Object duplication
+			/////////////////////////////////
+		public:
+			TextColonKeys* clone() const override;
 
 
-		/////////////////////////////////
-		// Static methods
-		/////////////////////////////////
-	public:
-		static QString id();
-		static Merge* create();
+			/////////////////////////////////
+			// Static methods
+			/////////////////////////////////
+		public:
+			static QString id();
+			static Merge* create();
 
-	};
+		};
 
+	}
 }
 
 
diff --git a/backends/merge/TextCsv.cpp b/backends/merge/TextCsv.cpp
index db044fc..1b68f86 100644
--- a/backends/merge/TextCsv.cpp
+++ b/backends/merge/TextCsv.cpp
@@ -21,61 +21,64 @@
 #include "TextCsv.h"
 
 
-namespace glabels::merge
+namespace glabels
 {
+	namespace merge
+	{
 
-	static const QString ID = "Text/Comma";
+		static const QString ID = "Text/Comma";
 	
 	
-	///
-	/// Constructor
-	///
-	TextCsv::TextCsv() : Text(',',false)
-	{
-		mId = ID;
-	}
+		///
+		/// Constructor
+		///
+		TextCsv::TextCsv() : Text(',',false)
+		{
+			mId = ID;
+		}
 
 
-	///
-	/// Constructor
-	///
-	TextCsv::TextCsv( const TextCsv* merge ) : Text( merge )
-	{
-	}
+		///
+		/// Constructor
+		///
+		TextCsv::TextCsv( const TextCsv* merge ) : Text( merge )
+		{
+		}
 
 
-	///
-	/// Destructor
-	///
-	TextCsv::~TextCsv()
-	{
-	}
+		///
+		/// Destructor
+		///
+		TextCsv::~TextCsv()
+		{
+		}
 
 
-	///
-	/// Clone
-	///
-	TextCsv* TextCsv::clone() const
-	{
-		return new TextCsv( this );
-	}
+		///
+		/// Clone
+		///
+		TextCsv* TextCsv::clone() const
+		{
+			return new TextCsv( this );
+		}
 
 
-	///
-	/// Get ID
-	///
-	QString TextCsv::id()
-	{
-		return ID;
-	}
+		///
+		/// Get ID
+		///
+		QString TextCsv::id()
+		{
+			return ID;
+		}
 
 
-	///
-	/// Create
-	///
-	Merge* TextCsv::create()
-	{
-		return new TextCsv();
-	}
+		///
+		/// Create
+		///
+		Merge* TextCsv::create()
+		{
+			return new TextCsv();
+		}
 
-} // namespace glabels::merge
+	} // namespace merge
+} // namespace glabels
diff --git a/backends/merge/TextCsv.h b/backends/merge/TextCsv.h
index e0bb0e5..c3c635b 100644
--- a/backends/merge/TextCsv.h
+++ b/backends/merge/TextCsv.h
@@ -25,40 +25,43 @@
 #include "Text.h"
 
 
-namespace glabels::merge
+namespace glabels
 {
-
-	///
-	/// TextCsv Merge Backend
-	///
-	struct TextCsv : public Text
+	namespace merge
 	{
 
-		/////////////////////////////////
-		// Life Cycle
-		/////////////////////////////////
-	private:
-		TextCsv();
-		TextCsv( const TextCsv* merge );
-		~TextCsv() override;
+		///
+		/// TextCsv Merge Backend
+		///
+		struct TextCsv : public Text
+		{
+
+			/////////////////////////////////
+			// Life Cycle
+			/////////////////////////////////
+		private:
+			TextCsv();
+			TextCsv( const TextCsv* merge );
+			~TextCsv() override;
 
 
-		/////////////////////////////////
-		// Object duplication
-		/////////////////////////////////
-	public:
-		TextCsv* clone() const override;
+			/////////////////////////////////
+			// Object duplication
+			/////////////////////////////////
+		public:
+			TextCsv* clone() const override;
 
 
-		/////////////////////////////////
-		// Static methods
-		/////////////////////////////////
-	public:
-		static QString id();
-		static Merge* create();
+			/////////////////////////////////
+			// Static methods
+			/////////////////////////////////
+		public:
+			static QString id();
+			static Merge* create();
 
-	};
+		};
 
+	}
 }
 
 
diff --git a/backends/merge/TextCsvKeys.cpp b/backends/merge/TextCsvKeys.cpp
index 26c8438..3093b40 100644
--- a/backends/merge/TextCsvKeys.cpp
+++ b/backends/merge/TextCsvKeys.cpp
@@ -21,61 +21,64 @@
 #include "TextCsvKeys.h"
 
 
-namespace glabels::merge
+namespace glabels
 {
+	namespace merge
+	{
 
-	static const QString ID = "Text/Comma/Line1Keys";
+		static const QString ID = "Text/Comma/Line1Keys";
 	
 	
-	///
-	/// Constructor
-	///
-	TextCsvKeys::TextCsvKeys() : Text(',',true)
-	{
-		mId = ID;
-	}
+		///
+		/// Constructor
+		///
+		TextCsvKeys::TextCsvKeys() : Text(',',true)
+		{
+			mId = ID;
+		}
 
 
-	///
-	/// Constructor
-	///
-	TextCsvKeys::TextCsvKeys( const TextCsvKeys* merge ) : Text( merge )
-	{
-	}
+		///
+		/// Constructor
+		///
+		TextCsvKeys::TextCsvKeys( const TextCsvKeys* merge ) : Text( merge )
+		{
+		}
 
 
-	///
-	/// Destructor
-	///
-	TextCsvKeys::~TextCsvKeys()
-	{
-	}
+		///
+		/// Destructor
+		///
+		TextCsvKeys::~TextCsvKeys()
+		{
+		}
 
 
-	///
-	/// Clone
-	///
-	TextCsvKeys* TextCsvKeys::clone() const
-	{
-		return new TextCsvKeys( this );
-	}
+		///
+		/// Clone
+		///
+		TextCsvKeys* TextCsvKeys::clone() const
+		{
+			return new TextCsvKeys( this );
+		}
 
 
-	///
-	/// Get ID
-	///
-	QString TextCsvKeys::id()
-	{
-		return ID;
-	}
+		///
+		/// Get ID
+		///
+		QString TextCsvKeys::id()
+		{
+			return ID;
+		}
 
 
-	///
-	/// Create
-	///
-	Merge* TextCsvKeys::create()
-	{
-		return new TextCsvKeys();
-	}
+		///
+		/// Create
+		///
+		Merge* TextCsvKeys::create()
+		{
+			return new TextCsvKeys();
+		}
 
-} // namespace glabels::merge
+	} // namespace merge
+} // namespace glabels
diff --git a/backends/merge/TextCsvKeys.h b/backends/merge/TextCsvKeys.h
index e800444..eb79385 100644
--- a/backends/merge/TextCsvKeys.h
+++ b/backends/merge/TextCsvKeys.h
@@ -25,40 +25,43 @@
 #include "Text.h"
 
 
-namespace glabels::merge
+namespace glabels
 {
-
-	///
-	/// TextCsvKeys Merge Backend
-	///
-	struct TextCsvKeys : public Text
+	namespace merge
 	{
 
-		/////////////////////////////////
-		// Life Cycle
-		/////////////////////////////////
-	private:
-		TextCsvKeys();
-		TextCsvKeys( const TextCsvKeys* merge );
-		~TextCsvKeys() override;
+		///
+		/// TextCsvKeys Merge Backend
+		///
+		struct TextCsvKeys : public Text
+		{
+
+			/////////////////////////////////
+			// Life Cycle
+			/////////////////////////////////
+		private:
+			TextCsvKeys();
+			TextCsvKeys( const TextCsvKeys* merge );
+			~TextCsvKeys() override;
 
 
-		/////////////////////////////////
-		// Object duplication
-		/////////////////////////////////
-	public:
-		TextCsvKeys* clone() const override;
+			/////////////////////////////////
+			// Object duplication
+			/////////////////////////////////
+		public:
+			TextCsvKeys* clone() const override;
 
 
-		/////////////////////////////////
-		// Static methods
-		/////////////////////////////////
-	public:
-		static QString id();
-		static Merge* create();
+			/////////////////////////////////
+			// Static methods
+			/////////////////////////////////
+		public:
+			static QString id();
+			static Merge* create();
 
-	};
+		};
 
+	}
 }
 
 
diff --git a/backends/merge/TextSemicolon.cpp b/backends/merge/TextSemicolon.cpp
index 393940f..270132b 100644
--- a/backends/merge/TextSemicolon.cpp
+++ b/backends/merge/TextSemicolon.cpp
@@ -21,61 +21,64 @@
 #include "TextSemicolon.h"
 
 
-namespace glabels::merge
+namespace glabels
 {
-
-	static const QString ID = "Text/Semicolon";
-
-
-	///
-	/// Constructor
-	///
-	TextSemicolon::TextSemicolon() : Text(';',false)
+	namespace merge
 	{
-		mId = ID;
-	}
+
+		static const QString ID = "Text/Semicolon";
 
 
-	///
-	/// Constructor
-	///
-	TextSemicolon::TextSemicolon( const TextSemicolon* merge ) : Text( merge )
-	{
-	}
+		///
+		/// Constructor
+		///
+		TextSemicolon::TextSemicolon() : Text(';',false)
+		{
+			mId = ID;
+		}
 
 
-	///
-	/// Destructor
-	///
-	TextSemicolon::~TextSemicolon()
-	{
-	}
+		///
+		/// Constructor
+		///
+		TextSemicolon::TextSemicolon( const TextSemicolon* merge ) : Text( merge )
+		{
+		}
 
 
-	///
-	/// Clone
-	///
-	TextSemicolon* TextSemicolon::clone() const
-	{
-		return new TextSemicolon( this );
-	}
+		///
+		/// Destructor
+		///
+		TextSemicolon::~TextSemicolon()
+		{
+		}
 
 
-	///
-	/// Get ID
-	///
-	QString TextSemicolon::id()
-	{
-		return ID;
-	}
+		///
+		/// Clone
+		///
+		TextSemicolon* TextSemicolon::clone() const
+		{
+			return new TextSemicolon( this );
+		}
 
 
-	///
-	/// Create
-	///
-	Merge* TextSemicolon::create()
-	{
-		return new TextSemicolon();
-	}
+		///
+		/// Get ID
+		///
+		QString TextSemicolon::id()
+		{
+			return ID;
+		}
 
-} // namespace glabels::merge
+
+		///
+		/// Create
+		///
+		Merge* TextSemicolon::create()
+		{
+			return new TextSemicolon();
+		}
+
+	} // namespace merge
+} // namespace glabels
diff --git a/backends/merge/TextSemicolon.h b/backends/merge/TextSemicolon.h
index 262dddf..01c5d08 100644
--- a/backends/merge/TextSemicolon.h
+++ b/backends/merge/TextSemicolon.h
@@ -25,40 +25,43 @@
 #include "Text.h"
 
 
-namespace glabels::merge
+namespace glabels
 {
-
-	///
-	/// TextSemicolon Merge Backend
-	///
-	struct TextSemicolon : public Text
+	namespace merge
 	{
 
-		/////////////////////////////////
-		// Life Cycle
-		/////////////////////////////////
-	private:
-		TextSemicolon();
-		TextSemicolon( const TextSemicolon* merge );
-		~TextSemicolon() override;
+		///
+		/// TextSemicolon Merge Backend
+		///
+		struct TextSemicolon : public Text
+		{
+
+			/////////////////////////////////
+			// Life Cycle
+			/////////////////////////////////
+		private:
+			TextSemicolon();
+			TextSemicolon( const TextSemicolon* merge );
+			~TextSemicolon() override;
 
 
-		/////////////////////////////////
-		// Object duplication
-		/////////////////////////////////
-	public:
-		TextSemicolon* clone() const override;
+			/////////////////////////////////
+			// Object duplication
+			/////////////////////////////////
+		public:
+			TextSemicolon* clone() const override;
 
 
-		/////////////////////////////////
-		// Static methods
-		/////////////////////////////////
-	public:
-		static QString id();
-		static Merge* create();
+			/////////////////////////////////
+			// Static methods
+			/////////////////////////////////
+		public:
+			static QString id();
+			static Merge* create();
 
-	};
+		};
 
+	}
 }
 
 
diff --git a/backends/merge/TextSemicolonKeys.cpp b/backends/merge/TextSemicolonKeys.cpp
index 77a0f14..56ed24b 100644
--- a/backends/merge/TextSemicolonKeys.cpp
+++ b/backends/merge/TextSemicolonKeys.cpp
@@ -21,61 +21,64 @@
 #include "TextSemicolonKeys.h"
 
 
-namespace glabels::merge
+namespace glabels
 {
-
-	static const QString ID = "Text/Semicolon/Keys";
-
-
-	///
-	/// Constructor
-	///
-	TextSemicolonKeys::TextSemicolonKeys() : Text(';',true)
+	namespace merge
 	{
-		mId = ID;
-	}
+
+		static const QString ID = "Text/Semicolon/Keys";
 
 
-	///
-	/// Constructor
-	///
-	TextSemicolonKeys::TextSemicolonKeys( const TextSemicolonKeys* merge ) : Text( merge )
-	{
-	}
+		///
+		/// Constructor
+		///
+		TextSemicolonKeys::TextSemicolonKeys() : Text(';',true)
+		{
+			mId = ID;
+		}
 
 
-	///
-	/// Destructor
-	///
-	TextSemicolonKeys::~TextSemicolonKeys()
-	{
-	}
+		///
+		/// Constructor
+		///
+		TextSemicolonKeys::TextSemicolonKeys( const TextSemicolonKeys* merge ) : Text( merge )
+		{
+		}
 
 
-	///
-	/// Clone
-	///
-	TextSemicolonKeys* TextSemicolonKeys::clone() const
-	{
-		return new TextSemicolonKeys( this );
-	}
+		///
+		/// Destructor
+		///
+		TextSemicolonKeys::~TextSemicolonKeys()
+		{
+		}
 
 
-	///
-	/// Get ID
-	///
-	QString TextSemicolonKeys::id()
-	{
-		return ID;
-	}
+		///
+		/// Clone
+		///
+		TextSemicolonKeys* TextSemicolonKeys::clone() const
+		{
+			return new TextSemicolonKeys( this );
+		}
 
 
-	///
-	/// Create
-	///
-	Merge* TextSemicolonKeys::create()
-	{
-		return new TextSemicolonKeys();
-	}
+		///
+		/// Get ID
+		///
+		QString TextSemicolonKeys::id()
+		{
+			return ID;
+		}
 
-} // namespace glabels::merge
+
+		///
+		/// Create
+		///
+		Merge* TextSemicolonKeys::create()
+		{
+			return new TextSemicolonKeys();
+		}
+
+	} // namespace merge
+} // namespace glabels
diff --git a/backends/merge/TextSemicolonKeys.h b/backends/merge/TextSemicolonKeys.h
index 1c6a43a..8e30009 100644
--- a/backends/merge/TextSemicolonKeys.h
+++ b/backends/merge/TextSemicolonKeys.h
@@ -25,40 +25,43 @@
 #include "Text.h"
 
 
-namespace glabels::merge
+namespace glabels
 {
-
-	///
-	/// TextSemicolonKeys Merge Backend
-	///
-	struct TextSemicolonKeys : public Text
+	namespace merge
 	{
 
-		/////////////////////////////////
-		// Life Cycle
-		/////////////////////////////////
-	private:
-		TextSemicolonKeys();
-		TextSemicolonKeys( const TextSemicolonKeys* merge );
-		~TextSemicolonKeys() override;
+		///
+		/// TextSemicolonKeys Merge Backend
+		///
+		struct TextSemicolonKeys : public Text
+		{
+
+			/////////////////////////////////
+			// Life Cycle
+			/////////////////////////////////
+		private:
+			TextSemicolonKeys();
+			TextSemicolonKeys( const TextSemicolonKeys* merge );
+			~TextSemicolonKeys() override;
 
 
-		/////////////////////////////////
-		// Object duplication
-		/////////////////////////////////
-	public:
-		TextSemicolonKeys* clone() const override;
+			/////////////////////////////////
+			// Object duplication
+			/////////////////////////////////
+		public:
+			TextSemicolonKeys* clone() const override;
 
 
-		/////////////////////////////////
-		// Static methods
-		/////////////////////////////////
-	public:
-		static QString id();
-		static Merge* create();
+			/////////////////////////////////
+			// Static methods
+			/////////////////////////////////
+		public:
+			static QString id();
+			static Merge* create();
 
-	};
+		};
 
+	}
 }
 
 
diff --git a/backends/merge/TextTsv.cpp b/backends/merge/TextTsv.cpp
index 4328be0..52006ea 100644
--- a/backends/merge/TextTsv.cpp
+++ b/backends/merge/TextTsv.cpp
@@ -21,61 +21,64 @@
 #include "TextTsv.h"
 
 
-namespace glabels::merge
+namespace glabels
 {
+	namespace merge
+	{
 
-	static const QString ID = "Text/Tab";
+		static const QString ID = "Text/Tab";
 
 	
-	///
-	/// Constructor
-	///
-	TextTsv::TextTsv() : Text('\t',false)
-	{
-		mId = ID;
-	}
+		///
+		/// Constructor
+		///
+		TextTsv::TextTsv() : Text('\t',false)
+		{
+			mId = ID;
+		}
 
 
-	///
-	/// Constructor
-	///
-	TextTsv::TextTsv( const TextTsv* merge ) : Text( merge )
-	{
-	}
+		///
+		/// Constructor
+		///
+		TextTsv::TextTsv( const TextTsv* merge ) : Text( merge )
+		{
+		}
 
 
-	///
-	/// Destructor
-	///
-	TextTsv::~TextTsv()
-	{
-	}
+		///
+		/// Destructor
+		///
+		TextTsv::~TextTsv()
+		{
+		}
 
 
-	///
-	/// Clone
-	///
-	TextTsv* TextTsv::clone() const
-	{
-		return new TextTsv( this );
-	}
+		///
+		/// Clone
+		///
+		TextTsv* TextTsv::clone() const
+		{
+			return new TextTsv( this );
+		}
 
 
-	///
-	/// Get ID
-	///
-	QString TextTsv::id()
-	{
-		return ID;
-	}
+		///
+		/// Get ID
+		///
+		QString TextTsv::id()
+		{
+			return ID;
+		}
 
 
-	///
-	/// Create
-	///
-	Merge* TextTsv::create()
-	{
-		return new TextTsv();
-	}
+		///
+		/// Create
+		///
+		Merge* TextTsv::create()
+		{
+			return new TextTsv();
+		}
 
-} // namespace glabels::merge
+	} // namespace merge
+} // namespace glabels
diff --git a/backends/merge/TextTsv.h b/backends/merge/TextTsv.h
index 5c772bf..5fde026 100644
--- a/backends/merge/TextTsv.h
+++ b/backends/merge/TextTsv.h
@@ -25,40 +25,43 @@
 #include "Text.h"
 
 
-namespace glabels::merge
+namespace glabels
 {
-
-	///
-	/// TextTsv Merge Backend
-	///
-	struct TextTsv : public Text
+	namespace merge
 	{
 
-		/////////////////////////////////
-		// Life Cycle
-		/////////////////////////////////
-	private:
-		TextTsv();
-		TextTsv( const TextTsv* merge );
-		~TextTsv() override;
+		///
+		/// TextTsv Merge Backend
+		///
+		struct TextTsv : public Text
+		{
+
+			/////////////////////////////////
+			// Life Cycle
+			/////////////////////////////////
+		private:
+			TextTsv();
+			TextTsv( const TextTsv* merge );
+			~TextTsv() override;
 
 
-		/////////////////////////////////
-		// Object duplication
-		/////////////////////////////////
-	public:
-		TextTsv* clone() const override;
+			/////////////////////////////////
+			// Object duplication
+			/////////////////////////////////
+		public:
+			TextTsv* clone() const override;
 
 
-		/////////////////////////////////
-		// Static methods
-		/////////////////////////////////
-	public:
-		static QString id();
-		static Merge* create();
+			/////////////////////////////////
+			// Static methods
+			/////////////////////////////////
+		public:
+			static QString id();
+			static Merge* create();
 
-	};
+		};
 
+	}
 }
 
 
diff --git a/backends/merge/TextTsvKeys.cpp b/backends/merge/TextTsvKeys.cpp
index 3f6e247..771be1d 100644
--- a/backends/merge/TextTsvKeys.cpp
+++ b/backends/merge/TextTsvKeys.cpp
@@ -21,61 +21,64 @@
 #include "TextTsvKeys.h"
 
 
-namespace glabels::merge
+namespace glabels
 {
-
-	static const QString ID = "Text/Tab/Line1Keys";
-
-
-	///
-	/// Constructor
-	///
-	TextTsvKeys::TextTsvKeys() : Text('\t',true)
+	namespace merge
 	{
-		mId = ID;
-	}
+
+		static const QString ID = "Text/Tab/Line1Keys";
 
 
-	///
-	/// Constructor
-	///
-	TextTsvKeys::TextTsvKeys( const TextTsvKeys* merge ) : Text( merge )
-	{
-	}
+		///
+		/// Constructor
+		///
+		TextTsvKeys::TextTsvKeys() : Text('\t',true)
+		{
+			mId = ID;
+		}
 
 
-	///
-	/// Destructor
-	///
-	TextTsvKeys::~TextTsvKeys()
-	{
-	}
+		///
+		/// Constructor
+		///
+		TextTsvKeys::TextTsvKeys( const TextTsvKeys* merge ) : Text( merge )
+		{
+		}
 
 
-	///
-	/// Clone
-	///
-	TextTsvKeys* TextTsvKeys::clone() const
-	{
-		return new TextTsvKeys( this );
-	}
+		///
+		/// Destructor
+		///
+		TextTsvKeys::~TextTsvKeys()
+		{
+		}
 
 
-	///
-	/// Get ID
-	///
-	QString TextTsvKeys::id()
-	{
-		return ID;
-	}
+		///
+		/// Clone
+		///
+		TextTsvKeys* TextTsvKeys::clone() const
+		{
+			return new TextTsvKeys( this );
+		}
 
 
-	///
-	/// Create
-	///
-	Merge* TextTsvKeys::create()
-	{
-		return new TextTsvKeys();
-	}
+		///
+		/// Get ID
+		///
+		QString TextTsvKeys::id()
+		{
+			return ID;
+		}
 
-} // namespace glabels::merge
+
+		///
+		/// Create
+		///
+		Merge* TextTsvKeys::create()
+		{
+			return new TextTsvKeys();
+		}
+
+	} // namespace merge
+} // namespace glabels
diff --git a/backends/merge/TextTsvKeys.h b/backends/merge/TextTsvKeys.h
index 0668848..550ae1d 100644
--- a/backends/merge/TextTsvKeys.h
+++ b/backends/merge/TextTsvKeys.h
@@ -25,40 +25,43 @@
 #include "Text.h"
 
 
-namespace glabels::merge
+namespace glabels
 {
-
-	///
-	/// TextTsvKeys Merge Backend
-	///
-	struct TextTsvKeys : public Text
+	namespace merge
 	{
 
-		/////////////////////////////////
-		// Life Cycle
-		/////////////////////////////////
-	private:
-		TextTsvKeys();
-		TextTsvKeys( const TextTsvKeys* merge );
-		~TextTsvKeys() override;
+		///
+		/// TextTsvKeys Merge Backend
+		///
+		struct TextTsvKeys : public Text
+		{
+
+			/////////////////////////////////
+			// Life Cycle
+			/////////////////////////////////
+		private:
+			TextTsvKeys();
+			TextTsvKeys( const TextTsvKeys* merge );
+			~TextTsvKeys() override;
 
 
-		/////////////////////////////////
-		// Object duplication
-		/////////////////////////////////
-	public:
-		TextTsvKeys* clone() const override;
+			/////////////////////////////////
+			// Object duplication
+			/////////////////////////////////
+		public:
+			TextTsvKeys* clone() const override;
 
 
-		/////////////////////////////////
-		// Static methods
-		/////////////////////////////////
-	public:
-		static QString id();
-		static Merge* create();
+			/////////////////////////////////
+			// Static methods
+			/////////////////////////////////
+		public:
+			static QString id();
+			static Merge* create();
 
-	};
+		};
 
+	}
 }
 
 
diff --git a/model/Category.cpp b/model/Category.cpp
index 7637e0d..5e1e8a7 100644
--- a/model/Category.cpp
+++ b/model/Category.cpp
@@ -21,25 +21,28 @@
 #include "Category.h"
 
 
-namespace glabels::model
+namespace glabels
 {
-
-	Category::Category( const QString &id, const QString &name )
-		: mId(id), mName(name)
+	namespace model
 	{
-		// empty
+
+		Category::Category( const QString &id, const QString &name )
+			: mId(id), mName(name)
+		{
+			// empty
+		}
+
+
+		QString Category::id() const
+		{
+			return mId;
+		}
+
+
+		QString Category::name() const
+		{
+			return mName;
+		}
+
 	}
-
-
-	QString Category::id() const
-	{
-		return mId;
-	}
-
-
-	QString Category::name() const
-	{
-		return mName;
-	}
-
-} // namespace glabels::model
+}
diff --git a/model/Category.h b/model/Category.h
index 63991e4..cd4d724 100644
--- a/model/Category.h
+++ b/model/Category.h
@@ -25,25 +25,28 @@
 #include <QString>
 
 
-namespace glabels::model
+namespace glabels
 {
-
-	class Category
+	namespace model
 	{
 
-	public:
-		Category( const QString& id, const QString& name );
+		class Category
+		{
 
-		QString id() const;
-		QString name() const;
+		public:
+			Category( const QString& id, const QString& name );
+
+			QString id() const;
+			QString name() const;
 
 
-	private:
-		QString mId;
-		QString mName;
+		private:
+			QString mId;
+			QString mName;
 
-	};
+		};
 
+	}
 }
 
 
diff --git a/model/ColorNode.cpp b/model/ColorNode.cpp
index 49e91a5..f399a1a 100644
--- a/model/ColorNode.cpp
+++ b/model/ColorNode.cpp
@@ -23,180 +23,183 @@
 #include "merge/Record.h"
 
 
-namespace glabels::model
+namespace glabels
 {
-
-	///
-	/// Default Constructor
-	///
-	ColorNode::ColorNode()
-		: mIsField(false), mColor(QColor::fromRgba(0x00000000)), mKey("")
+	namespace model
 	{
-		// empty
-	}
 
-
-	///
-	/// Constructor From Data
-	///
-	ColorNode::ColorNode( bool isField, const QColor& color, const QString& key )
-		: mIsField(isField), mColor(color), mKey(key)
-	{
-		// empty
-	}
-
-
-	///
-	/// Constructor From Data
-	///
-	ColorNode::ColorNode( bool isField, uint32_t rgba, const QString& key )
-		: mIsField(isField), mKey(key)
-	{
-		mColor = QColor( (rgba >> 24) & 0xFF,
-		                 (rgba >> 16) & 0xFF,
-		                 (rgba >>  8) & 0xFF,
-		                 (rgba      ) & 0xFF );
-	}
-
-
-	///
-	/// Constructor From Color
-	///
-	ColorNode::ColorNode( const QColor& color )
-		: mIsField(false), mColor(color), mKey("")
-	{
-		// empty
-	}
-
-
-	///
-	/// Constructor From Key
-	///
-	ColorNode::ColorNode( const QString& key )
-		: mIsField(true), mColor(QColor::fromRgba(0x00000000)), mKey(key)
-	{
-		// empty
-	}
-
-
-	///
-	/// == Operator
-	///
-	bool ColorNode::operator==( const ColorNode& cn )
-	{
-		return (mIsField == cn.mIsField) &&
-			(mColor   == cn.mColor)   &&
-			(mKey     == cn.mKey);
-	}
-
-
-	///
-	/// != Operator
-	///
-	bool ColorNode::operator!=( const ColorNode& cn )
-	{
-		return (mIsField != cn.mIsField) ||
-			(mColor   != cn.mColor)   ||
-			(mKey     != cn.mKey);
-	}
-
-
-	///
-	/// Field Flag Property Getter
-	///
-	bool ColorNode::isField() const
-	{
-		return mIsField;
-	}
-		
-
-	///
-	/// Field Flag Property Setter
-	///
-	void ColorNode::setField( bool isField )
-	{
-		mIsField = isField;
-	}
-
-
-	///
-	/// Color Property Getter
-	///
-	const QColor& ColorNode::color() const
-	{
-		return mColor;
-	}
-
-
-	///
-	/// Color Property Setter
-	///
-	void ColorNode::setColor( const QColor& color )
-	{
-		mColor = color;
-	}
-		
-
-	///
-	/// Key Property Getter
-	///
-	const QString& ColorNode::key() const
-	{
-		return mKey;
-	}
-
-
-	///
-	/// Key Property Setter
-	///
-	void ColorNode::setKey( const QString& key )
-	{
-		mKey = key;
-	}
-		
-
-	///
-	/// Get color encoded as an RGBA 32-bit number
-	///
-	uint32_t ColorNode::rgba() const
-	{
-		uint32_t c =
-			mColor.red()   << 24 |
-			mColor.green() << 16 |
-			mColor.blue()  <<  8 |
-			mColor.alpha();
-
-		return c;
-	}
-
-
-	///
-	/// Get color, expand if necessary
-	///
-	QColor ColorNode::color( merge::Record* record ) const
-	{
-		if ( mIsField )
+		///
+		/// Default Constructor
+		///
+		ColorNode::ColorNode()
+			: mIsField(false), mColor(QColor::fromRgba(0x00000000)), mKey("")
 		{
-			if ( record == nullptr )
-			{
-				return mColor;
-			}
-			else
-			{
-				if ( record->contains( mKey ) )
-				{
-					return QColor( (*record)[ mKey ] );
-				}
-				else
-				{
-					return mColor;
-				}
-			}
+			// empty
 		}
-		else
+
+
+		///
+		/// Constructor From Data
+		///
+		ColorNode::ColorNode( bool isField, const QColor& color, const QString& key )
+			: mIsField(isField), mColor(color), mKey(key)
+		{
+			// empty
+		}
+
+
+		///
+		/// Constructor From Data
+		///
+		ColorNode::ColorNode( bool isField, uint32_t rgba, const QString& key )
+			: mIsField(isField), mKey(key)
+		{
+			mColor = QColor( (rgba >> 24) & 0xFF,
+			                 (rgba >> 16) & 0xFF,
+			                 (rgba >>  8) & 0xFF,
+			                 (rgba      ) & 0xFF );
+		}
+
+
+		///
+		/// Constructor From Color
+		///
+		ColorNode::ColorNode( const QColor& color )
+			: mIsField(false), mColor(color), mKey("")
+		{
+			// empty
+		}
+
+
+		///
+		/// Constructor From Key
+		///
+		ColorNode::ColorNode( const QString& key )
+			: mIsField(true), mColor(QColor::fromRgba(0x00000000)), mKey(key)
+		{
+			// empty
+		}
+
+
+		///
+		/// == Operator
+		///
+		bool ColorNode::operator==( const ColorNode& cn )
+		{
+			return (mIsField == cn.mIsField) &&
+				(mColor   == cn.mColor)   &&
+				(mKey     == cn.mKey);
+		}
+
+
+		///
+		/// != Operator
+		///
+		bool ColorNode::operator!=( const ColorNode& cn )
+		{
+			return (mIsField != cn.mIsField) ||
+				(mColor   != cn.mColor)   ||
+				(mKey     != cn.mKey);
+		}
+
+
+		///
+		/// Field Flag Property Getter
+		///
+		bool ColorNode::isField() const
+		{
+			return mIsField;
+		}
+		
+
+		///
+		/// Field Flag Property Setter
+		///
+		void ColorNode::setField( bool isField )
+		{
+			mIsField = isField;
+		}
+
+
+		///
+		/// Color Property Getter
+		///
+		const QColor& ColorNode::color() const
 		{
 			return mColor;
 		}
-	}
 
-} // namespace glabels::model
+
+		///
+		/// Color Property Setter
+		///
+		void ColorNode::setColor( const QColor& color )
+		{
+			mColor = color;
+		}
+		
+
+		///
+		/// Key Property Getter
+		///
+		const QString& ColorNode::key() const
+		{
+			return mKey;
+		}
+
+
+		///
+		/// Key Property Setter
+		///
+		void ColorNode::setKey( const QString& key )
+		{
+			mKey = key;
+		}
+		
+
+		///
+		/// Get color encoded as an RGBA 32-bit number
+		///
+		uint32_t ColorNode::rgba() const
+		{
+			uint32_t c =
+				mColor.red()   << 24 |
+				mColor.green() << 16 |
+				mColor.blue()  <<  8 |
+				mColor.alpha();
+
+			return c;
+		}
+
+
+		///
+		/// Get color, expand if necessary
+		///
+		QColor ColorNode::color( merge::Record* record ) const
+		{
+			if ( mIsField )
+			{
+				if ( record == nullptr )
+				{
+					return mColor;
+				}
+				else
+				{
+					if ( record->contains( mKey ) )
+					{
+						return QColor( (*record)[ mKey ] );
+					}
+					else
+					{
+						return mColor;
+					}
+				}
+			}
+			else
+			{
+				return mColor;
+			}
+		}
+
+	}
+}
diff --git a/model/ColorNode.h b/model/ColorNode.h
index fbf7b15..07c556b 100644
--- a/model/ColorNode.h
+++ b/model/ColorNode.h
@@ -30,82 +30,85 @@
 #include <cstdint>
 
 
-namespace glabels::model
+namespace glabels
 {
-
-	///
-	/// Color Node Type
-	///
-	struct ColorNode
+	namespace model
 	{
 
-		/////////////////////////////////
-		// Life Cycle
-		/////////////////////////////////
-	public:
-		ColorNode();
+		///
+		/// Color Node Type
+		///
+		struct ColorNode
+		{
 
-		ColorNode( bool isField, const QColor& color, const QString& key );
+			/////////////////////////////////
+			// Life Cycle
+			/////////////////////////////////
+		public:
+			ColorNode();
 
-		ColorNode( bool isField, uint32_t rgba, const QString& key );
+			ColorNode( bool isField, const QColor& color, const QString& key );
 
-		ColorNode( const QColor& color );
+			ColorNode( bool isField, uint32_t rgba, const QString& key );
 
-		ColorNode( const QString& key );
+			ColorNode( const QColor& color );
+
+			ColorNode( const QString& key );
 
 
-		/////////////////////////////////
-		// Operators
-		/////////////////////////////////
-	public:
-		bool operator==( const ColorNode& cn );
+			/////////////////////////////////
+			// Operators
+			/////////////////////////////////
+		public:
+			bool operator==( const ColorNode& cn );
 
-		bool operator!=( const ColorNode& cn );
+			bool operator!=( const ColorNode& cn );
 
 
-		/////////////////////////////////
-		// Properties
-		/////////////////////////////////
-	public:
-		//
-		// Field Flag Property
-		//
-		bool isField() const;
-		void setField( bool isField );
+			/////////////////////////////////
+			// Properties
+			/////////////////////////////////
+		public:
+			//
+			// Field Flag Property
+			//
+			bool isField() const;
+			void setField( bool isField );
 		
 
-		//
-		// Color Property
-		//
-		const QColor& color() const;
-		void setColor( const QColor& color );
+			//
+			// Color Property
+			//
+			const QColor& color() const;
+			void setColor( const QColor& color );
 
 
-		//
-		// Key Property
-		//
-		const QString& key() const;
-		void setKey( const QString& key );
+			//
+			// Key Property
+			//
+			const QString& key() const;
+			void setKey( const QString& key );
 
 
-		/////////////////////////////////
-		// Misc. Methods
-		/////////////////////////////////
-	public:
-		uint32_t rgba() const;
-		QColor color( merge::Record* record ) const;
+			/////////////////////////////////
+			// Misc. Methods
+			/////////////////////////////////
+		public:
+			uint32_t rgba() const;
+			QColor color( merge::Record* record ) const;
 
 
-		/////////////////////////////////
-		// Private Data
-		/////////////////////////////////
-	private:
-		bool    mIsField;
-		QColor  mColor;
-		QString mKey;
+			/////////////////////////////////
+			// Private Data
+			/////////////////////////////////
+		private:
+			bool    mIsField;
+			QColor  mColor;
+			QString mKey;
 
-	};
+		};
 
+	}
 }
 
 
diff --git a/model/Config.h.in b/model/Config.h.in
index d132071..2bbe25c 100644
--- a/model/Config.h.in
+++ b/model/Config.h.in
@@ -22,15 +22,18 @@
 #define model_Config_h
 
 
-namespace glabels::model
+namespace glabels
 {
-
-	namespace Config
+	namespace model
 	{
-		const QString PROJECT_SOURCE_DIR    = "@glabels-qt_SOURCE_DIR@";
-		const QString PROJECT_BUILD_DIR     = "@glabels-qt_BINARY_DIR@";
-	}
 
+		namespace Config
+		{
+			const QString PROJECT_SOURCE_DIR    = "@glabels-qt_SOURCE_DIR@";
+			const QString PROJECT_BUILD_DIR     = "@glabels-qt_BINARY_DIR@";
+		}
+
+	}
 }
 
 
diff --git a/model/Constants.h b/model/Constants.h
index 383140b..dfed161 100644
--- a/model/Constants.h
+++ b/model/Constants.h
@@ -22,16 +22,20 @@
 #define model_Constants_h
 
 
-namespace glabels::model
+namespace glabels
 {
+	namespace model
+	{
 
-	const double PTS_PER_PT    =  1.0;
-	const double PTS_PER_INCH  = 72.0;
-	const double PTS_PER_MM    =  2.83464566929;
-	const double PTS_PER_CM    =  (10.0*PTS_PER_MM);
-	const double PTS_PER_PICA  =  12.0;
+		const double PTS_PER_PT    =  1.0;
+		const double PTS_PER_INCH  = 72.0;
+		const double PTS_PER_MM    =  2.83464566929;
+		const double PTS_PER_CM    =  (10.0*PTS_PER_MM);
+		const double PTS_PER_PICA  =  12.0;
 
-	const Distance EPSILON( 0.5, Units::PT );
+		const Distance EPSILON( 0.5, Units::PT );
+	}
 }
 
+
 #endif // model_Constants_h
diff --git a/model/DataCache.cpp b/model/DataCache.cpp
index aa0c480..d98797f 100644
--- a/model/DataCache.cpp
+++ b/model/DataCache.cpp
@@ -23,88 +23,91 @@
 #include "ModelImageObject.h"
 
 
-namespace glabels::model
+namespace glabels
 {
-
-	DataCache::DataCache()
+	namespace model
 	{
-		// empty
-	}
 
-
-	DataCache::DataCache( const QList<ModelObject*>& objects )
-	{
-		foreach( ModelObject* object, objects )
+		DataCache::DataCache()
 		{
-			if ( ModelImageObject* imageObject = dynamic_cast<ModelImageObject*>(object) )
+			// empty
+		}
+
+
+		DataCache::DataCache( const QList<ModelObject*>& objects )
+		{
+			foreach( ModelObject* object, objects )
 			{
-				TextNode filenameNode = imageObject->filenameNode();
-				if ( !filenameNode.isField()  )
+				if ( ModelImageObject* imageObject = dynamic_cast<ModelImageObject*>(object) )
 				{
-					if ( const QImage* image = imageObject->image() )
+					TextNode filenameNode = imageObject->filenameNode();
+					if ( !filenameNode.isField()  )
 					{
-						addImage( filenameNode.data(), *image );
-					}
-					else
-					{
-						QByteArray svg = imageObject->svg();
-						if ( !svg.isEmpty() )
+						if ( const QImage* image = imageObject->image() )
 						{
-							addSvg( filenameNode.data(), svg );
+							addImage( filenameNode.data(), *image );
+						}
+						else
+						{
+							QByteArray svg = imageObject->svg();
+							if ( !svg.isEmpty() )
+							{
+								addSvg( filenameNode.data(), svg );
+							}
 						}
 					}
 				}
 			}
 		}
-	}
 
 
-	bool DataCache::hasImage( const QString& name ) const
-	{
-		return mImageMap.contains( name );
-	}
+		bool DataCache::hasImage( const QString& name ) const
+		{
+			return mImageMap.contains( name );
+		}
 
 
-	QImage DataCache::getImage( const QString& name ) const
-	{
-		return mImageMap[ name ];
-	}
+		QImage DataCache::getImage( const QString& name ) const
+		{
+			return mImageMap[ name ];
+		}
 
 
-	void DataCache::addImage( const QString& name, const QImage& image )
-	{
-		mImageMap[ name ] = image;
-	}
+		void DataCache::addImage( const QString& name, const QImage& image )
+		{
+			mImageMap[ name ] = image;
+		}
 
 
-	QList<QString> DataCache::imageNames() const
-	{
-		return mImageMap.keys();
-	}
+		QList<QString> DataCache::imageNames() const
+		{
+			return mImageMap.keys();
+		}
 
 	
-	bool DataCache::hasSvg( const QString& name ) const
-	{
-		return mSvgMap.contains( name );
-	}
+		bool DataCache::hasSvg( const QString& name ) const
+		{
+			return mSvgMap.contains( name );
+		}
 
 
-	QByteArray DataCache::getSvg( const QString& name ) const
-	{
-		return mSvgMap[ name ];
-	}
+		QByteArray DataCache::getSvg( const QString& name ) const
+		{
+			return mSvgMap[ name ];
+		}
 
 
-	void DataCache::addSvg( const QString& name, const QByteArray& svg )
-	{
-		mSvgMap[ name ] = svg;
-	}
+		void DataCache::addSvg( const QString& name, const QByteArray& svg )
+		{
+			mSvgMap[ name ] = svg;
+		}
 
 
-	QList<QString> DataCache::svgNames() const
-	{
-		return mSvgMap.keys();
-	}
+		QList<QString> DataCache::svgNames() const
+		{
+			return mSvgMap.keys();
+		}
 
 	
-} // namespace glabels::model
+	}
+}
diff --git a/model/DataCache.h b/model/DataCache.h
index 37faed8..4a68f78 100644
--- a/model/DataCache.h
+++ b/model/DataCache.h
@@ -25,33 +25,36 @@
 #include "Model.h"
 
 
-namespace glabels::model
+namespace glabels
 {
-
-	class DataCache
+	namespace model
 	{
-	public:
-		DataCache();
+
+		class DataCache
+		{
+		public:
+			DataCache();
 		
-		DataCache( const QList<ModelObject*>& objects );
+			DataCache( const QList<ModelObject*>& objects );
 
-		bool hasImage( const QString& name ) const;
-		QImage getImage( const QString& name ) const;
-		void addImage( const QString& name, const QImage& image );
-		QList<QString> imageNames() const;
+			bool hasImage( const QString& name ) const;
+			QImage getImage( const QString& name ) const;
+			void addImage( const QString& name, const QImage& image );
+			QList<QString> imageNames() const;
 
-		bool hasSvg( const QString& name ) const;
-		QByteArray getSvg( const QString& name ) const;
-		void addSvg( const QString& name, const QByteArray& svg );
-		QList<QString> svgNames() const;
+			bool hasSvg( const QString& name ) const;
+			QByteArray getSvg( const QString& name ) const;
+			void addSvg( const QString& name, const QByteArray& svg );
+			QList<QString> svgNames() const;
 
 		
-	private:
-		QMap<QString,QImage> mImageMap;
-		QMap<QString,QByteArray> mSvgMap;
+		private:
+			QMap<QString,QImage> mImageMap;
+			QMap<QString,QByteArray> mSvgMap;
 
-	};
+		};
 
+	}
 }
 
 
diff --git a/model/Db.cpp b/model/Db.cpp
index eb9f57d..8871074 100644
--- a/model/Db.cpp
+++ b/model/Db.cpp
@@ -34,656 +34,659 @@
 #include <algorithm>
 
 
-namespace glabels::model
+namespace glabels
 {
-	
-	//
-	// Private
-	//
-	namespace
+	namespace model
 	{
-		const QString    empty = "";
 	
-		bool partNameLessThan( const Template *a, const Template *b )
+		//
+		// Private
+		//
+		namespace
 		{
-			return StrUtil::comparePartNames( a->name(), b->name() ) < 0;
+			const QString    empty = "";
+	
+			bool partNameLessThan( const Template *a, const Template *b )
+			{
+				return StrUtil::comparePartNames( a->name(), b->name() ) < 0;
+			}
 		}
-	}
 
 
-	//
-	// Static data
-	//
-	QList<Paper*>    Db::mPapers;
-	QStringList      Db::mPaperIds;
-	QStringList      Db::mPaperNames;
-	QList<Category*> Db::mCategories;
-	QStringList      Db::mCategoryIds;
-	QStringList      Db::mCategoryNames;
-	QList<Vendor*>   Db::mVendors;
-	QStringList      Db::mVendorNames;
-	QList<Template*> Db::mTemplates;
-	QString          Db::mPaperNameOther;
+		//
+		// Static data
+		//
+		QList<Paper*>    Db::mPapers;
+		QStringList      Db::mPaperIds;
+		QStringList      Db::mPaperNames;
+		QList<Category*> Db::mCategories;
+		QStringList      Db::mCategoryIds;
+		QStringList      Db::mCategoryNames;
+		QList<Vendor*>   Db::mVendors;
+		QStringList      Db::mVendorNames;
+		QList<Template*> Db::mTemplates;
+		QString          Db::mPaperNameOther;
 
 	
-	Db::Db()
-	{
-		mPaperNameOther = tr("Other");
+		Db::Db()
+		{
+			mPaperNameOther = tr("Other");
 
-		readPapers();
-		readCategories();
-		readVendors();
-		readTemplates();
-	}
+			readPapers();
+			readCategories();
+			readVendors();
+			readTemplates();
+		}
 
 
-	void Db::init()
-	{
-		instance();
-	}
+		void Db::init()
+		{
+			instance();
+		}
 
 	
-	Db* Db::instance()
-	{
-		static Db* db = new Db();
-		return db;
-	}
-
-
-	const QList<Paper*>& Db::papers()
-	{
-		return mPapers;
-	}
-
-
-	const QStringList& Db::paperIds()
-	{
-		return mPaperIds;
-	}
-
-
-	const QStringList& Db::paperNames()
-	{
-		return mPaperNames;
-	}
-
-
-	const QList<Category*>& Db::categories()
-	{
-		return mCategories;
-	}
-
-
-	const QStringList& Db::categoryIds()
-	{
-		return mCategoryIds;
-	}
-
-
-	const QStringList& Db::categoryNames()
-	{
-		return mCategoryNames;
-	}
-
-
-	const QList<Vendor*>& Db::vendors()
-	{
-		return mVendors;
-	}
-
-
-	const QStringList& Db::vendorNames()
-	{
-		return mVendorNames;
-	}
-
-
-	const QList<Template*>& Db::templates()
-	{
-		return mTemplates;
-	}
-
-
-	void Db::registerPaper( Paper *paper )
-	{
-		if ( !isPaperIdKnown( paper->id() ) )
+		Db* Db::instance()
 		{
-			mPapers << paper;
-			mPaperIds << paper->id();
-			mPaperNames << paper->name();
-		}
-		else
-		{
-			qWarning() << "Duplicate paper ID: " << paper->id();
-		}
-	}
-
-
-	const Paper *Db::lookupPaperFromName( const QString& name )
-	{
-		if ( name.isNull() || name.isEmpty() )
-		{
-			qWarning() << "NULL paper name.";
-			return mPapers.first();
+			static Db* db = new Db();
+			return db;
 		}
 
-		foreach ( Paper *paper, mPapers )
+
+		const QList<Paper*>& Db::papers()
 		{
-			if ( paper->name() == name )
+			return mPapers;
+		}
+
+
+		const QStringList& Db::paperIds()
+		{
+			return mPaperIds;
+		}
+
+
+		const QStringList& Db::paperNames()
+		{
+			return mPaperNames;
+		}
+
+
+		const QList<Category*>& Db::categories()
+		{
+			return mCategories;
+		}
+
+
+		const QStringList& Db::categoryIds()
+		{
+			return mCategoryIds;
+		}
+
+
+		const QStringList& Db::categoryNames()
+		{
+			return mCategoryNames;
+		}
+
+
+		const QList<Vendor*>& Db::vendors()
+		{
+			return mVendors;
+		}
+
+
+		const QStringList& Db::vendorNames()
+		{
+			return mVendorNames;
+		}
+
+
+		const QList<Template*>& Db::templates()
+		{
+			return mTemplates;
+		}
+
+
+		void Db::registerPaper( Paper *paper )
+		{
+			if ( !isPaperIdKnown( paper->id() ) )
 			{
-				return paper;
+				mPapers << paper;
+				mPaperIds << paper->id();
+				mPaperNames << paper->name();
+			}
+			else
+			{
+				qWarning() << "Duplicate paper ID: " << paper->id();
 			}
 		}
 
-		qWarning() << "Unknown paper name: " << name;
-		return nullptr;
-	}
 
-
-	const Paper *Db::lookupPaperFromId( const QString& id )
-	{
-		if ( id.isNull() || id.isEmpty() )
+		const Paper *Db::lookupPaperFromName( const QString& name )
 		{
-			qWarning() << "NULL paper ID.";
-			return mPapers.first();
+			if ( name.isNull() || name.isEmpty() )
+			{
+				qWarning() << "NULL paper name.";
+				return mPapers.first();
+			}
+
+			foreach ( Paper *paper, mPapers )
+			{
+				if ( paper->name() == name )
+				{
+					return paper;
+				}
+			}
+
+			qWarning() << "Unknown paper name: " << name;
+			return nullptr;
 		}
 
-		foreach ( Paper *paper, mPapers )
+
+		const Paper *Db::lookupPaperFromId( const QString& id )
 		{
-			if ( paper->id() == id )
+			if ( id.isNull() || id.isEmpty() )
 			{
-				return paper;
+				qWarning() << "NULL paper ID.";
+				return mPapers.first();
+			}
+
+			foreach ( Paper *paper, mPapers )
+			{
+				if ( paper->id() == id )
+				{
+					return paper;
+				}
+			}
+
+			qWarning() << "Unknown paper ID: " << id;
+			return nullptr;
+		}
+
+
+		QString Db::lookupPaperIdFromName( const QString& name )
+		{
+			if ( !name.isNull() && !name.isEmpty() )
+			{
+				const Paper *paper = lookupPaperFromName( name );
+				if ( paper != nullptr )
+				{
+					return paper->id();
+				}
+			}
+
+			qWarning() << "Unknown paper name: " << name;
+			return empty;
+		}
+
+
+		QString Db::lookupPaperNameFromId( const QString& id )
+		{
+			if ( !id.isNull() && !id.isEmpty() )
+			{
+				if ( isPaperIdOther( id ) )
+				{
+					return mPaperNameOther;
+				}
+
+				const Paper *paper = lookupPaperFromId( id );
+				if ( paper != nullptr )
+				{
+					return paper->name();
+				}
+			}
+
+			qWarning() << "Unknown paper id: " << id;
+			return empty;
+		}
+
+
+		bool Db::isPaperIdKnown( const QString& id )
+		{
+			foreach ( Paper *paper, mPapers )
+			{
+				if ( paper->id() == id )
+				{
+					return true;
+				}
+			}
+
+			return false;
+		}
+
+
+		bool Db::isPaperIdOther( const QString& id )
+		{
+			return ( id == "Other" );
+		}
+
+
+		void Db::registerCategory( Category *category )
+		{
+			if ( !isCategoryIdKnown( category->id() ) )
+			{
+				mCategories << category;
+				mCategoryIds << category->id();
+				mCategoryNames << category->name();
+			}
+			else
+			{
+				qWarning() << "Duplicate category ID: " << category->id();
 			}
 		}
 
-		qWarning() << "Unknown paper ID: " << id;
-		return nullptr;
-	}
 
-
-	QString Db::lookupPaperIdFromName( const QString& name )
-	{
-		if ( !name.isNull() && !name.isEmpty() )
+		const Category *Db::lookupCategoryFromName( const QString& name )
 		{
-			const Paper *paper = lookupPaperFromName( name );
-			if ( paper != nullptr )
+			if ( name.isNull() || name.isEmpty() )
 			{
-				return paper->id();
+				qWarning() << "NULL category name.";
+				return mCategories.first();
+			}
+
+			foreach ( Category *category, mCategories )
+			{
+				if ( category->name() == name )
+				{
+					return category;
+				}
+			}
+
+			qWarning() << "Unknown category name: \"%s\"." << name;
+			return nullptr;
+		}
+
+
+		const Category *Db::lookupCategoryFromId( const QString& id )
+		{
+			if ( id.isNull() || id.isEmpty() )
+			{
+				qDebug() << "NULL category ID.";
+				return mCategories.first();
+			}
+
+			foreach ( Category *category, mCategories )
+			{
+				if ( category->id() == id )
+				{
+					return category;
+				}
+			}
+
+			qWarning() << "Unknown category ID: " << id;
+			return nullptr;
+		}
+
+
+		QString Db::lookupCategoryIdFromName( const QString& name )
+		{
+			if ( !name.isNull() && !name.isEmpty() )
+			{
+				const Category *category = lookupCategoryFromName( name );
+				if ( category != nullptr )
+				{
+					return category->id();
+				}
+			}
+
+			qWarning() << "Unknown category name: " << name;
+			return empty;
+		}
+
+
+		QString Db::lookupCategoryNameFromId( const QString& id )
+		{
+			if ( !id.isNull() && !id.isEmpty() )
+			{
+				const Category *category = lookupCategoryFromId( id );
+				if ( category != nullptr )
+				{
+					return category->name();
+				}
+			}
+
+			qWarning() << "Unknown category id: " << id;
+			return empty;
+		}
+
+
+		bool Db::isCategoryIdKnown( const QString& id )
+		{
+			foreach ( Category *category, mCategories )
+			{
+				if ( category->id() == id )
+				{
+					return true;
+				}
+			}
+
+			return false;
+		}
+
+
+		void Db::registerVendor( Vendor *vendor )
+		{
+			if ( !isVendorNameKnown( vendor->name() ) )
+			{
+				mVendors << vendor;
+				mVendorNames << vendor->name();
+			}
+			else
+			{
+				qWarning() << "Duplicate vendor name: " << vendor->name();
 			}
 		}
 
-		qWarning() << "Unknown paper name: " << name;
-		return empty;
-	}
 
-
-	QString Db::lookupPaperNameFromId( const QString& id )
-	{
-		if ( !id.isNull() && !id.isEmpty() )
+		const Vendor *Db::lookupVendorFromName( const QString& name )
 		{
-			if ( isPaperIdOther( id ) )
+			if ( name.isNull() || name.isEmpty() )
 			{
-				return mPaperNameOther;
+				qWarning() << "NULL vendor name.";
+				return mVendors.first();
 			}
 
-			const Paper *paper = lookupPaperFromId( id );
-			if ( paper != nullptr )
+			foreach ( Vendor *vendor, mVendors )
 			{
-				return paper->name();
+				if ( vendor->name() == name )
+				{
+					return vendor;
+				}
+			}
+
+			qWarning() << "Unknown vendor name: " << name;
+			return nullptr;
+		}
+
+
+		QString Db::lookupVendorUrlFromName( const QString& name )
+		{
+			if ( !name.isNull() && !name.isEmpty() )
+			{
+				const Vendor *vendor = lookupVendorFromName( name );
+				if ( vendor != nullptr )
+				{
+					return vendor->url();
+				}
+			}
+
+			qWarning() << "Unknown vendor name: " << name;
+			return empty;
+		}
+
+
+		bool Db::isVendorNameKnown( const QString& name )
+		{
+			foreach ( Vendor *vendor, mVendors )
+			{
+				if ( vendor->name() == name )
+				{
+					return true;
+				}
+			}
+
+			return false;
+		}
+
+
+		void Db::registerTemplate( Template *tmplate )
+		{
+			if ( !isTemplateKnown( tmplate->brand(), tmplate->part() ) )
+			{
+				mTemplates << tmplate;
+			}
+			else
+			{
+				qWarning() << "Duplicate template name: " << tmplate->name();
 			}
 		}
 
-		qWarning() << "Unknown paper id: " << id;
-		return empty;
-	}
 
-
-	bool Db::isPaperIdKnown( const QString& id )
-	{
-		foreach ( Paper *paper, mPapers )
+		const Template *Db::lookupTemplateFromName( const QString& name )
 		{
-			if ( paper->id() == id )
+			if ( name.isNull() || name.isEmpty() )
 			{
-				return true;
+				qWarning() << "NULL template name.";
+				return mTemplates.first();
 			}
-		}
 
-		return false;
-	}
-
-
-	bool Db::isPaperIdOther( const QString& id )
-	{
-		return ( id == "Other" );
-	}
-
-
-	void Db::registerCategory( Category *category )
-	{
-		if ( !isCategoryIdKnown( category->id() ) )
-		{
-			mCategories << category;
-			mCategoryIds << category->id();
-			mCategoryNames << category->name();
-		}
-		else
-		{
-			qWarning() << "Duplicate category ID: " << category->id();
-		}
-	}
-
-
-	const Category *Db::lookupCategoryFromName( const QString& name )
-	{
-		if ( name.isNull() || name.isEmpty() )
-		{
-			qWarning() << "NULL category name.";
-			return mCategories.first();
-		}
-
-		foreach ( Category *category, mCategories )
-		{
-			if ( category->name() == name )
+			foreach ( Template *tmplate, mTemplates )
 			{
-				return category;
+				if ( tmplate->name() == name )
+				{
+					return tmplate;
+				}
 			}
-		}
 
-		qWarning() << "Unknown category name: \"%s\"." << name;
-		return nullptr;
-	}
-
-
-	const Category *Db::lookupCategoryFromId( const QString& id )
-	{
-		if ( id.isNull() || id.isEmpty() )
-		{
-			qDebug() << "NULL category ID.";
-			return mCategories.first();
-		}
-
-		foreach ( Category *category, mCategories )
-		{
-			if ( category->id() == id )
-			{
-				return category;
-			}
-		}
-
-		qWarning() << "Unknown category ID: " << id;
-		return nullptr;
-	}
-
-
-	QString Db::lookupCategoryIdFromName( const QString& name )
-	{
-		if ( !name.isNull() && !name.isEmpty() )
-		{
-			const Category *category = lookupCategoryFromName( name );
-			if ( category != nullptr )
-			{
-				return category->id();
-			}
-		}
-
-		qWarning() << "Unknown category name: " << name;
-		return empty;
-	}
-
-
-	QString Db::lookupCategoryNameFromId( const QString& id )
-	{
-		if ( !id.isNull() && !id.isEmpty() )
-		{
-			const Category *category = lookupCategoryFromId( id );
-			if ( category != nullptr )
-			{
-				return category->name();
-			}
-		}
-
-		qWarning() << "Unknown category id: " << id;
-		return empty;
-	}
-
-
-	bool Db::isCategoryIdKnown( const QString& id )
-	{
-		foreach ( Category *category, mCategories )
-		{
-			if ( category->id() == id )
-			{
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-
-	void Db::registerVendor( Vendor *vendor )
-	{
-		if ( !isVendorNameKnown( vendor->name() ) )
-		{
-			mVendors << vendor;
-			mVendorNames << vendor->name();
-		}
-		else
-		{
-			qWarning() << "Duplicate vendor name: " << vendor->name();
-		}
-	}
-
-
-	const Vendor *Db::lookupVendorFromName( const QString& name )
-	{
-		if ( name.isNull() || name.isEmpty() )
-		{
-			qWarning() << "NULL vendor name.";
-			return mVendors.first();
-		}
-
-		foreach ( Vendor *vendor, mVendors )
-		{
-			if ( vendor->name() == name )
-			{
-				return vendor;
-			}
-		}
-
-		qWarning() << "Unknown vendor name: " << name;
-		return nullptr;
-	}
-
-
-	QString Db::lookupVendorUrlFromName( const QString& name )
-	{
-		if ( !name.isNull() && !name.isEmpty() )
-		{
-			const Vendor *vendor = lookupVendorFromName( name );
-			if ( vendor != nullptr )
-			{
-				return vendor->url();
-			}
-		}
-
-		qWarning() << "Unknown vendor name: " << name;
-		return empty;
-	}
-
-
-	bool Db::isVendorNameKnown( const QString& name )
-	{
-		foreach ( Vendor *vendor, mVendors )
-		{
-			if ( vendor->name() == name )
-			{
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-
-	void Db::registerTemplate( Template *tmplate )
-	{
-		if ( !isTemplateKnown( tmplate->brand(), tmplate->part() ) )
-		{
-			mTemplates << tmplate;
-		}
-		else
-		{
-			qWarning() << "Duplicate template name: " << tmplate->name();
-		}
-	}
-
-
-	const Template *Db::lookupTemplateFromName( const QString& name )
-	{
-		if ( name.isNull() || name.isEmpty() )
-		{
-			qWarning() << "NULL template name.";
-			return mTemplates.first();
-		}
-
-		foreach ( Template *tmplate, mTemplates )
-		{
-			if ( tmplate->name() == name )
-			{
-				return tmplate;
-			}
-		}
-
-		qWarning() << "Unknown template name: " << name;
-		return nullptr;
-	}
-
-
-	const Template *Db::lookupTemplateFromBrandPart( const QString& brand, const QString& part )
-	{
-		if ( brand.isNull() || brand.isEmpty() || part.isNull() || part.isEmpty() )
-		{
-			qWarning() << "NULL template brand and/or part.";
-			return mTemplates.first();
-		}
-
-		foreach ( Template *tmplate, mTemplates )
-		{
-			if ( (tmplate->brand() == brand) && (tmplate->part() == part) )
-			{
-				return tmplate;
-			}
-		}
-
-		qWarning() << "Unknown template brand, part: " << brand << ", " << part;
-		return nullptr;
-	}
-
-
-	bool Db::isTemplateKnown( const QString& brand, const QString& part )
-	{
-		foreach ( Template *tmplate, mTemplates )
-		{
-			if ( (tmplate->brand() == brand) && (tmplate->part() == part) )
-			{
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-
-	QStringList Db::getNameListOfSimilarTemplates( const QString& name )
-	{
-		QStringList list;
-
-		const Template *tmplate1 = lookupTemplateFromName( name );
-		if ( tmplate1 == nullptr )
-		{
 			qWarning() << "Unknown template name: " << name;
+			return nullptr;
+		}
+
+
+		const Template *Db::lookupTemplateFromBrandPart( const QString& brand, const QString& part )
+		{
+			if ( brand.isNull() || brand.isEmpty() || part.isNull() || part.isEmpty() )
+			{
+				qWarning() << "NULL template brand and/or part.";
+				return mTemplates.first();
+			}
+
+			foreach ( Template *tmplate, mTemplates )
+			{
+				if ( (tmplate->brand() == brand) && (tmplate->part() == part) )
+				{
+					return tmplate;
+				}
+			}
+
+			qWarning() << "Unknown template brand, part: " << brand << ", " << part;
+			return nullptr;
+		}
+
+
+		bool Db::isTemplateKnown( const QString& brand, const QString& part )
+		{
+			foreach ( Template *tmplate, mTemplates )
+			{
+				if ( (tmplate->brand() == brand) && (tmplate->part() == part) )
+				{
+					return true;
+				}
+			}
+
+			return false;
+		}
+
+
+		QStringList Db::getNameListOfSimilarTemplates( const QString& name )
+		{
+			QStringList list;
+
+			const Template *tmplate1 = lookupTemplateFromName( name );
+			if ( tmplate1 == nullptr )
+			{
+				qWarning() << "Unknown template name: " << name;
+				return list;
+			}
+
+			foreach (const Template *tmplate2, mTemplates )
+			{
+				if ( tmplate1->name() != tmplate2->name() )
+				{
+					if ( tmplate1->isSimilarTo( tmplate2 ) )
+					{
+						list << tmplate2->name();
+					}
+				}
+			}
+
 			return list;
 		}
 
-		foreach (const Template *tmplate2, mTemplates )
+
+		void Db::registerUserTemplate( Template *templat )
 		{
-			if ( tmplate1->name() != tmplate2->name() )
+			// TODO
+		}
+
+
+		void Db::deleteUserTemplateByName( const QString& name )
+		{
+			// TODO
+		}
+
+
+		void Db::deleteUserTemplateByBrandPart( const QString& brand, const QString& part )
+		{
+			// TODO
+		}
+
+
+		void Db::printKnownPapers()
+		{
+			qDebug() << "KNOWN PAPERS:";
+
+			foreach ( Paper *paper, mPapers )
 			{
-				if ( tmplate1->isSimilarTo( tmplate2 ) )
+				qDebug() << "paper "
+				         << "id="       << paper->id()          << ", "
+				         << "name="     << paper->name()        << ", "
+				         << "width="    << paper->width().pt()  << "pts, "
+				         << "height="   << paper->height().pt() << "pts, "
+				         << "pwg_size=" << paper->pwgSize();
+			}
+
+			qDebug();
+		}
+
+
+		void Db::printKnownCategories()
+		{
+			qDebug() << "KNOWN CATEGORIES:";
+
+			foreach ( Category *category, mCategories )
+			{
+				qDebug() << "category "
+				         << "id="    << category->id()   << ", "
+				         << "name="  << category->name();
+			}
+
+			qDebug();
+		}
+
+
+		void Db::printKnownVendors()
+		{
+			qDebug() << "KNOWN VENDORS:";
+
+			foreach ( Vendor *vendor, mVendors )
+			{
+				qDebug() << "vendor "
+				         << "name='" << vendor->name() << ", "
+				         << "url='"  << vendor->url();
+			}
+
+			qDebug();
+		}
+
+
+		void Db::printKnownTemplates()
+		{
+			qDebug() << "KNOWN TEMPLATES:";
+
+			foreach ( Template *tmplate, mTemplates )
+			{
+				qDebug() << "template "
+				         << "brand="       << tmplate->brand()       << ", "
+				         << "part="        << tmplate->part()        << ", "
+				         << "description=" << tmplate->description();
+			}
+
+			qDebug();
+		}
+
+
+		void Db::readPapers()
+		{
+			readPapersFromDir( FileUtil::systemTemplatesDir() );
+		}
+
+
+		void Db::readPapersFromDir( const QDir& dir )
+		{
+			XmlPaperParser parser;
+
+			foreach ( QString fileName, dir.entryList( QDir::Files ) )
+			{
+				if ( fileName == "paper-sizes.xml" )
 				{
-					list << tmplate2->name();
+					parser.readFile( dir.absoluteFilePath( fileName ) );
 				}
 			}
 		}
 
-		return list;
-	}
 
-
-	void Db::registerUserTemplate( Template *templat )
-	{
-		// TODO
-	}
-
-
-	void Db::deleteUserTemplateByName( const QString& name )
-	{
-		// TODO
-	}
-
-
-	void Db::deleteUserTemplateByBrandPart( const QString& brand, const QString& part )
-	{
-		// TODO
-	}
-
-
-	void Db::printKnownPapers()
-	{
-		qDebug() << "KNOWN PAPERS:";
-
-		foreach ( Paper *paper, mPapers )
+		void Db::readCategories()
 		{
-			qDebug() << "paper "
-				 << "id="       << paper->id()          << ", "
-				 << "name="     << paper->name()        << ", "
-				 << "width="    << paper->width().pt()  << "pts, "
-				 << "height="   << paper->height().pt() << "pts, "
-				 << "pwg_size=" << paper->pwgSize();
+			readCategoriesFromDir( FileUtil::systemTemplatesDir() );
 		}
 
-		qDebug();
-	}
 
-
-	void Db::printKnownCategories()
-	{
-		qDebug() << "KNOWN CATEGORIES:";
-
-		foreach ( Category *category, mCategories )
+		void Db::readCategoriesFromDir( const QDir& dir )
 		{
-			qDebug() << "category "
-				 << "id="    << category->id()   << ", "
-				 << "name="  << category->name();
+			XmlCategoryParser parser;
+
+			foreach ( QString fileName, dir.entryList( QDir::Files ) )
+			{
+				if ( fileName == "categories.xml" )
+				{
+					parser.readFile( dir.absoluteFilePath( fileName ) );
+				}
+			}
 		}
 
-		qDebug();
-	}
 
-
-	void Db::printKnownVendors()
-	{
-		qDebug() << "KNOWN VENDORS:";
-
-		foreach ( Vendor *vendor, mVendors )
+		void Db::readVendors()
 		{
-			qDebug() << "vendor "
-				 << "name='" << vendor->name() << ", "
-				 << "url='"  << vendor->url();
+			readVendorsFromDir( FileUtil::systemTemplatesDir() );
 		}
 
-		qDebug();
-	}
 
-
-	void Db::printKnownTemplates()
-	{
-		qDebug() << "KNOWN TEMPLATES:";
-
-		foreach ( Template *tmplate, mTemplates )
+		void Db::readVendorsFromDir( const QDir& dir )
 		{
-			qDebug() << "template "
-				 << "brand="       << tmplate->brand()       << ", "
-				 << "part="        << tmplate->part()        << ", "
-				 << "description=" << tmplate->description();
+			XmlVendorParser parser;
+
+			foreach ( QString fileName, dir.entryList( QDir::Files ) )
+			{
+				if ( fileName == "vendors.xml" )
+				{
+					parser.readFile( dir.absoluteFilePath( fileName ) );
+				}
+			}
 		}
 
-		qDebug();
-	}
 
-
-	void Db::readPapers()
-	{
-		readPapersFromDir( FileUtil::systemTemplatesDir() );
-	}
-
-
-	void Db::readPapersFromDir( const QDir& dir )
-	{
-		XmlPaperParser parser;
-
-		foreach ( QString fileName, dir.entryList( QDir::Files ) )
+		void Db::readTemplates()
 		{
-			if ( fileName == "paper-sizes.xml" )
+			readTemplatesFromDir( FileUtil::systemTemplatesDir() );
+
+			// TODO: Read user directories
+
+			std::stable_sort( mTemplates.begin(), mTemplates.end(), partNameLessThan );
+		}
+
+
+		void Db::readTemplatesFromDir( const QDir& dir )
+		{
+			QStringList filters;
+			filters << "*-templates.xml" << "*.template";
+
+			XmlTemplateParser parser;
+
+			foreach ( QString fileName, dir.entryList( filters, QDir::Files ) )
 			{
 				parser.readFile( dir.absoluteFilePath( fileName ) );
 			}
 		}
+
 	}
-
-
-	void Db::readCategories()
-	{
-		readCategoriesFromDir( FileUtil::systemTemplatesDir() );
-	}
-
-
-	void Db::readCategoriesFromDir( const QDir& dir )
-	{
-		XmlCategoryParser parser;
-
-		foreach ( QString fileName, dir.entryList( QDir::Files ) )
-		{
-			if ( fileName == "categories.xml" )
-			{
-				parser.readFile( dir.absoluteFilePath( fileName ) );
-			}
-		}
-	}
-
-
-	void Db::readVendors()
-	{
-		readVendorsFromDir( FileUtil::systemTemplatesDir() );
-	}
-
-
-	void Db::readVendorsFromDir( const QDir& dir )
-	{
-		XmlVendorParser parser;
-
-		foreach ( QString fileName, dir.entryList( QDir::Files ) )
-		{
-			if ( fileName == "vendors.xml" )
-			{
-				parser.readFile( dir.absoluteFilePath( fileName ) );
-			}
-		}
-	}
-
-
-	void Db::readTemplates()
-	{
-		readTemplatesFromDir( FileUtil::systemTemplatesDir() );
-
-		// TODO: Read user directories
-
-		std::stable_sort( mTemplates.begin(), mTemplates.end(), partNameLessThan );
-	}
-
-
-	void Db::readTemplatesFromDir( const QDir& dir )
-	{
-		QStringList filters;
-		filters << "*-templates.xml" << "*.template";
-
-		XmlTemplateParser parser;
-
-		foreach ( QString fileName, dir.entryList( filters, QDir::Files ) )
-		{
-			parser.readFile( dir.absoluteFilePath( fileName ) );
-		}
-	}
-
-} // namespace glabels::model
+}
diff --git a/model/Db.h b/model/Db.h
index d730930..a7be79e 100644
--- a/model/Db.h
+++ b/model/Db.h
@@ -33,108 +33,111 @@
 #include <QString>
 
 
-namespace glabels::model
+namespace glabels
 {
-
-	class Db
+	namespace model
 	{
-		Q_DECLARE_TR_FUNCTIONS(Db)
 
-	private:
-		Db();
+		class Db
+		{
+			Q_DECLARE_TR_FUNCTIONS(Db)
+
+		private:
+			Db();
 
 		
-	public:
-		static void init();
-		static Db* instance();
+		public:
+			static void init();
+			static Db* instance();
 
 
-		static const QList<Paper*>& papers();
-		static const QStringList& paperIds();
-		static const QStringList& paperNames();
+			static const QList<Paper*>& papers();
+			static const QStringList& paperIds();
+			static const QStringList& paperNames();
 
-		static const QList<Category*>& categories();
-		static const QStringList& categoryIds();
-		static const QStringList& categoryNames();
+			static const QList<Category*>& categories();
+			static const QStringList& categoryIds();
+			static const QStringList& categoryNames();
 
-		static const QList<Vendor*>& vendors();
-		static const QStringList& vendorNames();
+			static const QList<Vendor*>& vendors();
+			static const QStringList& vendorNames();
 
-		static const QList<Template*>& templates();
+			static const QList<Template*>& templates();
 
 
-		static void registerPaper( Paper *paper );
-		static const Paper *lookupPaperFromName( const QString& name );
-		static const Paper *lookupPaperFromId( const QString& id );
-		static QString lookupPaperIdFromName( const QString& name );
-		static QString lookupPaperNameFromId( const QString& id );
-		static bool isPaperIdKnown( const QString& id );
-		static bool isPaperIdOther( const QString& id );
+			static void registerPaper( Paper *paper );
+			static const Paper *lookupPaperFromName( const QString& name );
+			static const Paper *lookupPaperFromId( const QString& id );
+			static QString lookupPaperIdFromName( const QString& name );
+			static QString lookupPaperNameFromId( const QString& id );
+			static bool isPaperIdKnown( const QString& id );
+			static bool isPaperIdOther( const QString& id );
 
-		static void registerCategory( Category *category );
-		static const Category *lookupCategoryFromName( const QString& name );
-		static const Category *lookupCategoryFromId( const QString& id );
-		static QString lookupCategoryIdFromName( const QString& name );
-		static QString lookupCategoryNameFromId( const QString& id );
-		static bool isCategoryIdKnown( const QString& id );
+			static void registerCategory( Category *category );
+			static const Category *lookupCategoryFromName( const QString& name );
+			static const Category *lookupCategoryFromId( const QString& id );
+			static QString lookupCategoryIdFromName( const QString& name );
+			static QString lookupCategoryNameFromId( const QString& id );
+			static bool isCategoryIdKnown( const QString& id );
 
-		static void registerVendor( Vendor *vendor );
-		static const Vendor *lookupVendorFromName( const QString& name );
-		static QString lookupVendorUrlFromName( const QString& name );
-		static bool isVendorNameKnown( const QString& id );
+			static void registerVendor( Vendor *vendor );
+			static const Vendor *lookupVendorFromName( const QString& name );
+			static QString lookupVendorUrlFromName( const QString& name );
+			static bool isVendorNameKnown( const QString& id );
 
-		static void registerTemplate( Template *tmplate );
-		static const Template *lookupTemplateFromName( const QString& name );
-		static const Template *lookupTemplateFromBrandPart( const QString& brand,
-		                                                    const QString& part );
-		static bool isTemplateKnown( const QString& brand, const QString& part );
-		static QStringList getNameListOfSimilarTemplates( const QString& name );
+			static void registerTemplate( Template *tmplate );
+			static const Template *lookupTemplateFromName( const QString& name );
+			static const Template *lookupTemplateFromBrandPart( const QString& brand,
+			                                                    const QString& part );
+			static bool isTemplateKnown( const QString& brand, const QString& part );
+			static QStringList getNameListOfSimilarTemplates( const QString& name );
 
-		static void registerUserTemplate( Template *tmplate );
-		static void deleteUserTemplateByName( const QString& name );
-		static void deleteUserTemplateByBrandPart( const QString& brand,
-		                                           const QString& part );
+			static void registerUserTemplate( Template *tmplate );
+			static void deleteUserTemplateByName( const QString& name );
+			static void deleteUserTemplateByBrandPart( const QString& brand,
+			                                           const QString& part );
 
-		static void printKnownPapers();
-		static void printKnownCategories();
-		static void printKnownVendors();
-		static void printKnownTemplates();
+			static void printKnownPapers();
+			static void printKnownCategories();
+			static void printKnownVendors();
+			static void printKnownTemplates();
 
 
-	private:
-		static QDir systemTemplatesDir();
+		private:
+			static QDir systemTemplatesDir();
 
-		static void readPapers();
-		static void readPapersFromDir( const QDir& dir );
+			static void readPapers();
+			static void readPapersFromDir( const QDir& dir );
 
-		static void readCategories();
-		static void readCategoriesFromDir( const QDir& dir );
+			static void readCategories();
+			static void readCategoriesFromDir( const QDir& dir );
 
-		static void readVendors();
-		static void readVendorsFromDir( const QDir& dir );
+			static void readVendors();
+			static void readVendorsFromDir( const QDir& dir );
 
-		static void readTemplates();
-		static void readTemplatesFromDir( const QDir& dir );
+			static void readTemplates();
+			static void readTemplatesFromDir( const QDir& dir );
 
 
-	private:
-		static QList<Paper*>    mPapers;
-		static QStringList      mPaperIds;
-		static QStringList      mPaperNames;
+		private:
+			static QList<Paper*>    mPapers;
+			static QStringList      mPaperIds;
+			static QStringList      mPaperNames;
 
-		static QList<Category*> mCategories;
-		static QStringList      mCategoryIds;
-		static QStringList      mCategoryNames;
+			static QList<Category*> mCategories;
+			static QStringList      mCategoryIds;
+			static QStringList      mCategoryNames;
 
-		static QList<Vendor*>   mVendors;
-		static QStringList      mVendorNames;
+			static QList<Vendor*>   mVendors;
+			static QStringList      mVendorNames;
 
-		static QList<Template*> mTemplates;
+			static QList<Template*> mTemplates;
 
-		static QString          mPaperNameOther;
+			static QString          mPaperNameOther;
 
-	};
+		};
 
+	}
 }
 
 
diff --git a/model/Distance.cpp b/model/Distance.cpp
index f39ab6a..19cd155 100644
--- a/model/Distance.cpp
+++ b/model/Distance.cpp
@@ -24,184 +24,187 @@
 #include <QtDebug>
 
 
-namespace glabels::model
+namespace glabels
 {
-
-	Distance::Distance( double d, Units::Enum unitsEnum )
+	namespace model
 	{
-		switch (unitsEnum)
+
+		Distance::Distance( double d, Units::Enum unitsEnum )
 		{
-		case Units::PT:
-			mDPts = d;
-			break;
-		case Units::IN:
-			mDPts = d * PTS_PER_INCH;
-			break;
-		case Units::MM:
-			mDPts = d * PTS_PER_MM;
-			break;
-		case Units::CM:
-			mDPts = d * PTS_PER_CM;
-			break;
-		case Units::PC:
-			mDPts = d * PTS_PER_PICA;
-			break;
-		default:
-			mDPts = d;
-			break;
+			switch (unitsEnum)
+			{
+			case Units::PT:
+				mDPts = d;
+				break;
+			case Units::IN:
+				mDPts = d * PTS_PER_INCH;
+				break;
+			case Units::MM:
+				mDPts = d * PTS_PER_MM;
+				break;
+			case Units::CM:
+				mDPts = d * PTS_PER_CM;
+				break;
+			case Units::PC:
+				mDPts = d * PTS_PER_PICA;
+				break;
+			default:
+				mDPts = d;
+				break;
+			}
 		}
-	}
 
 
-	Distance::Distance( double d, const Units& units )
-	{
-		switch (units.toEnum())
+		Distance::Distance( double d, const Units& units )
 		{
-		case Units::PT:
-			mDPts = d;
-			break;
-		case Units::IN:
-			mDPts = d * PTS_PER_INCH;
-			break;
-		case Units::MM:
-			mDPts = d * PTS_PER_MM;
-			break;
-		case Units::CM:
-			mDPts = d * PTS_PER_CM;
-			break;
-		case Units::PC:
-			mDPts = d * PTS_PER_PICA;
-			break;
-		default:
-			mDPts = d;
-			break;
+			switch (units.toEnum())
+			{
+			case Units::PT:
+				mDPts = d;
+				break;
+			case Units::IN:
+				mDPts = d * PTS_PER_INCH;
+				break;
+			case Units::MM:
+				mDPts = d * PTS_PER_MM;
+				break;
+			case Units::CM:
+				mDPts = d * PTS_PER_CM;
+				break;
+			case Units::PC:
+				mDPts = d * PTS_PER_PICA;
+				break;
+			default:
+				mDPts = d;
+				break;
+			}
 		}
-	}
 
 
-	Distance::Distance( double d, const QString& unitsId )
-	{
-		Units units = Units( unitsId );
+		Distance::Distance( double d, const QString& unitsId )
+		{
+			Units units = Units( unitsId );
 		
-		switch (units.toEnum())
-		{
-		case Units::PT:
-			mDPts = d;
-			break;
-		case Units::IN:
-			mDPts = d * PTS_PER_INCH;
-			break;
-		case Units::MM:
-			mDPts = d * PTS_PER_MM;
-			break;
-		case Units::CM:
-			mDPts = d * PTS_PER_CM;
-			break;
-		case Units::PC:
-			mDPts = d * PTS_PER_PICA;
-			break;
-		default:
-			mDPts = d;
-			break;
-		}
-	}
-
-
-	Distance Distance::fromString( const QString& string )
-	{
-		QString stringCopy = string;
-		QTextStream valueStream( &stringCopy, QIODevice::ReadOnly );
-
-		double value;
-		QString unitsString;
-		valueStream >> value >> unitsString;
-
-		if ( !unitsString.isEmpty() && !Units::isIdValid( unitsString ) )
-		{
-			qWarning() << "Invalid Units in string: \"" << string << "\"";
+			switch (units.toEnum())
+			{
+			case Units::PT:
+				mDPts = d;
+				break;
+			case Units::IN:
+				mDPts = d * PTS_PER_INCH;
+				break;
+			case Units::MM:
+				mDPts = d * PTS_PER_MM;
+				break;
+			case Units::CM:
+				mDPts = d * PTS_PER_CM;
+				break;
+			case Units::PC:
+				mDPts = d * PTS_PER_PICA;
+				break;
+			default:
+				mDPts = d;
+				break;
+			}
 		}
 
-		return Distance( value, unitsString );
-	}
 
-
-	double Distance::inUnits( const Units& units ) const
-	{
-		double d;
-
-		switch (units.toEnum())
+		Distance Distance::fromString( const QString& string )
 		{
-		case Units::PT:
-			d = pt();
-			break;
-		case Units::IN:
-			d = in();
-			break;
-		case Units::MM:
-			d = mm();
-			break;
-		case Units::CM:
-			d = cm();
-			break;
-		case Units::PC:
-			d = pc();
-			break;
+			QString stringCopy = string;
+			QTextStream valueStream( &stringCopy, QIODevice::ReadOnly );
+
+			double value;
+			QString unitsString;
+			valueStream >> value >> unitsString;
+
+			if ( !unitsString.isEmpty() && !Units::isIdValid( unitsString ) )
+			{
+				qWarning() << "Invalid Units in string: \"" << string << "\"";
+			}
+
+			return Distance( value, unitsString );
 		}
 
-		return d;
-	}
+
+		double Distance::inUnits( const Units& units ) const
+		{
+			double d;
+
+			switch (units.toEnum())
+			{
+			case Units::PT:
+				d = pt();
+				break;
+			case Units::IN:
+				d = in();
+				break;
+			case Units::MM:
+				d = mm();
+				break;
+			case Units::CM:
+				d = cm();
+				break;
+			case Units::PC:
+				d = pc();
+				break;
+			}
+
+			return d;
+		}
 	
 
-	double Distance::inUnits( Units::Enum unitsEnum ) const
-	{
-		double d;
-
-		switch (unitsEnum)
+		double Distance::inUnits( Units::Enum unitsEnum ) const
 		{
-		case Units::PT:
-			d = pt();
-			break;
-		case Units::IN:
-			d = in();
-			break;
-		case Units::MM:
-			d = mm();
-			break;
-		case Units::CM:
-			d = cm();
-			break;
-		case Units::PC:
-			d = pc();
-			break;
-		}
+			double d;
 
-		return d;
-	}
+			switch (unitsEnum)
+			{
+			case Units::PT:
+				d = pt();
+				break;
+			case Units::IN:
+				d = in();
+				break;
+			case Units::MM:
+				d = mm();
+				break;
+			case Units::CM:
+				d = cm();
+				break;
+			case Units::PC:
+				d = pc();
+				break;
+			}
+
+			return d;
+		}
 	
 
-	double Distance::inUnits( const QString& unitsId ) const
-	{
-		return inUnits( Units( unitsId ) );
+		double Distance::inUnits( const QString& unitsId ) const
+		{
+			return inUnits( Units( unitsId ) );
+		}
+
+
+		QString Distance::toString( const Units& units ) const
+		{
+			return QString::number( inUnits(units) ) + units.toIdString();
+		}
+
+
+		QString Distance::toString( Units::Enum unitsEnum ) const
+		{
+			Units units(unitsEnum);
+			return QString::number( inUnits(units) ) + units.toIdString();
+		}
+
+
+		QString Distance::toString( const QString& unitsId ) const
+		{
+			Units units(unitsId);
+			return QString::number( inUnits(units) ) + units.toIdString();
+		}
+
 	}
-
-
-	QString Distance::toString( const Units& units ) const
-	{
-		return QString::number( inUnits(units) ) + units.toIdString();
-	}
-
-
-	QString Distance::toString( Units::Enum unitsEnum ) const
-	{
-		Units units(unitsEnum);
-		return QString::number( inUnits(units) ) + units.toIdString();
-	}
-
-
-	QString Distance::toString( const QString& unitsId ) const
-	{
-		Units units(unitsId);
-		return QString::number( inUnits(units) ) + units.toIdString();
-	}
-
-} // namespace glabels::model
+}
diff --git a/model/Distance.h b/model/Distance.h
index d0556d7..ba525ab 100644
--- a/model/Distance.h
+++ b/model/Distance.h
@@ -29,71 +29,74 @@
 #include <QtMath>
 
 
-namespace glabels::model
+namespace glabels
 {
-
-	class Distance
+	namespace model
 	{
-		Q_DECLARE_TR_FUNCTIONS(Distance)
 
-	public:
-		Distance();
-		Distance( double d, Units::Enum unitsEnum = Units::PT );
-		Distance( double d, const Units& units );
-		Distance( double d, const QString& unitsId );
+		class Distance
+		{
+			Q_DECLARE_TR_FUNCTIONS(Distance)
 
-		static Distance pt( double dPts );
-		static Distance in( double dInches );
-		static Distance mm( double dMm );
-		static Distance cm( double dCm );
-		static Distance pc( double dPicas );
-		static Distance fromString( const QString& string );
+		public:
+			Distance();
+			Distance( double d, Units::Enum unitsEnum = Units::PT );
+			Distance( double d, const Units& units );
+			Distance( double d, const QString& unitsId );
+
+			static Distance pt( double dPts );
+			static Distance in( double dInches );
+			static Distance mm( double dMm );
+			static Distance cm( double dCm );
+			static Distance pc( double dPicas );
+			static Distance fromString( const QString& string );
 
 
-		double pt() const;
-		double in() const;
-		double mm() const;
-		double cm() const;
-		double pc() const;
-		double inUnits( const Units& units ) const;
-		double inUnits( Units::Enum unitsEnum ) const;
-		double inUnits( const QString& unitsId ) const;
+			double pt() const;
+			double in() const;
+			double mm() const;
+			double cm() const;
+			double pc() const;
+			double inUnits( const Units& units ) const;
+			double inUnits( Units::Enum unitsEnum ) const;
+			double inUnits( const QString& unitsId ) const;
 
 
-		QString toString( const Units& units ) const;
-		QString toString( Units::Enum unitsEnum ) const;
-		QString toString( const QString& unitsId ) const;
+			QString toString( const Units& units ) const;
+			QString toString( Units::Enum unitsEnum ) const;
+			QString toString( const QString& unitsId ) const;
 
 
-		Distance& operator+=( const Distance& d );
-		Distance& operator-=( const Distance& d );
-		Distance operator-();
+			Distance& operator+=( const Distance& d );
+			Distance& operator-=( const Distance& d );
+			Distance operator-();
 
-		friend inline Distance operator+( const Distance& d1, const Distance& d2 );
-		friend inline Distance operator-( const Distance& d1, const Distance& d2 );
-		friend inline Distance operator*( double x, const Distance& d );
-		friend inline Distance operator*( const Distance& d, double x );
-		friend inline double   operator/( const Distance& d1, const Distance& d2 );
-		friend inline Distance operator/( const Distance& d, double x );
+			friend inline Distance operator+( const Distance& d1, const Distance& d2 );
+			friend inline Distance operator-( const Distance& d1, const Distance& d2 );
+			friend inline Distance operator*( double x, const Distance& d );
+			friend inline Distance operator*( const Distance& d, double x );
+			friend inline double   operator/( const Distance& d1, const Distance& d2 );
+			friend inline Distance operator/( const Distance& d, double x );
 		
-		friend inline bool operator<( const Distance& d1, const Distance& d2 );
-		friend inline bool operator<=( const Distance& d1, const Distance& d2 );
-		friend inline bool operator>( const Distance& d1, const Distance& d2 );
-		friend inline bool operator>=( const Distance& d1, const Distance& d2 );
-		friend inline bool operator==( const Distance& d1, const Distance& d2 );
-		friend inline bool operator!=( const Distance& d1, const Distance& d2 );
+			friend inline bool operator<( const Distance& d1, const Distance& d2 );
+			friend inline bool operator<=( const Distance& d1, const Distance& d2 );
+			friend inline bool operator>( const Distance& d1, const Distance& d2 );
+			friend inline bool operator>=( const Distance& d1, const Distance& d2 );
+			friend inline bool operator==( const Distance& d1, const Distance& d2 );
+			friend inline bool operator!=( const Distance& d1, const Distance& d2 );
 		
-		friend inline Distance fabs( const Distance& d );
-		friend inline Distance min( const Distance& d1, const Distance& d2 );
-		friend inline Distance max( const Distance& d1, const Distance& d2 );
-		friend inline Distance fmod( const Distance& d1, const Distance& d2 );
+			friend inline Distance fabs( const Distance& d );
+			friend inline Distance min( const Distance& d1, const Distance& d2 );
+			friend inline Distance max( const Distance& d1, const Distance& d2 );
+			friend inline Distance fmod( const Distance& d1, const Distance& d2 );
 
 		
-	private:
-		double mDPts;
+		private:
+			double mDPts;
 
-	};
+		};
 
+	}
 }
 
 
@@ -103,199 +106,202 @@ namespace glabels::model
 	
 #include "Constants.h"
 
-namespace glabels::model
+namespace glabels
 {
-
-	inline Distance::Distance() : mDPts(0)
+	namespace model
 	{
-	}
+
+		inline Distance::Distance() : mDPts(0)
+		{
+		}
 
 	
-	inline Distance Distance::pt( double dPts )
-	{
-		Distance d;
-		d.mDPts = dPts;
-		return d;
-	}
+		inline Distance Distance::pt( double dPts )
+		{
+			Distance d;
+			d.mDPts = dPts;
+			return d;
+		}
 
 
-	inline Distance Distance::in( double dInches )
-	{
-		Distance d;
-		d.mDPts = dInches * PTS_PER_INCH;
-		return d;
-	}
+		inline Distance Distance::in( double dInches )
+		{
+			Distance d;
+			d.mDPts = dInches * PTS_PER_INCH;
+			return d;
+		}
 
 
-	inline Distance Distance::mm( double dMm )
-	{
-		Distance d;
-		d.mDPts = dMm * PTS_PER_MM;
-		return d;
-	}
+		inline Distance Distance::mm( double dMm )
+		{
+			Distance d;
+			d.mDPts = dMm * PTS_PER_MM;
+			return d;
+		}
 
 
-	inline Distance Distance::cm( double dCm )
-	{
-		Distance d;
-		d.mDPts = dCm * PTS_PER_CM;
-		return d;
-	}
+		inline Distance Distance::cm( double dCm )
+		{
+			Distance d;
+			d.mDPts = dCm * PTS_PER_CM;
+			return d;
+		}
 
 
-	inline Distance Distance::pc( double dPicas )
-	{
-		Distance d;
-		d.mDPts = dPicas * PTS_PER_PICA;
-		return d;
-	}
+		inline Distance Distance::pc( double dPicas )
+		{
+			Distance d;
+			d.mDPts = dPicas * PTS_PER_PICA;
+			return d;
+		}
 
 
-	inline double Distance::pt() const
-	{
-		return mDPts;
-	}
+		inline double Distance::pt() const
+		{
+			return mDPts;
+		}
 	
 
-	inline double Distance::in() const
-	{
-		return mDPts / PTS_PER_INCH;
-	}
+		inline double Distance::in() const
+		{
+			return mDPts / PTS_PER_INCH;
+		}
 	
 
-	inline double Distance::mm() const
-	{
-		return mDPts / PTS_PER_MM;
-	}
+		inline double Distance::mm() const
+		{
+			return mDPts / PTS_PER_MM;
+		}
 	
 
-	inline double Distance::cm() const
-	{
-		return mDPts / PTS_PER_CM;
-	}
+		inline double Distance::cm() const
+		{
+			return mDPts / PTS_PER_CM;
+		}
 	
 
-	inline double Distance::pc() const
-	{
-		return mDPts / PTS_PER_PICA;
-	}
+		inline double Distance::pc() const
+		{
+			return mDPts / PTS_PER_PICA;
+		}
 
 
-	inline Distance& Distance::operator+=( const Distance& d )
-	{
-		mDPts += d.mDPts;
-		return *this;
-	}
+		inline Distance& Distance::operator+=( const Distance& d )
+		{
+			mDPts += d.mDPts;
+			return *this;
+		}
 
 	
-	inline Distance& Distance::operator-=( const Distance& d )
-	{
-		mDPts -= d.mDPts;
-		return *this;
-	}
+		inline Distance& Distance::operator-=( const Distance& d )
+		{
+			mDPts -= d.mDPts;
+			return *this;
+		}
 
 	
-	inline Distance Distance::operator-()
-	{
-		return Distance::pt( -mDPts );
-	}
+		inline Distance Distance::operator-()
+		{
+			return Distance::pt( -mDPts );
+		}
 
 	
-	inline Distance operator+( const Distance& d1, const Distance& d2 )
-	{
-		return Distance::pt( d1.mDPts + d2.mDPts );
-	}
+		inline Distance operator+( const Distance& d1, const Distance& d2 )
+		{
+			return Distance::pt( d1.mDPts + d2.mDPts );
+		}
 	
 
-	inline Distance operator-( const Distance& d1, const Distance& d2 )
-	{
-		return Distance::pt( d1.mDPts - d2.mDPts );
-	}
+		inline Distance operator-( const Distance& d1, const Distance& d2 )
+		{
+			return Distance::pt( d1.mDPts - d2.mDPts );
+		}
 	
 
-	inline Distance operator*( double x, const Distance& d )
-	{
-		return Distance::pt( x * d.mDPts );
-	}
+		inline Distance operator*( double x, const Distance& d )
+		{
+			return Distance::pt( x * d.mDPts );
+		}
 
 
-	inline Distance operator*( const Distance& d, double x )
-	{
-		return Distance::pt( d.mDPts * x );
-	}
+		inline Distance operator*( const Distance& d, double x )
+		{
+			return Distance::pt( d.mDPts * x );
+		}
 
 	
-	inline double operator/( const Distance& d1, const Distance& d2 )
-	{
-		return d1.mDPts / d2.mDPts;
-	}
+		inline double operator/( const Distance& d1, const Distance& d2 )
+		{
+			return d1.mDPts / d2.mDPts;
+		}
 
 
-	inline Distance operator/( const Distance& d, double x )
-	{
-		return Distance::pt( d.mDPts / x );
-	}
+		inline Distance operator/( const Distance& d, double x )
+		{
+			return Distance::pt( d.mDPts / x );
+		}
 
 
-	inline bool operator<( const Distance& d1, const Distance& d2 )
-	{
-		return d1.mDPts < d2.mDPts;
-	}
+		inline bool operator<( const Distance& d1, const Distance& d2 )
+		{
+			return d1.mDPts < d2.mDPts;
+		}
 	
 
-	inline bool operator<=( const Distance& d1, const Distance& d2 )
-	{
-		return d1.mDPts <= d2.mDPts;
-	}
+		inline bool operator<=( const Distance& d1, const Distance& d2 )
+		{
+			return d1.mDPts <= d2.mDPts;
+		}
 	
 
-	inline bool operator>( const Distance& d1, const Distance& d2 )
-	{
-		return d1.mDPts > d2.mDPts;
-	}
+		inline bool operator>( const Distance& d1, const Distance& d2 )
+		{
+			return d1.mDPts > d2.mDPts;
+		}
 	
 
-	inline bool operator>=( const Distance& d1, const Distance& d2 )
-	{
-		return d1.mDPts >= d2.mDPts;
-	}
+		inline bool operator>=( const Distance& d1, const Distance& d2 )
+		{
+			return d1.mDPts >= d2.mDPts;
+		}
 	
 
-	inline bool operator==( const Distance& d1, const Distance& d2 )
-	{
-		return d1.mDPts == d2.mDPts;
-	}
+		inline bool operator==( const Distance& d1, const Distance& d2 )
+		{
+			return d1.mDPts == d2.mDPts;
+		}
 
 
-	inline bool operator!=( const Distance& d1, const Distance& d2 )
-	{
-		return d1.mDPts != d2.mDPts;
-	}
+		inline bool operator!=( const Distance& d1, const Distance& d2 )
+		{
+			return d1.mDPts != d2.mDPts;
+		}
 
 
-	inline Distance fabs( const Distance& d )
-	{
-		return Distance::pt( qFabs( d.mDPts ) );
-	}
+		inline Distance fabs( const Distance& d )
+		{
+			return Distance::pt( qFabs( d.mDPts ) );
+		}
 
 	
-	inline Distance min( const Distance& d1, const Distance& d2 )
-	{
-		return (d1.mDPts < d2.mDPts) ? d1 : d2;
-	}
+		inline Distance min( const Distance& d1, const Distance& d2 )
+		{
+			return (d1.mDPts < d2.mDPts) ? d1 : d2;
+		}
 
 	
-	inline Distance max( const Distance& d1, const Distance& d2 )
-	{
-		return (d1.mDPts > d2.mDPts) ? d1 : d2;
+		inline Distance max( const Distance& d1, const Distance& d2 )
+		{
+			return (d1.mDPts > d2.mDPts) ? d1 : d2;
+		}
+
+
+		inline Distance fmod( const Distance& d1, const Distance& d2 )
+		{
+			return Distance::pt( std::fmod( d1.mDPts, d2.mDPts ) );
+		}
+
 	}
-
-
-	inline Distance fmod( const Distance& d1, const Distance& d2 )
-	{
-		return Distance::pt( std::fmod( d1.mDPts, d2.mDPts ) );
-	}
-
 }
 
 
diff --git a/model/FileUtil.cpp b/model/FileUtil.cpp
index 4618221..c31b790 100644
--- a/model/FileUtil.cpp
+++ b/model/FileUtil.cpp
@@ -25,63 +25,66 @@
 #include <QApplication>
 
 
-namespace glabels::model
+namespace glabels
 {
-
-	QString FileUtil::addExtension( const QString& rawFilename, const QString& extension )
+	namespace model
 	{
-		if ( rawFilename.endsWith( extension ) )
+
+		QString FileUtil::addExtension( const QString& rawFilename, const QString& extension )
 		{
-			return rawFilename;
+			if ( rawFilename.endsWith( extension ) )
+			{
+				return rawFilename;
+			}
+
+			return rawFilename + extension;
+		}
+
+
+		QDir FileUtil::systemTemplatesDir()
+		{
+			QDir dir;
+
+			// First, try finding templates directory relative to application path
+			dir.cd( QApplication::applicationDirPath() );
+			if ( (dir.dirName() == "bin") &&
+			     dir.cdUp() && dir.cd( "share" ) && dir.cd( "glabels-qt" ) && dir.cd( "templates" ) )
+			{
+				return dir;
+			}
+
+			// Next, try running out of the source directory.
+			if ( dir.cd( Config::PROJECT_SOURCE_DIR ) && dir.cd( "templates" ) )
+			{
+				return dir;
+			}
+
+			qFatal( "Cannot locate system template directory!" );
+			return QDir("/");
+		}
+
+
+		QDir FileUtil::translationsDir()
+		{
+			QDir dir;
+
+			// First, try finding translations directory relative to application path
+			dir.cd( QApplication::applicationDirPath() );
+			if ( (dir.dirName() == "bin") &&
+			     dir.cdUp() && dir.cd( "share" ) && dir.cd( "glabels-qt" ) && dir.cd( "translations" ) )
+			{
+				return dir;
+			}
+
+			// Next, try running out of the source directory.
+			if ( dir.cd( Config::PROJECT_BUILD_DIR ) && dir.cd( "translations" ) )
+			{
+				return dir;
+			}
+
+			qFatal( "Cannot locate system template directory!" );
+			return QDir("/");
 		}
 
-		return rawFilename + extension;
 	}
-
-
-	QDir FileUtil::systemTemplatesDir()
-	{
-		QDir dir;
-
-		// First, try finding templates directory relative to application path
-		dir.cd( QApplication::applicationDirPath() );
-		if ( (dir.dirName() == "bin") &&
-		     dir.cdUp() && dir.cd( "share" ) && dir.cd( "glabels-qt" ) && dir.cd( "templates" ) )
-		{
-			return dir;
-		}
-
-		// Next, try running out of the source directory.
-		if ( dir.cd( Config::PROJECT_SOURCE_DIR ) && dir.cd( "templates" ) )
-		{
-			return dir;
-		}
-
-		qFatal( "Cannot locate system template directory!" );
-		return QDir("/");
-	}
-
-
-	QDir FileUtil::translationsDir()
-	{
-		QDir dir;
-
-		// First, try finding translations directory relative to application path
-		dir.cd( QApplication::applicationDirPath() );
-		if ( (dir.dirName() == "bin") &&
-		     dir.cdUp() && dir.cd( "share" ) && dir.cd( "glabels-qt" ) && dir.cd( "translations" ) )
-		{
-			return dir;
-		}
-
-		// Next, try running out of the source directory.
-		if ( dir.cd( Config::PROJECT_BUILD_DIR ) && dir.cd( "translations" ) )
-		{
-			return dir;
-		}
-
-		qFatal( "Cannot locate system template directory!" );
-		return QDir("/");
-	}
-
-} // namespace glabels::model
+}
diff --git a/model/FileUtil.h b/model/FileUtil.h
index 3c2469a..00d9c5b 100644
--- a/model/FileUtil.h
+++ b/model/FileUtil.h
@@ -26,20 +26,23 @@
 #include <QDir>
 
 
-namespace glabels::model
+namespace glabels
 {
-
-	namespace FileUtil
+	namespace model
 	{
 
-		QString addExtension( const QString& rawFilename, const QString& extension );
+		namespace FileUtil
+		{
 
-		QDir systemTemplatesDir();
-		QDir userTemplatesDir();
+			QString addExtension( const QString& rawFilename, const QString& extension );
+
+			QDir systemTemplatesDir();
+			QDir userTemplatesDir();
+
+			QDir translationsDir();
+		}
 
-		QDir translationsDir();
 	}
-
 }
 
 
diff --git a/model/Frame.cpp b/model/Frame.cpp
index 4d730cf..f020cd9 100644
--- a/model/Frame.cpp
+++ b/model/Frame.cpp
@@ -25,114 +25,117 @@
 #include <algorithm>
 
 
-namespace glabels::model
+namespace glabels
 {
-
-	Frame::Frame( const QString& id )
-		: mId(id), mNLabels(0), mLayoutDescription("")
+	namespace model
 	{
-		// empty
-	}
 
-
-	Frame::Frame( const Frame& other )
-	{
-		mId = other.mId;
-		mNLabels = 0;
-
-		foreach ( Layout *layout, mLayouts )
+		Frame::Frame( const QString& id )
+			: mId(id), mNLabels(0), mLayoutDescription("")
 		{
-			addLayout( layout->dup() );
+			// empty
 		}
-		
-		foreach ( Markup *markup, mMarkups )
+
+
+		Frame::Frame( const Frame& other )
 		{
-			addMarkup( markup->dup() );
-		}
-	}
+			mId = other.mId;
+			mNLabels = 0;
 
-
-	QString Frame::id() const
-	{
-		return mId;
-	}
-
-	
-	int Frame::nLabels() const
-	{
-		return mNLabels;
-	}
-
-	
-	QString Frame::layoutDescription() const
-	{
-		return mLayoutDescription;
-	}
-
-	
-	const QList<Layout*>& Frame::layouts() const
-	{
-		return mLayouts;
-	}
-
-	
-	const QList<Markup*>& Frame::markups() const
-	{
-		return mMarkups;
-	}
-	
-
-	QVector<Point> Frame::getOrigins() const
-	{
-		QVector<Point> origins( nLabels() );
-
-		int i = 0;
-		foreach ( Layout *layout, mLayouts )
-		{
-			for ( int iy = 0; iy < layout->ny(); iy++ )
+			foreach ( Layout *layout, mLayouts )
 			{
-				for ( int ix = 0; ix < layout->nx(); ix++ )
-				{
-					origins[i++] = Point( ix*layout->dx() + layout->x0(), iy*layout->dy() + layout->y0() );
-				}
+				addLayout( layout->dup() );
+			}
+		
+			foreach ( Markup *markup, mMarkups )
+			{
+				addMarkup( markup->dup() );
 			}
 		}
 
-		std::stable_sort( origins.begin(), origins.end() );
 
-		return origins;
-	}
-
-
-	void Frame::addLayout( Layout *layout )
-	{
-		mLayouts << layout;
-
-		// Update total number of labels
-		mNLabels += layout->nx() * layout->ny();
-
-		// Update layout description
-		if ( mLayouts.size() == 1 )
+		QString Frame::id() const
 		{
-			/*
-			 * Translators: %1 = number of labels across a page,
-			 *              %2 = number of labels down a page,
-			 *              %3 = total number of labels on a page (sheet).
-			 */
-			mLayoutDescription = QString( tr("%1 x %2 (%3 per sheet)") )
-				.arg(layout->nx()).arg(layout->ny()).arg(mNLabels);
+			return mId;
 		}
-		else
+
+	
+		int Frame::nLabels() const
 		{
-			/* Translators: %1 is the total number of labels on a page (sheet). */
-			mLayoutDescription = QString( tr("%1 per sheet") ).arg(mNLabels);
+			return mNLabels;
 		}
+
+	
+		QString Frame::layoutDescription() const
+		{
+			return mLayoutDescription;
+		}
+
+	
+		const QList<Layout*>& Frame::layouts() const
+		{
+			return mLayouts;
+		}
+
+	
+		const QList<Markup*>& Frame::markups() const
+		{
+			return mMarkups;
+		}
+	
+
+		QVector<Point> Frame::getOrigins() const
+		{
+			QVector<Point> origins( nLabels() );
+
+			int i = 0;
+			foreach ( Layout *layout, mLayouts )
+			{
+				for ( int iy = 0; iy < layout->ny(); iy++ )
+				{
+					for ( int ix = 0; ix < layout->nx(); ix++ )
+					{
+						origins[i++] = Point( ix*layout->dx() + layout->x0(), iy*layout->dy() + layout->y0() );
+					}
+				}
+			}
+
+			std::stable_sort( origins.begin(), origins.end() );
+
+			return origins;
+		}
+
+
+		void Frame::addLayout( Layout *layout )
+		{
+			mLayouts << layout;
+
+			// Update total number of labels
+			mNLabels += layout->nx() * layout->ny();
+
+			// Update layout description
+			if ( mLayouts.size() == 1 )
+			{
+				/*
+				 * Translators: %1 = number of labels across a page,
+				 *              %2 = number of labels down a page,
+				 *              %3 = total number of labels on a page (sheet).
+				 */
+				mLayoutDescription = QString( tr("%1 x %2 (%3 per sheet)") )
+					.arg(layout->nx()).arg(layout->ny()).arg(mNLabels);
+			}
+			else
+			{
+				/* Translators: %1 is the total number of labels on a page (sheet). */
+				mLayoutDescription = QString( tr("%1 per sheet") ).arg(mNLabels);
+			}
+		}
+
+
+		void Frame::addMarkup( Markup *markup )
+		{
+			mMarkups << markup;
+		}
+
 	}
-
-
-	void Frame::addMarkup( Markup *markup )
-	{
-		mMarkups << markup;
-	}
-
-} // namespace glabels::model
+}
diff --git a/model/Frame.h b/model/Frame.h
index 45e9859..b2bbc2c 100644
--- a/model/Frame.h
+++ b/model/Frame.h
@@ -33,55 +33,58 @@
 #include <QVector>
 
 
-namespace glabels::model
+namespace glabels
 {
-	
-	// Forward references
-	class Markup;
-
-
-	class Frame
+	namespace model
 	{
-		Q_DECLARE_TR_FUNCTIONS(Frame)
-
-	protected:
-		Frame( const QString& id = "0" );
-		Frame( const Frame& other );
-
-	public:
-		virtual Frame* dup() const = 0;
-
-		QString id() const;
-		int nLabels() const;
-		QString layoutDescription() const;
-		const QList<Layout*>& layouts() const;
-		const QList<Markup*>& markups() const;
-
-		QVector<Point> getOrigins() const;
-
-		void addLayout( Layout* layout );
-		void addMarkup( Markup* markup );
-
-		virtual Distance w() const = 0;
-		virtual Distance h() const = 0;
-
-		virtual QString sizeDescription( const Units& units ) const = 0;
-		virtual bool isSimilarTo( Frame* other ) const = 0;
-
-		virtual const QPainterPath& path() const = 0;
-		virtual const QPainterPath& clipPath() const = 0;
-		virtual QPainterPath marginPath( const Distance& size ) const = 0;
+	
+		// Forward references
+		class Markup;
 
 
-	private:
-		QString mId;
-		int     mNLabels;
-		QString mLayoutDescription;
+		class Frame
+		{
+			Q_DECLARE_TR_FUNCTIONS(Frame)
 
-		QList<Layout*> mLayouts;
-		QList<Markup*> mMarkups;
-	};
+		protected:
+			Frame( const QString& id = "0" );
+			Frame( const Frame& other );
 
+		public:
+			virtual Frame* dup() const = 0;
+
+			QString id() const;
+			int nLabels() const;
+			QString layoutDescription() const;
+			const QList<Layout*>& layouts() const;
+			const QList<Markup*>& markups() const;
+
+			QVector<Point> getOrigins() const;
+
+			void addLayout( Layout* layout );
+			void addMarkup( Markup* markup );
+
+			virtual Distance w() const = 0;
+			virtual Distance h() const = 0;
+
+			virtual QString sizeDescription( const Units& units ) const = 0;
+			virtual bool isSimilarTo( Frame* other ) const = 0;
+
+			virtual const QPainterPath& path() const = 0;
+			virtual const QPainterPath& clipPath() const = 0;
+			virtual QPainterPath marginPath( const Distance& size ) const = 0;
+
+
+		private:
+			QString mId;
+			int     mNLabels;
+			QString mLayoutDescription;
+
+			QList<Layout*> mLayouts;
+			QList<Markup*> mMarkups;
+		};
+
+	}
 }
 
 
diff --git a/model/FrameCd.cpp b/model/FrameCd.cpp
index e4d16ef..3f1985f 100644
--- a/model/FrameCd.cpp
+++ b/model/FrameCd.cpp
@@ -26,24 +26,177 @@
 #include <QtDebug>
 
 
-namespace glabels::model
+namespace glabels
 {
-
-	FrameCd::FrameCd( const Distance& r1,
-			  const Distance& r2,
-			  const Distance& w,
-			  const Distance& h,
-			  const Distance& waste,
-			  const QString&  id )
-		: Frame(id), mR1(r1), mR2(r2), mW(w), mH(h), mWaste(waste)
+	namespace model
 	{
-		Distance wReal = (mW == 0) ? 2*mR1 : mW;
-		Distance hReal = (mH == 0) ? 2*mR1 : mH;
 
-		//
-		// Create path
-		//
+		FrameCd::FrameCd( const Distance& r1,
+		                  const Distance& r2,
+		                  const Distance& w,
+		                  const Distance& h,
+		                  const Distance& waste,
+		                  const QString&  id )
+			: Frame(id), mR1(r1), mR2(r2), mW(w), mH(h), mWaste(waste)
 		{
+			Distance wReal = (mW == 0) ? 2*mR1 : mW;
+			Distance hReal = (mH == 0) ? 2*mR1 : mH;
+
+			//
+			// Create path
+			//
+			{
+				/*
+				 * Construct outer subpath (may be clipped if it's a business card CD)
+				 */
+				QPainterPath outerPath;
+				outerPath.addEllipse( (wReal/2 - r1).pt(), (hReal/2 - r1).pt(), 2*r1.pt(), 2*r1.pt() );
+
+				QPainterPath clipPath;
+				clipPath.addRect( 0, 0, wReal.pt(), hReal.pt() );
+
+				mPath.addPath( outerPath & clipPath );
+				mPath.closeSubpath();
+
+				/*
+				 * Add inner subpath
+				 */
+				mPath.addEllipse( (wReal/2 - r2).pt(), (hReal/2 - r2).pt(), 2*r2.pt(), 2*r2.pt() );
+			}
+
+			//
+			// Create clip path
+			//
+			{
+				Distance r1Clip = mR1 + mWaste;
+				Distance r2Clip = mR2 - mWaste;
+				Distance wClip = (mW == 0) ? 2*r1Clip : mW + 2*mWaste;
+				Distance hClip = (mH == 0) ? 2*r1Clip : mH + 2*mWaste;
+
+				/*
+				 * Construct outer subpath (may be clipped if it's a business card CD)
+				 */
+				QPainterPath outerPath;
+				outerPath.addEllipse( (wReal/2 - r1Clip).pt(), (hReal/2 - r1Clip).pt(), 2*r1Clip.pt(), 2*r1Clip.pt() );
+
+				QPainterPath clipPath;
+				clipPath.addRect( -mWaste.pt(), -mWaste.pt(), wClip.pt(), hClip.pt() );
+
+				mClipPath.addPath( outerPath & clipPath );
+				mClipPath.closeSubpath();
+
+				/*
+				 * Add inner subpath
+				 */
+				mClipPath.addEllipse( (wReal/2 - r2Clip).pt(), (hReal/2 - r2Clip).pt(), 2*r2Clip.pt(), 2*r2Clip.pt() );
+			}
+		}
+
+
+		FrameCd::FrameCd( const FrameCd& other )
+			: Frame(other),
+			  mR1(other.mR1), mR2(other.mR2), mW(other.mW), mH(other.mH), mWaste(other.mWaste),
+			  mPath(other.mPath)
+		{
+			// empty
+		}
+
+	
+		Frame* FrameCd::dup() const
+		{
+			return new FrameCd( *this );
+		}
+	
+
+		Distance FrameCd::w() const
+		{
+			return (mW == 0) ? 2*mR1 : mW;
+		}
+
+	
+		Distance FrameCd::h() const
+		{
+			return (mH == 0) ? 2*mR1 : mH;
+		}
+
+
+		Distance FrameCd::r1() const
+		{
+			return mR1;
+		}
+
+	
+		Distance FrameCd::r2() const
+		{
+			return mR2;
+		}
+
+	
+		Distance FrameCd::waste() const
+		{
+			return mWaste;
+		}
+	
+
+		QString FrameCd::sizeDescription( const Units& units ) const
+		{
+			if ( units.toEnum() == Units::IN )
+			{
+				QString dStr = StrUtil::formatFraction( 2 * mR1.in() );
+
+				return QString().sprintf( "%s %s %s",
+				                          qPrintable(dStr),
+				                          qPrintable(units.toTrName()),
+				                          qPrintable(tr("diameter")) );
+			}
+			else
+			{
+				return QString().sprintf( "%.5g %s %s",
+				                          2 * mR1.inUnits(units),
+				                          qPrintable(units.toTrName()),
+				                          qPrintable(tr("diameter")) );
+			}
+		}
+
+
+		bool FrameCd::isSimilarTo( Frame* other ) const
+		{
+			if ( FrameCd *otherCd = dynamic_cast<FrameCd*>(other) )
+			{
+				if ( (fabs( mW  - otherCd->mW )  <= EPSILON) &&
+				     (fabs( mH  - otherCd->mH )  <= EPSILON) &&
+				     (fabs( mR1 - otherCd->mR1 ) <= EPSILON) &&
+				     (fabs( mR2 - otherCd->mR2 ) <= EPSILON) )
+				{
+					return true;
+				}
+			}
+			return false;
+		}
+
+
+		const QPainterPath& FrameCd::path() const
+		{
+			return mPath;
+		}
+	
+
+		const QPainterPath& FrameCd::clipPath() const
+		{
+			return mClipPath;
+		}
+	
+
+		QPainterPath FrameCd::marginPath( const Distance& size ) const
+		{
+			Distance wReal = (mW == 0) ? 2*mR1 : mW;
+			Distance hReal = (mH == 0) ? 2*mR1 : mH;
+
+			Distance r1 = mR1 - size;
+			Distance r2 = mR2 + size;
+
+			QPainterPath path;
+
 			/*
 			 * Construct outer subpath (may be clipped if it's a business card CD)
 			 */
@@ -51,168 +204,18 @@ namespace glabels::model
 			outerPath.addEllipse( (wReal/2 - r1).pt(), (hReal/2 - r1).pt(), 2*r1.pt(), 2*r1.pt() );
 
 			QPainterPath clipPath;
-			clipPath.addRect( 0, 0, wReal.pt(), hReal.pt() );
+			clipPath.addRect( size.pt(), size.pt(), (wReal-2*size).pt(), (hReal-2*size).pt() );
 
-			mPath.addPath( outerPath & clipPath );
-			mPath.closeSubpath();
+			path.addPath( outerPath & clipPath );
+			path.closeSubpath();
 
 			/*
 			 * Add inner subpath
 			 */
-			mPath.addEllipse( (wReal/2 - r2).pt(), (hReal/2 - r2).pt(), 2*r2.pt(), 2*r2.pt() );
+			path.addEllipse( (wReal/2 - r2).pt(), (hReal/2 - r2).pt(), 2*r2.pt(), 2*r2.pt() );
+
+			return path;
 		}
 
-		//
-		// Create clip path
-		//
-		{
-			Distance r1Clip = mR1 + mWaste;
-			Distance r2Clip = mR2 - mWaste;
-			Distance wClip = (mW == 0) ? 2*r1Clip : mW + 2*mWaste;
-			Distance hClip = (mH == 0) ? 2*r1Clip : mH + 2*mWaste;
-
-			/*
-			 * Construct outer subpath (may be clipped if it's a business card CD)
-			 */
-			QPainterPath outerPath;
-			outerPath.addEllipse( (wReal/2 - r1Clip).pt(), (hReal/2 - r1Clip).pt(), 2*r1Clip.pt(), 2*r1Clip.pt() );
-
-			QPainterPath clipPath;
-			clipPath.addRect( -mWaste.pt(), -mWaste.pt(), wClip.pt(), hClip.pt() );
-
-			mClipPath.addPath( outerPath & clipPath );
-			mClipPath.closeSubpath();
-
-			/*
-			 * Add inner subpath
-			 */
-			mClipPath.addEllipse( (wReal/2 - r2Clip).pt(), (hReal/2 - r2Clip).pt(), 2*r2Clip.pt(), 2*r2Clip.pt() );
-		}
 	}
-
-
-	FrameCd::FrameCd( const FrameCd& other )
-		: Frame(other),
-		  mR1(other.mR1), mR2(other.mR2), mW(other.mW), mH(other.mH), mWaste(other.mWaste),
-		  mPath(other.mPath)
-	{
-		// empty
-	}
-
-	
-	Frame* FrameCd::dup() const
-	{
-		return new FrameCd( *this );
-	}
-	
-
-	Distance FrameCd::w() const
-	{
-		return (mW == 0) ? 2*mR1 : mW;
-	}
-
-	
-	Distance FrameCd::h() const
-	{
-		return (mH == 0) ? 2*mR1 : mH;
-	}
-
-
-	Distance FrameCd::r1() const
-	{
-		return mR1;
-	}
-
-	
-	Distance FrameCd::r2() const
-	{
-		return mR2;
-	}
-
-	
-	Distance FrameCd::waste() const
-	{
-		return mWaste;
-	}
-	
-
-	QString FrameCd::sizeDescription( const Units& units ) const
-	{
-		if ( units.toEnum() == Units::IN )
-		{
-			QString dStr = StrUtil::formatFraction( 2 * mR1.in() );
-
-			return QString().sprintf( "%s %s %s",
-						  qPrintable(dStr),
-						  qPrintable(units.toTrName()),
-						  qPrintable(tr("diameter")) );
-		}
-		else
-		{
-			return QString().sprintf( "%.5g %s %s",
-						  2 * mR1.inUnits(units),
-						  qPrintable(units.toTrName()),
-						  qPrintable(tr("diameter")) );
-		}
-	}
-
-
-	bool FrameCd::isSimilarTo( Frame* other ) const
-	{
-		if ( FrameCd *otherCd = dynamic_cast<FrameCd*>(other) )
-		{
-			if ( (fabs( mW  - otherCd->mW )  <= EPSILON) &&
-			     (fabs( mH  - otherCd->mH )  <= EPSILON) &&
-			     (fabs( mR1 - otherCd->mR1 ) <= EPSILON) &&
-			     (fabs( mR2 - otherCd->mR2 ) <= EPSILON) )
-			{
-				return true;
-			}
-		}
-		return false;
-	}
-
-
-	const QPainterPath& FrameCd::path() const
-	{
-		return mPath;
-	}
-	
-
-	const QPainterPath& FrameCd::clipPath() const
-	{
-		return mClipPath;
-	}
-	
-
-	QPainterPath FrameCd::marginPath( const Distance& size ) const
-	{
-		Distance wReal = (mW == 0) ? 2*mR1 : mW;
-		Distance hReal = (mH == 0) ? 2*mR1 : mH;
-
-		Distance r1 = mR1 - size;
-		Distance r2 = mR2 + size;
-
-		QPainterPath path;
-
-		/*
-		 * Construct outer subpath (may be clipped if it's a business card CD)
-		 */
-		QPainterPath outerPath;
-		outerPath.addEllipse( (wReal/2 - r1).pt(), (hReal/2 - r1).pt(), 2*r1.pt(), 2*r1.pt() );
-
-		QPainterPath clipPath;
-		clipPath.addRect( size.pt(), size.pt(), (wReal-2*size).pt(), (hReal-2*size).pt() );
-
-		path.addPath( outerPath & clipPath );
-		path.closeSubpath();
-
-		/*
-		 * Add inner subpath
-		 */
-		path.addEllipse( (wReal/2 - r2).pt(), (hReal/2 - r2).pt(), 2*r2.pt(), 2*r2.pt() );
-
-		return path;
-	}
-
-} // namespace glabels::model
+}
diff --git a/model/FrameCd.h b/model/FrameCd.h
index b50c83b..4805549 100644
--- a/model/FrameCd.h
+++ b/model/FrameCd.h
@@ -25,52 +25,55 @@
 #include "Frame.h"
 
 
-namespace glabels::model
+namespace glabels
 {
-
-	class FrameCd : public Frame
+	namespace model
 	{
-		Q_DECLARE_TR_FUNCTIONS(FrameCd)
 
-	public:
-		FrameCd( const Distance& r1,
-		         const Distance& r2,
-		         const Distance& w,
-		         const Distance& h,
-		         const Distance& waste,
-		         const QString&  id = "0" );
+		class FrameCd : public Frame
+		{
+			Q_DECLARE_TR_FUNCTIONS(FrameCd)
 
-		FrameCd( const FrameCd &other );
+		public:
+			FrameCd( const Distance& r1,
+			         const Distance& r2,
+			         const Distance& w,
+			         const Distance& h,
+			         const Distance& waste,
+			         const QString&  id = "0" );
 
-		Frame *dup() const override;
+			FrameCd( const FrameCd &other );
 
-		Distance r1() const;
-		Distance r2() const;
-		Distance waste() const;
+			Frame *dup() const override;
 
-		Distance w() const override;
-		Distance h() const override;
+			Distance r1() const;
+			Distance r2() const;
+			Distance waste() const;
 
-		QString sizeDescription( const Units& units ) const override;
-		bool isSimilarTo( Frame* other ) const override;
+			Distance w() const override;
+			Distance h() const override;
 
-		const QPainterPath& path() const override;
-		const QPainterPath& clipPath() const override;
-		QPainterPath marginPath( const Distance& size ) const override;
+			QString sizeDescription( const Units& units ) const override;
+			bool isSimilarTo( Frame* other ) const override;
+
+			const QPainterPath& path() const override;
+			const QPainterPath& clipPath() const override;
+			QPainterPath marginPath( const Distance& size ) const override;
 
 
-	private:
-		Distance mR1;
-		Distance mR2;
-		Distance mW;
-		Distance mH;
-		Distance mWaste;
+		private:
+			Distance mR1;
+			Distance mR2;
+			Distance mW;
+			Distance mH;
+			Distance mWaste;
 
-		QPainterPath mPath;
-		QPainterPath mClipPath;
+			QPainterPath mPath;
+			QPainterPath mClipPath;
 
-	};
+		};
 
+	}
 }
 
 
diff --git a/model/FrameEllipse.cpp b/model/FrameEllipse.cpp
index dc72cb9..766afcb 100644
--- a/model/FrameEllipse.cpp
+++ b/model/FrameEllipse.cpp
@@ -24,107 +24,111 @@
 #include "StrUtil.h"
 
 
-namespace glabels::model
+namespace glabels
 {
-
-	FrameEllipse::FrameEllipse( const Distance& w,
-				    const Distance& h,
-				    const Distance& waste,
-				    const QString&  id )
-		: Frame(id), mW(w), mH(h), mWaste(waste)
+	namespace model
 	{
-		mPath.addEllipse( 0, 0, mW.pt(), mH.pt() );
-		mClipPath.addEllipse( -mWaste.pt(), -mWaste.pt(), (mW+2*mWaste).pt(), (mH+2*mWaste).pt() );
-	}
 
-	FrameEllipse::FrameEllipse( const FrameEllipse& other )
-		: Frame(other), mW(other.mW), mH(other.mH), mWaste(other.mWaste), mPath(other.mPath)
-	{
-		// empty
-	}
-
-	
-	Frame* FrameEllipse::dup() const
-	{
-		return new FrameEllipse( *this );
-	}
-
-
-	Distance FrameEllipse::w() const
-	{
-		return mW;
-	}
-
-	
-	Distance FrameEllipse::h() const
-	{
-		return mH;
-	}
-	
-
-	Distance FrameEllipse::waste() const
-	{
-		return mWaste;
-	}
-
-
-	QString FrameEllipse::sizeDescription( const Units& units ) const
-	{
-		if ( units.toEnum() == Units::IN )
+		FrameEllipse::FrameEllipse( const Distance& w,
+		                            const Distance& h,
+		                            const Distance& waste,
+		                            const QString&  id )
+			: Frame(id), mW(w), mH(h), mWaste(waste)
 		{
-			QString wStr = StrUtil::formatFraction( mW.in() );
-			QString hStr = StrUtil::formatFraction( mH.in() );
-
-			return QString().sprintf( "%s x %s %s",
-						  qPrintable(wStr),
-						  qPrintable(hStr),
-						  qPrintable(units.toTrName()) );
+			mPath.addEllipse( 0, 0, mW.pt(), mH.pt() );
+			mClipPath.addEllipse( -mWaste.pt(), -mWaste.pt(), (mW+2*mWaste).pt(), (mH+2*mWaste).pt() );
 		}
-		else
+
+
+		FrameEllipse::FrameEllipse( const FrameEllipse& other )
+			: Frame(other), mW(other.mW), mH(other.mH), mWaste(other.mWaste), mPath(other.mPath)
 		{
-			return QString().sprintf( "%.5g x %.5g %s",
-						  mW.inUnits(units),
-						  mH.inUnits(units),
-						  qPrintable(units.toTrName()) );
+			// empty
 		}
-	}
 
 
-	bool FrameEllipse::isSimilarTo( Frame* other ) const
-	{
-		if ( FrameEllipse* otherEllipse = dynamic_cast<FrameEllipse*>(other) )
+		Frame* FrameEllipse::dup() const
 		{
-			if ( (fabs( mW - otherEllipse->mW ) <= EPSILON) &&
-			     (fabs( mH - otherEllipse->mH ) <= EPSILON) )
+			return new FrameEllipse( *this );
+		}
+
+
+		Distance FrameEllipse::w() const
+		{
+			return mW;
+		}
+
+	
+		Distance FrameEllipse::h() const
+		{
+			return mH;
+		}
+	
+
+		Distance FrameEllipse::waste() const
+		{
+			return mWaste;
+		}
+
+
+		QString FrameEllipse::sizeDescription( const Units& units ) const
+		{
+			if ( units.toEnum() == Units::IN )
 			{
-				return true;
+				QString wStr = StrUtil::formatFraction( mW.in() );
+				QString hStr = StrUtil::formatFraction( mH.in() );
+
+				return QString().sprintf( "%s x %s %s",
+				                          qPrintable(wStr),
+				                          qPrintable(hStr),
+				                          qPrintable(units.toTrName()) );
+			}
+			else
+			{
+				return QString().sprintf( "%.5g x %.5g %s",
+				                          mW.inUnits(units),
+				                          mH.inUnits(units),
+				                          qPrintable(units.toTrName()) );
 			}
 		}
-		return false;
-	}
 
 
-	const QPainterPath& FrameEllipse::path() const
-	{
-		return mPath;
-	}
+		bool FrameEllipse::isSimilarTo( Frame* other ) const
+		{
+			if ( FrameEllipse* otherEllipse = dynamic_cast<FrameEllipse*>(other) )
+			{
+				if ( (fabs( mW - otherEllipse->mW ) <= EPSILON) &&
+				     (fabs( mH - otherEllipse->mH ) <= EPSILON) )
+				{
+					return true;
+				}
+			}
+			return false;
+		}
+
+
+		const QPainterPath& FrameEllipse::path() const
+		{
+			return mPath;
+		}
 
 	
-	const QPainterPath& FrameEllipse::clipPath() const
-	{
-		return mClipPath;
-	}
+		const QPainterPath& FrameEllipse::clipPath() const
+		{
+			return mClipPath;
+		}
 
 	
-	QPainterPath FrameEllipse::marginPath( const Distance& size ) const
-	{
-		Distance w = mW - 2*size;
-		Distance h = mH - 2*size;
+		QPainterPath FrameEllipse::marginPath( const Distance& size ) const
+		{
+			Distance w = mW - 2*size;
+			Distance h = mH - 2*size;
 
-		QPainterPath path;
-		path.addEllipse( size.pt(), size.pt(), w.pt(), h.pt() );
+			QPainterPath path;
+			path.addEllipse( size.pt(), size.pt(), w.pt(), h.pt() );
+
+			return path;
+		}
 
-		return path;
 	}
-
-} // namespace glabels::model
+}
diff --git a/model/FrameEllipse.h b/model/FrameEllipse.h
index c96045a..43c0ed2 100644
--- a/model/FrameEllipse.h
+++ b/model/FrameEllipse.h
@@ -25,46 +25,49 @@
 #include "Frame.h"
 
 
-namespace glabels::model
+namespace glabels
 {
-
-	class FrameEllipse : public Frame
+	namespace model
 	{
-		Q_DECLARE_TR_FUNCTIONS(FrameEllipse)
+
+		class FrameEllipse : public Frame
+		{
+			Q_DECLARE_TR_FUNCTIONS(FrameEllipse)
 		
-	public:
-		FrameEllipse( const Distance& w,
-		              const Distance& h,
-		              const Distance& waste,
-		              const QString&  id = "0" );
+		public:
+			FrameEllipse( const Distance& w,
+			              const Distance& h,
+			              const Distance& waste,
+			              const QString&  id = "0" );
 
-		FrameEllipse( const FrameEllipse& other );
+			FrameEllipse( const FrameEllipse& other );
 
-		Frame* dup() const override;
+			Frame* dup() const override;
 
-		Distance waste() const;
+			Distance waste() const;
 
-		Distance w() const override;
-		Distance h() const override;
+			Distance w() const override;
+			Distance h() const override;
 
-		QString sizeDescription( const Units& units ) const override;
-		bool isSimilarTo( Frame* other ) const override;
+			QString sizeDescription( const Units& units ) const override;
+			bool isSimilarTo( Frame* other ) const override;
 
-		const QPainterPath& path() const override;
-		const QPainterPath& clipPath() const override;
-		QPainterPath marginPath( const Distance& size ) const override;
+			const QPainterPath& path() const override;
+			const QPainterPath& clipPath() const override;
+			QPainterPath marginPath( const Distance& size ) const override;
 
 
-	private:
-		Distance mW;
-		Distance mH;
-		Distance mWaste;
+		private:
+			Distance mW;
+			Distance mH;
+			Distance mWaste;
 
-		QPainterPath mPath;
-		QPainterPath mClipPath;
+			QPainterPath mPath;
+			QPainterPath mClipPath;
 
-	};
+		};
 
+	}
 }
 
 
diff --git a/model/FrameRect.cpp b/model/FrameRect.cpp
index b591b15..6a8e963 100644
--- a/model/FrameRect.cpp
+++ b/model/FrameRect.cpp
@@ -24,129 +24,132 @@
 #include "StrUtil.h"
 
 
-namespace glabels::model
+namespace glabels
 {
-
-	FrameRect::FrameRect( const Distance& w,
-			      const Distance& h,
-			      const Distance& r,
-			      const Distance& xWaste,
-			      const Distance& yWaste,
-			      const QString&  id )
-		: Frame(id), mW(w), mH(h), mR(r), mXWaste(xWaste), mYWaste(yWaste)
+	namespace model
 	{
-		mPath.addRoundedRect( 0, 0, mW.pt(), mH.pt(), mR.pt(), mR.pt() );
-		
-		mClipPath.addRoundedRect( -mXWaste.pt(), -mYWaste.pt(),
-					  mW.pt() + 2*mXWaste.pt(), mH.pt() + 2*mYWaste.pt(),
-					  mR.pt(), mR.pt() );
-	}
 
-	
-	FrameRect::FrameRect( const FrameRect &other )
-		: Frame(other),
-		  mW(other.mW), mH(other.mH), mR(other.mR), mXWaste(other.mXWaste),
-		  mYWaste(other.mYWaste), mPath(other.mPath)
-	{
-		// empty
-	}
-
-	
-	Frame* FrameRect::dup() const
-	{
-		return new FrameRect( *this );
-	}
-
-
-	Distance FrameRect::w() const
-	{
-		return mW;
-	}
-
-	
-	Distance FrameRect::h() const
-	{
-		return mH;
-	}
-
-
-	Distance FrameRect::r() const
-	{
-		return mR;
-	}
-
-		
-	Distance FrameRect::xWaste() const
-	{
-		return mXWaste;
-	}
-
-		
-	Distance FrameRect::yWaste() const
-	{
-		return mYWaste;
-	}
-
-
-	QString FrameRect::sizeDescription( const Units& units ) const
-	{
-		if ( units.toEnum() == Units::IN )
+		FrameRect::FrameRect( const Distance& w,
+		                      const Distance& h,
+		                      const Distance& r,
+		                      const Distance& xWaste,
+		                      const Distance& yWaste,
+		                      const QString&  id )
+			: Frame(id), mW(w), mH(h), mR(r), mXWaste(xWaste), mYWaste(yWaste)
 		{
-			QString wStr = StrUtil::formatFraction( mW.in() );
-			QString hStr = StrUtil::formatFraction( mH.in() );
-
-			return QString().sprintf( "%s x %s %s",
-						  qPrintable(wStr),
-						  qPrintable(hStr),
-						  qPrintable(units.toTrName()) );
+			mPath.addRoundedRect( 0, 0, mW.pt(), mH.pt(), mR.pt(), mR.pt() );
+		
+			mClipPath.addRoundedRect( -mXWaste.pt(), -mYWaste.pt(),
+			                          mW.pt() + 2*mXWaste.pt(), mH.pt() + 2*mYWaste.pt(),
+			                          mR.pt(), mR.pt() );
 		}
-		else
+
+	
+		FrameRect::FrameRect( const FrameRect &other )
+			: Frame(other),
+			  mW(other.mW), mH(other.mH), mR(other.mR), mXWaste(other.mXWaste),
+			  mYWaste(other.mYWaste), mPath(other.mPath)
 		{
-			return QString().sprintf( "%.5g x %.5g %s",
-						  mW.inUnits(units),
-						  mH.inUnits(units),
-						  qPrintable(units.toTrName()) );
+			// empty
 		}
-	}
 
-
-	bool FrameRect::isSimilarTo( Frame* other ) const
-	{
-		if ( FrameRect *otherRect = dynamic_cast<FrameRect*>(other) )
+	
+		Frame* FrameRect::dup() const
 		{
-			if ( (fabs( mW - otherRect->mW ) <= EPSILON) &&
-			     (fabs( mH - otherRect->mH ) <= EPSILON) )
+			return new FrameRect( *this );
+		}
+
+
+		Distance FrameRect::w() const
+		{
+			return mW;
+		}
+
+	
+		Distance FrameRect::h() const
+		{
+			return mH;
+		}
+
+
+		Distance FrameRect::r() const
+		{
+			return mR;
+		}
+
+		
+		Distance FrameRect::xWaste() const
+		{
+			return mXWaste;
+		}
+
+		
+		Distance FrameRect::yWaste() const
+		{
+			return mYWaste;
+		}
+
+
+		QString FrameRect::sizeDescription( const Units& units ) const
+		{
+			if ( units.toEnum() == Units::IN )
 			{
-				return true;
+				QString wStr = StrUtil::formatFraction( mW.in() );
+				QString hStr = StrUtil::formatFraction( mH.in() );
+
+				return QString().sprintf( "%s x %s %s",
+				                          qPrintable(wStr),
+				                          qPrintable(hStr),
+				                          qPrintable(units.toTrName()) );
+			}
+			else
+			{
+				return QString().sprintf( "%.5g x %.5g %s",
+				                          mW.inUnits(units),
+				                          mH.inUnits(units),
+				                          qPrintable(units.toTrName()) );
 			}
 		}
-		return false;
+
+
+		bool FrameRect::isSimilarTo( Frame* other ) const
+		{
+			if ( FrameRect *otherRect = dynamic_cast<FrameRect*>(other) )
+			{
+				if ( (fabs( mW - otherRect->mW ) <= EPSILON) &&
+				     (fabs( mH - otherRect->mH ) <= EPSILON) )
+				{
+					return true;
+				}
+			}
+			return false;
+		}
+
+
+		const QPainterPath& FrameRect::path() const
+		{
+			return mPath;
+		}
+
+
+		const QPainterPath& FrameRect::clipPath() const
+		{
+			return mClipPath;
+		}
+
+
+		QPainterPath FrameRect::marginPath( const Distance& size ) const
+		{
+			Distance w = mW - 2*size;
+			Distance h = mH - 2*size;
+			Distance r = std::max( mR - size, Distance(0.0) );
+
+			QPainterPath path;
+			path.addRoundedRect( size.pt(), size.pt(), w.pt(), h.pt(), r.pt(), r.pt() );
+
+			return path;
+		}
+
+
 	}
-
-
-	const QPainterPath& FrameRect::path() const
-	{
-		return mPath;
-	}
-
-
-	const QPainterPath& FrameRect::clipPath() const
-	{
-		return mClipPath;
-	}
-
-
-	QPainterPath FrameRect::marginPath( const Distance& size ) const
-	{
-		Distance w = mW - 2*size;
-		Distance h = mH - 2*size;
-		Distance r = std::max( mR - size, Distance(0.0) );
-
-		QPainterPath path;
-		path.addRoundedRect( size.pt(), size.pt(), w.pt(), h.pt(), r.pt(), r.pt() );
-
-		return path;
-	}
-
-
-} // namespace glabels::model
+}
diff --git a/model/FrameRect.h b/model/FrameRect.h
index f70013a..03438ae 100644
--- a/model/FrameRect.h
+++ b/model/FrameRect.h
@@ -25,53 +25,56 @@
 #include "Frame.h"
 
 
-namespace glabels::model
+namespace glabels
 {
-
-	class FrameRect : public Frame
+	namespace model
 	{
-		Q_DECLARE_TR_FUNCTIONS(FrameRect)
 
-	public:
-		FrameRect( const Distance& w,
-			   const Distance& h,
-		           const Distance& r,
-			   const Distance& xWaste,
-		           const Distance& yWaste,
-		           const QString&  id = "0" );
+		class FrameRect : public Frame
+		{
+			Q_DECLARE_TR_FUNCTIONS(FrameRect)
 
-		FrameRect( const FrameRect& other );
+		public:
+			FrameRect( const Distance& w,
+			           const Distance& h,
+			           const Distance& r,
+			           const Distance& xWaste,
+			           const Distance& yWaste,
+			           const QString&  id = "0" );
 
-		Frame* dup() const override;
+			FrameRect( const FrameRect& other );
 
-		Distance r() const;
-		Distance xWaste() const;
-		Distance yWaste() const;
+			Frame* dup() const override;
 
-		Distance w() const override;
-		Distance h() const override;
+			Distance r() const;
+			Distance xWaste() const;
+			Distance yWaste() const;
 
-		QString sizeDescription( const Units& units ) const override;
+			Distance w() const override;
+			Distance h() const override;
 
-		bool isSimilarTo( Frame* other ) const override;
+			QString sizeDescription( const Units& units ) const override;
 
-		const QPainterPath& path() const override;
-		const QPainterPath& clipPath() const override;
-		QPainterPath marginPath( const Distance& size ) const override;
+			bool isSimilarTo( Frame* other ) const override;
+
+			const QPainterPath& path() const override;
+			const QPainterPath& clipPath() const override;
+			QPainterPath marginPath( const Distance& size ) const override;
 
 
-	private:
-		Distance mW;
-		Distance mH;
-		Distance mR;
-		Distance mXWaste;
-		Distance mYWaste;
+		private:
+			Distance mW;
+			Distance mH;
+			Distance mR;
+			Distance mXWaste;
+			Distance mYWaste;
 
-		QPainterPath mPath;
-		QPainterPath mClipPath;
+			QPainterPath mPath;
+			QPainterPath mClipPath;
 
-	};
+		};
 
+	}
 }
 
 
diff --git a/model/FrameRound.cpp b/model/FrameRound.cpp
index c12d8fa..fe67822 100644
--- a/model/FrameRound.cpp
+++ b/model/FrameRound.cpp
@@ -24,111 +24,114 @@
 #include "StrUtil.h"
 
 
-namespace glabels::model
+namespace glabels
 {
-
-	FrameRound::FrameRound( const Distance& r,
-				const Distance& waste,
-				const QString&  id )
-		: Frame(id), mR(r), mWaste(waste)
+	namespace model
 	{
-		mPath.addEllipse( 0, 0, 2*mR.pt(), 2*mR.pt() );
-		mClipPath.addEllipse( -mWaste.pt(), -mWaste.pt(),
-		                      2*(mR+mWaste).pt(), 2*(mR+mWaste).pt() );
-	}
-	
 
-	FrameRound::FrameRound( const FrameRound& other )
-		: Frame(other), mR(other.mR), mWaste(other.mWaste), mPath(other.mPath)
-	{
-		// empty
-	}
-	
-
-	Frame* FrameRound::dup() const
-	{
-		return new FrameRound( *this );
-	}
-
-	
-	Distance FrameRound::w() const
-	{
-		return 2*mR;
-	}
-
-	
-	Distance FrameRound::h() const
-	{
-		return 2*mR;
-	}
-
-	
-	Distance FrameRound::r() const
-	{
-		return mR;
-	}
-
-
-	Distance FrameRound::waste() const
-	{
-		return mWaste;
-	}
-
-
-	QString FrameRound::sizeDescription( const Units& units ) const
-	{
-		if ( units.toEnum() == Units::IN )
+		FrameRound::FrameRound( const Distance& r,
+		                        const Distance& waste,
+		                        const QString&  id )
+			: Frame(id), mR(r), mWaste(waste)
 		{
-			QString dStr = StrUtil::formatFraction( 2 * mR.in() );
-
-			return QString().sprintf( "%s %s %s",
-						  qPrintable(dStr),
-						  qPrintable(units.toTrName()),
-						  qPrintable(tr("diameter")) );
+			mPath.addEllipse( 0, 0, 2*mR.pt(), 2*mR.pt() );
+			mClipPath.addEllipse( -mWaste.pt(), -mWaste.pt(),
+			                      2*(mR+mWaste).pt(), 2*(mR+mWaste).pt() );
 		}
-		else
+	
+
+		FrameRound::FrameRound( const FrameRound& other )
+			: Frame(other), mR(other.mR), mWaste(other.mWaste), mPath(other.mPath)
 		{
-			return QString().sprintf( "%.5g %s %s",
-						  2 * mR.inUnits(units),
-						  qPrintable(units.toTrName()),
-						  qPrintable(tr("diameter")) );
+			// empty
 		}
-	}
+	
 
-
-	bool FrameRound::isSimilarTo( Frame* other ) const
-	{
-		if ( FrameRound *otherRound = dynamic_cast<FrameRound*>(other) )
+		Frame* FrameRound::dup() const
 		{
-			if ( fabs( mR - otherRound->mR ) <= EPSILON )
+			return new FrameRound( *this );
+		}
+
+	
+		Distance FrameRound::w() const
+		{
+			return 2*mR;
+		}
+
+	
+		Distance FrameRound::h() const
+		{
+			return 2*mR;
+		}
+
+	
+		Distance FrameRound::r() const
+		{
+			return mR;
+		}
+
+
+		Distance FrameRound::waste() const
+		{
+			return mWaste;
+		}
+
+
+		QString FrameRound::sizeDescription( const Units& units ) const
+		{
+			if ( units.toEnum() == Units::IN )
 			{
-				return true;
+				QString dStr = StrUtil::formatFraction( 2 * mR.in() );
+
+				return QString().sprintf( "%s %s %s",
+				                          qPrintable(dStr),
+				                          qPrintable(units.toTrName()),
+				                          qPrintable(tr("diameter")) );
+			}
+			else
+			{
+				return QString().sprintf( "%.5g %s %s",
+				                          2 * mR.inUnits(units),
+				                          qPrintable(units.toTrName()),
+				                          qPrintable(tr("diameter")) );
 			}
 		}
-		return false;
+
+
+		bool FrameRound::isSimilarTo( Frame* other ) const
+		{
+			if ( FrameRound *otherRound = dynamic_cast<FrameRound*>(other) )
+			{
+				if ( fabs( mR - otherRound->mR ) <= EPSILON )
+				{
+					return true;
+				}
+			}
+			return false;
+		}
+
+
+		const QPainterPath& FrameRound::path() const
+		{
+			return mPath;
+		}
+
+
+		const QPainterPath& FrameRound::clipPath() const
+		{
+			return mClipPath;
+		}
+
+
+		QPainterPath FrameRound::marginPath( const Distance& size ) const
+		{
+			Distance r = mR - size;
+
+			QPainterPath path;
+			path.addEllipse( size.pt(), size.pt(), 2*r.pt(), 2*r.pt() );
+
+			return path;
+		}
+
 	}
-
-
-	const QPainterPath& FrameRound::path() const
-	{
-		return mPath;
-	}
-
-
-	const QPainterPath& FrameRound::clipPath() const
-	{
-		return mClipPath;
-	}
-
-
-	QPainterPath FrameRound::marginPath( const Distance& size ) const
-	{
-		Distance r = mR - size;
-
-		QPainterPath path;
-		path.addEllipse( size.pt(), size.pt(), 2*r.pt(), 2*r.pt() );
-
-		return path;
-	}
-
-} // namespace glabels::model
+}
diff --git a/model/FrameRound.h b/model/FrameRound.h
index c4b6fe6..41c53e9 100644
--- a/model/FrameRound.h
+++ b/model/FrameRound.h
@@ -25,45 +25,48 @@
 #include "Frame.h"
 
 
-namespace glabels::model
+namespace glabels
 {
-
-	class FrameRound : public Frame
+	namespace model
 	{
-		Q_DECLARE_TR_FUNCTIONS(FrameRound)
 
-	public:
-		FrameRound( const Distance& r,
-		            const Distance& waste,
-		            const QString&  id = "0" );
+		class FrameRound : public Frame
+		{
+			Q_DECLARE_TR_FUNCTIONS(FrameRound)
 
-		FrameRound( const FrameRound &other );
+		public:
+			FrameRound( const Distance& r,
+			            const Distance& waste,
+			            const QString&  id = "0" );
 
-		Frame *dup() const override;
+			FrameRound( const FrameRound &other );
 
-		Distance r() const;
-		Distance waste() const;
+			Frame *dup() const override;
 
-		Distance w() const override;
-		Distance h() const override;
+			Distance r() const;
+			Distance waste() const;
 
-		QString sizeDescription( const Units& units ) const override;
-		bool isSimilarTo( Frame* other ) const override;
+			Distance w() const override;
+			Distance h() const override;
 
-		const QPainterPath& path() const override;
-		const QPainterPath& clipPath() const override;
-		QPainterPath marginPath( const Distance& size ) const override;
+			QString sizeDescription( const Units& units ) const override;
+			bool isSimilarTo( Frame* other ) const override;
+
+			const QPainterPath& path() const override;
+			const QPainterPath& clipPath() const override;
+			QPainterPath marginPath( const Distance& size ) const override;
 
 
-	private:
-		Distance mR;
-		Distance mWaste;
+		private:
+			Distance mR;
+			Distance mWaste;
 
-		QPainterPath mPath;
-		QPainterPath mClipPath;
+			QPainterPath mPath;
+			QPainterPath mClipPath;
 
-	};
+		};
 
+	}
 }
 
 
diff --git a/model/Handles.cpp b/model/Handles.cpp
index a41874f..0591706 100644
--- a/model/Handles.cpp
+++ b/model/Handles.cpp
@@ -26,563 +26,566 @@
 #include <QtDebug>
 
 
-namespace glabels::model
+namespace glabels
 {
-
-	//
-	// Private
-	//
-	namespace
+	namespace model
 	{
-		const double handlePixels             = 7;
-		const double handleOutlineWidthPixels = 1;
 
-		const QColor handleFillColor( 0,  192,  0,  96 );
-		const QColor originHandleFillColor( 192,  0,  0,  96 );
-		const QColor handleOutlineColor( 0,  0,   0,  192 );
-	}
+		//
+		// Private
+		//
+		namespace
+		{
+			const double handlePixels             = 7;
+			const double handleOutlineWidthPixels = 1;
+
+			const QColor handleFillColor( 0,  192,  0,  96 );
+			const QColor originHandleFillColor( 192,  0,  0,  96 );
+			const QColor handleOutlineColor( 0,  0,   0,  192 );
+		}
 
 
-	///
-	/// Handle Constructor
-	///
-	Handle::Handle( ModelObject* owner, Location location )
-		: mOwner(owner), mLocation(location)
-	{
-		// empty
-	}
+		///
+		/// Handle Constructor
+		///
+		Handle::Handle( ModelObject* owner, Location location )
+			: mOwner(owner), mLocation(location)
+		{
+			// empty
+		}
 
 
-	///
-	/// Handle Destructor
-	///
-	Handle::~Handle()
-	{
-		// empty
-	}
+		///
+		/// Handle Destructor
+		///
+		Handle::~Handle()
+		{
+			// empty
+		}
 
 
-	///
-	/// Handle owner
-	///
-	ModelObject* Handle::owner() const
-	{
-		return mOwner;
-	}
+		///
+		/// Handle owner
+		///
+		ModelObject* Handle::owner() const
+		{
+			return mOwner;
+		}
 
 
-	///
-	/// Handle location
-	///
-	Handle::Location Handle::location() const
-	{
-		return mLocation;
-	}
+		///
+		/// Handle location
+		///
+		Handle::Location Handle::location() const
+		{
+			return mLocation;
+		}
 
 
-	///
-	/// Draw Handle at x,y
-	///
-	void Handle::drawAt( QPainter*       painter,
-	                     double          scale,
-	                     const Distance& x,
-	                     const Distance& y,
-	                     QColor          color ) const
-	{
-		painter->save();
+		///
+		/// Draw Handle at x,y
+		///
+		void Handle::drawAt( QPainter*       painter,
+		                     double          scale,
+		                     const Distance& x,
+		                     const Distance& y,
+		                     QColor          color ) const
+		{
+			painter->save();
 
-		painter->translate( x.pt(), y.pt() );
+			painter->translate( x.pt(), y.pt() );
 
-		double s = 1.0 / scale;
+			double s = 1.0 / scale;
 
-		QPen pen( handleOutlineColor );
-		pen.setCosmetic( true );
-		pen.setWidth( handleOutlineWidthPixels );
+			QPen pen( handleOutlineColor );
+			pen.setCosmetic( true );
+			pen.setWidth( handleOutlineWidthPixels );
 
-		painter->setPen( pen );
-		painter->setBrush( color );
+			painter->setPen( pen );
+			painter->setBrush( color );
 
-		painter->drawRect( QRectF( -s*handlePixels/2.0, -s*handlePixels/2.0,
-		                           s*handlePixels, s*handlePixels ) );
+			painter->drawRect( QRectF( -s*handlePixels/2.0, -s*handlePixels/2.0,
+			                           s*handlePixels, s*handlePixels ) );
 
-		painter->restore();
-	}
+			painter->restore();
+		}
 
 
-	///
-	/// Create Handle path at x,y
-	///
-	QPainterPath Handle::pathAt( double          scale,
-	                             const Distance& x,
-	                             const Distance& y ) const
-	{
-		QPainterPath path;
+		///
+		/// Create Handle path at x,y
+		///
+		QPainterPath Handle::pathAt( double          scale,
+		                             const Distance& x,
+		                             const Distance& y ) const
+		{
+			QPainterPath path;
 
-		double s = 1/scale;
+			double s = 1/scale;
 
-		path.addRect( -s*handlePixels/2, -s*handlePixels/2, s*handlePixels, s*handlePixels );
-		path.translate( x.pt(), y.pt() );
+			path.addRect( -s*handlePixels/2, -s*handlePixels/2, s*handlePixels, s*handlePixels );
+			path.translate( x.pt(), y.pt() );
 	
-		return path;
+			return path;
+		}
+
+
+		///
+		/// HandleNorth Constructor
+		///
+		HandleNorth::HandleNorth( ModelObject* owner )
+			: Handle( owner, N )
+		{
+			// empty
+		}
+
+
+		///
+		/// HandleNorth Destructor
+		///
+		HandleNorth::~HandleNorth()
+		{
+			// empty
+		}
+
+
+		///
+		/// HandleNorth Clone
+		///
+		HandleNorth* HandleNorth::clone( ModelObject* newOwner ) const
+		{
+			return new HandleNorth( newOwner );
+		}
+
+
+		///
+		/// Draw HandleNorth
+		///
+		void HandleNorth::draw( QPainter* painter, double scale ) const
+		{
+			drawAt( painter, scale, mOwner->w()/2, 0, handleFillColor );
+		}
+
+
+		///
+		/// HandleNorth Path
+		///
+		QPainterPath HandleNorth::path( double scale ) const
+		{
+			return pathAt( scale, mOwner->w()/2, 0 );
+		}
+
+
+		///
+		/// HandleNorthEast Constructor
+		///
+		HandleNorthEast::HandleNorthEast( ModelObject* owner )
+			: Handle( owner, NE )
+		{
+			// empty
+		}
+
+
+		///
+		/// HandleNorthEast Destructor
+		///
+		HandleNorthEast::~HandleNorthEast()
+		{
+			// empty
+		}
+
+
+		///
+		/// HandleNorthEast Clone
+		///
+		HandleNorthEast* HandleNorthEast::clone( ModelObject* newOwner ) const
+		{
+			return new HandleNorthEast( newOwner );
+		}
+
+
+		///
+		/// Draw HandleNorthEast
+		///
+		void HandleNorthEast::draw( QPainter* painter, double scale ) const
+		{
+			drawAt( painter, scale, mOwner->w(), 0, handleFillColor );
+		}
+
+
+		///
+		/// HandleNorthEast Path
+		///
+		QPainterPath HandleNorthEast::path( double scale ) const
+		{
+			return pathAt( scale, mOwner->w(), 0 );
+		}
+
+
+		///
+		/// HandleEast Constructor
+		///
+		HandleEast::HandleEast( ModelObject* owner )
+			: Handle( owner, E )
+		{
+			// empty
+		}
+
+
+		///
+		/// HandleEast Destructor
+		///
+		HandleEast::~HandleEast()
+		{
+			// empty
+		}
+
+
+		///
+		/// HandleEast Clone
+		///
+		HandleEast* HandleEast::clone( ModelObject* newOwner ) const
+		{
+			return new HandleEast( newOwner );
+		}
+
+
+		///
+		/// Draw HandleEast
+		///
+		void HandleEast::draw( QPainter* painter, double scale ) const
+		{
+			drawAt( painter, scale, mOwner->w(), mOwner->h()/2, handleFillColor );
+		}
+
+
+		///
+		/// HandleEast Path
+		///
+		QPainterPath HandleEast::path( double scale ) const
+		{
+			return pathAt( scale, mOwner->w(), mOwner->h()/2 );
+		}
+
+
+		///
+		/// HandleSouthEast Constructor
+		///
+		HandleSouthEast::HandleSouthEast( ModelObject* owner )
+			: Handle( owner, SE )
+		{
+			// empty
+		}
+
+
+		///
+		/// HandleSouthEast Destructor
+		///
+		HandleSouthEast::~HandleSouthEast()
+		{
+			// empty
+		}
+
+
+		///
+		/// HandleSouthEast Clone
+		///
+		HandleSouthEast* HandleSouthEast::clone( ModelObject* newOwner ) const
+		{
+			return new HandleSouthEast( newOwner );
+		}
+
+
+		///
+		/// Draw HandleSouthEast
+		///
+		void HandleSouthEast::draw( QPainter* painter, double scale ) const
+		{
+			drawAt( painter, scale, mOwner->w(), mOwner->h(), handleFillColor );
+		}
+
+
+		///
+		/// HandleSouthEast Path
+		///
+		QPainterPath HandleSouthEast::path( double scale ) const
+		{
+			return pathAt( scale, mOwner->w(), mOwner->h() );
+		}
+
+
+		///
+		/// HandleSouth Constructor
+		///
+		HandleSouth::HandleSouth( ModelObject* owner )
+			: Handle( owner, S )
+		{
+			// empty
+		}
+
+
+		///
+		/// HandleSouth Destructor
+		///
+		HandleSouth::~HandleSouth()
+		{
+			// empty
+		}
+
+
+		///
+		/// HandleSouth Clone
+		///
+		HandleSouth* HandleSouth::clone( ModelObject* newOwner ) const
+		{
+			return new HandleSouth( newOwner );
+		}
+
+
+		///
+		/// Draw HandleSouth
+		///
+		void HandleSouth::draw( QPainter* painter, double scale ) const
+		{
+			drawAt( painter, scale, mOwner->w()/2, mOwner->h(), handleFillColor );
+		}
+
+
+		///
+		/// HandleSouth Path
+		///
+		QPainterPath HandleSouth::path( double scale ) const
+		{
+			return pathAt( scale, mOwner->w()/2, mOwner->h() );
+		}
+
+
+		///
+		/// HandleSouthWest Constructor
+		///
+		HandleSouthWest::HandleSouthWest( ModelObject* owner )
+			: Handle( owner, SW )
+		{
+			// empty
+		}
+
+
+		///
+		/// HandleSouthWest Destructor
+		///
+		HandleSouthWest::~HandleSouthWest()
+		{
+			// empty
+		}
+
+
+		///
+		/// HandleSouthWest Clone
+		///
+		HandleSouthWest* HandleSouthWest::clone( ModelObject* newOwner ) const
+		{
+			return new HandleSouthWest( newOwner );
+		}
+
+
+		///
+		/// Draw HandleSouthWest
+		///
+		void HandleSouthWest::draw( QPainter* painter, double scale ) const
+		{
+			drawAt( painter, scale, 0, mOwner->h(), handleFillColor );
+		}
+
+
+		///
+		/// HandleSouthWest Path
+		///
+		QPainterPath HandleSouthWest::path( double scale ) const
+		{
+			return pathAt( scale, 0, mOwner->h() );
+		}
+
+
+		///
+		/// HandleWest Constructor
+		///
+		HandleWest::HandleWest( ModelObject* owner )
+			: Handle( owner, W )
+		{
+			// empty
+		}
+
+
+		///
+		/// HandleWest Destructor
+		///
+		HandleWest::~HandleWest()
+		{
+			// empty
+		}
+
+
+		///
+		/// HandleWest Clone
+		///
+		HandleWest* HandleWest::clone( ModelObject* newOwner ) const
+		{
+			return new HandleWest( newOwner );
+		}
+
+
+		///
+		/// Draw HandleWest
+		///
+		void HandleWest::draw( QPainter* painter, double scale ) const
+		{
+			drawAt( painter, scale, 0, mOwner->h()/2, handleFillColor );
+		}
+
+
+		///
+		/// HandleWest Path
+		///
+		QPainterPath HandleWest::path( double scale ) const
+		{
+			return pathAt( scale, 0, mOwner->h()/2 );
+		}
+
+
+		///
+		/// HandleNorthWest Constructor
+		///
+		HandleNorthWest::HandleNorthWest( ModelObject* owner )
+			: Handle( owner, NW )
+		{
+			// empty
+		}
+
+
+		///
+		/// HandleNorthWest Destructor
+		///
+		HandleNorthWest::~HandleNorthWest()
+		{
+			// empty
+		}
+
+		///
+		/// HandleNorthWest Clone
+		///
+		HandleNorthWest* HandleNorthWest::clone( ModelObject* newOwner ) const
+		{
+			return new HandleNorthWest( newOwner );
+		}
+
+
+		///
+		/// Draw HandleNorthWest
+		///
+		void HandleNorthWest::draw( QPainter* painter, double scale ) const
+		{
+			drawAt( painter, scale, 0, 0, originHandleFillColor );
+		}
+
+
+		///
+		/// HandleNorthWest Path
+		///
+		QPainterPath HandleNorthWest::path( double scale ) const
+		{
+			return pathAt( scale, 0, 0 );
+		}
+
+
+		///
+		/// HandleP1 Constructor
+		///
+		HandleP1::HandleP1( ModelObject* owner )
+			: Handle( owner, P1 )
+		{
+			// empty
+		}
+
+
+		///
+		/// HandleP1 Destructor
+		///
+		HandleP1::~HandleP1()
+		{
+			// empty
+		}
+
+
+		///
+		/// HandleP1 Clone
+		///
+		HandleP1* HandleP1::clone( ModelObject* newOwner ) const
+		{
+			return new HandleP1( newOwner );
+		}
+
+
+		///
+		/// Draw HandleP1
+		///
+		void HandleP1::draw( QPainter* painter, double scale ) const
+		{
+			drawAt( painter, scale, 0, 0, originHandleFillColor );
+		}
+
+
+		///
+		/// HandleP1 Path
+		///
+		QPainterPath HandleP1::path( double scale ) const
+		{
+			return pathAt( scale, 0, 0 );
+		}
+
+
+		///
+		/// HandleP2 Constructor
+		///
+		HandleP2::HandleP2( ModelObject* owner )
+			: Handle( owner, P2 )
+		{
+			// empty
+		}
+
+
+		///
+		/// HandleP2 Destructor
+		///
+		HandleP2::~HandleP2()
+		{
+			// empty
+		}
+
+
+		///
+		/// HandleP2 Clone
+		///
+		HandleP2* HandleP2::clone( ModelObject* newOwner ) const
+		{
+			return new HandleP2( newOwner );
+		}
+
+
+		///
+		/// Draw HandleP2
+		///
+		void HandleP2::draw( QPainter* painter, double scale ) const
+		{
+			drawAt( painter, scale, mOwner->w(), mOwner->h(), handleFillColor );
+		}
+
+
+		///
+		/// HandleP2 Path
+		///
+		QPainterPath HandleP2::path( double scale ) const
+		{
+			return pathAt( scale, mOwner->w(), mOwner->h() );
+		}
+
 	}
-
-
-	///
-	/// HandleNorth Constructor
-	///
-	HandleNorth::HandleNorth( ModelObject* owner )
-		: Handle( owner, N )
-	{
-		// empty
-	}
-
-
-	///
-	/// HandleNorth Destructor
-	///
-	HandleNorth::~HandleNorth()
-	{
-		// empty
-	}
-
-
-	///
-	/// HandleNorth Clone
-	///
-	HandleNorth* HandleNorth::clone( ModelObject* newOwner ) const
-	{
-		return new HandleNorth( newOwner );
-	}
-
-
-	///
-	/// Draw HandleNorth
-	///
-	void HandleNorth::draw( QPainter* painter, double scale ) const
-	{
-		drawAt( painter, scale, mOwner->w()/2, 0, handleFillColor );
-	}
-
-
-	///
-	/// HandleNorth Path
-	///
-	QPainterPath HandleNorth::path( double scale ) const
-	{
-		return pathAt( scale, mOwner->w()/2, 0 );
-	}
-
-
-	///
-	/// HandleNorthEast Constructor
-	///
-	HandleNorthEast::HandleNorthEast( ModelObject* owner )
-		: Handle( owner, NE )
-	{
-		// empty
-	}
-
-
-	///
-	/// HandleNorthEast Destructor
-	///
-	HandleNorthEast::~HandleNorthEast()
-	{
-		// empty
-	}
-
-
-	///
-	/// HandleNorthEast Clone
-	///
-	HandleNorthEast* HandleNorthEast::clone( ModelObject* newOwner ) const
-	{
-		return new HandleNorthEast( newOwner );
-	}
-
-
-	///
-	/// Draw HandleNorthEast
-	///
-	void HandleNorthEast::draw( QPainter* painter, double scale ) const
-	{
-		drawAt( painter, scale, mOwner->w(), 0, handleFillColor );
-	}
-
-
-	///
-	/// HandleNorthEast Path
-	///
-	QPainterPath HandleNorthEast::path( double scale ) const
-	{
-		return pathAt( scale, mOwner->w(), 0 );
-	}
-
-
-	///
-	/// HandleEast Constructor
-	///
-	HandleEast::HandleEast( ModelObject* owner )
-		: Handle( owner, E )
-	{
-		// empty
-	}
-
-
-	///
-	/// HandleEast Destructor
-	///
-	HandleEast::~HandleEast()
-	{
-		// empty
-	}
-
-
-	///
-	/// HandleEast Clone
-	///
-	HandleEast* HandleEast::clone( ModelObject* newOwner ) const
-	{
-		return new HandleEast( newOwner );
-	}
-
-
-	///
-	/// Draw HandleEast
-	///
-	void HandleEast::draw( QPainter* painter, double scale ) const
-	{
-		drawAt( painter, scale, mOwner->w(), mOwner->h()/2, handleFillColor );
-	}
-
-
-	///
-	/// HandleEast Path
-	///
-	QPainterPath HandleEast::path( double scale ) const
-	{
-		return pathAt( scale, mOwner->w(), mOwner->h()/2 );
-	}
-
-
-	///
-	/// HandleSouthEast Constructor
-	///
-	HandleSouthEast::HandleSouthEast( ModelObject* owner )
-		: Handle( owner, SE )
-	{
-		// empty
-	}
-
-
-	///
-	/// HandleSouthEast Destructor
-	///
-	HandleSouthEast::~HandleSouthEast()
-	{
-		// empty
-	}
-
-
-	///
-	/// HandleSouthEast Clone
-	///
-	HandleSouthEast* HandleSouthEast::clone( ModelObject* newOwner ) const
-	{
-		return new HandleSouthEast( newOwner );
-	}
-
-
-	///
-	/// Draw HandleSouthEast
-	///
-	void HandleSouthEast::draw( QPainter* painter, double scale ) const
-	{
-		drawAt( painter, scale, mOwner->w(), mOwner->h(), handleFillColor );
-	}
-
-
-	///
-	/// HandleSouthEast Path
-	///
-	QPainterPath HandleSouthEast::path( double scale ) const
-	{
-		return pathAt( scale, mOwner->w(), mOwner->h() );
-	}
-
-
-	///
-	/// HandleSouth Constructor
-	///
-	HandleSouth::HandleSouth( ModelObject* owner )
-		: Handle( owner, S )
-	{
-		// empty
-	}
-
-
-	///
-	/// HandleSouth Destructor
-	///
-	HandleSouth::~HandleSouth()
-	{
-		// empty
-	}
-
-
-	///
-	/// HandleSouth Clone
-	///
-	HandleSouth* HandleSouth::clone( ModelObject* newOwner ) const
-	{
-		return new HandleSouth( newOwner );
-	}
-
-
-	///
-	/// Draw HandleSouth
-	///
-	void HandleSouth::draw( QPainter* painter, double scale ) const
-	{
-		drawAt( painter, scale, mOwner->w()/2, mOwner->h(), handleFillColor );
-	}
-
-
-	///
-	/// HandleSouth Path
-	///
-	QPainterPath HandleSouth::path( double scale ) const
-	{
-		return pathAt( scale, mOwner->w()/2, mOwner->h() );
-	}
-
-
-	///
-	/// HandleSouthWest Constructor
-	///
-	HandleSouthWest::HandleSouthWest( ModelObject* owner )
-		: Handle( owner, SW )
-	{
-		// empty
-	}
-
-
-	///
-	/// HandleSouthWest Destructor
-	///
-	HandleSouthWest::~HandleSouthWest()
-	{
-		// empty
-	}
-
-
-	///
-	/// HandleSouthWest Clone
-	///
-	HandleSouthWest* HandleSouthWest::clone( ModelObject* newOwner ) const
-	{
-		return new HandleSouthWest( newOwner );
-	}
-
-
-	///
-	/// Draw HandleSouthWest
-	///
-	void HandleSouthWest::draw( QPainter* painter, double scale ) const
-	{
-		drawAt( painter, scale, 0, mOwner->h(), handleFillColor );
-	}
-
-
-	///
-	/// HandleSouthWest Path
-	///
-	QPainterPath HandleSouthWest::path( double scale ) const
-	{
-		return pathAt( scale, 0, mOwner->h() );
-	}
-
-
-	///
-	/// HandleWest Constructor
-	///
-	HandleWest::HandleWest( ModelObject* owner )
-		: Handle( owner, W )
-	{
-		// empty
-	}
-
-
-	///
-	/// HandleWest Destructor
-	///
-	HandleWest::~HandleWest()
-	{
-		// empty
-	}
-
-
-	///
-	/// HandleWest Clone
-	///
-	HandleWest* HandleWest::clone( ModelObject* newOwner ) const
-	{
-		return new HandleWest( newOwner );
-	}
-
-
-	///
-	/// Draw HandleWest
-	///
-	void HandleWest::draw( QPainter* painter, double scale ) const
-	{
-		drawAt( painter, scale, 0, mOwner->h()/2, handleFillColor );
-	}
-
-
-	///
-	/// HandleWest Path
-	///
-	QPainterPath HandleWest::path( double scale ) const
-	{
-		return pathAt( scale, 0, mOwner->h()/2 );
-	}
-
-
-	///
-	/// HandleNorthWest Constructor
-	///
-	HandleNorthWest::HandleNorthWest( ModelObject* owner )
-		: Handle( owner, NW )
-	{
-		// empty
-	}
-
-
-	///
-	/// HandleNorthWest Destructor
-	///
-	HandleNorthWest::~HandleNorthWest()
-	{
-		// empty
-	}
-
-	///
-	/// HandleNorthWest Clone
-	///
-	HandleNorthWest* HandleNorthWest::clone( ModelObject* newOwner ) const
-	{
-		return new HandleNorthWest( newOwner );
-	}
-
-
-	///
-	/// Draw HandleNorthWest
-	///
-	void HandleNorthWest::draw( QPainter* painter, double scale ) const
-	{
-		drawAt( painter, scale, 0, 0, originHandleFillColor );
-	}
-
-
-	///
-	/// HandleNorthWest Path
-	///
-	QPainterPath HandleNorthWest::path( double scale ) const
-	{
-		return pathAt( scale, 0, 0 );
-	}
-
-
-	///
-	/// HandleP1 Constructor
-	///
-	HandleP1::HandleP1( ModelObject* owner )
-		: Handle( owner, P1 )
-	{
-		// empty
-	}
-
-
-	///
-	/// HandleP1 Destructor
-	///
-	HandleP1::~HandleP1()
-	{
-		// empty
-	}
-
-
-	///
-	/// HandleP1 Clone
-	///
-	HandleP1* HandleP1::clone( ModelObject* newOwner ) const
-	{
-		return new HandleP1( newOwner );
-	}
-
-
-	///
-	/// Draw HandleP1
-	///
-	void HandleP1::draw( QPainter* painter, double scale ) const
-	{
-		drawAt( painter, scale, 0, 0, originHandleFillColor );
-	}
-
-
-	///
-	/// HandleP1 Path
-	///
-	QPainterPath HandleP1::path( double scale ) const
-	{
-		return pathAt( scale, 0, 0 );
-	}
-
-
-	///
-	/// HandleP2 Constructor
-	///
-	HandleP2::HandleP2( ModelObject* owner )
-		: Handle( owner, P2 )
-	{
-		// empty
-	}
-
-
-	///
-	/// HandleP2 Destructor
-	///
-	HandleP2::~HandleP2()
-	{
-		// empty
-	}
-
-
-	///
-	/// HandleP2 Clone
-	///
-	HandleP2* HandleP2::clone( ModelObject* newOwner ) const
-	{
-		return new HandleP2( newOwner );
-	}
-
-
-	///
-	/// Draw HandleP2
-	///
-	void HandleP2::draw( QPainter* painter, double scale ) const
-	{
-		drawAt( painter, scale, mOwner->w(), mOwner->h(), handleFillColor );
-	}
-
-
-	///
-	/// HandleP2 Path
-	///
-	QPainterPath HandleP2::path( double scale ) const
-	{
-		return pathAt( scale, mOwner->w(), mOwner->h() );
-	}
-
-} // namespace glabels::model
+}
diff --git a/model/Handles.h b/model/Handles.h
index 8e110c8..10d4ab2 100644
--- a/model/Handles.h
+++ b/model/Handles.h
@@ -28,308 +28,311 @@
 #include <QPainterPath>
 
 
-namespace glabels::model
+namespace glabels
 {
-
-	// Forward References
-	class ModelObject;
-
-
-	///
-	/// Handle Base Class
-	///
-	class Handle
+	namespace model
 	{
-		////////////////////////////
-		// Location enumeration
-		////////////////////////////
-	public:
-		enum Location { NW, N, NE, E, SE, S, SW, W, P1, P2 };
-		
-		
-		////////////////////////////
-		// Lifecycle Methods
-		////////////////////////////
-	protected:
-		Handle( ModelObject* owner, Location location );
-	public:
-		virtual ~Handle();
+
+		// Forward References
+		class ModelObject;
 
 
-		////////////////////////////
-		// Duplication
-		////////////////////////////
-		virtual Handle* clone( ModelObject* newOwner ) const = 0;
+		///
+		/// Handle Base Class
+		///
+		class Handle
+		{
+			////////////////////////////
+			// Location enumeration
+			////////////////////////////
+		public:
+			enum Location { NW, N, NE, E, SE, S, SW, W, P1, P2 };
+		
+		
+			////////////////////////////
+			// Lifecycle Methods
+			////////////////////////////
+		protected:
+			Handle( ModelObject* owner, Location location );
+		public:
+			virtual ~Handle();
+
+
+			////////////////////////////
+			// Duplication
+			////////////////////////////
+			virtual Handle* clone( ModelObject* newOwner ) const = 0;
 	
 		
-		////////////////////////////
-		// Attribue Methods
-		////////////////////////////
-		ModelObject* owner() const;
-		Location location() const;
+			////////////////////////////
+			// Attribue Methods
+			////////////////////////////
+			ModelObject* owner() const;
+			Location location() const;
 		
 
-		////////////////////////////
-		// Drawing Methods
-		////////////////////////////
-	public:
-		virtual void  draw( QPainter* painter, double scale ) const = 0;
-		virtual QPainterPath path( double scale ) const = 0;
-	protected:
-		void drawAt( QPainter*       painter,
-		             double          scale,
-		             const Distance& x,
-		             const Distance& y,
-		             QColor          color ) const;
+			////////////////////////////
+			// Drawing Methods
+			////////////////////////////
+		public:
+			virtual void  draw( QPainter* painter, double scale ) const = 0;
+			virtual QPainterPath path( double scale ) const = 0;
+		protected:
+			void drawAt( QPainter*       painter,
+			             double          scale,
+			             const Distance& x,
+			             const Distance& y,
+			             QColor          color ) const;
 		
-		QPainterPath pathAt( double          scale,
-		                     const Distance& x,
-		                     const Distance& y ) const;
+			QPainterPath pathAt( double          scale,
+			                     const Distance& x,
+			                     const Distance& y ) const;
 
 
-		////////////////////////////
-		// Protected Data
-		////////////////////////////
-	protected:
-		ModelObject* mOwner;
-		Location mLocation;
+			////////////////////////////
+			// Protected Data
+			////////////////////////////
+		protected:
+			ModelObject* mOwner;
+			Location mLocation;
 
-	};
+		};
 
 
-	///
-	/// HandleNorth Class
-	///
-	class HandleNorth : public Handle
-	{
-		////////////////////////////
-		// Lifecycle Methods
-		////////////////////////////
-	public:
-		HandleNorth( ModelObject* owner );
-		~HandleNorth() override;
-		HandleNorth* clone( ModelObject* newOwner ) const override;
+		///
+		/// HandleNorth Class
+		///
+		class HandleNorth : public Handle
+		{
+			////////////////////////////
+			// Lifecycle Methods
+			////////////////////////////
+		public:
+			HandleNorth( ModelObject* owner );
+			~HandleNorth() override;
+			HandleNorth* clone( ModelObject* newOwner ) const override;
 
 
-		////////////////////////////
-		// Drawing Methods
-		////////////////////////////
-	public:
-		void  draw( QPainter* painter, double scale ) const override;
-		QPainterPath path( double scale ) const override;
-	};
+			////////////////////////////
+			// Drawing Methods
+			////////////////////////////
+		public:
+			void  draw( QPainter* painter, double scale ) const override;
+			QPainterPath path( double scale ) const override;
+		};
 
 
-	///
-	/// HandleNorthEast Class
-	///
-	class HandleNorthEast : public Handle
-	{
-		////////////////////////////
-		// Lifecycle Methods
-		////////////////////////////
-	public:
-		HandleNorthEast( ModelObject* owner );
-		~HandleNorthEast() override;
-		HandleNorthEast* clone( ModelObject* newOwner ) const override;
+		///
+		/// HandleNorthEast Class
+		///
+		class HandleNorthEast : public Handle
+		{
+			////////////////////////////
+			// Lifecycle Methods
+			////////////////////////////
+		public:
+			HandleNorthEast( ModelObject* owner );
+			~HandleNorthEast() override;
+			HandleNorthEast* clone( ModelObject* newOwner ) const override;
 
 
-		////////////////////////////
-		// Drawing Methods
-		////////////////////////////
-	public:
-		void  draw( QPainter* painter, double scale ) const override;
-		QPainterPath path( double scale ) const override;
-	};
+			////////////////////////////
+			// Drawing Methods
+			////////////////////////////
+		public:
+			void  draw( QPainter* painter, double scale ) const override;
+			QPainterPath path( double scale ) const override;
+		};
 
 
-	///
-	/// HandleEast Class
-	///
-	class HandleEast : public Handle
-	{
-		////////////////////////////
-		// Lifecycle Methods
-		////////////////////////////
-	public:
-		HandleEast( ModelObject* owner );
-		~HandleEast() override;
-		HandleEast* clone( ModelObject* newOwner ) const override;
+		///
+		/// HandleEast Class
+		///
+		class HandleEast : public Handle
+		{
+			////////////////////////////
+			// Lifecycle Methods
+			////////////////////////////
+		public:
+			HandleEast( ModelObject* owner );
+			~HandleEast() override;
+			HandleEast* clone( ModelObject* newOwner ) const override;
 
 
-		////////////////////////////
-		// Drawing Methods
-		////////////////////////////
-	public:
-		void  draw( QPainter* painter, double scale ) const override;
-		QPainterPath path( double scale ) const override;
-	};
+			////////////////////////////
+			// Drawing Methods
+			////////////////////////////
+		public:
+			void  draw( QPainter* painter, double scale ) const override;
+			QPainterPath path( double scale ) const override;
+		};
 
 
-	///
-	/// HandleSouthEast Class
-	///
-	class HandleSouthEast : public Handle
-	{
-		////////////////////////////
-		// Lifecycle Methods
-		////////////////////////////
-	public:
-		HandleSouthEast( ModelObject* owner );
-		~HandleSouthEast() override;
-		HandleSouthEast* clone( ModelObject* newOwner ) const override;
+		///
+		/// HandleSouthEast Class
+		///
+		class HandleSouthEast : public Handle
+		{
+			////////////////////////////
+			// Lifecycle Methods
+			////////////////////////////
+		public:
+			HandleSouthEast( ModelObject* owner );
+			~HandleSouthEast() override;
+			HandleSouthEast* clone( ModelObject* newOwner ) const override;
 
 
-		////////////////////////////
-		// Drawing Methods
-		////////////////////////////
-	public:
-		void  draw( QPainter* painter, double scale ) const override;
-		QPainterPath path( double scale ) const override;
-	};
+			////////////////////////////
+			// Drawing Methods
+			////////////////////////////
+		public:
+			void  draw( QPainter* painter, double scale ) const override;
+			QPainterPath path( double scale ) const override;
+		};
 
 
-	///
-	/// HandleSouth Class
-	///
-	class HandleSouth : public Handle
-	{
-		////////////////////////////
-		// Lifecycle Methods
-		////////////////////////////
-	public:
-		HandleSouth( ModelObject* owner );
-		~HandleSouth() override;
-		HandleSouth* clone( ModelObject* newOwner ) const override;
+		///
+		/// HandleSouth Class
+		///
+		class HandleSouth : public Handle
+		{
+			////////////////////////////
+			// Lifecycle Methods
+			////////////////////////////
+		public:
+			HandleSouth( ModelObject* owner );
+			~HandleSouth() override;
+			HandleSouth* clone( ModelObject* newOwner ) const override;
 
 
-		////////////////////////////
-		// Drawing Methods
-		////////////////////////////
-	public:
-		void  draw( QPainter* painter, double scale ) const override;
-		QPainterPath path( double scale ) const override;
-	};
+			////////////////////////////
+			// Drawing Methods
+			////////////////////////////
+		public:
+			void  draw( QPainter* painter, double scale ) const override;
+			QPainterPath path( double scale ) const override;
+		};
 
 
-	///
-	/// HandleSouthWest Class
-	///
-	class HandleSouthWest : public Handle
-	{
-		////////////////////////////
-		// Lifecycle Methods
-		////////////////////////////
-	public:
-		HandleSouthWest( ModelObject* owner );
-		~HandleSouthWest() override;
-		HandleSouthWest* clone( ModelObject* newOwner ) const override;
+		///
+		/// HandleSouthWest Class
+		///
+		class HandleSouthWest : public Handle
+		{
+			////////////////////////////
+			// Lifecycle Methods
+			////////////////////////////
+		public:
+			HandleSouthWest( ModelObject* owner );
+			~HandleSouthWest() override;
+			HandleSouthWest* clone( ModelObject* newOwner ) const override;
 
 
-		////////////////////////////
-		// Drawing Methods
-		////////////////////////////
-	public:
-		void  draw( QPainter* painter, double scale ) const override;
-		QPainterPath path( double scale ) const override;
-	};
+			////////////////////////////
+			// Drawing Methods
+			////////////////////////////
+		public:
+			void  draw( QPainter* painter, double scale ) const override;
+			QPainterPath path( double scale ) const override;
+		};
 
 
-	///
-	/// HandleWest Class
-	///
-	class HandleWest : public Handle
-	{
-		////////////////////////////
-		// Lifecycle Methods
-		////////////////////////////
-	public:
-		HandleWest( ModelObject* owner );
-		~HandleWest() override;
-		HandleWest* clone( ModelObject* newOwner ) const override;
+		///
+		/// HandleWest Class
+		///
+		class HandleWest : public Handle
+		{
+			////////////////////////////
+			// Lifecycle Methods
+			////////////////////////////
+		public:
+			HandleWest( ModelObject* owner );
+			~HandleWest() override;
+			HandleWest* clone( ModelObject* newOwner ) const override;
 
 
-		////////////////////////////
-		// Drawing Methods
-		////////////////////////////
-	public:
-		void  draw( QPainter* painter, double scale ) const override;
-		QPainterPath path( double scale ) const override;
-	};
+			////////////////////////////
+			// Drawing Methods
+			////////////////////////////
+		public:
+			void  draw( QPainter* painter, double scale ) const override;
+			QPainterPath path( double scale ) const override;
+		};
 
 
-	///
-	/// HandleNorthWest Class
-	///
-	class HandleNorthWest : public Handle
-	{
-		////////////////////////////
-		// Lifecycle Methods
-		////////////////////////////
-	public:
-		HandleNorthWest( ModelObject* owner );
-		~HandleNorthWest() override;
-		HandleNorthWest* clone( ModelObject* newOwner ) const override;
+		///
+		/// HandleNorthWest Class
+		///
+		class HandleNorthWest : public Handle
+		{
+			////////////////////////////
+			// Lifecycle Methods
+			////////////////////////////
+		public:
+			HandleNorthWest( ModelObject* owner );
+			~HandleNorthWest() override;
+			HandleNorthWest* clone( ModelObject* newOwner ) const override;
 
 
-		////////////////////////////
-		// Drawing Methods
-		////////////////////////////
-	public:
-		void  draw( QPainter* painter, double scale ) const override;
-		QPainterPath path( double scale ) const override;
-	};
+			////////////////////////////
+			// Drawing Methods
+			////////////////////////////
+		public:
+			void  draw( QPainter* painter, double scale ) const override;
+			QPainterPath path( double scale ) const override;
+		};
 
 
-	///
-	/// HandleP1 Class
-	///
-	class HandleP1 : public Handle
-	{
-		////////////////////////////
-		// Lifecycle Methods
-		////////////////////////////
-	public:
-		HandleP1( ModelObject* owner );
-		~HandleP1() override;
-		HandleP1* clone( ModelObject* newOwner ) const override;
+		///
+		/// HandleP1 Class
+		///
+		class HandleP1 : public Handle
+		{
+			////////////////////////////
+			// Lifecycle Methods
+			////////////////////////////
+		public:
+			HandleP1( ModelObject* owner );
+			~HandleP1() override;
+			HandleP1* clone( ModelObject* newOwner ) const override;
 
 
-		////////////////////////////
-		// Drawing Methods
-		////////////////////////////
-	public:
-		void  draw( QPainter* painter, double scale ) const override;
-		QPainterPath path( double scale ) const override;
-	};
+			////////////////////////////
+			// Drawing Methods
+			////////////////////////////
+		public:
+			void  draw( QPainter* painter, double scale ) const override;
+			QPainterPath path( double scale ) const override;
+		};
 
 
-	///
-	/// HandleP2 Class
-	///
-	class HandleP2 : public Handle
-	{
-		////////////////////////////
-		// Lifecycle Methods
-		////////////////////////////
-	public:
-		HandleP2( ModelObject* owner );
-		~HandleP2() override;
+		///
+		/// HandleP2 Class
+		///
+		class HandleP2 : public Handle
+		{
+			////////////////////////////
+			// Lifecycle Methods
+			////////////////////////////
+		public:
+			HandleP2( ModelObject* owner );
+			~HandleP2() override;
 
-		////////////////////////////
-		// Duplication
-		////////////////////////////
-		HandleP2* clone( ModelObject* newOwner ) const override;
+			////////////////////////////
+			// Duplication
+			////////////////////////////
+			HandleP2* clone( ModelObject* newOwner ) const override;
 
 
-		////////////////////////////
-		// Drawing Methods
-		////////////////////////////
-	public:
-		void  draw( QPainter* painter, double scale ) const override;
-		QPainterPath path( double scale ) const override;
-	};
+			////////////////////////////
+			// Drawing Methods
+			////////////////////////////
+		public:
+			void  draw( QPainter* painter, double scale ) const override;
+			QPainterPath path( double scale ) const override;
+		};
 
+	}
 }
 
 
diff --git a/model/Layout.cpp b/model/Layout.cpp
index f1a38e0..af9d4df 100644
--- a/model/Layout.cpp
+++ b/model/Layout.cpp
@@ -25,80 +25,83 @@
 #include <cmath>
 
 
-namespace glabels::model
+namespace glabels
 {
-
-	Layout::Layout( int             nx,
-		        int             ny,
-		        const Distance& x0,
-		        const Distance& y0,
-		        const Distance& dx,
-		        const Distance& dy )
-		: mNx(nx), mNy(ny), mX0(x0), mY0(y0), mDx(dx), mDy(dy)
+	namespace model
 	{
-		// empty
-	}
+
+		Layout::Layout( int             nx,
+		                int             ny,
+		                const Distance& x0,
+		                const Distance& y0,
+		                const Distance& dx,
+		                const Distance& dy )
+			: mNx(nx), mNy(ny), mX0(x0), mY0(y0), mDx(dx), mDy(dy)
+		{
+			// empty
+		}
 
 	
-	Layout::Layout( const Layout& other )
-		: mNx(other.mNx), mNy(other.mNy), mX0(other.mX0), mY0(other.mY0),
-		  mDx(other.mDx), mDy(other.mDy)
-	{
-		// empty
-	}
+		Layout::Layout( const Layout& other )
+			: mNx(other.mNx), mNy(other.mNy), mX0(other.mX0), mY0(other.mY0),
+			  mDx(other.mDx), mDy(other.mDy)
+		{
+			// empty
+		}
 
 
-	int Layout::nx() const
-	{
-		return mNx;
-	}
+		int Layout::nx() const
+		{
+			return mNx;
+		}
 
 		
-	int Layout::ny() const
-	{
-		return mNy;
-	}
+		int Layout::ny() const
+		{
+			return mNy;
+		}
 		
 
-	Distance Layout::x0() const
-	{
-		return mX0;
-	}
+		Distance Layout::x0() const
+		{
+			return mX0;
+		}
 
 		
-	Distance Layout::y0() const
-	{
-		return mY0;
-	}
+		Distance Layout::y0() const
+		{
+			return mY0;
+		}
 		
 
-	Distance Layout::dx() const
-	{
-		return mDx;
-	}
+		Distance Layout::dx() const
+		{
+			return mDx;
+		}
 
 		
-	Distance Layout::dy() const
-	{
-		return mDy;
+		Distance Layout::dy() const
+		{
+			return mDy;
+		}
+
+
+		bool Layout::isSimilarTo( const Layout *other )
+		{
+			return ( (mNx == other->mNx)                &&
+			         (mNy == other->mNy)                &&
+			         (fabs(mX0 - other->mX0) < EPSILON) &&
+			         (fabs(mY0 - other->mY0) < EPSILON) &&
+			         (fabs(mDx - other->mDx) < EPSILON) &&
+			         (fabs(mDy - other->mDy) < EPSILON) );
+		}
+
+
+		Layout* Layout::dup() const
+		{
+			Layout *other = new Layout( *this );
+			return other;
+		}
+
 	}
-
-
-	bool Layout::isSimilarTo( const Layout *other )
-	{
-		return ( (mNx == other->mNx)                &&
-			 (mNy == other->mNy)                &&
-			 (fabs(mX0 - other->mX0) < EPSILON) &&
-			 (fabs(mY0 - other->mY0) < EPSILON) &&
-			 (fabs(mDx - other->mDx) < EPSILON) &&
-			 (fabs(mDy - other->mDy) < EPSILON) );
-	}
-
-
-	Layout* Layout::dup() const
-	{
-		Layout *other = new Layout( *this );
-		return other;
-	}
-
-} // namespace glabels::model
+}
diff --git a/model/Layout.h b/model/Layout.h
index 8cf27de..3485780 100644
--- a/model/Layout.h
+++ b/model/Layout.h
@@ -25,46 +25,49 @@
 #include "Distance.h"
 
 
-namespace glabels::model
+namespace glabels
 {
-
-	class Layout
+	namespace model
 	{
+
+		class Layout
+		{
 		
-	public:
-		Layout( int             nx,
-		        int             ny,
-		        const Distance& x0,
-		        const Distance& y0,
-		        const Distance& dx,
-		        const Distance& dy );
+		public:
+			Layout( int             nx,
+			        int             ny,
+			        const Distance& x0,
+			        const Distance& y0,
+			        const Distance& dx,
+			        const Distance& dy );
 
-		Layout( const Layout &other );
+			Layout( const Layout &other );
 
-		int nx() const;
-		int ny() const;
+			int nx() const;
+			int ny() const;
 
-		Distance x0() const;
-		Distance y0() const;
+			Distance x0() const;
+			Distance y0() const;
 
-		Distance dx() const;
-		Distance dy() const;
+			Distance dx() const;
+			Distance dy() const;
 
-		bool isSimilarTo( const Layout *other );
+			bool isSimilarTo( const Layout *other );
 
-		Layout* dup() const;
+			Layout* dup() const;
 
 
-	private:
-		int      mNx;
-		int      mNy;
-		Distance mX0;
-		Distance mY0;
-		Distance mDx;
-		Distance mDy;
+		private:
+			int      mNx;
+			int      mNy;
+			Distance mX0;
+			Distance mY0;
+			Distance mDx;
+			Distance mDy;
 		
-	};
+		};
 
+	}
 }
 
 
diff --git a/model/Markup.cpp b/model/Markup.cpp
index 5e79eac..4f16ae9 100644
--- a/model/Markup.cpp
+++ b/model/Markup.cpp
@@ -21,192 +21,195 @@
 #include "Markup.h"
 
 
-namespace glabels::model
+namespace glabels
 {
-
-	const QPainterPath& Markup::path() const
+	namespace model
 	{
-		return mPath;
-	}
+
+		const QPainterPath& Markup::path() const
+		{
+			return mPath;
+		}
 
 	
-	MarkupMargin::MarkupMargin( const Frame*    frame,
-				    const Distance& size )
-		: mFrame(frame), mSize(size)
-	{
-		mPath = frame->marginPath( size );
-	}
+		MarkupMargin::MarkupMargin( const Frame*    frame,
+		                            const Distance& size )
+			: mFrame(frame), mSize(size)
+		{
+			mPath = frame->marginPath( size );
+		}
 	
 
-	Markup* MarkupMargin::dup() const
-	{
-		return new MarkupMargin( mFrame, mSize );
-	}
+		Markup* MarkupMargin::dup() const
+		{
+			return new MarkupMargin( mFrame, mSize );
+		}
 
 
-	Distance MarkupMargin::size() const
-	{
-		return mSize;
-	}
+		Distance MarkupMargin::size() const
+		{
+			return mSize;
+		}
 
 
-	MarkupLine::MarkupLine( const Distance& x1,
-				const Distance& y1,
-				const Distance& x2,
-				const Distance& y2 )
-		: mX1(x1), mY1(y1), mX2(x2), mY2(y2)
-	{
-		mPath.moveTo( x1.pt(), y1.pt() );
-		mPath.lineTo( x2.pt(), y2.pt() );
-	}
+		MarkupLine::MarkupLine( const Distance& x1,
+		                        const Distance& y1,
+		                        const Distance& x2,
+		                        const Distance& y2 )
+			: mX1(x1), mY1(y1), mX2(x2), mY2(y2)
+		{
+			mPath.moveTo( x1.pt(), y1.pt() );
+			mPath.lineTo( x2.pt(), y2.pt() );
+		}
 
 
-	Markup* MarkupLine::dup() const
-	{
-		return new MarkupLine( mX1, mY1, mX2, mY2 );
-	}
+		Markup* MarkupLine::dup() const
+		{
+			return new MarkupLine( mX1, mY1, mX2, mY2 );
+		}
 
 	
-	Distance MarkupLine::x1() const
-	{
-		return mX1;
-	}
+		Distance MarkupLine::x1() const
+		{
+			return mX1;
+		}
 
 	
-	Distance MarkupLine::y1() const
-	{
-		return mY1;
-	}
+		Distance MarkupLine::y1() const
+		{
+			return mY1;
+		}
 
 	
-	Distance MarkupLine::x2() const
-	{
-		return mX2;
-	}
+		Distance MarkupLine::x2() const
+		{
+			return mX2;
+		}
 
 	
-	Distance MarkupLine::y2() const
-	{
-		return mY2;
-	}
+		Distance MarkupLine::y2() const
+		{
+			return mY2;
+		}
 
 
-	MarkupRect::MarkupRect( const Distance& x1,
-				const Distance& y1,
-				const Distance& w,
-				const Distance& h,
-				const Distance& r )
-		: mX1(x1), mY1(y1), mW(w), mH(h), mR(r)
-	{
-		mPath.addRoundedRect( x1.pt(), y1.pt(), w.pt(), h.pt(), r.pt(), r.pt() );
-	}
+		MarkupRect::MarkupRect( const Distance& x1,
+		                        const Distance& y1,
+		                        const Distance& w,
+		                        const Distance& h,
+		                        const Distance& r )
+			: mX1(x1), mY1(y1), mW(w), mH(h), mR(r)
+		{
+			mPath.addRoundedRect( x1.pt(), y1.pt(), w.pt(), h.pt(), r.pt(), r.pt() );
+		}
 
 
-	Markup* MarkupRect::dup() const
-	{
-		return new MarkupRect( mX1, mY1, mW, mH, mR );
-	}
+		Markup* MarkupRect::dup() const
+		{
+			return new MarkupRect( mX1, mY1, mW, mH, mR );
+		}
 	
 
-	Distance MarkupRect::x1() const
-	{
-		return mX1;
-	}
+		Distance MarkupRect::x1() const
+		{
+			return mX1;
+		}
 
 	
-	Distance MarkupRect::y1() const
-	{
-		return mY1;
-	}
+		Distance MarkupRect::y1() const
+		{
+			return mY1;
+		}
 
 	
-	Distance MarkupRect::w() const
-	{
-		return mW;
-	}
+		Distance MarkupRect::w() const
+		{
+			return mW;
+		}
 
 	
-	Distance MarkupRect::h() const
-	{
-		return mH;
-	}
+		Distance MarkupRect::h() const
+		{
+			return mH;
+		}
 
 	
-	Distance MarkupRect::r() const
-	{
-		return mR;
-	}
+		Distance MarkupRect::r() const
+		{
+			return mR;
+		}
 
 	
-	MarkupEllipse::MarkupEllipse( const Distance& x1,
-				      const Distance& y1,
-				      const Distance& w,
-				      const Distance& h )
-		: mX1(x1), mY1(y1), mW(w), mH(h)
-	{
-		mPath.addEllipse( x1.pt(), y1.pt(), w.pt(), h.pt() );
-	}
+		MarkupEllipse::MarkupEllipse( const Distance& x1,
+		                              const Distance& y1,
+		                              const Distance& w,
+		                              const Distance& h )
+			: mX1(x1), mY1(y1), mW(w), mH(h)
+		{
+			mPath.addEllipse( x1.pt(), y1.pt(), w.pt(), h.pt() );
+		}
 
 
-	Markup* MarkupEllipse::dup() const
-	{
-		return new MarkupEllipse( mX1, mY1, mW, mH );
-	}
+		Markup* MarkupEllipse::dup() const
+		{
+			return new MarkupEllipse( mX1, mY1, mW, mH );
+		}
 
 	
-	Distance MarkupEllipse::x1() const
-	{
-		return mX1;
-	}
+		Distance MarkupEllipse::x1() const
+		{
+			return mX1;
+		}
 
 	
-	Distance MarkupEllipse::y1() const
-	{
-		return mY1;
-	}
+		Distance MarkupEllipse::y1() const
+		{
+			return mY1;
+		}
 
 	
-	Distance MarkupEllipse::w() const
-	{
-		return mW;
-	}
+		Distance MarkupEllipse::w() const
+		{
+			return mW;
+		}
 
 	
-	Distance MarkupEllipse::h() const
-	{
-		return mH;
-	}
+		Distance MarkupEllipse::h() const
+		{
+			return mH;
+		}
 
 
-	MarkupCircle::MarkupCircle( const Distance& x0,
-				    const Distance& y0,
-				    const Distance& r )
-		: mX0(x0), mY0(y0), mR(r)
-	{
-		mPath.addEllipse( (x0-r).pt(), (y0-r).pt(), 2*r.pt(), 2*r.pt() );
-	}
+		MarkupCircle::MarkupCircle( const Distance& x0,
+		                            const Distance& y0,
+		                            const Distance& r )
+			: mX0(x0), mY0(y0), mR(r)
+		{
+			mPath.addEllipse( (x0-r).pt(), (y0-r).pt(), 2*r.pt(), 2*r.pt() );
+		}
 
-	Markup* MarkupCircle::dup() const
-	{
-		return new MarkupCircle( mX0, mY0, mR );
-	}
+		Markup* MarkupCircle::dup() const
+		{
+			return new MarkupCircle( mX0, mY0, mR );
+		}
 
 
-	Distance MarkupCircle::x0() const
-	{
-		return mX0;
-	}
+		Distance MarkupCircle::x0() const
+		{
+			return mX0;
+		}
 
 	
-	Distance MarkupCircle::y0() const
-	{
-		return mY0;
-	}
+		Distance MarkupCircle::y0() const
+		{
+			return mY0;
+		}
 
 	
-	Distance MarkupCircle::r() const
-	{
-		return mR;
-	}
+		Distance MarkupCircle::r() const
+		{
+			return mR;
+		}
 
-} // namespace glabels::model
+	}
+}
diff --git a/model/Markup.h b/model/Markup.h
index f5fecaf..1c57859 100644
--- a/model/Markup.h
+++ b/model/Markup.h
@@ -27,129 +27,132 @@
 #include <QPainterPath>
 
 
-namespace glabels::model
+namespace glabels
 {
-
-	class Markup
+	namespace model
 	{
-	public:
-		virtual Markup* dup() const = 0;
 
-		const QPainterPath& path() const;
+		class Markup
+		{
+		public:
+			virtual Markup* dup() const = 0;
 
-	protected:
-		QPainterPath mPath;
-	};
+			const QPainterPath& path() const;
+
+		protected:
+			QPainterPath mPath;
+		};
 
 
-	class MarkupMargin : public Markup
-	{
-	public:
-		MarkupMargin( const Frame*    frame,
-		              const Distance& size );
+		class MarkupMargin : public Markup
+		{
+		public:
+			MarkupMargin( const Frame*    frame,
+			              const Distance& size );
 
-		Distance size() const;
+			Distance size() const;
 
-		Markup* dup() const override;
+			Markup* dup() const override;
 
-	private:
-		const Frame* mFrame;
-		Distance  mSize;
-	};
+		private:
+			const Frame* mFrame;
+			Distance  mSize;
+		};
 
 
-	class MarkupLine : public Markup
-	{
-	public:
-		MarkupLine( const Distance& x1,
-		            const Distance& y1,
-		            const Distance& x2,
-		            const Distance& y2 );
+		class MarkupLine : public Markup
+		{
+		public:
+			MarkupLine( const Distance& x1,
+			            const Distance& y1,
+			            const Distance& x2,
+			            const Distance& y2 );
 
-		Distance x1() const;
-		Distance y1() const;
-		Distance x2() const;
-		Distance y2() const;
+			Distance x1() const;
+			Distance y1() const;
+			Distance x2() const;
+			Distance y2() const;
 
-		Markup* dup() const override;
+			Markup* dup() const override;
 
-	private:
-		Distance  mX1;
-		Distance  mY1;
-		Distance  mX2;
-		Distance  mY2;
-	};
+		private:
+			Distance  mX1;
+			Distance  mY1;
+			Distance  mX2;
+			Distance  mY2;
+		};
 
 
-	class MarkupRect : public Markup
-	{
-	public:
-		MarkupRect( const Distance& x1,
-		            const Distance& y1,
-		            const Distance& w,
-		            const Distance& h,
-		            const Distance& r );
+		class MarkupRect : public Markup
+		{
+		public:
+			MarkupRect( const Distance& x1,
+			            const Distance& y1,
+			            const Distance& w,
+			            const Distance& h,
+			            const Distance& r );
 
-		Distance x1() const;
-		Distance y1() const;
-		Distance w() const;
-		Distance h() const;
-		Distance r() const;
+			Distance x1() const;
+			Distance y1() const;
+			Distance w() const;
+			Distance h() const;
+			Distance r() const;
 
-		Markup* dup() const override;
+			Markup* dup() const override;
 
-	private:
-		Distance  mX1;
-		Distance  mY1;
-		Distance  mW;
-		Distance  mH;
-		Distance  mR;
-	};
+		private:
+			Distance  mX1;
+			Distance  mY1;
+			Distance  mW;
+			Distance  mH;
+			Distance  mR;
+		};
 
 
-	class MarkupEllipse : public Markup
-	{
-	public:
-		MarkupEllipse( const Distance& x1,
-		               const Distance& y1,
-		               const Distance& w,
-		               const Distance& h );
+		class MarkupEllipse : public Markup
+		{
+		public:
+			MarkupEllipse( const Distance& x1,
+			               const Distance& y1,
+			               const Distance& w,
+			               const Distance& h );
 
-		Distance x1() const;
-		Distance y1() const;
-		Distance w() const;
-		Distance h() const;
+			Distance x1() const;
+			Distance y1() const;
+			Distance w() const;
+			Distance h() const;
 
-		Markup* dup() const override;
+			Markup* dup() const override;
 
-	private:
-		Distance  mX1;
-		Distance  mY1;
-		Distance  mW;
-		Distance  mH;
-	};
+		private:
+			Distance  mX1;
+			Distance  mY1;
+			Distance  mW;
+			Distance  mH;
+		};
 
 
-	class MarkupCircle : public Markup
-	{
-	public:
-		MarkupCircle( const Distance& x0,
-		              const Distance& y0,
-		              const Distance& r );
+		class MarkupCircle : public Markup
+		{
+		public:
+			MarkupCircle( const Distance& x0,
+			              const Distance& y0,
+			              const Distance& r );
 
-		Distance x0() const;
-		Distance y0() const;
-		Distance r() const;
+			Distance x0() const;
+			Distance y0() const;
+			Distance r() const;
 
-		Markup* dup() const override;
+			Markup* dup() const override;
 
-	private:
-		Distance  mX0;
-		Distance  mY0;
-		Distance  mR;
-	};
+		private:
+			Distance  mX0;
+			Distance  mY0;
+			Distance  mR;
+		};
 	
 
+	}
 }
 
 
diff --git a/model/Model.cpp b/model/Model.cpp
index c695b64..5ed7b36 100644
--- a/model/Model.cpp
+++ b/model/Model.cpp
@@ -37,1408 +37,1411 @@
 #include <QtDebug>
 
 
-namespace glabels::model
+namespace glabels
 {
-
-	//
-	// Private
-	//
-	namespace
+	namespace model
 	{
-		const QString MIME_TYPE = "application/x-glabels-objects";
-	}
 
-
-	///
-	/// Default constructor.
-	///
-	Model::Model() : mUntitledInstance(0), mModified(true), mTmplate(nullptr), mRotate(false)
-	{
-		mMerge = new merge::None();
-	}
-
-
-	///
-	/// Save model state
-	///
-	Model* Model::save() const
-	{
-		Model* savedModel = new Model;
-		savedModel->restore( this );
-
-		return savedModel;
-	}
-
-
-	///
-	/// Restore model state
-	///
-	void Model::restore( const Model *savedModel )
-	{
-		// Clear current object list
-		foreach ( ModelObject* object, mObjectList )
+		//
+		// Private
+		//
+		namespace
 		{
-			delete object;
+			const QString MIME_TYPE = "application/x-glabels-objects";
 		}
-		mObjectList.clear();
 
-		// Now copy state
-		mUntitledInstance = savedModel->mUntitledInstance;
-		mModified         = savedModel->mModified;
-		mFileName         = savedModel->mFileName;
-		mCompressionLevel = savedModel->mCompressionLevel;
-		mTmplate          = savedModel->mTmplate;
-		mFrame            = savedModel->mFrame;
-		mRotate           = savedModel->mRotate;
 
-		foreach ( ModelObject* savedObject, savedModel->mObjectList )
+		///
+		/// Default constructor.
+		///
+		Model::Model() : mUntitledInstance(0), mModified(true), mTmplate(nullptr), mRotate(false)
 		{
-			ModelObject* object = savedObject->clone();
+			mMerge = new merge::None();
+		}
+
+
+		///
+		/// Save model state
+		///
+		Model* Model::save() const
+		{
+			Model* savedModel = new Model;
+			savedModel->restore( this );
+
+			return savedModel;
+		}
+
+
+		///
+		/// Restore model state
+		///
+		void Model::restore( const Model *savedModel )
+		{
+			// Clear current object list
+			foreach ( ModelObject* object, mObjectList )
+			{
+				delete object;
+			}
+			mObjectList.clear();
+
+			// Now copy state
+			mUntitledInstance = savedModel->mUntitledInstance;
+			mModified         = savedModel->mModified;
+			mFileName         = savedModel->mFileName;
+			mCompressionLevel = savedModel->mCompressionLevel;
+			mTmplate          = savedModel->mTmplate;
+			mFrame            = savedModel->mFrame;
+			mRotate           = savedModel->mRotate;
+
+			foreach ( ModelObject* savedObject, savedModel->mObjectList )
+			{
+				ModelObject* object = savedObject->clone();
 		
+				object->setParent( this );
+				mObjectList << object;
+
+				connect( object, SIGNAL(changed()), this, SLOT(onObjectChanged()) );
+				connect( object, SIGNAL(moved()), this, SLOT(onObjectMoved()) );
+			}
+
+			delete mMerge;
+			mMerge = savedModel->mMerge->clone();
+
+			// Emit signals based on potential changes
+			emit changed();
+			emit selectionChanged();
+			emit modifiedChanged();
+			emit nameChanged();
+			emit sizeChanged();
+			emit mergeChanged();
+			emit mergeSourceChanged();
+			emit mergeSelectionChanged();
+		}
+
+
+		///
+		/// Is model modified?
+		///
+		bool Model::isModified() const
+		{
+			return mModified;
+		}
+
+
+		///
+		/// Get filename
+		///
+		const QString& Model::fileName() const
+		{
+			return mFileName;
+		}
+
+
+		///
+		/// Set filename
+		///
+		void Model::setFileName( const QString &fileName )
+		{
+			if ( mFileName != fileName )
+			{
+				mFileName = fileName;
+				emit nameChanged();
+			}
+		}
+
+
+		///
+		/// Get compression level
+		///
+		int Model::compressionLevel() const
+		{
+			return mCompressionLevel;
+		}
+
+
+		///
+		/// Set compression level
+		///
+		void Model::setCompressionLevel( int compressionLevel )
+		{
+			mCompressionLevel = compressionLevel;
+		}
+
+
+		///
+		/// Get template
+		///
+		const Template* Model::tmplate() const
+		{
+			return mTmplate;
+		}
+
+
+		///
+		/// Get frame
+		///
+		const Frame* Model::frame() const
+		{
+			return mFrame;
+		}
+
+
+		///
+		/// Set template
+		///
+		void Model::setTmplate( const Template* tmplate )
+		{
+			if (mTmplate != tmplate)
+			{
+				mTmplate = tmplate;
+				mFrame = tmplate->frames().first();
+
+				setModified();
+		
+				emit changed();
+				emit sizeChanged();
+
+				Settings::addToRecentTemplateList( tmplate->name() );
+			}
+		}
+
+
+		///
+		/// Get rotation
+		///
+		bool Model::rotate() const
+		{
+			return mRotate;
+		}
+
+
+		///
+		/// Set rotation
+		///
+		void Model::setRotate( bool rotate )
+		{
+			if (mRotate != rotate)
+			{
+				mRotate = rotate;
+
+				setModified();
+
+				emit changed();
+				emit sizeChanged();
+			}
+		}
+
+
+		///
+		/// Get width
+		///
+		Distance Model::w() const
+		{
+			return mRotate ? mFrame->h() : mFrame->w();
+		}
+
+
+		///
+		/// Get height
+		///
+		Distance Model::h() const
+		{
+			return mRotate ? mFrame->w() : mFrame->h();
+		}
+
+
+		///
+		/// Get object list
+		///
+		const QList<ModelObject*>& Model::objectList() const
+		{
+			return mObjectList;
+		}
+
+
+		///
+		/// Get short name.
+		///
+		QString Model::shortName()
+		{
+			static int untitledCount = 0;
+		
+			if ( mFileName.isEmpty() )
+			{
+				if ( mUntitledInstance == 0 )
+				{
+					mUntitledInstance = ++untitledCount;
+				}
+				QString numString;
+				numString.setNum(mUntitledInstance);;
+
+				return tr("Untitled") + numString;
+			}
+			else
+			{
+				QFileInfo fileInfo( mFileName );
+				return fileInfo.baseName();
+			}
+		}
+
+
+		///
+		/// Get merge object
+		///
+		merge::Merge* Model::merge() const
+		{
+			return mMerge;
+		}
+
+
+		///
+		/// Set merge object
+		///
+		void Model::setMerge( merge::Merge* merge )
+		{
+			if ( merge != mMerge )
+			{
+				delete mMerge;
+				mMerge = merge;
+
+				connect( mMerge, SIGNAL(sourceChanged()), this, SLOT(onMergeSourceChanged()) );
+				connect( mMerge, SIGNAL(selectionChanged()), this, SLOT(onMergeSelectionChanged()) );
+
+				setModified();
+		
+				emit changed();
+				emit mergeChanged();
+				emit mergeSourceChanged();
+			}
+		}
+
+
+		///
+		/// Set modified status
+		///
+		void Model::setModified()
+		{
+			mModified = true;
+			emit modifiedChanged();
+		}
+
+
+		///
+		/// Clear modified status
+		///
+		void Model::clearModified()
+		{
+			mModified = false;
+			emit modifiedChanged();
+		}
+
+
+		///
+		/// Add object.
+		///
+		void Model::addObject( ModelObject* object )
+		{
 			object->setParent( this );
 			mObjectList << object;
 
 			connect( object, SIGNAL(changed()), this, SLOT(onObjectChanged()) );
 			connect( object, SIGNAL(moved()), this, SLOT(onObjectMoved()) );
-		}
-
-		delete mMerge;
-		mMerge = savedModel->mMerge->clone();
-
-		// Emit signals based on potential changes
-		emit changed();
-		emit selectionChanged();
-		emit modifiedChanged();
-		emit nameChanged();
-		emit sizeChanged();
-		emit mergeChanged();
-		emit mergeSourceChanged();
-		emit mergeSelectionChanged();
-	}
-
-
-	///
-	/// Is model modified?
-	///
-	bool Model::isModified() const
-	{
-		return mModified;
-	}
-
-
-	///
-	/// Get filename
-	///
-	const QString& Model::fileName() const
-	{
-		return mFileName;
-	}
-
-
-	///
-	/// Set filename
-	///
-	void Model::setFileName( const QString &fileName )
-	{
-		if ( mFileName != fileName )
-		{
-			mFileName = fileName;
-			emit nameChanged();
-		}
-	}
-
-
-	///
-	/// Get compression level
-	///
-	int Model::compressionLevel() const
-	{
-		return mCompressionLevel;
-	}
-
-
-	///
-	/// Set compression level
-	///
-	void Model::setCompressionLevel( int compressionLevel )
-	{
-		mCompressionLevel = compressionLevel;
-	}
-
-
-	///
-	/// Get template
-	///
-	const Template* Model::tmplate() const
-	{
-		return mTmplate;
-	}
-
-
-	///
-	/// Get frame
-	///
-	const Frame* Model::frame() const
-	{
-		return mFrame;
-	}
-
-
-	///
-	/// Set template
-	///
-	void Model::setTmplate( const Template* tmplate )
-	{
-		if (mTmplate != tmplate)
-		{
-			mTmplate = tmplate;
-			mFrame = tmplate->frames().first();
-
-			setModified();
-		
-			emit changed();
-			emit sizeChanged();
-
-			Settings::addToRecentTemplateList( tmplate->name() );
-		}
-	}
-
-
-	///
-	/// Get rotation
-	///
-	bool Model::rotate() const
-	{
-		return mRotate;
-	}
-
-
-	///
-	/// Set rotation
-	///
-	void Model::setRotate( bool rotate )
-	{
-		if (mRotate != rotate)
-		{
-			mRotate = rotate;
 
 			setModified();
 
 			emit changed();
-			emit sizeChanged();
-		}
-	}
-
-
-	///
-	/// Get width
-	///
-	Distance Model::w() const
-	{
-		return mRotate ? mFrame->h() : mFrame->w();
-	}
-
-
-	///
-	/// Get height
-	///
-	Distance Model::h() const
-	{
-		return mRotate ? mFrame->w() : mFrame->h();
-	}
-
-
-	///
-	/// Get object list
-	///
-	const QList<ModelObject*>& Model::objectList() const
-	{
-		return mObjectList;
-	}
-
-
-	///
-	/// Get short name.
-	///
-	QString Model::shortName()
-	{
-		static int untitledCount = 0;
-		
-		if ( mFileName.isEmpty() )
-		{
-			if ( mUntitledInstance == 0 )
-			{
-				mUntitledInstance = ++untitledCount;
-			}
-			QString numString;
-			numString.setNum(mUntitledInstance);;
-
-			return tr("Untitled") + numString;
-		}
-		else
-		{
-			QFileInfo fileInfo( mFileName );
-			return fileInfo.baseName();
-		}
-	}
-
-
-	///
-	/// Get merge object
-	///
-	merge::Merge* Model::merge() const
-	{
-		return mMerge;
-	}
-
-
-	///
-	/// Set merge object
-	///
-	void Model::setMerge( merge::Merge* merge )
-	{
-		if ( merge != mMerge )
-		{
-			delete mMerge;
-			mMerge = merge;
-
-			connect( mMerge, SIGNAL(sourceChanged()), this, SLOT(onMergeSourceChanged()) );
-			connect( mMerge, SIGNAL(selectionChanged()), this, SLOT(onMergeSelectionChanged()) );
-
-			setModified();
-		
-			emit changed();
-			emit mergeChanged();
-			emit mergeSourceChanged();
-		}
-	}
-
-
-	///
-	/// Set modified status
-	///
-	void Model::setModified()
-	{
-		mModified = true;
-		emit modifiedChanged();
-	}
-
-
-	///
-	/// Clear modified status
-	///
-	void Model::clearModified()
-	{
-		mModified = false;
-		emit modifiedChanged();
-	}
-
-
-	///
-	/// Add object.
-	///
-	void Model::addObject( ModelObject* object )
-	{
-		object->setParent( this );
-		mObjectList << object;
-
-		connect( object, SIGNAL(changed()), this, SLOT(onObjectChanged()) );
-		connect( object, SIGNAL(moved()), this, SLOT(onObjectMoved()) );
-
-		setModified();
-
-		emit changed();
-	}
-
-
-	///
-	/// Delete Object
-	///
-	void Model::deleteObject( ModelObject* object )
-	{
-		object->unselect();
-		mObjectList.removeOne( object );
-
-		disconnect( object, nullptr, this, nullptr );
-
-		setModified();
-
-		emit changed();
-
-		delete object;
-	}
-
-
-	///
-	/// Object at x,y
-	///
-	ModelObject* Model::objectAt( double          scale,
-	                              const Distance& x,
-	                              const Distance& y ) const
-	{
-		/* Search object list in reverse order.  I.e. from top to bottom. */
-		QList<ModelObject*>::const_iterator it = mObjectList.end();
-		while ( it != mObjectList.begin() )
-		{
-			it--;
-			ModelObject* object = *it;
-			if ( object->isLocatedAt( scale, x, y ) )
-			{
-				return object;
-			}
 		}
 
-		return nullptr;
-	}
 
-
-	///
-	/// Handle at x,y
-	///
-	Handle* Model::handleAt( double          scale,
-	                         const Distance& x,
-	                         const Distance& y ) const
-	{
-		foreach( ModelObject* object, mObjectList )
-		{
-			Handle* handle = object->handleAt( scale, x, y );
-			if ( handle )
-			{
-				return handle;
-			}
-		}
-
-		return nullptr;
-	}
-
-
-	///
-	/// Object Changed Slot
-	///
-	void Model::onObjectChanged()
-	{
-		setModified();
-		emit changed();
-	}
-
-
-	///
-	/// Object Moved Slot
-	///
-	void Model::onObjectMoved()
-	{
-		setModified();
-		emit changed();
-	}
-
-
-	///
-	/// Merge Source Changed Slot
-	///
-	void Model::onMergeSourceChanged()
-	{
-		setModified();
-		emit changed();
-		emit mergeSourceChanged();
-	}
-
-
-	///
-	/// Merge Selection Changed Slot
-	///
-	void Model::onMergeSelectionChanged()
-	{
-		emit changed();
-		emit mergeSelectionChanged();
-	}
-
-
-	///
-	/// Select Object
-	///
-	void Model::selectObject( ModelObject* object )
-	{
-		object->select();
-
-		emit selectionChanged();
-	}
-
-
-	///
-	/// Unselect Object
-	///
-	void Model::unselectObject( ModelObject* object )
-	{
-		object->unselect();
-
-		emit selectionChanged();
-	}
-
-
-	///
-	/// Select All Objects
-	///
-	void Model::selectAll()
-	{
-		foreach ( ModelObject* object, mObjectList )
-		{
-			object->select();
-		}
-
-		emit selectionChanged();
-	}
-
-
-	///
-	/// Unselect All Objects
-	///
-	void Model::unselectAll()
-	{
-		foreach ( ModelObject* object, mObjectList )
+		///
+		/// Delete Object
+		///
+		void Model::deleteObject( ModelObject* object )
 		{
 			object->unselect();
+			mObjectList.removeOne( object );
+
+			disconnect( object, nullptr, this, nullptr );
+
+			setModified();
+
+			emit changed();
+
+			delete object;
 		}
 
-		emit selectionChanged();
-	}
 
-
-	///
-	/// Select Region
-	///
-	void Model::selectRegion( const Region &region )
-	{
-		Distance rX1 = min( region.x1(), region.x2() );
-		Distance rY1 = min( region.y1(), region.y2() );
-		Distance rX2 = max( region.x1(), region.x2() );
-		Distance rY2 = max( region.y1(), region.y2() );
-
-		foreach ( ModelObject* object, mObjectList )
+		///
+		/// Object at x,y
+		///
+		ModelObject* Model::objectAt( double          scale,
+		                              const Distance& x,
+		                              const Distance& y ) const
 		{
-			Region objectExtent = object->getExtent();
+			/* Search object list in reverse order.  I.e. from top to bottom. */
+			QList<ModelObject*>::const_iterator it = mObjectList.end();
+			while ( it != mObjectList.begin() )
+			{
+				it--;
+				ModelObject* object = *it;
+				if ( object->isLocatedAt( scale, x, y ) )
+				{
+					return object;
+				}
+			}
 
-			if ( (objectExtent.x1() >= rX1) &&
-			     (objectExtent.x2() <= rX2) &&
-			     (objectExtent.y1() >= rY1) &&
-			     (objectExtent.y2() <= rY2) )
+			return nullptr;
+		}
+
+
+		///
+		/// Handle at x,y
+		///
+		Handle* Model::handleAt( double          scale,
+		                         const Distance& x,
+		                         const Distance& y ) const
+		{
+			foreach( ModelObject* object, mObjectList )
+			{
+				Handle* handle = object->handleAt( scale, x, y );
+				if ( handle )
+				{
+					return handle;
+				}
+			}
+
+			return nullptr;
+		}
+
+
+		///
+		/// Object Changed Slot
+		///
+		void Model::onObjectChanged()
+		{
+			setModified();
+			emit changed();
+		}
+
+
+		///
+		/// Object Moved Slot
+		///
+		void Model::onObjectMoved()
+		{
+			setModified();
+			emit changed();
+		}
+
+
+		///
+		/// Merge Source Changed Slot
+		///
+		void Model::onMergeSourceChanged()
+		{
+			setModified();
+			emit changed();
+			emit mergeSourceChanged();
+		}
+
+
+		///
+		/// Merge Selection Changed Slot
+		///
+		void Model::onMergeSelectionChanged()
+		{
+			emit changed();
+			emit mergeSelectionChanged();
+		}
+
+
+		///
+		/// Select Object
+		///
+		void Model::selectObject( ModelObject* object )
+		{
+			object->select();
+
+			emit selectionChanged();
+		}
+
+
+		///
+		/// Unselect Object
+		///
+		void Model::unselectObject( ModelObject* object )
+		{
+			object->unselect();
+
+			emit selectionChanged();
+		}
+
+
+		///
+		/// Select All Objects
+		///
+		void Model::selectAll()
+		{
+			foreach ( ModelObject* object, mObjectList )
 			{
 				object->select();
 			}
+
+			emit selectionChanged();
 		}
 
-		emit selectionChanged();
-	}
 
-
-	///
-	/// Is Selection Empty?
-	///
-	bool Model::isSelectionEmpty()
-	{
-		foreach ( ModelObject* object, mObjectList )
+		///
+		/// Unselect All Objects
+		///
+		void Model::unselectAll()
 		{
-			if ( object->isSelected() )
+			foreach ( ModelObject* object, mObjectList )
 			{
-				return false;
+				object->unselect();
 			}
+
+			emit selectionChanged();
 		}
 
-		return true;
-	}
 
-
-	///
-	/// Is Selection Atomic?
-	///
-	bool Model::isSelectionAtomic()
-	{
-		int nSelected = 0;
-
-		foreach ( ModelObject* object, mObjectList )
+		///
+		/// Select Region
+		///
+		void Model::selectRegion( const Region &region )
 		{
-			if ( object->isSelected() )
+			Distance rX1 = min( region.x1(), region.x2() );
+			Distance rY1 = min( region.y1(), region.y2() );
+			Distance rX2 = max( region.x1(), region.x2() );
+			Distance rY2 = max( region.y1(), region.y2() );
+
+			foreach ( ModelObject* object, mObjectList )
 			{
-				nSelected++;
-				if ( nSelected > 1 )
+				Region objectExtent = object->getExtent();
+
+				if ( (objectExtent.x1() >= rX1) &&
+				     (objectExtent.x2() <= rX2) &&
+				     (objectExtent.y1() >= rY1) &&
+				     (objectExtent.y2() <= rY2) )
+				{
+					object->select();
+				}
+			}
+
+			emit selectionChanged();
+		}
+
+
+		///
+		/// Is Selection Empty?
+		///
+		bool Model::isSelectionEmpty()
+		{
+			foreach ( ModelObject* object, mObjectList )
+			{
+				if ( object->isSelected() )
 				{
 					return false;
 				}
 			}
+
+			return true;
 		}
 
-		return nSelected == 1;
-	}
 
-
-	///
-	/// Get List of Selected Objects
-	///
-	QList<ModelObject*> Model::getSelection()
-	{
-		QList<ModelObject*> selectedList;
-
-		foreach ( ModelObject* object, mObjectList )
+		///
+		/// Is Selection Atomic?
+		///
+		bool Model::isSelectionAtomic()
 		{
-			if ( object->isSelected() )
+			int nSelected = 0;
+
+			foreach ( ModelObject* object, mObjectList )
 			{
-				selectedList << object;
+				if ( object->isSelected() )
+				{
+					nSelected++;
+					if ( nSelected > 1 )
+					{
+						return false;
+					}
+				}
 			}
+
+			return nSelected == 1;
 		}
 
-		return selectedList;
-	}
 
-
-	///
-	/// Get First Object in Selection List
-	///
-	ModelObject* Model::getFirstSelectedObject()
-	{
-		foreach ( ModelObject* object, mObjectList )
+		///
+		/// Get List of Selected Objects
+		///
+		QList<ModelObject*> Model::getSelection()
 		{
-			if ( object->isSelected() )
+			QList<ModelObject*> selectedList;
+
+			foreach ( ModelObject* object, mObjectList )
 			{
-				return object;
+				if ( object->isSelected() )
+				{
+					selectedList << object;
+				}
 			}
+
+			return selectedList;
 		}
 
-		return nullptr;
-	}
 
-
-	///
-	/// Can Any Objects in Selection Accept Text Properties?
-	///
-	bool Model::canSelectionText()
-	{
-		foreach ( ModelObject* object, mObjectList )
+		///
+		/// Get First Object in Selection List
+		///
+		ModelObject* Model::getFirstSelectedObject()
 		{
-			if ( object->isSelected() && object->canText() )
+			foreach ( ModelObject* object, mObjectList )
 			{
-				return true;
+				if ( object->isSelected() )
+				{
+					return object;
+				}
 			}
+
+			return nullptr;
 		}
 
-		return false;
-	}
 
-
-	///
-	/// Can Any Objects in Selection Accept Fill Property?
-	///
-	bool Model::canSelectionFill()
-	{
-		foreach ( ModelObject* object, mObjectList )
+		///
+		/// Can Any Objects in Selection Accept Text Properties?
+		///
+		bool Model::canSelectionText()
 		{
-			if ( object->isSelected() && object->canFill() )
+			foreach ( ModelObject* object, mObjectList )
 			{
-				return true;
+				if ( object->isSelected() && object->canText() )
+				{
+					return true;
+				}
 			}
+
+			return false;
 		}
 
-		return false;
-	}
 
-
-	///
-	/// Can Any Objects in Selection Accept Line Color Property?
-	///
-	bool Model::canSelectionLineColor()
-	{
-		foreach ( ModelObject* object, mObjectList )
+		///
+		/// Can Any Objects in Selection Accept Fill Property?
+		///
+		bool Model::canSelectionFill()
 		{
-			if ( object->isSelected() && object->canLineColor() )
+			foreach ( ModelObject* object, mObjectList )
 			{
-				return true;
+				if ( object->isSelected() && object->canFill() )
+				{
+					return true;
+				}
 			}
+
+			return false;
 		}
 
-		return false;
-	}
 
-
-	///
-	/// Can Any Objects in Selection Accept Line Width Property?
-	///
-	bool Model::canSelectionLineWidth()
-	{
-		foreach ( ModelObject* object, mObjectList )
+		///
+		/// Can Any Objects in Selection Accept Line Color Property?
+		///
+		bool Model::canSelectionLineColor()
 		{
-			if ( object->isSelected() && object->canLineWidth() )
+			foreach ( ModelObject* object, mObjectList )
 			{
-				return true;
+				if ( object->isSelected() && object->canLineColor() )
+				{
+					return true;
+				}
 			}
+
+			return false;
 		}
 
-		return false;
-	}
 
-
-	///
-	/// Delete Selected Objects
-	///
-	void Model::deleteSelection()
-	{
-		QList<ModelObject*> selectedList = getSelection();
-
-		foreach ( ModelObject* object, selectedList )
+		///
+		/// Can Any Objects in Selection Accept Line Width Property?
+		///
+		bool Model::canSelectionLineWidth()
 		{
-			deleteObject( object );
-		}
-
-		setModified();
-
-		emit changed();
-		emit selectionChanged();
-	}
-
-
-	///
-	/// Raise Selected Objects To Top
-	///
-	void Model::raiseSelectionToTop()
-	{
-		QList<ModelObject*> selectedList = getSelection();
-
-		foreach ( ModelObject* object, selectedList )
-		{
-			mObjectList.removeOne( object );
-		}
-
-		// Move to end of list, representing top most object.
-		foreach ( ModelObject* object, selectedList )
-		{
-			mObjectList.push_back( object );
-		}
-
-		setModified();
-
-		emit changed();
-	}
-
-
-	///
-	/// Lower Selected Objects To Bottom
-	///
-	void Model::lowerSelectionToBottom()
-	{
-		QList<ModelObject*> selectedList = getSelection();
-
-		foreach ( ModelObject* object, selectedList )
-		{
-			mObjectList.removeOne( object );
-		}
-
-		// Move to front of list, representing bottom most object.
-		foreach ( ModelObject* object, selectedList )
-		{
-			mObjectList.push_front( object );
-		}
-
-		setModified();
-
-		emit changed();
-	}
-
-
-	///
-	/// Rotate Selected Objects
-	///
-	void Model::rotateSelection( double thetaDegs )
-	{
-		foreach ( ModelObject* object, mObjectList )
-		{
-			if ( object->isSelected() )
+			foreach ( ModelObject* object, mObjectList )
 			{
-				object->rotate( thetaDegs );
+				if ( object->isSelected() && object->canLineWidth() )
+				{
+					return true;
+				}
 			}
+
+			return false;
 		}
 
-		setModified();
 
-		emit changed();
-	}
-
-
-	///
-	/// Rotate Selected Objects Left 90 degrees
-	///
-	void Model::rotateSelectionLeft()
-	{
-		rotateSelection( -90.0 );
-	}
-
-
-	///
-	/// Rotate Selected Objects Right 90 degrees
-	///
-	void Model::rotateSelectionRight()
-	{
-		rotateSelection( 90.0 );
-	}
-
-
-	///
-	/// Flip Selected Objects Horizontally
-	///
-	void Model::flipSelectionHoriz()
-	{
-		foreach ( ModelObject* object, mObjectList )
+		///
+		/// Delete Selected Objects
+		///
+		void Model::deleteSelection()
 		{
-			if ( object->isSelected() )
+			QList<ModelObject*> selectedList = getSelection();
+
+			foreach ( ModelObject* object, selectedList )
 			{
-				object->flipHoriz();
+				deleteObject( object );
 			}
+
+			setModified();
+
+			emit changed();
+			emit selectionChanged();
 		}
 
-		setModified();
 
-		emit changed();
-	}
-
-
-	///
-	/// Flip Selected Objects Vertically
-	///
-	void Model::flipSelectionVert()
-	{
-		foreach ( ModelObject* object, mObjectList )
+		///
+		/// Raise Selected Objects To Top
+		///
+		void Model::raiseSelectionToTop()
 		{
-			if ( object->isSelected() )
+			QList<ModelObject*> selectedList = getSelection();
+
+			foreach ( ModelObject* object, selectedList )
 			{
-				object->flipVert();
+				mObjectList.removeOne( object );
 			}
-		}
 
-		setModified();
-
-		emit changed();
-	}
-
-
-	///
-	/// Align Selected Objects To Their Left Edges
-	///
-	void Model::alignSelectionLeft()
-	{
-		if ( isSelectionEmpty() || isSelectionAtomic() )
-		{
-			return;
-		}
-
-		QList<ModelObject*> selectedList = getSelection();
-
-		// Find left-most edge.
-		Distance x1_min = 7200; // Start with a very large value: 7200pts = 100in
-		foreach ( ModelObject* object, selectedList )
-		{
-			Region r = object->getExtent();
-			if ( r.x1() < x1_min ) x1_min = r.x1();
-		}
-
-		// Now adjust the object positions to line up the left edges at left-most edge.
-		foreach ( ModelObject* object, selectedList )
-		{
-			Region r = object->getExtent();
-			Distance dx = x1_min - r.x1();
-			object->setPositionRelative( dx, 0 );
-		}
-		
-		setModified();
-
-		emit changed();
-	}
-
-
-	///
-	/// Align Selected Objects To Their Right Edges
-	///
-	void Model::alignSelectionRight()
-	{
-		if ( isSelectionEmpty() || isSelectionAtomic() )
-		{
-			return;
-		}
-
-		QList<ModelObject*> selectedList = getSelection();
-
-		// Find right-most edge.
-		Distance x1_max = -7200; // Start with a very large negative value: 7200pts = 100in
-		foreach ( ModelObject* object, selectedList )
-		{
-			Region r = object->getExtent();
-			if ( r.x1() > x1_max ) x1_max = r.x1();
-		}
-
-		// Now adjust the object positions to line up the right edges at right-most edge.
-		foreach ( ModelObject* object, selectedList )
-		{
-			Region r = object->getExtent();
-			Distance dx = x1_max - r.x1();
-			object->setPositionRelative( dx, 0 );
-		}
-		
-		setModified();
-
-		emit changed();
-	}
-
-
-	///
-	/// Align Selected Objects To Their Horizontal Centers
-	///
-	void Model::alignSelectionHCenter()
-	{
-		if ( isSelectionEmpty() || isSelectionAtomic() )
-		{
-			return;
-		}
-
-		QList<ModelObject*> selectedList = getSelection();
-
-		// Find average center of objects.
-		Distance xsum = 0;
-		int n = 0;
-		foreach ( ModelObject* object, selectedList )
-		{
-			Region r = object->getExtent();
-			xsum += (r.x1() + r.x2()) / 2.0;
-			n++;
-		}
-		Distance xavg = xsum / n;
-
-		// Find object closest to average center of objects.
-		Distance xcenter = 7200; // Start with very large value.
-		Distance dxmin = fabs( xavg - xcenter );
-		foreach ( ModelObject* object, selectedList )
-		{
-			Region r = object->getExtent();
-			Distance dx = fabs( xavg - (r.x1() + r.x2())/2.0 );
-			if ( dx < dxmin )
+			// Move to end of list, representing top most object.
+			foreach ( ModelObject* object, selectedList )
 			{
-				dxmin = dx;
-				xcenter = (r.x1() + r.x2()) / 2.0;
+				mObjectList.push_back( object );
 			}
+
+			setModified();
+
+			emit changed();
 		}
 
-		// Now adjust the object positions to line up with the center of this object.
-		foreach ( ModelObject* object, selectedList )
+
+		///
+		/// Lower Selected Objects To Bottom
+		///
+		void Model::lowerSelectionToBottom()
 		{
-			Region r = object->getExtent();
-			Distance dx = xcenter - (r.x1() + r.x2())/2.0;
-			object->setPositionRelative( dx, 0 );
-		}
-		
-		setModified();
+			QList<ModelObject*> selectedList = getSelection();
 
-		emit changed();
-	}
-
-
-	///
-	/// Align Selected Objects To Their Top Edges
-	///
-	void Model::alignSelectionTop()
-	{
-		if ( isSelectionEmpty() || isSelectionAtomic() )
-		{
-			return;
-		}
-
-		QList<ModelObject*> selectedList = getSelection();
-
-		// Find top-most edge.
-		Distance y1_min = 7200; // Start with a very large value: 7200pts = 100in
-		foreach ( ModelObject* object, selectedList )
-		{
-			Region r = object->getExtent();
-			if ( r.y1() < y1_min ) y1_min = r.y1();
-		}
-
-		// Now adjust the object positions to line up the top edges at top-most edge.
-		foreach ( ModelObject* object, selectedList )
-		{
-			Region r = object->getExtent();
-			Distance dy = y1_min - r.y1();
-			object->setPositionRelative( 0, dy );
-		}
-		
-		setModified();
-
-		emit changed();
-	}
-
-
-	///
-	/// Align Selected Objects To Their Bottom Edges
-	///
-	void Model::alignSelectionBottom()
-	{
-		if ( isSelectionEmpty() || isSelectionAtomic() )
-		{
-			return;
-		}
-
-		QList<ModelObject*> selectedList = getSelection();
-
-		// Find bottom-most edge.
-		Distance y1_max = -7200; // Start with a very large negative value: 7200pts = 100in
-		foreach ( ModelObject* object, selectedList )
-		{
-			Region r = object->getExtent();
-			if ( r.y1() > y1_max ) y1_max = r.y1();
-		}
-
-		// Now adjust the object positions to line up the bottom edges at bottom-most edge.
-		foreach ( ModelObject* object, selectedList )
-		{
-			Region r = object->getExtent();
-			Distance dy = y1_max - r.y1();
-			object->setPositionRelative( 0, dy );
-		}
-		
-		setModified();
-
-		emit changed();
-	}
-
-
-	///
-	/// Align Selected Objects To Their Vertical Centers Edges
-	///
-	void Model::alignSelectionVCenter()
-	{
-		if ( isSelectionEmpty() || isSelectionAtomic() )
-		{
-			return;
-		}
-
-		QList<ModelObject*> selectedList = getSelection();
-
-		// Find average center of objects.
-		Distance ysum = 0;
-		int n = 0;
-		foreach ( ModelObject* object, selectedList )
-		{
-			Region r = object->getExtent();
-			ysum += (r.y1() + r.y2()) / 2.0;
-			n++;
-		}
-		Distance yavg = ysum / n;
-
-		// Find object closest to average center of objects.
-		Distance ycenter = 7200; // Start with very large value.
-		Distance dymin = fabs( yavg - ycenter );
-		foreach ( ModelObject* object, selectedList )
-		{
-			Region r = object->getExtent();
-			Distance dy = fabs( yavg - (r.y1() + r.y2())/2.0 );
-			if ( dy < dymin )
+			foreach ( ModelObject* object, selectedList )
 			{
-				dymin = dy;
-				ycenter = (r.y1() + r.y2()) / 2.0;
+				mObjectList.removeOne( object );
 			}
+
+			// Move to front of list, representing bottom most object.
+			foreach ( ModelObject* object, selectedList )
+			{
+				mObjectList.push_front( object );
+			}
+
+			setModified();
+
+			emit changed();
 		}
 
-		// Now adjust the object positions to line up with the center of this object.
-		foreach ( ModelObject* object, selectedList )
+
+		///
+		/// Rotate Selected Objects
+		///
+		void Model::rotateSelection( double thetaDegs )
 		{
-			Region r = object->getExtent();
-			Distance dy = ycenter - (r.y1() + r.y2())/2.0;
-			object->setPositionRelative( 0, dy );
+			foreach ( ModelObject* object, mObjectList )
+			{
+				if ( object->isSelected() )
+				{
+					object->rotate( thetaDegs );
+				}
+			}
+
+			setModified();
+
+			emit changed();
 		}
-		
-		setModified();
-
-		emit changed();
-	}
 
 
-	///
-	/// Align Selected Objects To Center Of Label Horizontally
-	///
-	void Model::centerSelectionHoriz()
-	{
-		Distance xLabelCenter = w() / 2.0;
-
-		foreach ( ModelObject* object, mObjectList )
+		///
+		/// Rotate Selected Objects Left 90 degrees
+		///
+		void Model::rotateSelectionLeft()
 		{
-			if ( object->isSelected() )
+			rotateSelection( -90.0 );
+		}
+
+
+		///
+		/// Rotate Selected Objects Right 90 degrees
+		///
+		void Model::rotateSelectionRight()
+		{
+			rotateSelection( 90.0 );
+		}
+
+
+		///
+		/// Flip Selected Objects Horizontally
+		///
+		void Model::flipSelectionHoriz()
+		{
+			foreach ( ModelObject* object, mObjectList )
+			{
+				if ( object->isSelected() )
+				{
+					object->flipHoriz();
+				}
+			}
+
+			setModified();
+
+			emit changed();
+		}
+
+
+		///
+		/// Flip Selected Objects Vertically
+		///
+		void Model::flipSelectionVert()
+		{
+			foreach ( ModelObject* object, mObjectList )
+			{
+				if ( object->isSelected() )
+				{
+					object->flipVert();
+				}
+			}
+
+			setModified();
+
+			emit changed();
+		}
+
+
+		///
+		/// Align Selected Objects To Their Left Edges
+		///
+		void Model::alignSelectionLeft()
+		{
+			if ( isSelectionEmpty() || isSelectionAtomic() )
+			{
+				return;
+			}
+
+			QList<ModelObject*> selectedList = getSelection();
+
+			// Find left-most edge.
+			Distance x1_min = 7200; // Start with a very large value: 7200pts = 100in
+			foreach ( ModelObject* object, selectedList )
 			{
 				Region r = object->getExtent();
-				Distance xObjectCenter = (r.x1() + r.x2()) / 2.0;
-				Distance dx = xLabelCenter - xObjectCenter;
+				if ( r.x1() < x1_min ) x1_min = r.x1();
+			}
+
+			// Now adjust the object positions to line up the left edges at left-most edge.
+			foreach ( ModelObject* object, selectedList )
+			{
+				Region r = object->getExtent();
+				Distance dx = x1_min - r.x1();
 				object->setPositionRelative( dx, 0 );
 			}
+		
+			setModified();
+
+			emit changed();
 		}
 
-		setModified();
 
-		emit changed();
-	}
-
-
-	///
-	/// Align Selected Objects To Center Of Label Vertically
-	///
-	void Model::centerSelectionVert()
-	{
-		Distance yLabelCenter = h() / 2.0;
-
-		foreach ( ModelObject* object, mObjectList )
+		///
+		/// Align Selected Objects To Their Right Edges
+		///
+		void Model::alignSelectionRight()
 		{
-			if ( object->isSelected() )
+			if ( isSelectionEmpty() || isSelectionAtomic() )
+			{
+				return;
+			}
+
+			QList<ModelObject*> selectedList = getSelection();
+
+			// Find right-most edge.
+			Distance x1_max = -7200; // Start with a very large negative value: 7200pts = 100in
+			foreach ( ModelObject* object, selectedList )
 			{
 				Region r = object->getExtent();
-				Distance yObjectCenter = (r.y1() + r.y2()) / 2.0;
-				Distance dy = yLabelCenter - yObjectCenter;
+				if ( r.x1() > x1_max ) x1_max = r.x1();
+			}
+
+			// Now adjust the object positions to line up the right edges at right-most edge.
+			foreach ( ModelObject* object, selectedList )
+			{
+				Region r = object->getExtent();
+				Distance dx = x1_max - r.x1();
+				object->setPositionRelative( dx, 0 );
+			}
+		
+			setModified();
+
+			emit changed();
+		}
+
+
+		///
+		/// Align Selected Objects To Their Horizontal Centers
+		///
+		void Model::alignSelectionHCenter()
+		{
+			if ( isSelectionEmpty() || isSelectionAtomic() )
+			{
+				return;
+			}
+
+			QList<ModelObject*> selectedList = getSelection();
+
+			// Find average center of objects.
+			Distance xsum = 0;
+			int n = 0;
+			foreach ( ModelObject* object, selectedList )
+			{
+				Region r = object->getExtent();
+				xsum += (r.x1() + r.x2()) / 2.0;
+				n++;
+			}
+			Distance xavg = xsum / n;
+
+			// Find object closest to average center of objects.
+			Distance xcenter = 7200; // Start with very large value.
+			Distance dxmin = fabs( xavg - xcenter );
+			foreach ( ModelObject* object, selectedList )
+			{
+				Region r = object->getExtent();
+				Distance dx = fabs( xavg - (r.x1() + r.x2())/2.0 );
+				if ( dx < dxmin )
+				{
+					dxmin = dx;
+					xcenter = (r.x1() + r.x2()) / 2.0;
+				}
+			}
+
+			// Now adjust the object positions to line up with the center of this object.
+			foreach ( ModelObject* object, selectedList )
+			{
+				Region r = object->getExtent();
+				Distance dx = xcenter - (r.x1() + r.x2())/2.0;
+				object->setPositionRelative( dx, 0 );
+			}
+		
+			setModified();
+
+			emit changed();
+		}
+
+
+		///
+		/// Align Selected Objects To Their Top Edges
+		///
+		void Model::alignSelectionTop()
+		{
+			if ( isSelectionEmpty() || isSelectionAtomic() )
+			{
+				return;
+			}
+
+			QList<ModelObject*> selectedList = getSelection();
+
+			// Find top-most edge.
+			Distance y1_min = 7200; // Start with a very large value: 7200pts = 100in
+			foreach ( ModelObject* object, selectedList )
+			{
+				Region r = object->getExtent();
+				if ( r.y1() < y1_min ) y1_min = r.y1();
+			}
+
+			// Now adjust the object positions to line up the top edges at top-most edge.
+			foreach ( ModelObject* object, selectedList )
+			{
+				Region r = object->getExtent();
+				Distance dy = y1_min - r.y1();
 				object->setPositionRelative( 0, dy );
 			}
-		}
-
-		setModified();
-
-		emit changed();
-	}
-
-
-	///
-	/// Move Selected Objects By dx,dy
-	///
-	void Model::moveSelection( const Distance& dx, const Distance& dy )
-	{
-		foreach ( ModelObject* object, mObjectList )
-		{
-			if ( object->isSelected() )
-			{
-				object->setPositionRelative( dx, dy );
-			}
-		}
-
-		setModified();
-
-		emit changed();
-	}
-
-
-	///
-	/// Set Font Family Of Selected Objects
-	///
-	void Model::setSelectionFontFamily( const QString &fontFamily )
-	{
-		foreach ( ModelObject* object, mObjectList )
-		{
-			if ( object->isSelected() )
-			{
-				object->setFontFamily( fontFamily );
-			}
-		}
-
-		setModified();
-
-		emit changed();
-	}
-
-
-	///
-	/// Set Font Size Of Selected Objects
-	///
-	void Model::setSelectionFontSize( double fontSize )
-	{
-		foreach ( ModelObject* object, mObjectList )
-		{
-			if ( object->isSelected() )
-			{
-				object->setFontSize( fontSize );
-			}
-		}
-
-		setModified();
-
-		emit changed();
-	}
-
-
-	///
-	/// Set Font Weight Of Selected Objects
-	///
-	void Model::setSelectionFontWeight( QFont::Weight fontWeight )
-	{
-		foreach ( ModelObject* object, mObjectList )
-		{
-			if ( object->isSelected() )
-			{
-				object->setFontWeight( fontWeight );
-			}
-		}
-
-		setModified();
-
-		emit changed();
-	}
-
-
-	///
-	/// Set Font Italic Flag Of Selected Objects
-	///
-	void Model::setSelectionFontItalicFlag( bool fontItalicFlag )
-	{
-		foreach ( ModelObject* object, mObjectList )
-		{
-			if ( object->isSelected() )
-			{
-				object->setFontItalicFlag( fontItalicFlag );
-			}
-		}
-
-		setModified();
-
-		emit changed();
-	}
-
-
-	///
-	/// Set Text Horizontal Alignment Of Selected Objects
-	///
-	void Model::setSelectionTextHAlign( Qt::Alignment textHAlign )
-	{
-		foreach ( ModelObject* object, mObjectList )
-		{
-			if ( object->isSelected() )
-			{
-				object->setTextHAlign( textHAlign );
-			}
-		}
-
-		setModified();
-
-		emit changed();
-	}
-
-
-	///
-	/// Set Text Vertical Alignment Of Selected Objects
-	///
-	void Model::setSelectionTextVAlign( Qt::Alignment textVAlign )
-	{
-		foreach ( ModelObject* object, mObjectList )
-		{
-			if ( object->isSelected() )
-			{
-				object->setTextVAlign( textVAlign );
-			}
-		}
-
-		setModified();
-
-		emit changed();
-	}
-
-
-	///
-	/// Set Text Line Spacing Of Selected Objects
-	///
-	void Model::setSelectionTextLineSpacing( double textLineSpacing )
-	{
-		foreach ( ModelObject* object, mObjectList )
-		{
-			if ( object->isSelected() )
-			{
-				object->setTextLineSpacing( textLineSpacing );
-			}
-		}
-
-		setModified();
-
-		emit changed();
-	}
-
-
-	///
-	/// Set Text Color Node Of Selected Objects
-	///
-	void Model::setSelectionTextColorNode( ColorNode textColorNode )
-	{
-		foreach ( ModelObject* object, mObjectList )
-		{
-			if ( object->isSelected() )
-			{
-				object->setTextColorNode( textColorNode );
-			}
-		}
-
-		setModified();
-
-		emit changed();
-	}
-
-
-	///
-	/// Set Line Width Of Selected Objects
-	///
-	void Model::setSelectionLineWidth( const Distance& lineWidth )
-	{
-		foreach ( ModelObject* object, mObjectList )
-		{
-			if ( object->isSelected() )
-			{
-				object->setLineWidth( lineWidth );
-			}
-		}
-
-		setModified();
-
-		emit changed();
-	}
-
-
-	///
-	/// Set Line Color Node Of Selected Objects
-	///
-	void Model::setSelectionLineColorNode( ColorNode lineColorNode )
-	{
-		foreach ( ModelObject* object, mObjectList )
-		{
-			if ( object->isSelected() )
-			{
-				object->setLineColorNode( lineColorNode );
-			}
-		}
-
-		setModified();
-
-		emit changed();
-	}
-
-
-	///
-	/// Set Fill Color Node Of Selected Objects
-	///
-	void Model::setSelectionFillColorNode( ColorNode fillColorNode )
-	{
-		foreach ( ModelObject* object, mObjectList )
-		{
-			if ( object->isSelected() )
-			{
-				object->setFillColorNode( fillColorNode );
-			}
-		}
-
-		setModified();
-
-		emit changed();
-	}
-
-
-	///
-	/// Copy selection to clipboard
-	///
-	void Model::copySelection()
-	{
-		if ( !isSelectionEmpty() )
-		{
-			QClipboard *clipboard = QApplication::clipboard();
 		
-			QByteArray buffer;
-			XmlLabelCreator::serializeObjects( getSelection(), buffer );
+			setModified();
 
-			QMimeData *mimeData = new QMimeData;
-			mimeData->setData( MIME_TYPE, buffer );
-
-			clipboard->setMimeData( mimeData );
+			emit changed();
 		}
-	}
 
 
-	///
-	/// Cut selection to clipboard
-	///
-	void Model::cutSelection()
-	{
-		copySelection();
-		deleteSelection();
-	}
-
-
-	///
-	/// Can we paste?
-	///
-	bool Model::canPaste()
-	{
-		const QClipboard *clipboard = QApplication::clipboard();
-		const QMimeData *mimeData = clipboard->mimeData();
-
-		if ( mimeData->hasFormat( MIME_TYPE ) )
+		///
+		/// Align Selected Objects To Their Bottom Edges
+		///
+		void Model::alignSelectionBottom()
 		{
-			return true;
-		}
-		else if ( mimeData->hasImage() )
-		{
-			return true;
-		}
-		else if ( mimeData->hasText() )
-		{
-			return true;
-		}
-		return false;
-	}
-
-
-	///
-	/// Paste from clipboard
-	///
-	void Model::paste()
-	{
-		const QClipboard *clipboard = QApplication::clipboard();
-		const QMimeData *mimeData = clipboard->mimeData();
-
-		if ( mimeData->hasFormat( MIME_TYPE ) )
-		{
-			// Native objects
-			QByteArray buffer = mimeData->data( MIME_TYPE );
-			QList <ModelObject*> objects = XmlLabelParser::deserializeObjects( buffer );
-
-			unselectAll();
-			foreach ( ModelObject* object, objects )
+			if ( isSelectionEmpty() || isSelectionAtomic() )
 			{
+				return;
+			}
+
+			QList<ModelObject*> selectedList = getSelection();
+
+			// Find bottom-most edge.
+			Distance y1_max = -7200; // Start with a very large negative value: 7200pts = 100in
+			foreach ( ModelObject* object, selectedList )
+			{
+				Region r = object->getExtent();
+				if ( r.y1() > y1_max ) y1_max = r.y1();
+			}
+
+			// Now adjust the object positions to line up the bottom edges at bottom-most edge.
+			foreach ( ModelObject* object, selectedList )
+			{
+				Region r = object->getExtent();
+				Distance dy = y1_max - r.y1();
+				object->setPositionRelative( 0, dy );
+			}
+		
+			setModified();
+
+			emit changed();
+		}
+
+
+		///
+		/// Align Selected Objects To Their Vertical Centers Edges
+		///
+		void Model::alignSelectionVCenter()
+		{
+			if ( isSelectionEmpty() || isSelectionAtomic() )
+			{
+				return;
+			}
+
+			QList<ModelObject*> selectedList = getSelection();
+
+			// Find average center of objects.
+			Distance ysum = 0;
+			int n = 0;
+			foreach ( ModelObject* object, selectedList )
+			{
+				Region r = object->getExtent();
+				ysum += (r.y1() + r.y2()) / 2.0;
+				n++;
+			}
+			Distance yavg = ysum / n;
+
+			// Find object closest to average center of objects.
+			Distance ycenter = 7200; // Start with very large value.
+			Distance dymin = fabs( yavg - ycenter );
+			foreach ( ModelObject* object, selectedList )
+			{
+				Region r = object->getExtent();
+				Distance dy = fabs( yavg - (r.y1() + r.y2())/2.0 );
+				if ( dy < dymin )
+				{
+					dymin = dy;
+					ycenter = (r.y1() + r.y2()) / 2.0;
+				}
+			}
+
+			// Now adjust the object positions to line up with the center of this object.
+			foreach ( ModelObject* object, selectedList )
+			{
+				Region r = object->getExtent();
+				Distance dy = ycenter - (r.y1() + r.y2())/2.0;
+				object->setPositionRelative( 0, dy );
+			}
+		
+			setModified();
+
+			emit changed();
+		}
+
+
+		///
+		/// Align Selected Objects To Center Of Label Horizontally
+		///
+		void Model::centerSelectionHoriz()
+		{
+			Distance xLabelCenter = w() / 2.0;
+
+			foreach ( ModelObject* object, mObjectList )
+			{
+				if ( object->isSelected() )
+				{
+					Region r = object->getExtent();
+					Distance xObjectCenter = (r.x1() + r.x2()) / 2.0;
+					Distance dx = xLabelCenter - xObjectCenter;
+					object->setPositionRelative( dx, 0 );
+				}
+			}
+
+			setModified();
+
+			emit changed();
+		}
+
+
+		///
+		/// Align Selected Objects To Center Of Label Vertically
+		///
+		void Model::centerSelectionVert()
+		{
+			Distance yLabelCenter = h() / 2.0;
+
+			foreach ( ModelObject* object, mObjectList )
+			{
+				if ( object->isSelected() )
+				{
+					Region r = object->getExtent();
+					Distance yObjectCenter = (r.y1() + r.y2()) / 2.0;
+					Distance dy = yLabelCenter - yObjectCenter;
+					object->setPositionRelative( 0, dy );
+				}
+			}
+
+			setModified();
+
+			emit changed();
+		}
+
+
+		///
+		/// Move Selected Objects By dx,dy
+		///
+		void Model::moveSelection( const Distance& dx, const Distance& dy )
+		{
+			foreach ( ModelObject* object, mObjectList )
+			{
+				if ( object->isSelected() )
+				{
+					object->setPositionRelative( dx, dy );
+				}
+			}
+
+			setModified();
+
+			emit changed();
+		}
+
+
+		///
+		/// Set Font Family Of Selected Objects
+		///
+		void Model::setSelectionFontFamily( const QString &fontFamily )
+		{
+			foreach ( ModelObject* object, mObjectList )
+			{
+				if ( object->isSelected() )
+				{
+					object->setFontFamily( fontFamily );
+				}
+			}
+
+			setModified();
+
+			emit changed();
+		}
+
+
+		///
+		/// Set Font Size Of Selected Objects
+		///
+		void Model::setSelectionFontSize( double fontSize )
+		{
+			foreach ( ModelObject* object, mObjectList )
+			{
+				if ( object->isSelected() )
+				{
+					object->setFontSize( fontSize );
+				}
+			}
+
+			setModified();
+
+			emit changed();
+		}
+
+
+		///
+		/// Set Font Weight Of Selected Objects
+		///
+		void Model::setSelectionFontWeight( QFont::Weight fontWeight )
+		{
+			foreach ( ModelObject* object, mObjectList )
+			{
+				if ( object->isSelected() )
+				{
+					object->setFontWeight( fontWeight );
+				}
+			}
+
+			setModified();
+
+			emit changed();
+		}
+
+
+		///
+		/// Set Font Italic Flag Of Selected Objects
+		///
+		void Model::setSelectionFontItalicFlag( bool fontItalicFlag )
+		{
+			foreach ( ModelObject* object, mObjectList )
+			{
+				if ( object->isSelected() )
+				{
+					object->setFontItalicFlag( fontItalicFlag );
+				}
+			}
+
+			setModified();
+
+			emit changed();
+		}
+
+
+		///
+		/// Set Text Horizontal Alignment Of Selected Objects
+		///
+		void Model::setSelectionTextHAlign( Qt::Alignment textHAlign )
+		{
+			foreach ( ModelObject* object, mObjectList )
+			{
+				if ( object->isSelected() )
+				{
+					object->setTextHAlign( textHAlign );
+				}
+			}
+
+			setModified();
+
+			emit changed();
+		}
+
+
+		///
+		/// Set Text Vertical Alignment Of Selected Objects
+		///
+		void Model::setSelectionTextVAlign( Qt::Alignment textVAlign )
+		{
+			foreach ( ModelObject* object, mObjectList )
+			{
+				if ( object->isSelected() )
+				{
+					object->setTextVAlign( textVAlign );
+				}
+			}
+
+			setModified();
+
+			emit changed();
+		}
+
+
+		///
+		/// Set Text Line Spacing Of Selected Objects
+		///
+		void Model::setSelectionTextLineSpacing( double textLineSpacing )
+		{
+			foreach ( ModelObject* object, mObjectList )
+			{
+				if ( object->isSelected() )
+				{
+					object->setTextLineSpacing( textLineSpacing );
+				}
+			}
+
+			setModified();
+
+			emit changed();
+		}
+
+
+		///
+		/// Set Text Color Node Of Selected Objects
+		///
+		void Model::setSelectionTextColorNode( ColorNode textColorNode )
+		{
+			foreach ( ModelObject* object, mObjectList )
+			{
+				if ( object->isSelected() )
+				{
+					object->setTextColorNode( textColorNode );
+				}
+			}
+
+			setModified();
+
+			emit changed();
+		}
+
+
+		///
+		/// Set Line Width Of Selected Objects
+		///
+		void Model::setSelectionLineWidth( const Distance& lineWidth )
+		{
+			foreach ( ModelObject* object, mObjectList )
+			{
+				if ( object->isSelected() )
+				{
+					object->setLineWidth( lineWidth );
+				}
+			}
+
+			setModified();
+
+			emit changed();
+		}
+
+
+		///
+		/// Set Line Color Node Of Selected Objects
+		///
+		void Model::setSelectionLineColorNode( ColorNode lineColorNode )
+		{
+			foreach ( ModelObject* object, mObjectList )
+			{
+				if ( object->isSelected() )
+				{
+					object->setLineColorNode( lineColorNode );
+				}
+			}
+
+			setModified();
+
+			emit changed();
+		}
+
+
+		///
+		/// Set Fill Color Node Of Selected Objects
+		///
+		void Model::setSelectionFillColorNode( ColorNode fillColorNode )
+		{
+			foreach ( ModelObject* object, mObjectList )
+			{
+				if ( object->isSelected() )
+				{
+					object->setFillColorNode( fillColorNode );
+				}
+			}
+
+			setModified();
+
+			emit changed();
+		}
+
+
+		///
+		/// Copy selection to clipboard
+		///
+		void Model::copySelection()
+		{
+			if ( !isSelectionEmpty() )
+			{
+				QClipboard *clipboard = QApplication::clipboard();
+		
+				QByteArray buffer;
+				XmlLabelCreator::serializeObjects( getSelection(), buffer );
+
+				QMimeData *mimeData = new QMimeData;
+				mimeData->setData( MIME_TYPE, buffer );
+
+				clipboard->setMimeData( mimeData );
+			}
+		}
+
+
+		///
+		/// Cut selection to clipboard
+		///
+		void Model::cutSelection()
+		{
+			copySelection();
+			deleteSelection();
+		}
+
+
+		///
+		/// Can we paste?
+		///
+		bool Model::canPaste()
+		{
+			const QClipboard *clipboard = QApplication::clipboard();
+			const QMimeData *mimeData = clipboard->mimeData();
+
+			if ( mimeData->hasFormat( MIME_TYPE ) )
+			{
+				return true;
+			}
+			else if ( mimeData->hasImage() )
+			{
+				return true;
+			}
+			else if ( mimeData->hasText() )
+			{
+				return true;
+			}
+			return false;
+		}
+
+
+		///
+		/// Paste from clipboard
+		///
+		void Model::paste()
+		{
+			const QClipboard *clipboard = QApplication::clipboard();
+			const QMimeData *mimeData = clipboard->mimeData();
+
+			if ( mimeData->hasFormat( MIME_TYPE ) )
+			{
+				// Native objects
+				QByteArray buffer = mimeData->data( MIME_TYPE );
+				QList <ModelObject*> objects = XmlLabelParser::deserializeObjects( buffer );
+
+				unselectAll();
+				foreach ( ModelObject* object, objects )
+				{
+					addObject( object );
+					selectObject( object );
+				}
+			}
+			else if ( mimeData->hasImage() )
+			{
+				// Create object from clipboard image
+				ModelImageObject* object = new ModelImageObject();
+				object->setImage( qvariant_cast<QImage>(mimeData->imageData()) );
+				object->setSize( object->naturalSize() );
+				object->setPosition( (w()-object->w())/2.0, (h()-object->h())/2.0 );
 				addObject( object );
+				unselectAll();
+				selectObject( object );
+			}
+			else if ( mimeData->hasText() )
+			{
+				// Create object from clipboard text
+				ModelTextObject* object = new ModelTextObject();
+				object->setText( mimeData->text() );
+				object->setSize( object->naturalSize() );
+				object->setPosition( (w()-object->w())/2.0, (h()-object->h())/2.0 );
+				addObject( object );
+				unselectAll();
 				selectObject( object );
 			}
 		}
-		else if ( mimeData->hasImage() )
+
+
+		///
+		/// Draw label objects
+		///
+		void Model::draw( QPainter* painter, bool inEditor, merge::Record* record ) const
 		{
-			// Create object from clipboard image
-			ModelImageObject* object = new ModelImageObject();
-			object->setImage( qvariant_cast<QImage>(mimeData->imageData()) );
-			object->setSize( object->naturalSize() );
-			object->setPosition( (w()-object->w())/2.0, (h()-object->h())/2.0 );
-			addObject( object );
-			unselectAll();
-			selectObject( object );
-		}
-		else if ( mimeData->hasText() )
-		{
-			// Create object from clipboard text
-			ModelTextObject* object = new ModelTextObject();
-			object->setText( mimeData->text() );
-			object->setSize( object->naturalSize() );
-			object->setPosition( (w()-object->w())/2.0, (h()-object->h())/2.0 );
-			addObject( object );
-			unselectAll();
-			selectObject( object );
+			foreach ( ModelObject* object, mObjectList )
+			{
+				object->draw( painter, inEditor, record );
+			}
 		}
+
 	}
-
-
-	///
-	/// Draw label objects
-	///
-	void Model::draw( QPainter* painter, bool inEditor, merge::Record* record ) const
-	{
-		foreach ( ModelObject* object, mObjectList )
-		{
-			object->draw( painter, inEditor, record );
-		}
-	}
-
-} // namespace glabels::model
+}
diff --git a/model/Model.h b/model/Model.h
index 3eb3039..44f7aeb 100644
--- a/model/Model.h
+++ b/model/Model.h
@@ -33,206 +33,209 @@
 #include <QPainter>
 
 
-namespace glabels::model
+namespace glabels
 {
-
-	// Forward References
-	class ColorNode;
-	class Handle;
-	class ModelObject;
-	class Region;
-
-	///
-	/// Model
-	///
-	class Model : public QObject
+	namespace model
 	{
-		Q_OBJECT
+
+		// Forward References
+		class ColorNode;
+		class Handle;
+		class ModelObject;
+		class Region;
+
+		///
+		/// Model
+		///
+		class Model : public QObject
+		{
+			Q_OBJECT
 
 
-		/////////////////////////////////
-		// Lifecycle
-		/////////////////////////////////
-	public:
-		Model();
-		~Model() override {}
+			/////////////////////////////////
+			// Lifecycle
+			/////////////////////////////////
+		public:
+			Model();
+			~Model() override {}
 
 	
-		/////////////////////////////////
-		// Save/restore model state
-		/////////////////////////////////
-		Model* save() const;
-		void restore( const Model *savedModel );
+			/////////////////////////////////
+			// Save/restore model state
+			/////////////////////////////////
+			Model* save() const;
+			void restore( const Model *savedModel );
 	
 
-		/////////////////////////////////
-		// Signals
-		/////////////////////////////////
-	signals:
-		void changed();
-		void nameChanged();
-		void sizeChanged();
-		void selectionChanged();
-		void modifiedChanged();
-		void mergeChanged();
-		void mergeSourceChanged();
-		void mergeSelectionChanged();
+			/////////////////////////////////
+			// Signals
+			/////////////////////////////////
+		signals:
+			void changed();
+			void nameChanged();
+			void sizeChanged();
+			void selectionChanged();
+			void modifiedChanged();
+			void mergeChanged();
+			void mergeSourceChanged();
+			void mergeSelectionChanged();
 
 
-		/////////////////////////////////
-		// Properties
-		/////////////////////////////////
-	public:
-		bool isModified() const;
-		void setModified();
-		void clearModified();
+			/////////////////////////////////
+			// Properties
+			/////////////////////////////////
+		public:
+			bool isModified() const;
+			void setModified();
+			void clearModified();
 
-		QString shortName();
-		const QString& fileName() const;
-		void setFileName( const QString &fileName );
+			QString shortName();
+			const QString& fileName() const;
+			void setFileName( const QString &fileName );
 
-		int compressionLevel() const;
-		void setCompressionLevel( int compressionLevel );
+			int compressionLevel() const;
+			void setCompressionLevel( int compressionLevel );
 
-		const Template* tmplate() const;
-		const Frame* frame() const;
-		void setTmplate( const Template* tmplate );
+			const Template* tmplate() const;
+			const Frame* frame() const;
+			void setTmplate( const Template* tmplate );
 
-		bool rotate() const;
-		void setRotate( bool rotate );
+			bool rotate() const;
+			void setRotate( bool rotate );
 
-		Distance w() const;
-		Distance h() const;
+			Distance w() const;
+			Distance h() const;
 
-		const QList<ModelObject*>& objectList() const;
+			const QList<ModelObject*>& objectList() const;
 
-		merge::Merge* merge() const;
-		void setMerge( merge::Merge* merge );
+			merge::Merge* merge() const;
+			void setMerge( merge::Merge* merge );
 	
 		
-		/////////////////////////////////
-		// Manage objects
-		/////////////////////////////////
-	public:
-		void addObject( ModelObject* object );
-		void deleteObject( ModelObject* object );
+			/////////////////////////////////
+			// Manage objects
+			/////////////////////////////////
+		public:
+			void addObject( ModelObject* object );
+			void deleteObject( ModelObject* object );
 
-		ModelObject* objectAt( double          scale,
-		                       const Distance& x,
-		                       const Distance& y ) const;
+			ModelObject* objectAt( double          scale,
+			                       const Distance& x,
+			                       const Distance& y ) const;
 		
-		Handle* handleAt( double          scale,
-		                  const Distance& x,
-		                  const Distance& y ) const;
+			Handle* handleAt( double          scale,
+			                  const Distance& x,
+			                  const Distance& y ) const;
 
 
-		/////////////////////////////////
-		// Manipulate selection
-		/////////////////////////////////
-	public:
-		void selectObject( ModelObject* object );
-		void unselectObject( ModelObject* object );
-		void selectAll();
-		void unselectAll();
-		void selectRegion( const Region& region );
-		bool isSelectionEmpty();
-		bool isSelectionAtomic();
+			/////////////////////////////////
+			// Manipulate selection
+			/////////////////////////////////
+		public:
+			void selectObject( ModelObject* object );
+			void unselectObject( ModelObject* object );
+			void selectAll();
+			void unselectAll();
+			void selectRegion( const Region& region );
+			bool isSelectionEmpty();
+			bool isSelectionAtomic();
 
 
-		/////////////////////////////////
-		// Get selected objects
-		/////////////////////////////////
-	public:
-		QList<ModelObject*> getSelection();
-		ModelObject* getFirstSelectedObject();
+			/////////////////////////////////
+			// Get selected objects
+			/////////////////////////////////
+		public:
+			QList<ModelObject*> getSelection();
+			ModelObject* getFirstSelectedObject();
 
 
-		/////////////////////////////////
-		// Query selection capabilities
-		/////////////////////////////////
-	public:
-		bool canSelectionText();
-		bool canSelectionFill();
-		bool canSelectionLineColor();
-		bool canSelectionLineWidth();
+			/////////////////////////////////
+			// Query selection capabilities
+			/////////////////////////////////
+		public:
+			bool canSelectionText();
+			bool canSelectionFill();
+			bool canSelectionLineColor();
+			bool canSelectionLineWidth();
 
 
-		/////////////////////////////////
-		// Operations on selections
-		/////////////////////////////////
-	public:
-		void deleteSelection();
-		void raiseSelectionToTop();
-		void lowerSelectionToBottom();
-		void rotateSelection( double thetaDegs );
-		void rotateSelectionLeft();
-		void rotateSelectionRight();
-		void flipSelectionHoriz();
-		void flipSelectionVert();
-		void alignSelectionLeft();
-		void alignSelectionRight();
-		void alignSelectionHCenter();
-		void alignSelectionTop();
-		void alignSelectionBottom();
-		void alignSelectionVCenter();
-		void centerSelectionHoriz();
-		void centerSelectionVert();
-		void moveSelection( const Distance& dx, const Distance& dy );
-		void setSelectionFontFamily( const QString& fontFamily );
-		void setSelectionFontSize( double fontSize );
-		void setSelectionFontWeight( QFont::Weight fontWeight );
-		void setSelectionFontItalicFlag( bool fontItalicFlag );
-		void setSelectionTextHAlign( Qt::Alignment textHAlign );
-		void setSelectionTextVAlign( Qt::Alignment textVAlign );
-		void setSelectionTextLineSpacing( double textLineSpacing );
-		void setSelectionTextColorNode( ColorNode textColorNode );
-		void setSelectionLineWidth( const Distance& lineWidth );
-		void setSelectionLineColorNode( ColorNode lineColorNode );
-		void setSelectionFillColorNode( ColorNode fillColorNode );
+			/////////////////////////////////
+			// Operations on selections
+			/////////////////////////////////
+		public:
+			void deleteSelection();
+			void raiseSelectionToTop();
+			void lowerSelectionToBottom();
+			void rotateSelection( double thetaDegs );
+			void rotateSelectionLeft();
+			void rotateSelectionRight();
+			void flipSelectionHoriz();
+			void flipSelectionVert();
+			void alignSelectionLeft();
+			void alignSelectionRight();
+			void alignSelectionHCenter();
+			void alignSelectionTop();
+			void alignSelectionBottom();
+			void alignSelectionVCenter();
+			void centerSelectionHoriz();
+			void centerSelectionVert();
+			void moveSelection( const Distance& dx, const Distance& dy );
+			void setSelectionFontFamily( const QString& fontFamily );
+			void setSelectionFontSize( double fontSize );
+			void setSelectionFontWeight( QFont::Weight fontWeight );
+			void setSelectionFontItalicFlag( bool fontItalicFlag );
+			void setSelectionTextHAlign( Qt::Alignment textHAlign );
+			void setSelectionTextVAlign( Qt::Alignment textVAlign );
+			void setSelectionTextLineSpacing( double textLineSpacing );
+			void setSelectionTextColorNode( ColorNode textColorNode );
+			void setSelectionLineWidth( const Distance& lineWidth );
+			void setSelectionLineColorNode( ColorNode lineColorNode );
+			void setSelectionFillColorNode( ColorNode fillColorNode );
 
 
-		/////////////////////////////////
-		// Clipboard operations
-		/////////////////////////////////
-		void copySelection();
-		void cutSelection();
-		bool canPaste();
-		void paste();
+			/////////////////////////////////
+			// Clipboard operations
+			/////////////////////////////////
+			void copySelection();
+			void cutSelection();
+			bool canPaste();
+			void paste();
 	
-		/////////////////////////////////
-		// Drawing operations
-		/////////////////////////////////
-	public:
-		void draw( QPainter* painter, bool inEditor = true, merge::Record* record = nullptr ) const;
+			/////////////////////////////////
+			// Drawing operations
+			/////////////////////////////////
+		public:
+			void draw( QPainter* painter, bool inEditor = true, merge::Record* record = nullptr ) const;
 
 		
-		/////////////////////////////////
-		// Slots
-		/////////////////////////////////
-	private slots:
-		void onObjectChanged();
-		void onObjectMoved();
-		void onMergeSourceChanged();
-		void onMergeSelectionChanged();
+			/////////////////////////////////
+			// Slots
+			/////////////////////////////////
+		private slots:
+			void onObjectChanged();
+			void onObjectMoved();
+			void onMergeSourceChanged();
+			void onMergeSelectionChanged();
 
 
-		/////////////////////////////////
-		// Private data
-		/////////////////////////////////
-	private:
-		int                       mUntitledInstance;
-		bool                      mModified;
-		QString                   mFileName;
-		int                       mCompressionLevel;
-		const Template*           mTmplate;
-		const Frame*              mFrame;
-		bool                      mRotate;
+			/////////////////////////////////
+			// Private data
+			/////////////////////////////////
+		private:
+			int                       mUntitledInstance;
+			bool                      mModified;
+			QString                   mFileName;
+			int                       mCompressionLevel;
+			const Template*           mTmplate;
+			const Frame*              mFrame;
+			bool                      mRotate;
 
-		QList<ModelObject*>  mObjectList;
+			QList<ModelObject*>  mObjectList;
 
-		merge::Merge*             mMerge;
-	};
+			merge::Merge*             mMerge;
+		};
 
+	}
 }
 
 
diff --git a/model/ModelBarcodeObject.cpp b/model/ModelBarcodeObject.cpp
index 2bac922..32fe29b 100644
--- a/model/ModelBarcodeObject.cpp
+++ b/model/ModelBarcodeObject.cpp
@@ -35,497 +35,500 @@
 #include <QtDebug>
 
 
-namespace glabels::model
+namespace glabels
 {
-
-	//
-	// Private
-	//
-	namespace
+	namespace model
 	{
-		const QColor fillColor = QColor( 224, 224, 224, 255 );
-		const Distance pad = Distance::pt(4);
-		const Distance minW = Distance::pt(18);
-		const Distance minH = Distance::pt(18);
-	}
+
+		//
+		// Private
+		//
+		namespace
+		{
+			const QColor fillColor = QColor( 224, 224, 224, 255 );
+			const Distance pad = Distance::pt(4);
+			const Distance minW = Distance::pt(18);
+			const Distance minH = Distance::pt(18);
+		}
 
 
-	///
-	/// Constructor
-	///
-	ModelBarcodeObject::ModelBarcodeObject()
-	{
-		mOutline = new Outline( this );
+		///
+		/// Constructor
+		///
+		ModelBarcodeObject::ModelBarcodeObject()
+		{
+			mOutline = new Outline( this );
 
-		mHandles << new HandleNorthWest( this );
-		mHandles << new HandleNorth( this );
-		mHandles << new HandleNorthEast( this );
-		mHandles << new HandleEast( this );
-		mHandles << new HandleSouthEast( this );
-		mHandles << new HandleSouth( this );
-		mHandles << new HandleSouthWest( this );
-		mHandles << new HandleWest( this );
+			mHandles << new HandleNorthWest( this );
+			mHandles << new HandleNorth( this );
+			mHandles << new HandleNorthEast( this );
+			mHandles << new HandleEast( this );
+			mHandles << new HandleSouthEast( this );
+			mHandles << new HandleSouth( this );
+			mHandles << new HandleSouthWest( this );
+			mHandles << new HandleWest( this );
 
-		mBcStyle        = barcode::Backends::defaultStyle();
-		mBcTextFlag     = mBcStyle.canText();
-		mBcChecksumFlag = mBcStyle.canChecksum();
-		mBcFormatDigits = mBcStyle.preferedN();
-		mBcData         = "";
-		mBcColorNode    = ColorNode( Qt::black );
+			mBcStyle        = barcode::Backends::defaultStyle();
+			mBcTextFlag     = mBcStyle.canText();
+			mBcChecksumFlag = mBcStyle.canChecksum();
+			mBcFormatDigits = mBcStyle.preferedN();
+			mBcData         = "";
+			mBcColorNode    = ColorNode( Qt::black );
 
-		mEditorBarcode = nullptr;
-		mEditorDefaultBarcode = nullptr;
+			mEditorBarcode = nullptr;
+			mEditorDefaultBarcode = nullptr;
 
-		update(); // Initialize cached editor layouts
-	}
+			update(); // Initialize cached editor layouts
+		}
 
 
-	///
-	/// Constructor
-	///
-	ModelBarcodeObject::ModelBarcodeObject( const Distance&       x0,
-	                                        const Distance&       y0,
-	                                        const Distance&       w,
-	                                        const Distance&       h,
-	                                        const barcode::Style& bcStyle,
-	                                        bool                  bcTextFlag,
-	                                        bool                  bcChecksumFlag,
-	                                        QString               bcData,
-	                                        const ColorNode&      bcColorNode,
-	                                        const QMatrix&        matrix )
-	: ModelObject( x0, y0, w, h, matrix )
-	{
-		mOutline = new Outline( this );
+		///
+		/// Constructor
+		///
+		ModelBarcodeObject::ModelBarcodeObject( const Distance&       x0,
+		                                        const Distance&       y0,
+		                                        const Distance&       w,
+		                                        const Distance&       h,
+		                                        const barcode::Style& bcStyle,
+		                                        bool                  bcTextFlag,
+		                                        bool                  bcChecksumFlag,
+		                                        QString               bcData,
+		                                        const ColorNode&      bcColorNode,
+		                                        const QMatrix&        matrix )
+		: ModelObject( x0, y0, w, h, matrix )
+		{
+			mOutline = new Outline( this );
 
-		mHandles << new HandleNorthWest( this );
-		mHandles << new HandleNorth( this );
-		mHandles << new HandleNorthEast( this );
-		mHandles << new HandleEast( this );
-		mHandles << new HandleSouthEast( this );
-		mHandles << new HandleSouth( this );
-		mHandles << new HandleSouthWest( this );
-		mHandles << new HandleWest( this );
+			mHandles << new HandleNorthWest( this );
+			mHandles << new HandleNorth( this );
+			mHandles << new HandleNorthEast( this );
+			mHandles << new HandleEast( this );
+			mHandles << new HandleSouthEast( this );
+			mHandles << new HandleSouth( this );
+			mHandles << new HandleSouthWest( this );
+			mHandles << new HandleWest( this );
 
-		mBcStyle        = bcStyle;
-		mBcTextFlag     = bcTextFlag;
-		mBcChecksumFlag = bcChecksumFlag;
-		mBcData         = bcData;
-		mBcColorNode    = bcColorNode;
+			mBcStyle        = bcStyle;
+			mBcTextFlag     = bcTextFlag;
+			mBcChecksumFlag = bcChecksumFlag;
+			mBcData         = bcData;
+			mBcColorNode    = bcColorNode;
 
-		mEditorBarcode = nullptr;
-		mEditorDefaultBarcode = nullptr;
+			mEditorBarcode = nullptr;
+			mEditorDefaultBarcode = nullptr;
 
-		update(); // Initialize cached editor layouts
-	}
+			update(); // Initialize cached editor layouts
+		}
 	
 
-	///
-	/// Copy constructor
-	///
-	ModelBarcodeObject::ModelBarcodeObject( const ModelBarcodeObject* object )
-		: ModelObject(object)
-	{
-		mBcStyle        = object->mBcStyle;
-		mBcTextFlag     = object->mBcTextFlag;
-		mBcChecksumFlag = object->mBcChecksumFlag;
-		mBcFormatDigits = object->mBcFormatDigits;
-		mBcData         = object->mBcData;
-		mBcColorNode    = object->mBcColorNode;
-
-		mEditorBarcode = nullptr;
-		mEditorDefaultBarcode = nullptr;
-
-		update(); // Initialize cached editor layouts
-	}
-
-
-	///
-	/// Destructor
-	///
-	ModelBarcodeObject::~ModelBarcodeObject()
-	{
-		delete mOutline;
-
-		foreach( Handle* handle, mHandles )
+		///
+		/// Copy constructor
+		///
+		ModelBarcodeObject::ModelBarcodeObject( const ModelBarcodeObject* object )
+			: ModelObject(object)
 		{
-			delete handle;
+			mBcStyle        = object->mBcStyle;
+			mBcTextFlag     = object->mBcTextFlag;
+			mBcChecksumFlag = object->mBcChecksumFlag;
+			mBcFormatDigits = object->mBcFormatDigits;
+			mBcData         = object->mBcData;
+			mBcColorNode    = object->mBcColorNode;
+
+			mEditorBarcode = nullptr;
+			mEditorDefaultBarcode = nullptr;
+
+			update(); // Initialize cached editor layouts
 		}
-		mHandles.clear();
-
-		delete mEditorBarcode;
-	}
 
 
-	///
-	/// Clone
-	///
-	ModelBarcodeObject* ModelBarcodeObject::clone() const
-	{
-		return new ModelBarcodeObject( this );
-	}
-
-
-	///
-	/// bcData Property Getter
-	///
-	QString ModelBarcodeObject::bcData() const
-	{
-		return mBcData.toString();
-	}
-
-
-	///
-	/// bcData Property Setter
-	///
-	void ModelBarcodeObject::setBcData( const QString& value )
-	{
-		if ( mBcData.toString() != value )
+		///
+		/// Destructor
+		///
+		ModelBarcodeObject::~ModelBarcodeObject()
 		{
-			mBcData = value;
-			update();
-			emit changed();
-		}
-	}
+			delete mOutline;
 
+			foreach( Handle* handle, mHandles )
+			{
+				delete handle;
+			}
+			mHandles.clear();
 
-	///
-	/// bcTextFlag Property Getter
-	///
-	bool ModelBarcodeObject::bcTextFlag() const
-	{
-		return mBcTextFlag;
-	}
-
-
-	///
-	/// bcTextFlag Property Setter
-	///
-	void ModelBarcodeObject::setBcTextFlag( bool value )
-	{
-		if ( mBcTextFlag != value )
-		{
-			mBcTextFlag = value;
-			update();
-			emit changed();
-		}
-	}
-
-
-	///
-	/// bcChecksumFlag Property Getter
-	///
-	bool ModelBarcodeObject::bcChecksumFlag() const
-	{
-		return mBcChecksumFlag;
-	}
-
-
-	///
-	/// bcChecksumFlag Property Setter
-	///
-	void ModelBarcodeObject::setBcChecksumFlag( bool value )
-	{
-		if ( mBcChecksumFlag != value )
-		{
-			mBcChecksumFlag = value;
-			update();
-			emit changed();
-		}
-	}
-
-
-	///
-	/// Barcode Color Node Property Getter
-	///
-	ColorNode ModelBarcodeObject::bcColorNode() const
-	{
-		return mBcColorNode;
-	}
-
-
-	///
-	/// Barcode Color Node Property Setter
-	///
-	void ModelBarcodeObject::setBcColorNode( const ColorNode& value )
-	{
-		if ( mBcColorNode != value )
-		{
-			mBcColorNode = value;
-			update();
-			emit changed();
-		}
-	}
-		
-
-	///
-	/// Barcode Style Property Getter
-	///
-	barcode::Style ModelBarcodeObject::bcStyle() const
-	{
-		return mBcStyle;
-	}
-
-
-	///
-	/// Barcode Style Property Setter
-	///
-	void ModelBarcodeObject::setBcStyle( const barcode::Style& value )
-	{
-		if ( mBcStyle != value )
-		{
-			mBcStyle = value;
-			update();
-			emit changed();
-		}
-	}
-
-
-	///
-	/// Barcode Format Digits Property Getter
-	///
-	int ModelBarcodeObject::bcFormatDigits() const
-	{
-		return mBcFormatDigits;
-	}
-
-
-	///
-	/// Barcode Format Digits Property Setter
-	///
-	void ModelBarcodeObject::setBcFormatDigits( int value )
-	{
-		if ( mBcFormatDigits != value )
-		{
-			mBcFormatDigits = value;
-			update();
-			emit changed();
-		}
-	}
-
-
-	///
-	/// Draw shadow of object
-	///
-	void ModelBarcodeObject::drawShadow( QPainter*      painter,
-	                                     bool           inEditor,
-	                                     merge::Record* record ) const
-	{
-		// Barcodes don't support shadows.
-	}
-
-	
-	///
-	/// Draw object itself
-	///
-	void ModelBarcodeObject::drawObject( QPainter*      painter,
-	                                     bool           inEditor,
-	                                     merge::Record* record ) const
-	{
-		QColor bcColor = mBcColorNode.color( record );
-
-		if ( inEditor )
-		{
-			drawBcInEditor( painter, bcColor );
-		}
-		else
-		{
-			drawBc( painter, bcColor, record );
-		}
-	}
-
-
-	///
-	/// Path to test for hover condition
-	///
-	QPainterPath ModelBarcodeObject::hoverPath( double scale ) const
-	{
-		return mHoverPath;
-	}
-
-
-	///
-	/// Size updated
-	///
-	void ModelBarcodeObject::sizeUpdated()
-	{
-		update();
-	}
-
-
-	///
-	/// Update cached information for editor view
-	///
-	void ModelBarcodeObject::update()
-	{
-		//
-		// Build barcode from data
-		//
-		if ( mEditorBarcode )
-		{
 			delete mEditorBarcode;
 		}
-		mEditorBarcode = glbarcode::Factory::createBarcode( mBcStyle.fullId().toStdString() );
-		if ( !mEditorBarcode )
-		{
-			qWarning() << "Invalid barcode style" << mBcStyle.fullId() << "using \"code39\".";
-			mBcStyle = barcode::Backends::defaultStyle();
-			mEditorBarcode = glbarcode::Factory::createBarcode( mBcStyle.id().toStdString() );
-		}
-		mEditorBarcode->setChecksum(mBcChecksumFlag);
-		mEditorBarcode->setShowText(mBcTextFlag);
 
-		mEditorBarcode->build( mBcData.toStdString(), mW.pt(), mH.pt() );
 
-		//
-		// Build a place holder barcode to display in editor, if cannot display actual barcode
-		//
-		if ( mEditorDefaultBarcode )
+		///
+		/// Clone
+		///
+		ModelBarcodeObject* ModelBarcodeObject::clone() const
 		{
-			delete mEditorDefaultBarcode;
-		}
-		mEditorDefaultBarcode = glbarcode::Factory::createBarcode( mBcStyle.fullId().toStdString() );
-		if ( !mEditorDefaultBarcode )
-		{
-			qWarning() << "Invalid barcode style" << mBcStyle.fullId() << "using \"code39\".";
-			mBcStyle = barcode::Backends::defaultStyle();
-			mEditorDefaultBarcode = glbarcode::Factory::createBarcode( mBcStyle.id().toStdString() );
-		}
-		mEditorDefaultBarcode->setChecksum(mBcChecksumFlag);
-		mEditorDefaultBarcode->setShowText(mBcTextFlag);
-
-		mEditorDefaultBarcode->build( mBcStyle.defaultDigits().toStdString(), mW.pt(), mH.pt() );
-
-		//
-		// Adjust size
-		//
-		if ( mEditorBarcode->isDataValid() )
-		{
-			mW = Distance::pt( mEditorBarcode->width() );
-			mH = Distance::pt( mEditorBarcode->height() );
-		}
-		else
-		{
-			mW = Distance::pt( mEditorDefaultBarcode->width() );
-			mH = Distance::pt( mEditorDefaultBarcode->height() );
+			return new ModelBarcodeObject( this );
 		}
 
-		QPainterPath path;
-		path.addRect( 0, 0, mW.pt(), mH.pt() );
-		mHoverPath = path;
-	}
 
-
-	///
-	/// Draw barcode in editor from cached information
-	///
-	void ModelBarcodeObject::drawBcInEditor( QPainter* painter, const QColor& color ) const
-	{
-		if ( mBcData.isEmpty() )
+		///
+		/// bcData Property Getter
+		///
+		QString ModelBarcodeObject::bcData() const
 		{
-			drawPlaceHolder( painter, color, tr("No barcode data") );
+			return mBcData.toString();
 		}
-		else if ( mBcData.hasPlaceHolders() )
+
+
+		///
+		/// bcData Property Setter
+		///
+		void ModelBarcodeObject::setBcData( const QString& value )
 		{
-			drawPlaceHolder( painter, color, mBcData.toString() );
+			if ( mBcData.toString() != value )
+			{
+				mBcData = value;
+				update();
+				emit changed();
+			}
 		}
-		else if ( mEditorBarcode->isDataValid() )
+
+
+		///
+		/// bcTextFlag Property Getter
+		///
+		bool ModelBarcodeObject::bcTextFlag() const
 		{
-			painter->setPen( QPen( color ) );
-			glbarcode::QtRenderer renderer(painter);
-			mEditorBarcode->render( renderer );
+			return mBcTextFlag;
 		}
-		else
+
+
+		///
+		/// bcTextFlag Property Setter
+		///
+		void ModelBarcodeObject::setBcTextFlag( bool value )
 		{
-			drawPlaceHolder( painter, color, tr("Invalid barcode data") );
+			if ( mBcTextFlag != value )
+			{
+				mBcTextFlag = value;
+				update();
+				emit changed();
+			}
 		}
-	}
 
 
-	///
-	/// Draw barcode in final printout or preview
-	///
-	void
-	ModelBarcodeObject::drawBc( QPainter*      painter,
-	                            const QColor&  color,
-	                            merge::Record* record ) const
-	{
-		painter->setPen( QPen( color ) );
-
-		glbarcode::Barcode* bc = glbarcode::Factory::createBarcode( mBcStyle.fullId().toStdString() );
-		bc->setChecksum(mBcChecksumFlag);
-		bc->setShowText(mBcTextFlag);
-
-		bc->build( mBcData.toStdString(), mW.pt(), mH.pt() );
-
-		glbarcode::QtRenderer renderer(painter);
-		bc->render( renderer );
-	}
+		///
+		/// bcChecksumFlag Property Getter
+		///
+		bool ModelBarcodeObject::bcChecksumFlag() const
+		{
+			return mBcChecksumFlag;
+		}
 
 
-	///
-	/// Draw barcode place holder in editor
-	///
-	void
-	ModelBarcodeObject::drawPlaceHolder( QPainter*      painter,
-	                                     const QColor&  color,
-	                                     const QString& text ) const
-	{
-		QString shortText = text.left( 32 ); // Don't let the text get out of hand
+		///
+		/// bcChecksumFlag Property Setter
+		///
+		void ModelBarcodeObject::setBcChecksumFlag( bool value )
+		{
+			if ( mBcChecksumFlag != value )
+			{
+				mBcChecksumFlag = value;
+				update();
+				emit changed();
+			}
+		}
+
+
+		///
+		/// Barcode Color Node Property Getter
+		///
+		ColorNode ModelBarcodeObject::bcColorNode() const
+		{
+			return mBcColorNode;
+		}
+
+
+		///
+		/// Barcode Color Node Property Setter
+		///
+		void ModelBarcodeObject::setBcColorNode( const ColorNode& value )
+		{
+			if ( mBcColorNode != value )
+			{
+				mBcColorNode = value;
+				update();
+				emit changed();
+			}
+		}
 		
-		//
-		// Render box
-		//
-		painter->setPen( Qt::NoPen );
-		painter->setBrush( QBrush( fillColor ) );
-		painter->drawRect( QRectF( 0, 0, mW.pt(), mH.pt() ) );
 
-		//
-		// Render default barcode
-		//
-		painter->setPen( QPen( color ) );
-		glbarcode::QtRenderer renderer(painter);
-		mEditorDefaultBarcode->render( renderer );
-
-		//
-		// Determine font size for text
-		//
-		QFont font( "Sans" );
-		font.setPointSizeF( 6 );
-
-		QFontMetricsF fm( font );
-		QRectF textRect = fm.boundingRect( shortText );
-
-		double wPts = (mW - 2*pad).pt();
-		double hPts = (mH - 2*pad).pt();
-		if ( (wPts < textRect.width()) || (hPts < textRect.height()) )
+		///
+		/// Barcode Style Property Getter
+		///
+		barcode::Style ModelBarcodeObject::bcStyle() const
 		{
-			double scaleX = wPts / textRect.width();
-			double scaleY = hPts / textRect.height();
-			font.setPointSizeF( 6 * std::min( scaleX, scaleY ) );
+			return mBcStyle;
 		}
 
-		//
-		// Render hole for text (font size may have changed above)
-		//
-		fm = QFontMetricsF( font );
-		textRect = fm.boundingRect( shortText );
-		
-		QRectF holeRect( (mW.pt() - textRect.width())/2 - pad.pt(),
-		                 (mH.pt() - textRect.height())/2 - pad.pt(),
-		                 textRect.width() + 2*pad.pt(),
-		                 textRect.height() + 2*pad.pt() );
 
-		painter->setPen( Qt::NoPen );
-		painter->setBrush( QBrush( fillColor ) );
-		painter->drawRect( holeRect );
+		///
+		/// Barcode Style Property Setter
+		///
+		void ModelBarcodeObject::setBcStyle( const barcode::Style& value )
+		{
+			if ( mBcStyle != value )
+			{
+				mBcStyle = value;
+				update();
+				emit changed();
+			}
+		}
 
-		//
-		// Render text
-		//
-		painter->setFont( font );
-		painter->setPen( QPen( color ) );
-		painter->drawText( QRectF( 0, 0, mW.pt(), mH.pt() ), Qt::AlignCenter, shortText );
-	}
+
+		///
+		/// Barcode Format Digits Property Getter
+		///
+		int ModelBarcodeObject::bcFormatDigits() const
+		{
+			return mBcFormatDigits;
+		}
+
+
+		///
+		/// Barcode Format Digits Property Setter
+		///
+		void ModelBarcodeObject::setBcFormatDigits( int value )
+		{
+			if ( mBcFormatDigits != value )
+			{
+				mBcFormatDigits = value;
+				update();
+				emit changed();
+			}
+		}
+
+
+		///
+		/// Draw shadow of object
+		///
+		void ModelBarcodeObject::drawShadow( QPainter*      painter,
+		                                     bool           inEditor,
+		                                     merge::Record* record ) const
+		{
+			// Barcodes don't support shadows.
+		}
 
 	
-} // namespace glabels::model
+		///
+		/// Draw object itself
+		///
+		void ModelBarcodeObject::drawObject( QPainter*      painter,
+		                                     bool           inEditor,
+		                                     merge::Record* record ) const
+		{
+			QColor bcColor = mBcColorNode.color( record );
+
+			if ( inEditor )
+			{
+				drawBcInEditor( painter, bcColor );
+			}
+			else
+			{
+				drawBc( painter, bcColor, record );
+			}
+		}
+
+
+		///
+		/// Path to test for hover condition
+		///
+		QPainterPath ModelBarcodeObject::hoverPath( double scale ) const
+		{
+			return mHoverPath;
+		}
+
+
+		///
+		/// Size updated
+		///
+		void ModelBarcodeObject::sizeUpdated()
+		{
+			update();
+		}
+
+
+		///
+		/// Update cached information for editor view
+		///
+		void ModelBarcodeObject::update()
+		{
+			//
+			// Build barcode from data
+			//
+			if ( mEditorBarcode )
+			{
+				delete mEditorBarcode;
+			}
+			mEditorBarcode = glbarcode::Factory::createBarcode( mBcStyle.fullId().toStdString() );
+			if ( !mEditorBarcode )
+			{
+				qWarning() << "Invalid barcode style" << mBcStyle.fullId() << "using \"code39\".";
+				mBcStyle = barcode::Backends::defaultStyle();
+				mEditorBarcode = glbarcode::Factory::createBarcode( mBcStyle.id().toStdString() );
+			}
+			mEditorBarcode->setChecksum(mBcChecksumFlag);
+			mEditorBarcode->setShowText(mBcTextFlag);
+
+			mEditorBarcode->build( mBcData.toStdString(), mW.pt(), mH.pt() );
+
+			//
+			// Build a place holder barcode to display in editor, if cannot display actual barcode
+			//
+			if ( mEditorDefaultBarcode )
+			{
+				delete mEditorDefaultBarcode;
+			}
+			mEditorDefaultBarcode = glbarcode::Factory::createBarcode( mBcStyle.fullId().toStdString() );
+			if ( !mEditorDefaultBarcode )
+			{
+				qWarning() << "Invalid barcode style" << mBcStyle.fullId() << "using \"code39\".";
+				mBcStyle = barcode::Backends::defaultStyle();
+				mEditorDefaultBarcode = glbarcode::Factory::createBarcode( mBcStyle.id().toStdString() );
+			}
+			mEditorDefaultBarcode->setChecksum(mBcChecksumFlag);
+			mEditorDefaultBarcode->setShowText(mBcTextFlag);
+
+			mEditorDefaultBarcode->build( mBcStyle.defaultDigits().toStdString(), mW.pt(), mH.pt() );
+
+			//
+			// Adjust size
+			//
+			if ( mEditorBarcode->isDataValid() )
+			{
+				mW = Distance::pt( mEditorBarcode->width() );
+				mH = Distance::pt( mEditorBarcode->height() );
+			}
+			else
+			{
+				mW = Distance::pt( mEditorDefaultBarcode->width() );
+				mH = Distance::pt( mEditorDefaultBarcode->height() );
+			}
+
+			QPainterPath path;
+			path.addRect( 0, 0, mW.pt(), mH.pt() );
+			mHoverPath = path;
+		}
+
+
+		///
+		/// Draw barcode in editor from cached information
+		///
+		void ModelBarcodeObject::drawBcInEditor( QPainter* painter, const QColor& color ) const
+		{
+			if ( mBcData.isEmpty() )
+			{
+				drawPlaceHolder( painter, color, tr("No barcode data") );
+			}
+			else if ( mBcData.hasPlaceHolders() )
+			{
+				drawPlaceHolder( painter, color, mBcData.toString() );
+			}
+			else if ( mEditorBarcode->isDataValid() )
+			{
+				painter->setPen( QPen( color ) );
+				glbarcode::QtRenderer renderer(painter);
+				mEditorBarcode->render( renderer );
+			}
+			else
+			{
+				drawPlaceHolder( painter, color, tr("Invalid barcode data") );
+			}
+		}
+
+
+		///
+		/// Draw barcode in final printout or preview
+		///
+		void
+		ModelBarcodeObject::drawBc( QPainter*      painter,
+		                            const QColor&  color,
+		                            merge::Record* record ) const
+		{
+			painter->setPen( QPen( color ) );
+
+			glbarcode::Barcode* bc = glbarcode::Factory::createBarcode( mBcStyle.fullId().toStdString() );
+			bc->setChecksum(mBcChecksumFlag);
+			bc->setShowText(mBcTextFlag);
+
+			bc->build( mBcData.toStdString(), mW.pt(), mH.pt() );
+
+			glbarcode::QtRenderer renderer(painter);
+			bc->render( renderer );
+		}
+
+
+		///
+		/// Draw barcode place holder in editor
+		///
+		void
+		ModelBarcodeObject::drawPlaceHolder( QPainter*      painter,
+		                                     const QColor&  color,
+		                                     const QString& text ) const
+		{
+			QString shortText = text.left( 32 ); // Don't let the text get out of hand
+		
+			//
+			// Render box
+			//
+			painter->setPen( Qt::NoPen );
+			painter->setBrush( QBrush( fillColor ) );
+			painter->drawRect( QRectF( 0, 0, mW.pt(), mH.pt() ) );
+
+			//
+			// Render default barcode
+			//
+			painter->setPen( QPen( color ) );
+			glbarcode::QtRenderer renderer(painter);
+			mEditorDefaultBarcode->render( renderer );
+
+			//
+			// Determine font size for text
+			//
+			QFont font( "Sans" );
+			font.setPointSizeF( 6 );
+
+			QFontMetricsF fm( font );
+			QRectF textRect = fm.boundingRect( shortText );
+
+			double wPts = (mW - 2*pad).pt();
+			double hPts = (mH - 2*pad).pt();
+			if ( (wPts < textRect.width()) || (hPts < textRect.height()) )
+			{
+				double scaleX = wPts / textRect.width();
+				double scaleY = hPts / textRect.height();
+				font.setPointSizeF( 6 * std::min( scaleX, scaleY ) );
+			}
+
+			//
+			// Render hole for text (font size may have changed above)
+			//
+			fm = QFontMetricsF( font );
+			textRect = fm.boundingRect( shortText );
+		
+			QRectF holeRect( (mW.pt() - textRect.width())/2 - pad.pt(),
+			                 (mH.pt() - textRect.height())/2 - pad.pt(),
+			                 textRect.width() + 2*pad.pt(),
+			                 textRect.height() + 2*pad.pt() );
+
+			painter->setPen( Qt::NoPen );
+			painter->setBrush( QBrush( fillColor ) );
+			painter->drawRect( holeRect );
+
+			//
+			// Render text
+			//
+			painter->setFont( font );
+			painter->setPen( QPen( color ) );
+			painter->drawText( QRectF( 0, 0, mW.pt(), mH.pt() ), Qt::AlignCenter, shortText );
+		}
+
+	
+	}
+}
diff --git a/model/ModelBarcodeObject.h b/model/ModelBarcodeObject.h
index c1f2596..4931ddf 100644
--- a/model/ModelBarcodeObject.h
+++ b/model/ModelBarcodeObject.h
@@ -29,137 +29,140 @@
 #include "glbarcode/Barcode.h"
 
 
-namespace glabels::model
+namespace glabels
 {
-
-	///
-	/// Label Model Line Object
-	///
-	class ModelBarcodeObject : public ModelObject
+	namespace model
 	{
-		Q_OBJECT
 
-		///////////////////////////////////////////////////////////////
-		// Lifecycle Methods
-		///////////////////////////////////////////////////////////////
-	public:
-		ModelBarcodeObject();
+		///
+		/// Label Model Line Object
+		///
+		class ModelBarcodeObject : public ModelObject
+		{
+			Q_OBJECT
 
-		ModelBarcodeObject( const Distance&       x0,
-		                    const Distance&       y0,
-		                    const Distance&       w,
-		                    const Distance&       h,
-		                    const barcode::Style& bcStyle,
-		                    bool                  bcTextFlag,
-		                    bool                  bcChecksumFlag,
-		                    QString               bcData,
-		                    const ColorNode&      bcColorNode,
-		                    const QMatrix&        matrix = QMatrix() );
+			///////////////////////////////////////////////////////////////
+			// Lifecycle Methods
+			///////////////////////////////////////////////////////////////
+		public:
+			ModelBarcodeObject();
 
-		ModelBarcodeObject( const ModelBarcodeObject* object );
+			ModelBarcodeObject( const Distance&       x0,
+			                    const Distance&       y0,
+			                    const Distance&       w,
+			                    const Distance&       h,
+			                    const barcode::Style& bcStyle,
+			                    bool                  bcTextFlag,
+			                    bool                  bcChecksumFlag,
+			                    QString               bcData,
+			                    const ColorNode&      bcColorNode,
+			                    const QMatrix&        matrix = QMatrix() );
 
-		~ModelBarcodeObject() override;
+			ModelBarcodeObject( const ModelBarcodeObject* object );
+
+			~ModelBarcodeObject() override;
 
 
-		///////////////////////////////////////////////////////////////
-		// Object duplication
-		///////////////////////////////////////////////////////////////
-		ModelBarcodeObject* clone() const override;
+			///////////////////////////////////////////////////////////////
+			// Object duplication
+			///////////////////////////////////////////////////////////////
+			ModelBarcodeObject* clone() const override;
 
 
-		///////////////////////////////////////////////////////////////
-		// Property Implementations
-		///////////////////////////////////////////////////////////////
-	public:
-                //
-                // Barcode Property: bcData
-                //
-		QString bcData() const override;
-                void setBcData( const QString &value ) override;
+			///////////////////////////////////////////////////////////////
+			// Property Implementations
+			///////////////////////////////////////////////////////////////
+		public:
+			//
+			// Barcode Property: bcData
+			//
+			QString bcData() const override;
+			void setBcData( const QString &value ) override;
                 
 
-                //
-                // Barcode Property: bcTextFlag
-                //
-                bool bcTextFlag() const override;
-                void setBcTextFlag( bool value ) override;
+			//
+			// Barcode Property: bcTextFlag
+			//
+			bool bcTextFlag() const override;
+			void setBcTextFlag( bool value ) override;
 
 
-                //
-                // Barcode Property: bcChecksumFlag
-                //
-                bool bcChecksumFlag() const override;
-                void setBcChecksumFlag( bool value ) override;
+			//
+			// Barcode Property: bcChecksumFlag
+			//
+			bool bcChecksumFlag() const override;
+			void setBcChecksumFlag( bool value ) override;
 
 
-                //
-                // Barcode Property: bcColorNode
-                //
-                ColorNode bcColorNode() const override;
-                void setBcColorNode( const ColorNode &value ) override;
+			//
+			// Barcode Property: bcColorNode
+			//
+			ColorNode bcColorNode() const override;
+			void setBcColorNode( const ColorNode &value ) override;
                 
 
-                //
-                // Barcode Property: bcStyle
-                //
-                barcode::Style bcStyle() const override;
-                void setBcStyle( const barcode::Style &value ) override;
+			//
+			// Barcode Property: bcStyle
+			//
+			barcode::Style bcStyle() const override;
+			void setBcStyle( const barcode::Style &value ) override;
                 
 
-                //
-                // Barcode Property: bcFormatDigits
-                //
-                int bcFormatDigits() const override;
-                void setBcFormatDigits( int value ) override;
+			//
+			// Barcode Property: bcFormatDigits
+			//
+			int bcFormatDigits() const override;
+			void setBcFormatDigits( int value ) override;
 
 
 
-		///////////////////////////////////////////////////////////////
-		// Capability Implementations
-		///////////////////////////////////////////////////////////////
-	public:
+			///////////////////////////////////////////////////////////////
+			// Capability Implementations
+			///////////////////////////////////////////////////////////////
+		public:
 
 
-		///////////////////////////////////////////////////////////////
-		// Drawing operations
-		///////////////////////////////////////////////////////////////
-	protected:
-		void drawShadow( QPainter* painter, bool inEditor, merge::Record* record ) const override;
-		void drawObject( QPainter* painter, bool inEditor, merge::Record* record ) const override;
-		QPainterPath hoverPath( double scale ) const override;
+			///////////////////////////////////////////////////////////////
+			// Drawing operations
+			///////////////////////////////////////////////////////////////
+		protected:
+			void drawShadow( QPainter* painter, bool inEditor, merge::Record* record ) const override;
+			void drawObject( QPainter* painter, bool inEditor, merge::Record* record ) const override;
+			QPainterPath hoverPath( double scale ) const override;
 
 
-		///////////////////////////////////////////////////////////////
-		// Private methods
-		///////////////////////////////////////////////////////////////
-	private:
-		void sizeUpdated() override;
-		void update();
+			///////////////////////////////////////////////////////////////
+			// Private methods
+			///////////////////////////////////////////////////////////////
+		private:
+			void sizeUpdated() override;
+			void update();
 
-		void drawBcInEditor( QPainter* painter, const QColor& color ) const;
-		void drawBc( QPainter* painter, const QColor& color, merge::Record* record ) const;
-		void drawPlaceHolder( QPainter* painter, const QColor& color, const QString& text ) const;
+			void drawBcInEditor( QPainter* painter, const QColor& color ) const;
+			void drawBc( QPainter* painter, const QColor& color, merge::Record* record ) const;
+			void drawPlaceHolder( QPainter* painter, const QColor& color, const QString& text ) const;
 
 	
 
-		///////////////////////////////////////////////////////////////
-		// Private Members
-		///////////////////////////////////////////////////////////////
-	private:
-		barcode::Style      mBcStyle;
-		bool                mBcTextFlag;
-		bool                mBcChecksumFlag;
-		int                 mBcFormatDigits;
-		RawText             mBcData;
-		ColorNode           mBcColorNode;
+			///////////////////////////////////////////////////////////////
+			// Private Members
+			///////////////////////////////////////////////////////////////
+		private:
+			barcode::Style      mBcStyle;
+			bool                mBcTextFlag;
+			bool                mBcChecksumFlag;
+			int                 mBcFormatDigits;
+			RawText             mBcData;
+			ColorNode           mBcColorNode;
 
-		glbarcode::Barcode* mEditorBarcode;
-		glbarcode::Barcode* mEditorDefaultBarcode;
+			glbarcode::Barcode* mEditorBarcode;
+			glbarcode::Barcode* mEditorDefaultBarcode;
 		
-		QPainterPath mHoverPath;
+			QPainterPath mHoverPath;
 
-	};
+		};
 
+	}
 }
 
 
diff --git a/model/ModelBoxObject.cpp b/model/ModelBoxObject.cpp
index 9d40554..94e81d5 100644
--- a/model/ModelBoxObject.cpp
+++ b/model/ModelBoxObject.cpp
@@ -24,171 +24,174 @@
 #include <QPen>
 
 
-namespace glabels::model
+namespace glabels
 {
-
-	//
-	// Private
-	//
-	namespace
+	namespace model
 	{
-		const double slopPixels = 2;
-	}
 
-
-	///
-	/// Constructor
-	///
-	ModelBoxObject::ModelBoxObject()
-	{
-		// empty
-	}
-
-
-	///
-	/// Constructor
-	///
-	ModelBoxObject::ModelBoxObject( const Distance&  x0,
-	                                const Distance&  y0,
-	                                const Distance&  w,
-	                                const Distance&  h,
-	                                const Distance&  lineWidth,
-	                                const ColorNode& lineColorNode,
-	                                const ColorNode& fillColorNode,
-	                                const QMatrix&   matrix,
-	                                bool             shadowState,
-	                                const Distance&  shadowX,
-	                                const Distance&  shadowY,
-	                                double           shadowOpacity,
-	                                const ColorNode& shadowColorNode )
-	: ModelShapeObject( x0, y0, w, h,
-	                    lineWidth, lineColorNode, fillColorNode,
-	                    matrix,
-	                    shadowState, shadowX, shadowY, shadowOpacity, shadowColorNode )
-	{
-		// empty
-	}
-
-
-	///
-	/// Copy constructor
-	///
-	ModelBoxObject::ModelBoxObject( const ModelBoxObject* object )
-		: ModelShapeObject( object )
-	{
-		// empty
-	}
-
-
-	///
-	/// Destructor
-	///
-	ModelBoxObject::~ModelBoxObject()
-	{
-		// empty
-	}
-
-
-	///
-	/// Clone
-	///
-	ModelBoxObject* ModelBoxObject::clone() const
-	{
-		return new ModelBoxObject( this );
-	}
-
-
-	///
-	/// Draw shadow of object
-	///
-	void ModelBoxObject::drawShadow( QPainter* painter, bool inEditor, merge::Record* record ) const
-	{
-		QColor lineColor = mLineColorNode.color( record );
-		QColor fillColor = mFillColorNode.color( record );
-		QColor shadowColor = mShadowColorNode.color( record );
-
-		shadowColor.setAlphaF( mShadowOpacity );
-
-		if ( fillColor.alpha() )
+		//
+		// Private
+		//
+		namespace
 		{
-			painter->setPen( Qt::NoPen );
-			painter->setBrush( shadowColor );
+			const double slopPixels = 2;
+		}
 
-			if ( lineColor.alpha() )
+
+		///
+		/// Constructor
+		///
+		ModelBoxObject::ModelBoxObject()
+		{
+			// empty
+		}
+
+
+		///
+		/// Constructor
+		///
+		ModelBoxObject::ModelBoxObject( const Distance&  x0,
+		                                const Distance&  y0,
+		                                const Distance&  w,
+		                                const Distance&  h,
+		                                const Distance&  lineWidth,
+		                                const ColorNode& lineColorNode,
+		                                const ColorNode& fillColorNode,
+		                                const QMatrix&   matrix,
+		                                bool             shadowState,
+		                                const Distance&  shadowX,
+		                                const Distance&  shadowY,
+		                                double           shadowOpacity,
+		                                const ColorNode& shadowColorNode )
+		: ModelShapeObject( x0, y0, w, h,
+		                    lineWidth, lineColorNode, fillColorNode,
+		                    matrix,
+		                    shadowState, shadowX, shadowY, shadowOpacity, shadowColorNode )
+		{
+			// empty
+		}
+
+
+		///
+		/// Copy constructor
+		///
+		ModelBoxObject::ModelBoxObject( const ModelBoxObject* object )
+			: ModelShapeObject( object )
+		{
+			// empty
+		}
+
+
+		///
+		/// Destructor
+		///
+		ModelBoxObject::~ModelBoxObject()
+		{
+			// empty
+		}
+
+
+		///
+		/// Clone
+		///
+		ModelBoxObject* ModelBoxObject::clone() const
+		{
+			return new ModelBoxObject( this );
+		}
+
+
+		///
+		/// Draw shadow of object
+		///
+		void ModelBoxObject::drawShadow( QPainter* painter, bool inEditor, merge::Record* record ) const
+		{
+			QColor lineColor = mLineColorNode.color( record );
+			QColor fillColor = mFillColorNode.color( record );
+			QColor shadowColor = mShadowColorNode.color( record );
+
+			shadowColor.setAlphaF( mShadowOpacity );
+
+			if ( fillColor.alpha() )
 			{
-				/* Has FILL and OUTLINE: adjust size to account for line width. */
-				painter->drawRect( QRectF( -mLineWidth.pt()/2,
-				                           -mLineWidth.pt()/2,
-				                           (mW + mLineWidth).pt(),
-				                           (mH + mLineWidth).pt() ) );
+				painter->setPen( Qt::NoPen );
+				painter->setBrush( shadowColor );
+
+				if ( lineColor.alpha() )
+				{
+					/* Has FILL and OUTLINE: adjust size to account for line width. */
+					painter->drawRect( QRectF( -mLineWidth.pt()/2,
+					                           -mLineWidth.pt()/2,
+					                           (mW + mLineWidth).pt(),
+					                           (mH + mLineWidth).pt() ) );
+				}
+				else
+				{
+					/* Has FILL, but no OUTLINE. */
+					painter->drawRect( QRectF( 0, 0, mW.pt(), mH.pt() ) );
+				}
 			}
 			else
 			{
-				/* Has FILL, but no OUTLINE. */
-				painter->drawRect( QRectF( 0, 0, mW.pt(), mH.pt() ) );
-			}
-		}
-		else
-		{
-			if ( lineColor.alpha() )
-			{
-				/* Has only OUTLINE. */
-				painter->setPen( QPen( shadowColor, mLineWidth.pt() ) );
-				painter->setBrush( Qt::NoBrush );
+				if ( lineColor.alpha() )
+				{
+					/* Has only OUTLINE. */
+					painter->setPen( QPen( shadowColor, mLineWidth.pt() ) );
+					painter->setBrush( Qt::NoBrush );
 
-				painter->drawRect( QRectF( 0, 0, mW.pt(), mH.pt() ) );
+					painter->drawRect( QRectF( 0, 0, mW.pt(), mH.pt() ) );
+				}
 			}
-		}
 		
-	}
+		}
 
 	
-	///
-	/// Draw object itself
-	///
-	void ModelBoxObject::drawObject( QPainter* painter, bool inEditor, merge::Record* record ) const
-	{
-		QColor lineColor = mLineColorNode.color( record );
-		QColor fillColor = mFillColorNode.color( record );
+		///
+		/// Draw object itself
+		///
+		void ModelBoxObject::drawObject( QPainter* painter, bool inEditor, merge::Record* record ) const
+		{
+			QColor lineColor = mLineColorNode.color( record );
+			QColor fillColor = mFillColorNode.color( record );
 
-		painter->setPen( QPen( lineColor, mLineWidth.pt() ) );
-		painter->setBrush( fillColor );
+			painter->setPen( QPen( lineColor, mLineWidth.pt() ) );
+			painter->setBrush( fillColor );
+
+			painter->drawRect( QRectF( 0, 0, mW.pt(), mH.pt() ) );
+		}
+
+
+		///
+		/// Path to test for hover condition
+		///
+		QPainterPath ModelBoxObject::hoverPath( double scale ) const
+		{
+			double s = 1 / scale;
+
+			QPainterPath path;
+
+			if ( mFillColorNode.color().alpha() && mLineColorNode.color().alpha() )
+			{
+				path.addRect( -mLineWidth.pt()/2, -mLineWidth.pt()/2, (mW+mLineWidth).pt(), (mH+mLineWidth).pt() );
+			}
+			else if ( mFillColorNode.color().alpha() && !(mLineColorNode.color().alpha()) )
+			{
+				path.addRect( 0, 0, mW.pt(), mH.pt() );
+			}
+			else if ( mLineColorNode.color().alpha() )
+			{
+				path.addRect( (-mLineWidth.pt()/2) - s*slopPixels,
+				              (-mLineWidth.pt()/2) - s*slopPixels,
+				              (mW + mLineWidth).pt() + s*2*slopPixels,
+				              (mH + mLineWidth).pt() + s*2*slopPixels );
+				path.closeSubpath();
+				path.addRect( mLineWidth.pt()/2 + s*slopPixels,
+				              mLineWidth.pt()/2 + s*slopPixels,
+				              (mW - mLineWidth).pt() - s*2*slopPixels,
+				              (mH - mLineWidth).pt() - s*2*slopPixels );
+			}
+
+			return path;
+		}
 
-		painter->drawRect( QRectF( 0, 0, mW.pt(), mH.pt() ) );
 	}
-
-
-	///
-	/// Path to test for hover condition
-	///
-	QPainterPath ModelBoxObject::hoverPath( double scale ) const
-	{
-		double s = 1 / scale;
-
-		QPainterPath path;
-
-		if ( mFillColorNode.color().alpha() && mLineColorNode.color().alpha() )
-		{
-			path.addRect( -mLineWidth.pt()/2, -mLineWidth.pt()/2, (mW+mLineWidth).pt(), (mH+mLineWidth).pt() );
-		}
-		else if ( mFillColorNode.color().alpha() && !(mLineColorNode.color().alpha()) )
-		{
-			path.addRect( 0, 0, mW.pt(), mH.pt() );
-		}
-		else if ( mLineColorNode.color().alpha() )
-		{
-			path.addRect( (-mLineWidth.pt()/2) - s*slopPixels,
-			              (-mLineWidth.pt()/2) - s*slopPixels,
-			              (mW + mLineWidth).pt() + s*2*slopPixels,
-			              (mH + mLineWidth).pt() + s*2*slopPixels );
-			path.closeSubpath();
-			path.addRect( mLineWidth.pt()/2 + s*slopPixels,
-			              mLineWidth.pt()/2 + s*slopPixels,
-			              (mW - mLineWidth).pt() - s*2*slopPixels,
-			              (mH - mLineWidth).pt() - s*2*slopPixels );
-		}
-
-		return path;
-	}
-
-} // namespace glabels::model
+}
diff --git a/model/ModelBoxObject.h b/model/ModelBoxObject.h
index 0e810d2..8705c99 100644
--- a/model/ModelBoxObject.h
+++ b/model/ModelBoxObject.h
@@ -25,57 +25,60 @@
 #include "ModelShapeObject.h"
 
 
-namespace glabels::model
+namespace glabels
 {
-
-	///
-	/// Label Model Box Object
-	///
-	class ModelBoxObject : public ModelShapeObject
+	namespace model
 	{
-		Q_OBJECT
 
-		///////////////////////////////////////////////////////////////
-		// Lifecycle Methods
-		///////////////////////////////////////////////////////////////
-	public:
-		ModelBoxObject();
+		///
+		/// Label Model Box Object
+		///
+		class ModelBoxObject : public ModelShapeObject
+		{
+			Q_OBJECT
 
-		ModelBoxObject( const Distance&  x0,
-		                const Distance&  y0,
-		                const Distance&  w,
-		                const Distance&  h,
-		                const Distance&  lineWidth,
-		                const ColorNode& lineColorNode,
-		                const ColorNode& fillColorNode,
-		                const QMatrix&   matrix = QMatrix(),
-		                bool             shadowState = false,
-		                const Distance&  shadowX = 0,
-		                const Distance&  shadowY = 0,
-		                double           shadowOpacity = 1.0,
-		                const ColorNode& shadowColorNode = ColorNode() );
+			///////////////////////////////////////////////////////////////
+			// Lifecycle Methods
+			///////////////////////////////////////////////////////////////
+		public:
+			ModelBoxObject();
 
-		ModelBoxObject( const ModelBoxObject* object );
+			ModelBoxObject( const Distance&  x0,
+			                const Distance&  y0,
+			                const Distance&  w,
+			                const Distance&  h,
+			                const Distance&  lineWidth,
+			                const ColorNode& lineColorNode,
+			                const ColorNode& fillColorNode,
+			                const QMatrix&   matrix = QMatrix(),
+			                bool             shadowState = false,
+			                const Distance&  shadowX = 0,
+			                const Distance&  shadowY = 0,
+			                double           shadowOpacity = 1.0,
+			                const ColorNode& shadowColorNode = ColorNode() );
+
+			ModelBoxObject( const ModelBoxObject* object );
 		
-		~ModelBoxObject() override;
+			~ModelBoxObject() override;
 
 	
-		///////////////////////////////////////////////////////////////
-		// Object duplication
-		///////////////////////////////////////////////////////////////
-		ModelBoxObject* clone() const override;
+			///////////////////////////////////////////////////////////////
+			// Object duplication
+			///////////////////////////////////////////////////////////////
+			ModelBoxObject* clone() const override;
 
 
-		///////////////////////////////////////////////////////////////
-		// Drawing operations
-		///////////////////////////////////////////////////////////////
-	protected:
-		void drawShadow( QPainter* painter, bool inEditor, merge::Record* record ) const override;
-		void drawObject( QPainter* painter, bool inEditor, merge::Record* record ) const override;
-		QPainterPath hoverPath( double scale ) const override;
+			///////////////////////////////////////////////////////////////
+			// Drawing operations
+			///////////////////////////////////////////////////////////////
+		protected:
+			void drawShadow( QPainter* painter, bool inEditor, merge::Record* record ) const override;
+			void drawObject( QPainter* painter, bool inEditor, merge::Record* record ) const override;
+			QPainterPath hoverPath( double scale ) const override;
 
-	};
+		};
 
+	}
 }
 
 
diff --git a/model/ModelEllipseObject.cpp b/model/ModelEllipseObject.cpp
index 2f6a91d..c3ca82e 100644
--- a/model/ModelEllipseObject.cpp
+++ b/model/ModelEllipseObject.cpp
@@ -24,171 +24,174 @@
 #include <QPen>
 
 
-namespace glabels::model
+namespace glabels
 {
-
-	//
-	// Private
-	//
-	namespace
+	namespace model
 	{
-		const double slopPixels = 2;
-	}
 
-
-	///
-	/// Constructor
-	///
-	ModelEllipseObject::ModelEllipseObject()
-	{
-		// empty
-	}
-
-
-	///
-	/// Constructor
-	///
-	ModelEllipseObject::ModelEllipseObject( const Distance&  x0,
-	                                        const Distance&  y0,
-	                                        const Distance&  w,
-	                                        const Distance&  h,
-	                                        const Distance&  lineWidth,
-	                                        const ColorNode& lineColorNode,
-	                                        const ColorNode& fillColorNode,
-	                                        const QMatrix&   matrix,
-	                                        bool             shadowState,
-	                                        const Distance&  shadowX,
-	                                        const Distance&  shadowY,
-	                                        double           shadowOpacity,
-	                                        const ColorNode& shadowColorNode )
-	: ModelShapeObject( x0, y0, w, h,
-	                    lineWidth, lineColorNode, fillColorNode,
-	                    matrix,
-	                    shadowState, shadowX, shadowY, shadowOpacity, shadowColorNode )
-	{
-		// empty
-	}
-
-
-	///
-	/// Copy constructor
-	///
-	ModelEllipseObject::ModelEllipseObject( const ModelEllipseObject* object )
-		: ModelShapeObject( object )
-	{
-		// empty
-	}
-
-
-	///
-	/// Destructor
-	///
-	ModelEllipseObject::~ModelEllipseObject()
-	{
-		// empty
-	}
-
-
-	///
-	/// Clone
-	///
-	ModelEllipseObject* ModelEllipseObject::clone() const
-	{
-		return new ModelEllipseObject( this );
-	}
-
-
-	///
-	/// Draw shadow of object
-	///
-	void ModelEllipseObject::drawShadow( QPainter* painter, bool inEditor, merge::Record* record ) const
-	{
-		QColor lineColor = mLineColorNode.color( record );
-		QColor fillColor = mFillColorNode.color( record );
-		QColor shadowColor = mShadowColorNode.color( record );
-
-		shadowColor.setAlphaF( mShadowOpacity );
-
-		if ( fillColor.alpha() )
+		//
+		// Private
+		//
+		namespace
 		{
-			painter->setPen( Qt::NoPen );
-			painter->setBrush( shadowColor );
+			const double slopPixels = 2;
+		}
 
-			if ( lineColor.alpha() )
+
+		///
+		/// Constructor
+		///
+		ModelEllipseObject::ModelEllipseObject()
+		{
+			// empty
+		}
+
+
+		///
+		/// Constructor
+		///
+		ModelEllipseObject::ModelEllipseObject( const Distance&  x0,
+		                                        const Distance&  y0,
+		                                        const Distance&  w,
+		                                        const Distance&  h,
+		                                        const Distance&  lineWidth,
+		                                        const ColorNode& lineColorNode,
+		                                        const ColorNode& fillColorNode,
+		                                        const QMatrix&   matrix,
+		                                        bool             shadowState,
+		                                        const Distance&  shadowX,
+		                                        const Distance&  shadowY,
+		                                        double           shadowOpacity,
+		                                        const ColorNode& shadowColorNode )
+		: ModelShapeObject( x0, y0, w, h,
+		                    lineWidth, lineColorNode, fillColorNode,
+		                    matrix,
+		                    shadowState, shadowX, shadowY, shadowOpacity, shadowColorNode )
+		{
+			// empty
+		}
+
+
+		///
+		/// Copy constructor
+		///
+		ModelEllipseObject::ModelEllipseObject( const ModelEllipseObject* object )
+			: ModelShapeObject( object )
+		{
+			// empty
+		}
+
+
+		///
+		/// Destructor
+		///
+		ModelEllipseObject::~ModelEllipseObject()
+		{
+			// empty
+		}
+
+
+		///
+		/// Clone
+		///
+		ModelEllipseObject* ModelEllipseObject::clone() const
+		{
+			return new ModelEllipseObject( this );
+		}
+
+
+		///
+		/// Draw shadow of object
+		///
+		void ModelEllipseObject::drawShadow( QPainter* painter, bool inEditor, merge::Record* record ) const
+		{
+			QColor lineColor = mLineColorNode.color( record );
+			QColor fillColor = mFillColorNode.color( record );
+			QColor shadowColor = mShadowColorNode.color( record );
+
+			shadowColor.setAlphaF( mShadowOpacity );
+
+			if ( fillColor.alpha() )
 			{
-				/* Has FILL and OUTLINE: adjust size to account for line width. */
-				painter->drawEllipse( QRectF( -mLineWidth.pt()/2,
-				                              -mLineWidth.pt()/2,
-				                              (mW + mLineWidth).pt(),
-				                              (mH + mLineWidth).pt() ) );
+				painter->setPen( Qt::NoPen );
+				painter->setBrush( shadowColor );
+
+				if ( lineColor.alpha() )
+				{
+					/* Has FILL and OUTLINE: adjust size to account for line width. */
+					painter->drawEllipse( QRectF( -mLineWidth.pt()/2,
+					                              -mLineWidth.pt()/2,
+					                              (mW + mLineWidth).pt(),
+					                              (mH + mLineWidth).pt() ) );
+				}
+				else
+				{
+					/* Has FILL, but no OUTLINE. */
+					painter->drawEllipse( QRectF( 0, 0, mW.pt(), mH.pt() ) );
+				}
 			}
 			else
 			{
-				/* Has FILL, but no OUTLINE. */
-				painter->drawEllipse( QRectF( 0, 0, mW.pt(), mH.pt() ) );
-			}
-		}
-		else
-		{
-			if ( lineColor.alpha() )
-			{
-				/* Has only OUTLINE. */
-				painter->setPen( QPen( shadowColor, mLineWidth.pt() ) );
-				painter->setBrush( Qt::NoBrush );
+				if ( lineColor.alpha() )
+				{
+					/* Has only OUTLINE. */
+					painter->setPen( QPen( shadowColor, mLineWidth.pt() ) );
+					painter->setBrush( Qt::NoBrush );
 
-				painter->drawEllipse( QRectF( 0, 0, mW.pt(), mH.pt() ) );
+					painter->drawEllipse( QRectF( 0, 0, mW.pt(), mH.pt() ) );
+				}
 			}
-		}
 		
-	}
+		}
 
 	
-	///
-	/// Draw object itself
-	///
-	void ModelEllipseObject::drawObject( QPainter* painter, bool inEditor, merge::Record* record ) const
-	{
-		QColor lineColor = mLineColorNode.color( record );
-		QColor fillColor = mFillColorNode.color( record );
+		///
+		/// Draw object itself
+		///
+		void ModelEllipseObject::drawObject( QPainter* painter, bool inEditor, merge::Record* record ) const
+		{
+			QColor lineColor = mLineColorNode.color( record );
+			QColor fillColor = mFillColorNode.color( record );
 
-		painter->setPen( QPen( lineColor, mLineWidth.pt() ) );
-		painter->setBrush( fillColor );
+			painter->setPen( QPen( lineColor, mLineWidth.pt() ) );
+			painter->setBrush( fillColor );
+
+			painter->drawEllipse( QRectF( 0, 0, mW.pt(), mH.pt() ) );
+		}
+
+
+		///
+		/// Path to test for hover condition
+		///
+		QPainterPath ModelEllipseObject::hoverPath( double scale ) const
+		{
+			double s = 1 / scale;
+
+			QPainterPath path;
+
+			if ( mFillColorNode.color().alpha() && mLineColorNode.color().alpha() )
+			{
+				path.addEllipse( -mLineWidth.pt()/2, -mLineWidth.pt()/2, (mW+mLineWidth).pt(), (mH+mLineWidth).pt() );
+			}
+			else if ( mFillColorNode.color().alpha() && !(mLineColorNode.color().alpha()) )
+			{
+				path.addEllipse( 0, 0, mW.pt(), mH.pt() );
+			}
+			else if ( mLineColorNode.color().alpha() )
+			{
+				path.addEllipse( (-mLineWidth.pt()/2) - s*slopPixels,
+				                 (-mLineWidth.pt()/2) - s*slopPixels,
+				                 (mW + mLineWidth).pt() + s*2*slopPixels,
+				                 (mH + mLineWidth).pt() + s*2*slopPixels );
+				path.closeSubpath();
+				path.addEllipse( mLineWidth.pt()/2 + s*slopPixels,
+				                 mLineWidth.pt()/2 + s*slopPixels,
+				                 (mW - mLineWidth).pt() - s*2*slopPixels,
+				                 (mH - mLineWidth).pt() - s*2*slopPixels );
+			}
+
+			return path;
+		}
 
-		painter->drawEllipse( QRectF( 0, 0, mW.pt(), mH.pt() ) );
 	}
-
-
-	///
-	/// Path to test for hover condition
-	///
-	QPainterPath ModelEllipseObject::hoverPath( double scale ) const
-	{
-		double s = 1 / scale;
-
-		QPainterPath path;
-
-		if ( mFillColorNode.color().alpha() && mLineColorNode.color().alpha() )
-		{
-			path.addEllipse( -mLineWidth.pt()/2, -mLineWidth.pt()/2, (mW+mLineWidth).pt(), (mH+mLineWidth).pt() );
-		}
-		else if ( mFillColorNode.color().alpha() && !(mLineColorNode.color().alpha()) )
-		{
-			path.addEllipse( 0, 0, mW.pt(), mH.pt() );
-		}
-		else if ( mLineColorNode.color().alpha() )
-		{
-			path.addEllipse( (-mLineWidth.pt()/2) - s*slopPixels,
-			                 (-mLineWidth.pt()/2) - s*slopPixels,
-			                 (mW + mLineWidth).pt() + s*2*slopPixels,
-			                 (mH + mLineWidth).pt() + s*2*slopPixels );
-			path.closeSubpath();
-			path.addEllipse( mLineWidth.pt()/2 + s*slopPixels,
-			                 mLineWidth.pt()/2 + s*slopPixels,
-			                 (mW - mLineWidth).pt() - s*2*slopPixels,
-			                 (mH - mLineWidth).pt() - s*2*slopPixels );
-		}
-
-		return path;
-	}
-
-} // namespace glabels::model
+}
diff --git a/model/ModelEllipseObject.h b/model/ModelEllipseObject.h
index 3a83302..e26e9ba 100644
--- a/model/ModelEllipseObject.h
+++ b/model/ModelEllipseObject.h
@@ -25,57 +25,60 @@
 #include "ModelShapeObject.h"
 
 
-namespace glabels::model
+namespace glabels
 {
-
-	///
-	/// Label Model Ellipse Object
-	///
-	class ModelEllipseObject : public ModelShapeObject
+	namespace model
 	{
-		Q_OBJECT
 
-		///////////////////////////////////////////////////////////////
-		// Lifecycle Methods
-		///////////////////////////////////////////////////////////////
-	public:
-		ModelEllipseObject();
+		///
+		/// Label Model Ellipse Object
+		///
+		class ModelEllipseObject : public ModelShapeObject
+		{
+			Q_OBJECT
 
-		ModelEllipseObject( const Distance&  x0,
-		                    const Distance&  y0,
-		                    const Distance&  w,
-		                    const Distance&  h,
-		                    const Distance&  lineWidth,
-		                    const ColorNode& lineColorNode,
-		                    const ColorNode& fillColorNode,
-		                    const QMatrix&   matrix = QMatrix(),
-		                    bool             shadowState = false,
-		                    const Distance&  shadowX = 0,
-		                    const Distance&  shadowY = 0,
-		                    double           shadowOpacity = 1.0,
-		                    const ColorNode& shadowColorNode = ColorNode() );
+			///////////////////////////////////////////////////////////////
+			// Lifecycle Methods
+			///////////////////////////////////////////////////////////////
+		public:
+			ModelEllipseObject();
 
-		ModelEllipseObject( const ModelEllipseObject* object );
+			ModelEllipseObject( const Distance&  x0,
+			                    const Distance&  y0,
+			                    const Distance&  w,
+			                    const Distance&  h,
+			                    const Distance&  lineWidth,
+			                    const ColorNode& lineColorNode,
+			                    const ColorNode& fillColorNode,
+			                    const QMatrix&   matrix = QMatrix(),
+			                    bool             shadowState = false,
+			                    const Distance&  shadowX = 0,
+			                    const Distance&  shadowY = 0,
+			                    double           shadowOpacity = 1.0,
+			                    const ColorNode& shadowColorNode = ColorNode() );
 
-		~ModelEllipseObject() override;
+			ModelEllipseObject( const ModelEllipseObject* object );
+
+			~ModelEllipseObject() override;
 
 	
-		///////////////////////////////////////////////////////////////
-		// Object duplication
-		///////////////////////////////////////////////////////////////
-		ModelEllipseObject* clone() const override;
+			///////////////////////////////////////////////////////////////
+			// Object duplication
+			///////////////////////////////////////////////////////////////
+			ModelEllipseObject* clone() const override;
 
 
-		///////////////////////////////////////////////////////////////
-		// Drawing operations
-		///////////////////////////////////////////////////////////////
-	protected:
-		void drawShadow( QPainter* painter, bool inEditor, merge::Record* record ) const override;
-		void drawObject( QPainter* painter, bool inEditor, merge::Record* record ) const override;
-		QPainterPath hoverPath( double scale ) const override;
+			///////////////////////////////////////////////////////////////
+			// Drawing operations
+			///////////////////////////////////////////////////////////////
+		protected:
+			void drawShadow( QPainter* painter, bool inEditor, merge::Record* record ) const override;
+			void drawObject( QPainter* painter, bool inEditor, merge::Record* record ) const override;
+			QPainterPath hoverPath( double scale ) const override;
 
-	};
+		};
 
+	}
 }
 
 
diff --git a/model/ModelImageObject.cpp b/model/ModelImageObject.cpp
index d3bc30e..221e4f5 100644
--- a/model/ModelImageObject.cpp
+++ b/model/ModelImageObject.cpp
@@ -29,477 +29,503 @@
 #include <QtDebug>
 
 
-namespace glabels::model
+namespace glabels
 {
-
-	///
-	/// Static data
-	///
-	QImage* ModelImageObject::smDefaultImage = nullptr;
-
-
-	///
-	/// Constructor
-	///
-	ModelImageObject::ModelImageObject() : mImage(nullptr), mSvgRenderer(nullptr)
+	namespace model
 	{
-		mOutline = new Outline( this );
 
-		mHandles << new HandleNorthWest( this );
-		mHandles << new HandleNorth( this );
-		mHandles << new HandleNorthEast( this );
-		mHandles << new HandleEast( this );
-		mHandles << new HandleSouthEast( this );
-		mHandles << new HandleSouth( this );
-		mHandles << new HandleSouthWest( this );
-		mHandles << new HandleWest( this );
+		///
+		/// Static data
+		///
+		QImage* ModelImageObject::smDefaultImage = nullptr;
 
-		if ( smDefaultImage == nullptr )
+
+		///
+		/// Constructor
+		///
+		ModelImageObject::ModelImageObject() : mImage(nullptr), mSvgRenderer(nullptr)
 		{
-			smDefaultImage = new QImage( ":images/checkerboard.png" );
-		}
-	}
+			mOutline = new Outline( this );
 
+			mHandles << new HandleNorthWest( this );
+			mHandles << new HandleNorth( this );
+			mHandles << new HandleNorthEast( this );
+			mHandles << new HandleEast( this );
+			mHandles << new HandleSouthEast( this );
+			mHandles << new HandleSouth( this );
+			mHandles << new HandleSouthWest( this );
+			mHandles << new HandleWest( this );
 
-	///
-	/// Constructor
-	///
-	ModelImageObject::ModelImageObject( const Distance&  x0,
-	                                    const Distance&  y0,
-	                                    const Distance&  w,
-	                                    const Distance&  h,
-	                                    const TextNode&  filenameNode,
-	                                    const QMatrix&   matrix,
-	                                    bool             shadowState,
-	                                    const Distance&  shadowX,
-	                                    const Distance&  shadowY,
-	                                    double           shadowOpacity,
-	                                    const ColorNode& shadowColorNode )
-	: ModelObject( x0, y0, w, h,
-	               matrix,
-	               shadowState, shadowX, shadowY, shadowOpacity, shadowColorNode )
-	{
-		mOutline = new Outline( this );
-
-		mHandles << new HandleNorthWest( this );
-		mHandles << new HandleNorth( this );
-		mHandles << new HandleNorthEast( this );
-		mHandles << new HandleEast( this );
-		mHandles << new HandleSouthEast( this );
-		mHandles << new HandleSouth( this );
-		mHandles << new HandleSouthWest( this );
-		mHandles << new HandleWest( this );
-
-		if ( smDefaultImage == nullptr )
-		{
-			smDefaultImage = new QImage( ":images/checkerboard.png" );
+			if ( smDefaultImage == nullptr )
+			{
+				smDefaultImage = new QImage( ":images/checkerboard.png" );
+			}
 		}
 
-		mFilenameNode = filenameNode;
 
-		mImage = nullptr;
-		mSvgRenderer = nullptr;
-	}
-
-	
-	///
-	/// Constructor
-	///
-	ModelImageObject::ModelImageObject( const Distance&  x0,
-	                                    const Distance&  y0,
-	                                    const Distance&  w,
-	                                    const Distance&  h,
-	                                    const QString&   filename,
-	                                    const QImage&    image,
-	                                    const QMatrix&   matrix,
-	                                    bool             shadowState,
-	                                    const Distance&  shadowX,
-	                                    const Distance&  shadowY,
-	                                    double           shadowOpacity,
-	                                    const ColorNode& shadowColorNode )
-	: ModelObject( x0, y0, w, h,
-	               matrix,
-	               shadowState, shadowX, shadowY, shadowOpacity, shadowColorNode )
-	{
-		mOutline = new Outline( this );
-
-		mHandles << new HandleNorthWest( this );
-		mHandles << new HandleNorth( this );
-		mHandles << new HandleNorthEast( this );
-		mHandles << new HandleEast( this );
-		mHandles << new HandleSouthEast( this );
-		mHandles << new HandleSouth( this );
-		mHandles << new HandleSouthWest( this );
-		mHandles << new HandleWest( this );
-
-		if ( smDefaultImage == nullptr )
+		///
+		/// Constructor
+		///
+		ModelImageObject::ModelImageObject( const Distance&  x0,
+		                                    const Distance&  y0,
+		                                    const Distance&  w,
+		                                    const Distance&  h,
+		                                    const TextNode&  filenameNode,
+		                                    const QMatrix&   matrix,
+		                                    bool             shadowState,
+		                                    const Distance&  shadowX,
+		                                    const Distance&  shadowY,
+		                                    double           shadowOpacity,
+		                                    const ColorNode& shadowColorNode )
+		: ModelObject( x0, y0, w, h,
+		               matrix,
+		               shadowState, shadowX, shadowY, shadowOpacity, shadowColorNode )
 		{
-			smDefaultImage = new QImage( ":images/checkerboard.png" );
-		}
+			mOutline = new Outline( this );
 
-		mImage = new QImage(image);
-		mFilenameNode = TextNode( false, filename );
-		mSvgRenderer = nullptr;
-	}
+			mHandles << new HandleNorthWest( this );
+			mHandles << new HandleNorth( this );
+			mHandles << new HandleNorthEast( this );
+			mHandles << new HandleEast( this );
+			mHandles << new HandleSouthEast( this );
+			mHandles << new HandleSouth( this );
+			mHandles << new HandleSouthWest( this );
+			mHandles << new HandleWest( this );
 
+			if ( smDefaultImage == nullptr )
+			{
+				smDefaultImage = new QImage( ":images/checkerboard.png" );
+			}
 
-	///
-	/// Constructor
-	///
-	ModelImageObject::ModelImageObject( const Distance&   x0,
-	                                    const Distance&   y0,
-	                                    const Distance&   w,
-	                                    const Distance&   h,
-	                                    const QString&    filename,
-	                                    const QByteArray& svg,
-	                                    const QMatrix&    matrix,
-	                                    bool              shadowState,
-	                                    const Distance&   shadowX,
-	                                    const Distance&   shadowY,
-	                                    double            shadowOpacity,
-	                                    const ColorNode&  shadowColorNode )
-	: ModelObject( x0, y0, w, h,
-	               matrix,
-	               shadowState, shadowX, shadowY, shadowOpacity, shadowColorNode )
-	{
-		mOutline = new Outline( this );
+			mFilenameNode = filenameNode;
 
-		mHandles << new HandleNorthWest( this );
-		mHandles << new HandleNorth( this );
-		mHandles << new HandleNorthEast( this );
-		mHandles << new HandleEast( this );
-		mHandles << new HandleSouthEast( this );
-		mHandles << new HandleSouth( this );
-		mHandles << new HandleSouthWest( this );
-		mHandles << new HandleWest( this );
-
-		if ( smDefaultImage == nullptr )
-		{
-			smDefaultImage = new QImage( ":images/checkerboard.png" );
-		}
-
-		mSvg = svg;
-		mSvgRenderer = new QSvgRenderer( mSvg );
-		mFilenameNode = TextNode( false, filename );
-		mImage = nullptr;
-	}
-
-
-	///
-	/// Copy constructor
-	///
-	ModelImageObject::ModelImageObject( const ModelImageObject* object ) : ModelObject(object)
-	{
-		mFilenameNode = object->mFilenameNode;
-		if ( object->mImage )
-		{
-			mImage = new QImage( *object->mImage );
-		}
-		else
-		{
 			mImage = nullptr;
-		}
-		if ( object->mSvgRenderer )
-		{
-			mSvgRenderer = new QSvgRenderer( object->mSvg );
-		}
-		else
-		{
 			mSvgRenderer = nullptr;
 		}
-		mSvg = object->mSvg;
-	}
 
-
-	///
-	/// Destructor
-	///
-	ModelImageObject::~ModelImageObject()
-	{
-		delete mOutline;
-
-		foreach( Handle* handle, mHandles )
+	
+		///
+		/// Constructor
+		///
+		ModelImageObject::ModelImageObject( const Distance&  x0,
+		                                    const Distance&  y0,
+		                                    const Distance&  w,
+		                                    const Distance&  h,
+		                                    const QString&   filename,
+		                                    const QImage&    image,
+		                                    const QMatrix&   matrix,
+		                                    bool             shadowState,
+		                                    const Distance&  shadowX,
+		                                    const Distance&  shadowY,
+		                                    double           shadowOpacity,
+		                                    const ColorNode& shadowColorNode )
+		: ModelObject( x0, y0, w, h,
+		               matrix,
+		               shadowState, shadowX, shadowY, shadowOpacity, shadowColorNode )
 		{
-			delete handle;
-		}
-		mHandles.clear();
+			mOutline = new Outline( this );
 
-		if ( mImage )
-		{
-			delete mImage;
-		}
-		if ( mSvgRenderer )
-		{
-			delete mSvgRenderer;
-		}
-	}
+			mHandles << new HandleNorthWest( this );
+			mHandles << new HandleNorth( this );
+			mHandles << new HandleNorthEast( this );
+			mHandles << new HandleEast( this );
+			mHandles << new HandleSouthEast( this );
+			mHandles << new HandleSouth( this );
+			mHandles << new HandleSouthWest( this );
+			mHandles << new HandleWest( this );
 
-
-	///
-	/// Clone
-	///
-	ModelImageObject* ModelImageObject::clone() const
-	{
-		return new ModelImageObject( this );
-	}
-
-
-	///
-	/// Image filenameNode Property Getter
-	///
-	TextNode ModelImageObject::filenameNode() const
-	{
-		return mFilenameNode;
-	}
-
-
-	///
-	/// Image filenameNode Property Setter
-	///
-	void ModelImageObject::setFilenameNode( const TextNode& value )
-	{
-		if ( mFilenameNode != value )
-		{
-			mFilenameNode = value;
-			loadImage();
-		
-			emit changed();
-		}
-	}
-
-
-	///
-	/// Image image Property Getter
-	///
-	const QImage* ModelImageObject::image() const
-	{
-		return mImage;
-	}
-
-
-	///
-	/// Image Property Setter
-	///
-	void ModelImageObject::setImage( const QImage& value )
-	{
-		if ( !value.isNull() )
-		{
-			if ( mImage )
+			if ( smDefaultImage == nullptr )
 			{
-				delete mImage;
-				mImage = nullptr;
-			}
-			if ( mSvgRenderer )
-			{
-				delete mSvgRenderer;
-				mSvgRenderer = nullptr;
+				smDefaultImage = new QImage( ":images/checkerboard.png" );
 			}
 
-			mImage = new QImage(value);
-			quint16 cs = qChecksum( (const char*)mImage->constBits(), mImage->byteCount() );
-			mFilenameNode = TextNode( false, QString("%image_%1%").arg( cs ) );
-
-			emit changed();
+			mImage = new QImage(image);
+			mFilenameNode = TextNode( false, filename );
+			mSvgRenderer = nullptr;
 		}
-	}
-		
 
-	///
-	/// Image Property Setter
-	///
-	void ModelImageObject::setImage( const QString& name, const QImage& value )
-	{
-		if ( !value.isNull() )
+
+		///
+		/// Constructor
+		///
+		ModelImageObject::ModelImageObject( const Distance&   x0,
+		                                    const Distance&   y0,
+		                                    const Distance&   w,
+		                                    const Distance&   h,
+		                                    const QString&    filename,
+		                                    const QByteArray& svg,
+		                                    const QMatrix&    matrix,
+		                                    bool              shadowState,
+		                                    const Distance&   shadowX,
+		                                    const Distance&   shadowY,
+		                                    double            shadowOpacity,
+		                                    const ColorNode&  shadowColorNode )
+		: ModelObject( x0, y0, w, h,
+		               matrix,
+		               shadowState, shadowX, shadowY, shadowOpacity, shadowColorNode )
 		{
-			if ( mImage )
+			mOutline = new Outline( this );
+
+			mHandles << new HandleNorthWest( this );
+			mHandles << new HandleNorth( this );
+			mHandles << new HandleNorthEast( this );
+			mHandles << new HandleEast( this );
+			mHandles << new HandleSouthEast( this );
+			mHandles << new HandleSouth( this );
+			mHandles << new HandleSouthWest( this );
+			mHandles << new HandleWest( this );
+
+			if ( smDefaultImage == nullptr )
 			{
-				delete mImage;
-				mImage = nullptr;
-			}
-			if ( mSvgRenderer )
-			{
-				delete mSvgRenderer;
-				mSvgRenderer = nullptr;
+				smDefaultImage = new QImage( ":images/checkerboard.png" );
 			}
 
-			mImage = new QImage(value);
-			mFilenameNode = TextNode( false, name );
-
-			emit changed();
-		}
-	}
-		
-
-	///
-	/// Image svg Property Getter
-	///
-	QByteArray ModelImageObject::svg() const
-	{
-		return mSvg;
-	}
-
-
-	///
-	/// Image svgSource Property Setter
-	///
-	void ModelImageObject::setSvg( const QString& name, const QByteArray& value )
-	{
-		if ( !value.isEmpty() )
-		{
-			if ( mImage )
-			{
-				delete mImage;
-				mImage = nullptr;
-			}
-			if ( mSvgRenderer )
-			{
-				delete mSvgRenderer;
-				mSvgRenderer = nullptr;
-			}
-
-			mSvg = value;
+			mSvg = svg;
 			mSvgRenderer = new QSvgRenderer( mSvg );
-			mFilenameNode = TextNode( false, name );
-
-			emit changed();
-		}
-	}
-		
-
-	///
-	/// naturalSize Property Getter (assumes 72 DPI, i.e. 1pixel == 1pt)
-	///
-	Size ModelImageObject::naturalSize() const
-	{
-		Size size( Distance::pt(72), Distance::pt(72) );
-
-		if ( mImage )
-		{
-			QSize qsize = mImage->size();
-			size.setW( Distance::pt( qsize.width() ) );
-			size.setH( Distance::pt( qsize.height() ) );
-		}
-		else if ( mSvgRenderer )
-		{
-			QSize qsize = mSvgRenderer->defaultSize();
-			size.setW( Distance::pt( qsize.width() ) );
-			size.setH( Distance::pt( qsize.height() ) );
-		}
-
-		return size;
-	}
-
-
-	///
-	/// Draw shadow of object
-	///
-	void ModelImageObject::drawShadow( QPainter* painter, bool inEditor, merge::Record* record ) const
-	{
-		QRectF destRect( 0, 0, mW.pt(), mH.pt() );
-	
-		QColor shadowColor = mShadowColorNode.color( record );
-		shadowColor.setAlphaF( mShadowOpacity );
-
-		if ( mImage && mImage->hasAlphaChannel() && (mImage->depth() == 32) )
-		{
-			QImage* shadowImage = createShadowImage( shadowColor );
-			painter->drawImage( destRect, *shadowImage );
-			delete shadowImage;
-		}
-		else
-		{
-			if ( mImage || inEditor )
-			{
-				painter->setBrush( shadowColor );
-				painter->setPen( QPen( Qt::NoPen ) );
-
-				painter->drawRect( destRect );
-			}
-		}
-	}
-
-	
-	///
-	/// Draw object itself
-	///
-	void ModelImageObject::drawObject( QPainter* painter, bool inEditor, merge::Record* record ) const
-	{
-		QRectF destRect( 0, 0, mW.pt(), mH.pt() );
-	
-		if ( inEditor && (mFilenameNode.isField() || (!mImage && !mSvgRenderer) ) )
-		{
-			painter->save();
-			painter->setRenderHint( QPainter::SmoothPixmapTransform, false );
-			painter->drawImage( destRect, *smDefaultImage );
-			painter->restore();
-		}
-		else if ( mImage )
-		{
-			painter->drawImage( destRect, *mImage );
-		}
-		else if ( mSvgRenderer )
-		{
-			mSvgRenderer->render( painter, destRect );
-		}
-		else if ( mFilenameNode.isField() )
-		{
-			// TODO
-		}
-	}
-
-
-	///
-	/// Path to test for hover condition
-	///
-	QPainterPath ModelImageObject::hoverPath( double scale ) const
-	{
-		QPainterPath path;
-		path.addRect( 0, 0, mW.pt(), mH.pt() );
-
-		return path;
-	}
-
-
-	///
-	/// Load image
-	///
-	void ModelImageObject::loadImage()
-	{
-		if ( mImage )
-		{
-			delete mImage;
+			mFilenameNode = TextNode( false, filename );
 			mImage = nullptr;
 		}
-		if ( mSvgRenderer )
+
+
+		///
+		/// Copy constructor
+		///
+		ModelImageObject::ModelImageObject( const ModelImageObject* object ) : ModelObject(object)
 		{
-			delete mSvgRenderer;
-			mSvgRenderer = nullptr;
+			mFilenameNode = object->mFilenameNode;
+			if ( object->mImage )
+			{
+				mImage = new QImage( *object->mImage );
+			}
+			else
+			{
+				mImage = nullptr;
+			}
+			if ( object->mSvgRenderer )
+			{
+				mSvgRenderer = new QSvgRenderer( object->mSvg );
+			}
+			else
+			{
+				mSvgRenderer = nullptr;
+			}
+			mSvg = object->mSvg;
 		}
 
-		if ( !mFilenameNode.isField() )
-		{
-			QString filename = mFilenameNode.data();
-			QFileInfo fileInfo( filename );
 
-			if ( fileInfo.isReadable() )
+		///
+		/// Destructor
+		///
+		ModelImageObject::~ModelImageObject()
+		{
+			delete mOutline;
+
+			foreach( Handle* handle, mHandles )
 			{
-				if ( (fileInfo.suffix() == "svg") || (fileInfo.suffix() == "SVG") )
+				delete handle;
+			}
+			mHandles.clear();
+
+			if ( mImage )
+			{
+				delete mImage;
+			}
+			if ( mSvgRenderer )
+			{
+				delete mSvgRenderer;
+			}
+		}
+
+
+		///
+		/// Clone
+		///
+		ModelImageObject* ModelImageObject::clone() const
+		{
+			return new ModelImageObject( this );
+		}
+
+
+		///
+		/// Image filenameNode Property Getter
+		///
+		TextNode ModelImageObject::filenameNode() const
+		{
+			return mFilenameNode;
+		}
+
+
+		///
+		/// Image filenameNode Property Setter
+		///
+		void ModelImageObject::setFilenameNode( const TextNode& value )
+		{
+			if ( mFilenameNode != value )
+			{
+				mFilenameNode = value;
+				loadImage();
+		
+				emit changed();
+			}
+		}
+
+
+		///
+		/// Image image Property Getter
+		///
+		const QImage* ModelImageObject::image() const
+		{
+			return mImage;
+		}
+
+
+		///
+		/// Image Property Setter
+		///
+		void ModelImageObject::setImage( const QImage& value )
+		{
+			if ( !value.isNull() )
+			{
+				if ( mImage )
 				{
-					QFile file( filename );
-					if ( file.open( QFile::ReadOnly ) )
+					delete mImage;
+					mImage = nullptr;
+				}
+				if ( mSvgRenderer )
+				{
+					delete mSvgRenderer;
+					mSvgRenderer = nullptr;
+				}
+
+				mImage = new QImage(value);
+				quint16 cs = qChecksum( (const char*)mImage->constBits(), mImage->byteCount() );
+				mFilenameNode = TextNode( false, QString("%image_%1%").arg( cs ) );
+
+				emit changed();
+			}
+		}
+		
+
+		///
+		/// Image Property Setter
+		///
+		void ModelImageObject::setImage( const QString& name, const QImage& value )
+		{
+			if ( !value.isNull() )
+			{
+				if ( mImage )
+				{
+					delete mImage;
+					mImage = nullptr;
+				}
+				if ( mSvgRenderer )
+				{
+					delete mSvgRenderer;
+					mSvgRenderer = nullptr;
+				}
+
+				mImage = new QImage(value);
+				mFilenameNode = TextNode( false, name );
+
+				emit changed();
+			}
+		}
+		
+
+		///
+		/// Image svg Property Getter
+		///
+		QByteArray ModelImageObject::svg() const
+		{
+			return mSvg;
+		}
+
+
+		///
+		/// Image svgSource Property Setter
+		///
+		void ModelImageObject::setSvg( const QString& name, const QByteArray& value )
+		{
+			if ( !value.isEmpty() )
+			{
+				if ( mImage )
+				{
+					delete mImage;
+					mImage = nullptr;
+				}
+				if ( mSvgRenderer )
+				{
+					delete mSvgRenderer;
+					mSvgRenderer = nullptr;
+				}
+
+				mSvg = value;
+				mSvgRenderer = new QSvgRenderer( mSvg );
+				mFilenameNode = TextNode( false, name );
+
+				emit changed();
+			}
+		}
+		
+
+		///
+		/// naturalSize Property Getter (assumes 72 DPI, i.e. 1pixel == 1pt)
+		///
+		Size ModelImageObject::naturalSize() const
+		{
+			Size size( Distance::pt(72), Distance::pt(72) );
+
+			if ( mImage )
+			{
+				QSize qsize = mImage->size();
+				size.setW( Distance::pt( qsize.width() ) );
+				size.setH( Distance::pt( qsize.height() ) );
+			}
+			else if ( mSvgRenderer )
+			{
+				QSize qsize = mSvgRenderer->defaultSize();
+				size.setW( Distance::pt( qsize.width() ) );
+				size.setH( Distance::pt( qsize.height() ) );
+			}
+
+			return size;
+		}
+
+
+		///
+		/// Draw shadow of object
+		///
+		void ModelImageObject::drawShadow( QPainter* painter, bool inEditor, merge::Record* record ) const
+		{
+			QRectF destRect( 0, 0, mW.pt(), mH.pt() );
+	
+			QColor shadowColor = mShadowColorNode.color( record );
+			shadowColor.setAlphaF( mShadowOpacity );
+
+			if ( mImage && mImage->hasAlphaChannel() && (mImage->depth() == 32) )
+			{
+				QImage* shadowImage = createShadowImage( shadowColor );
+				painter->drawImage( destRect, *shadowImage );
+				delete shadowImage;
+			}
+			else
+			{
+				if ( mImage || inEditor )
+				{
+					painter->setBrush( shadowColor );
+					painter->setPen( QPen( Qt::NoPen ) );
+
+					painter->drawRect( destRect );
+				}
+			}
+		}
+
+	
+		///
+		/// Draw object itself
+		///
+		void ModelImageObject::drawObject( QPainter* painter, bool inEditor, merge::Record* record ) const
+		{
+			QRectF destRect( 0, 0, mW.pt(), mH.pt() );
+	
+			if ( inEditor && (mFilenameNode.isField() || (!mImage && !mSvgRenderer) ) )
+			{
+				painter->save();
+				painter->setRenderHint( QPainter::SmoothPixmapTransform, false );
+				painter->drawImage( destRect, *smDefaultImage );
+				painter->restore();
+			}
+			else if ( mImage )
+			{
+				painter->drawImage( destRect, *mImage );
+			}
+			else if ( mSvgRenderer )
+			{
+				mSvgRenderer->render( painter, destRect );
+			}
+			else if ( mFilenameNode.isField() )
+			{
+				// TODO
+			}
+		}
+
+
+		///
+		/// Path to test for hover condition
+		///
+		QPainterPath ModelImageObject::hoverPath( double scale ) const
+		{
+			QPainterPath path;
+			path.addRect( 0, 0, mW.pt(), mH.pt() );
+
+			return path;
+		}
+
+
+		///
+		/// Load image
+		///
+		void ModelImageObject::loadImage()
+		{
+			if ( mImage )
+			{
+				delete mImage;
+				mImage = nullptr;
+			}
+			if ( mSvgRenderer )
+			{
+				delete mSvgRenderer;
+				mSvgRenderer = nullptr;
+			}
+
+			if ( !mFilenameNode.isField() )
+			{
+				QString filename = mFilenameNode.data();
+				QFileInfo fileInfo( filename );
+
+				if ( fileInfo.isReadable() )
+				{
+					if ( (fileInfo.suffix() == "svg") || (fileInfo.suffix() == "SVG") )
 					{
-						mSvg = file.readAll();
-						file.close();
-						mSvgRenderer = new QSvgRenderer( mSvg );
-						if ( !mSvgRenderer->isValid() )
+						QFile file( filename );
+						if ( file.open( QFile::ReadOnly ) )
 						{
-							mSvgRenderer = nullptr;
+							mSvg = file.readAll();
+							file.close();
+							mSvgRenderer = new QSvgRenderer( mSvg );
+							if ( !mSvgRenderer->isValid() )
+							{
+								mSvgRenderer = nullptr;
+							}
+							else
+							{
+								// Adjust size based on aspect ratio of SVG image
+								QRectF rect = mSvgRenderer->viewBoxF();
+								double aspectRatio = rect.height() / rect.width();
+								if ( mH > mW*aspectRatio )
+								{
+									mH = mW*aspectRatio;
+								}
+								else
+								{
+									mW = mH/aspectRatio;
+								}
+							}
+						}
+					}
+					else
+					{
+						mImage = new QImage( filename );
+						if ( mImage->isNull() )
+						{
+							mImage = nullptr;
 						}
 						else
 						{
-							// Adjust size based on aspect ratio of SVG image
-							QRectF rect = mSvgRenderer->viewBoxF();
-							double aspectRatio = rect.height() / rect.width();
+							// Adjust size based on aspect ratio of image
+							double imageW = mImage->width();
+							double imageH = mImage->height();
+							double aspectRatio = imageH / imageW;
 							if ( mH > mW*aspectRatio )
 							{
 								mH = mW*aspectRatio;
@@ -511,56 +537,33 @@ namespace glabels::model
 						}
 					}
 				}
-				else
+			}
+		}
+
+
+		///
+		/// Create shadow image
+		///
+		QImage* ModelImageObject::createShadowImage( const QColor& color ) const
+		{
+			int r = color.red();
+			int g = color.green();
+			int b = color.blue();
+			int a = color.alpha();
+		
+			QImage* shadow = new QImage( *mImage );
+			for ( int iy = 0; iy < shadow->height(); iy++ )
+			{
+				QRgb* scanLine = (QRgb*)shadow->scanLine( iy );
+		
+				for ( int ix = 0; ix < shadow->width(); ix++ )
 				{
-					mImage = new QImage( filename );
-					if ( mImage->isNull() )
-					{
-						mImage = nullptr;
-					}
-					else
-					{
-						// Adjust size based on aspect ratio of image
-						double imageW = mImage->width();
-						double imageH = mImage->height();
-						double aspectRatio = imageH / imageW;
-						if ( mH > mW*aspectRatio )
-						{
-							mH = mW*aspectRatio;
-						}
-						else
-						{
-							mW = mH/aspectRatio;
-						}
-					}
+					scanLine[ix] = qRgba( r, g, b, (a*qAlpha(scanLine[ix]))/255 );
 				}
 			}
-		}
-	}
 
-
-	///
-	/// Create shadow image
-	///
-	QImage* ModelImageObject::createShadowImage( const QColor& color ) const
-	{
-		int r = color.red();
-		int g = color.green();
-		int b = color.blue();
-		int a = color.alpha();
-		
-		QImage* shadow = new QImage( *mImage );
-		for ( int iy = 0; iy < shadow->height(); iy++ )
-		{
-			QRgb* scanLine = (QRgb*)shadow->scanLine( iy );
-		
-			for ( int ix = 0; ix < shadow->width(); ix++ )
-			{
-				scanLine[ix] = qRgba( r, g, b, (a*qAlpha(scanLine[ix]))/255 );
-			}
+			return shadow;
 		}
 
-		return shadow;
 	}
-
-} // namespace glabels::model
+}
diff --git a/model/ModelImageObject.h b/model/ModelImageObject.h
index 043fa3d..ba87078 100644
--- a/model/ModelImageObject.h
+++ b/model/ModelImageObject.h
@@ -27,134 +27,137 @@
 #include <QSvgRenderer>
 
 
-namespace glabels::model
+namespace glabels
 {
-
-	///
-	/// Label Model Image Object
-	///
-	class ModelImageObject : public ModelObject
+	namespace model
 	{
-		Q_OBJECT
 
-		///////////////////////////////////////////////////////////////
-		// Lifecycle Methods
-		///////////////////////////////////////////////////////////////
-	public:
-		ModelImageObject();
+		///
+		/// Label Model Image Object
+		///
+		class ModelImageObject : public ModelObject
+		{
+			Q_OBJECT
 
-		ModelImageObject( const Distance&  x0,
-		                  const Distance&  y0,
-		                  const Distance&  w,
-		                  const Distance&  h,
-		                  const TextNode&  filenameNode,
-		                  const QMatrix&   matrix = QMatrix(),
-		                  bool             shadowState = false,
-		                  const Distance&  shadowX = 0,
-		                  const Distance&  shadowY = 0,
-		                  double           shadowOpacity = 1.0,
-		                  const ColorNode& shadowColorNode = ColorNode() );
+			///////////////////////////////////////////////////////////////
+			// Lifecycle Methods
+			///////////////////////////////////////////////////////////////
+		public:
+			ModelImageObject();
 
-		ModelImageObject( const Distance&  x0,
-		                  const Distance&  y0,
-		                  const Distance&  w,
-		                  const Distance&  h,
-		                  const QString&   filename,
-		                  const QImage&    image,
-		                  const QMatrix&   matrix = QMatrix(),
-		                  bool             shadowState = false,
-		                  const Distance&  shadowX = 0,
-		                  const Distance&  shadowY = 0,
-		                  double           shadowOpacity = 1.0,
-		                  const ColorNode& shadowColorNode = ColorNode() );
+			ModelImageObject( const Distance&  x0,
+			                  const Distance&  y0,
+			                  const Distance&  w,
+			                  const Distance&  h,
+			                  const TextNode&  filenameNode,
+			                  const QMatrix&   matrix = QMatrix(),
+			                  bool             shadowState = false,
+			                  const Distance&  shadowX = 0,
+			                  const Distance&  shadowY = 0,
+			                  double           shadowOpacity = 1.0,
+			                  const ColorNode& shadowColorNode = ColorNode() );
 
-		ModelImageObject( const Distance&   x0,
-		                  const Distance&   y0,
-		                  const Distance&   w,
-		                  const Distance&   h,
-		                  const QString&    filename,
-		                  const QByteArray& svg,
-		                  const QMatrix&    matrix = QMatrix(),
-		                  bool              shadowState = false,
-		                  const Distance&   shadowX = 0,
-		                  const Distance&   shadowY = 0,
-		                  double            shadowOpacity = 1.0,
-		                  const ColorNode&  shadowColorNode = ColorNode() );
+			ModelImageObject( const Distance&  x0,
+			                  const Distance&  y0,
+			                  const Distance&  w,
+			                  const Distance&  h,
+			                  const QString&   filename,
+			                  const QImage&    image,
+			                  const QMatrix&   matrix = QMatrix(),
+			                  bool             shadowState = false,
+			                  const Distance&  shadowX = 0,
+			                  const Distance&  shadowY = 0,
+			                  double           shadowOpacity = 1.0,
+			                  const ColorNode& shadowColorNode = ColorNode() );
 
-		ModelImageObject( const ModelImageObject* object );
+			ModelImageObject( const Distance&   x0,
+			                  const Distance&   y0,
+			                  const Distance&   w,
+			                  const Distance&   h,
+			                  const QString&    filename,
+			                  const QByteArray& svg,
+			                  const QMatrix&    matrix = QMatrix(),
+			                  bool              shadowState = false,
+			                  const Distance&   shadowX = 0,
+			                  const Distance&   shadowY = 0,
+			                  double            shadowOpacity = 1.0,
+			                  const ColorNode&  shadowColorNode = ColorNode() );
+
+			ModelImageObject( const ModelImageObject* object );
 		
-		~ModelImageObject() override;
+			~ModelImageObject() override;
 
 
-		///////////////////////////////////////////////////////////////
-		// Object duplication
-		///////////////////////////////////////////////////////////////
-		ModelImageObject* clone() const override;
+			///////////////////////////////////////////////////////////////
+			// Object duplication
+			///////////////////////////////////////////////////////////////
+			ModelImageObject* clone() const override;
 
 
-		///////////////////////////////////////////////////////////////
-		// Property Implementations
-		///////////////////////////////////////////////////////////////
-	public:
-		//
-		// Image Property: filenameNode
-		//
-		TextNode filenameNode() const override;
-		void setFilenameNode( const TextNode& value ) override;
+			///////////////////////////////////////////////////////////////
+			// Property Implementations
+			///////////////////////////////////////////////////////////////
+		public:
+			//
+			// Image Property: filenameNode
+			//
+			TextNode filenameNode() const override;
+			void setFilenameNode( const TextNode& value ) override;
 
-		//
-		// Image Property: image
-		//
-		const QImage* image() const override;
-		void setImage( const QImage& value ) override;
-		void setImage( const QString& name, const QImage& value ) override;
+			//
+			// Image Property: image
+			//
+			const QImage* image() const override;
+			void setImage( const QImage& value ) override;
+			void setImage( const QString& name, const QImage& value ) override;
 
-		//
-		// Image Property: svg
-		//
-		QByteArray svg() const override;
-		void setSvg( const QString& name, const QByteArray& value ) override;
+			//
+			// Image Property: svg
+			//
+			QByteArray svg() const override;
+			void setSvg( const QString& name, const QByteArray& value ) override;
 
-		//
-		// Property: naturalSize
-		//
-		Size naturalSize() const override;
+			//
+			// Property: naturalSize
+			//
+			Size naturalSize() const override;
 	
 
-		///////////////////////////////////////////////////////////////
-		// Capability Implementations
-		///////////////////////////////////////////////////////////////
+			///////////////////////////////////////////////////////////////
+			// Capability Implementations
+			///////////////////////////////////////////////////////////////
 
 
-		///////////////////////////////////////////////////////////////
-		// Drawing operations
-		///////////////////////////////////////////////////////////////
-	protected:
-		void drawShadow( QPainter* painter, bool inEditor, merge::Record* record ) const override;
-		void drawObject( QPainter* painter, bool inEditor, merge::Record* record ) const override;
-		QPainterPath hoverPath( double scale ) const override;
+			///////////////////////////////////////////////////////////////
+			// Drawing operations
+			///////////////////////////////////////////////////////////////
+		protected:
+			void drawShadow( QPainter* painter, bool inEditor, merge::Record* record ) const override;
+			void drawObject( QPainter* painter, bool inEditor, merge::Record* record ) const override;
+			QPainterPath hoverPath( double scale ) const override;
 
 
-		///////////////////////////////////////////////////////////////
-		// Private
-		///////////////////////////////////////////////////////////////
-		void loadImage();
-		QImage* createShadowImage( const QColor& color ) const;
+			///////////////////////////////////////////////////////////////
+			// Private
+			///////////////////////////////////////////////////////////////
+			void loadImage();
+			QImage* createShadowImage( const QColor& color ) const;
 	
 
-		///////////////////////////////////////////////////////////////
-		// Private Members
-		///////////////////////////////////////////////////////////////
-	protected:
-		TextNode       mFilenameNode;
-		QImage*        mImage;
-		QSvgRenderer*  mSvgRenderer;
-		QByteArray     mSvg;
+			///////////////////////////////////////////////////////////////
+			// Private Members
+			///////////////////////////////////////////////////////////////
+		protected:
+			TextNode       mFilenameNode;
+			QImage*        mImage;
+			QSvgRenderer*  mSvgRenderer;
+			QByteArray     mSvg;
 
-		static QImage* smDefaultImage;
+			static QImage* smDefaultImage;
 
-	};
+		};
 
+	}
 }
 
 
diff --git a/model/ModelLineObject.cpp b/model/ModelLineObject.cpp
index 4a653f4..e1b4810 100644
--- a/model/ModelLineObject.cpp
+++ b/model/ModelLineObject.cpp
@@ -24,220 +24,223 @@
 #include <QPen>
 
 
-namespace glabels::model
+namespace glabels
 {
-
-	//
-	// Private
-	//
-	namespace
+	namespace model
 	{
-		const double slopPixels = 2;
-	}
+
+		//
+		// Private
+		//
+		namespace
+		{
+			const double slopPixels = 2;
+		}
 
 
-	///
-	/// Constructor
-	///
-	ModelLineObject::ModelLineObject()
-	{
-		mOutline = nullptr;
+		///
+		/// Constructor
+		///
+		ModelLineObject::ModelLineObject()
+		{
+			mOutline = nullptr;
 
-		mHandles << new HandleP1( this );
-		mHandles << new HandleP2( this );
+			mHandles << new HandleP1( this );
+			mHandles << new HandleP2( this );
 
-		mLineWidth       = 1.0;
-		mLineColorNode   = ColorNode( QColor( 0, 0, 0 ) );
-	}
+			mLineWidth       = 1.0;
+			mLineColorNode   = ColorNode( QColor( 0, 0, 0 ) );
+		}
 
 
-	///
-	/// Constructor
-	///
-	ModelLineObject::ModelLineObject( const Distance&  x0,
-	                                  const Distance&  y0,
-	                                  const Distance&  dx,
-	                                  const Distance&  dy,
-	                                  const Distance&  lineWidth,
-	                                  const ColorNode& lineColorNode,
-	                                  const QMatrix&   matrix,
-	                                  bool             shadowState,
-	                                  const Distance&  shadowX,
-	                                  const Distance&  shadowY,
-	                                  double           shadowOpacity,
-	                                  const ColorNode& shadowColorNode )
-	: ModelObject( x0, y0, dx, dy,
-	               matrix,
-	               shadowState, shadowX, shadowY, shadowOpacity, shadowColorNode )
-	{
-		mOutline = new Outline( this );
+		///
+		/// Constructor
+		///
+		ModelLineObject::ModelLineObject( const Distance&  x0,
+		                                  const Distance&  y0,
+		                                  const Distance&  dx,
+		                                  const Distance&  dy,
+		                                  const Distance&  lineWidth,
+		                                  const ColorNode& lineColorNode,
+		                                  const QMatrix&   matrix,
+		                                  bool             shadowState,
+		                                  const Distance&  shadowX,
+		                                  const Distance&  shadowY,
+		                                  double           shadowOpacity,
+		                                  const ColorNode& shadowColorNode )
+		: ModelObject( x0, y0, dx, dy,
+		               matrix,
+		               shadowState, shadowX, shadowY, shadowOpacity, shadowColorNode )
+		{
+			mOutline = new Outline( this );
 
-		mHandles << new HandleNorthWest( this );
-		mHandles << new HandleNorth( this );
-		mHandles << new HandleNorthEast( this );
-		mHandles << new HandleEast( this );
-		mHandles << new HandleSouthEast( this );
-		mHandles << new HandleSouth( this );
-		mHandles << new HandleSouthWest( this );
-		mHandles << new HandleWest( this );
+			mHandles << new HandleNorthWest( this );
+			mHandles << new HandleNorth( this );
+			mHandles << new HandleNorthEast( this );
+			mHandles << new HandleEast( this );
+			mHandles << new HandleSouthEast( this );
+			mHandles << new HandleSouth( this );
+			mHandles << new HandleSouthWest( this );
+			mHandles << new HandleWest( this );
 
-		mLineWidth       = lineWidth;
-		mLineColorNode   = lineColorNode;
-	}
+			mLineWidth       = lineWidth;
+			mLineColorNode   = lineColorNode;
+		}
 
 	
-	///
-	/// Copy constructor
-	///
-	ModelLineObject::ModelLineObject( const ModelLineObject* object )
-		: ModelObject(object)
-	{
-		mLineWidth       = object->mLineWidth;
-		mLineColorNode   = object->mLineColorNode;
-	}
-
-
-	///
-	/// Destructor
-	///
-	ModelLineObject::~ModelLineObject()
-	{
-		foreach( Handle* handle, mHandles )
+		///
+		/// Copy constructor
+		///
+		ModelLineObject::ModelLineObject( const ModelLineObject* object )
+			: ModelObject(object)
 		{
-			delete handle;
+			mLineWidth       = object->mLineWidth;
+			mLineColorNode   = object->mLineColorNode;
 		}
-		mHandles.clear();
-	}
 
 
-	///
-	/// Clone
-	///
-	ModelLineObject* ModelLineObject::clone() const
-	{
-		return new ModelLineObject( this );
-	}
-
-
-	///
-	/// Line Width Property Getter
-	///
-	Distance ModelLineObject::lineWidth() const
-	{
-		return mLineWidth;
-	}
-
-
-	///
-	/// Line Width Property Setter
-	///
-	void ModelLineObject::setLineWidth( const Distance& value )
-	{
-		if ( mLineWidth != value )
+		///
+		/// Destructor
+		///
+		ModelLineObject::~ModelLineObject()
 		{
-			mLineWidth = value;
-			emit changed();
+			foreach( Handle* handle, mHandles )
+			{
+				delete handle;
+			}
+			mHandles.clear();
 		}
-	}
 
 
-	///
-	/// Line Color Node Property Getter
-	///
-	ColorNode ModelLineObject::lineColorNode() const
-	{
-		return mLineColorNode;
-	}
-
-
-	///
-	/// Line Color Node Property Setter
-	///
-	void ModelLineObject::setLineColorNode( const ColorNode& value )
-	{
-		if ( mLineColorNode != value )
+		///
+		/// Clone
+		///
+		ModelLineObject* ModelLineObject::clone() const
 		{
-			mLineColorNode = value;
-			emit changed();
+			return new ModelLineObject( this );
+		}
+
+
+		///
+		/// Line Width Property Getter
+		///
+		Distance ModelLineObject::lineWidth() const
+		{
+			return mLineWidth;
+		}
+
+
+		///
+		/// Line Width Property Setter
+		///
+		void ModelLineObject::setLineWidth( const Distance& value )
+		{
+			if ( mLineWidth != value )
+			{
+				mLineWidth = value;
+				emit changed();
+			}
+		}
+
+
+		///
+		/// Line Color Node Property Getter
+		///
+		ColorNode ModelLineObject::lineColorNode() const
+		{
+			return mLineColorNode;
+		}
+
+
+		///
+		/// Line Color Node Property Setter
+		///
+		void ModelLineObject::setLineColorNode( const ColorNode& value )
+		{
+			if ( mLineColorNode != value )
+			{
+				mLineColorNode = value;
+				emit changed();
+			}
 		}
-	}
 		
 
-	///
-	/// Can Line Color Capability Implementation
-	///
-	bool ModelLineObject::canLineColor()
-	{
-		return true;
-	}
-
-
-	///
-	/// Can Line Width Capability Implementation
-	///
-	bool ModelLineObject::canLineWidth()
-	{
-		return true;
-	}
-
-
-	///
-	/// Draw shadow of object
-	///
-	void ModelLineObject::drawShadow( QPainter* painter, bool inEditor, merge::Record* record ) const
-	{
-		QColor lineColor = mLineColorNode.color( record );
-		QColor shadowColor = mShadowColorNode.color( record );
-
-		shadowColor.setAlphaF( mShadowOpacity );
-
-		if ( lineColor.alpha() )
+		///
+		/// Can Line Color Capability Implementation
+		///
+		bool ModelLineObject::canLineColor()
 		{
-			painter->setPen( QPen( shadowColor, mLineWidth.pt() ) );
+			return true;
+		}
+
+
+		///
+		/// Can Line Width Capability Implementation
+		///
+		bool ModelLineObject::canLineWidth()
+		{
+			return true;
+		}
+
+
+		///
+		/// Draw shadow of object
+		///
+		void ModelLineObject::drawShadow( QPainter* painter, bool inEditor, merge::Record* record ) const
+		{
+			QColor lineColor = mLineColorNode.color( record );
+			QColor shadowColor = mShadowColorNode.color( record );
+
+			shadowColor.setAlphaF( mShadowOpacity );
+
+			if ( lineColor.alpha() )
+			{
+				painter->setPen( QPen( shadowColor, mLineWidth.pt() ) );
+				painter->drawLine( 0, 0, mW.pt(), mH.pt() );
+			}
+		}
+
+	
+		///
+		/// Draw object itself
+		///
+		void ModelLineObject::drawObject( QPainter* painter, bool inEditor, merge::Record* record ) const
+		{
+			QColor lineColor = mLineColorNode.color( record );
+
+			painter->setPen( QPen( lineColor, mLineWidth.pt() ) );
 			painter->drawLine( 0, 0, mW.pt(), mH.pt() );
 		}
-	}
-
-	
-	///
-	/// Draw object itself
-	///
-	void ModelLineObject::drawObject( QPainter* painter, bool inEditor, merge::Record* record ) const
-	{
-		QColor lineColor = mLineColorNode.color( record );
-
-		painter->setPen( QPen( lineColor, mLineWidth.pt() ) );
-		painter->drawLine( 0, 0, mW.pt(), mH.pt() );
-	}
 
 
-	///
-	/// Path to test for hover condition
-	///
-	QPainterPath ModelLineObject::hoverPath( double scale ) const
-	{
-		QPainterPath path;
-
-		if ( mLineColorNode.color().alpha() )
+		///
+		/// Path to test for hover condition
+		///
+		QPainterPath ModelLineObject::hoverPath( double scale ) const
 		{
-			//
-			// Build a thin rectangle representing line
-			//
-			double rPts = mLineWidth.pt()/2 + slopPixels / scale;
+			QPainterPath path;
 
-			double lengthPts = sqrt( mW.pt()*mW.pt() + mH.pt()*mH.pt() );
-			double dx = mH.pt() / lengthPts; // horizontal pitch of perpendicular line
-			double dy = mW.pt() / lengthPts; // vertical pitch of perpendicular line
+			if ( mLineColorNode.color().alpha() )
+			{
+				//
+				// Build a thin rectangle representing line
+				//
+				double rPts = mLineWidth.pt()/2 + slopPixels / scale;
+
+				double lengthPts = sqrt( mW.pt()*mW.pt() + mH.pt()*mH.pt() );
+				double dx = mH.pt() / lengthPts; // horizontal pitch of perpendicular line
+				double dy = mW.pt() / lengthPts; // vertical pitch of perpendicular line
 	
-			path.moveTo(           rPts*dx,         - rPts*dy );
-			path.lineTo( mW.pt() + rPts*dx, mH.pt() - rPts*dy );
-			path.lineTo( mW.pt() - rPts*dx, mH.pt() + rPts*dy );
-			path.lineTo(         - rPts*dx,           rPts*dy );
+				path.moveTo(           rPts*dx,         - rPts*dy );
+				path.lineTo( mW.pt() + rPts*dx, mH.pt() - rPts*dy );
+				path.lineTo( mW.pt() - rPts*dx, mH.pt() + rPts*dy );
+				path.lineTo(         - rPts*dx,           rPts*dy );
 		
-			path.closeSubpath();
+				path.closeSubpath();
+			}
+
+			return path;
 		}
 
-		return path;
 	}
-
-} // namespace glabels::model
+}
diff --git a/model/ModelLineObject.h b/model/ModelLineObject.h
index 1b75301..bfe3877 100644
--- a/model/ModelLineObject.h
+++ b/model/ModelLineObject.h
@@ -25,90 +25,93 @@
 #include "ModelObject.h"
 
 
-namespace glabels::model
+namespace glabels
 {
-
-	///
-	/// Label Model Line Object
-	///
-	class ModelLineObject : public ModelObject
+	namespace model
 	{
-		Q_OBJECT
 
-		///////////////////////////////////////////////////////////////
-		// Lifecycle Methods
-		///////////////////////////////////////////////////////////////
-	public:
-		ModelLineObject();
+		///
+		/// Label Model Line Object
+		///
+		class ModelLineObject : public ModelObject
+		{
+			Q_OBJECT
 
-		ModelLineObject( const Distance&  x0,
-		                 const Distance&  y0,
-		                 const Distance&  w,
-		                 const Distance&  h,
-		                 const Distance&  lineWidth,
-		                 const ColorNode& lineColorNode,
-		                 const QMatrix&   matrix = QMatrix(),
-		                 bool             shadowState = false,
-		                 const Distance&  shadowX = 0,
-		                 const Distance&  shadowY = 0,
-		                 double           shadowOpacity = 1.0,
-		                 const ColorNode& shadowColorNode = ColorNode() );
+			///////////////////////////////////////////////////////////////
+			// Lifecycle Methods
+			///////////////////////////////////////////////////////////////
+		public:
+			ModelLineObject();
 
-		ModelLineObject( const ModelLineObject* object );
+			ModelLineObject( const Distance&  x0,
+			                 const Distance&  y0,
+			                 const Distance&  w,
+			                 const Distance&  h,
+			                 const Distance&  lineWidth,
+			                 const ColorNode& lineColorNode,
+			                 const QMatrix&   matrix = QMatrix(),
+			                 bool             shadowState = false,
+			                 const Distance&  shadowX = 0,
+			                 const Distance&  shadowY = 0,
+			                 double           shadowOpacity = 1.0,
+			                 const ColorNode& shadowColorNode = ColorNode() );
+
+			ModelLineObject( const ModelLineObject* object );
 		
-		~ModelLineObject() override;
+			~ModelLineObject() override;
 
 
-		///////////////////////////////////////////////////////////////
-		// Object duplication
-		///////////////////////////////////////////////////////////////
-		ModelLineObject* clone() const override;
+			///////////////////////////////////////////////////////////////
+			// Object duplication
+			///////////////////////////////////////////////////////////////
+			ModelLineObject* clone() const override;
 
 
-		///////////////////////////////////////////////////////////////
-		// Property Implementations
-		///////////////////////////////////////////////////////////////
-	public:
-		//
-		// Line Property: lineWidth
-		//
-		Distance lineWidth() const override;
-		void setLineWidth( const Distance& value ) override;
+			///////////////////////////////////////////////////////////////
+			// Property Implementations
+			///////////////////////////////////////////////////////////////
+		public:
+			//
+			// Line Property: lineWidth
+			//
+			Distance lineWidth() const override;
+			void setLineWidth( const Distance& value ) override;
 
 
-		//
-		// Line Property: lineColorNode
-		//
-		ColorNode lineColorNode() const override;
-		void setLineColorNode( const ColorNode& value ) override;
+			//
+			// Line Property: lineColorNode
+			//
+			ColorNode lineColorNode() const override;
+			void setLineColorNode( const ColorNode& value ) override;
 		
 
-		///////////////////////////////////////////////////////////////
-		// Capability Implementations
-		///////////////////////////////////////////////////////////////
-	public:
-		virtual bool canLineColor();
-		virtual bool canLineWidth();
+			///////////////////////////////////////////////////////////////
+			// Capability Implementations
+			///////////////////////////////////////////////////////////////
+		public:
+			virtual bool canLineColor();
+			virtual bool canLineWidth();
 
 
-		///////////////////////////////////////////////////////////////
-		// Drawing operations
-		///////////////////////////////////////////////////////////////
-	protected:
-		void drawShadow( QPainter* painter, bool inEditor, merge::Record* record ) const override;
-		void drawObject( QPainter* painter, bool inEditor, merge::Record* record ) const override;
-		QPainterPath hoverPath( double scale ) const override;
+			///////////////////////////////////////////////////////////////
+			// Drawing operations
+			///////////////////////////////////////////////////////////////
+		protected:
+			void drawShadow( QPainter* painter, bool inEditor, merge::Record* record ) const override;
+			void drawObject( QPainter* painter, bool inEditor, merge::Record* record ) const override;
+			QPainterPath hoverPath( double scale ) const override;
 
 
-		///////////////////////////////////////////////////////////////
-		// Private Members
-		///////////////////////////////////////////////////////////////
-	protected:
-		Distance    mLineWidth;
-		ColorNode   mLineColorNode;
+			///////////////////////////////////////////////////////////////
+			// Private Members
+			///////////////////////////////////////////////////////////////
+		protected:
+			Distance    mLineWidth;
+			ColorNode   mLineColorNode;
 
-	};
+		};
 
+	}
 }
 
 
diff --git a/model/ModelObject.cpp b/model/ModelObject.cpp
index 449d800..11907d5 100644
--- a/model/ModelObject.cpp
+++ b/model/ModelObject.cpp
@@ -29,979 +29,927 @@
 #include <QtDebug>
 
 
-namespace glabels::model
+namespace glabels
 {
-
-	///
-	/// Next Object ID
-	///
-	int ModelObject::msNextId = 0;
-
-
-	///
-	/// Constructor
-	///
-	ModelObject::ModelObject() : QObject(nullptr)
+	namespace model
 	{
-		mId = msNextId++;
 
-		mX0 = 0;
-		mY0 = 0;
-		mW  = 0;
-		mH  = 0;
-		mMatrix = QMatrix();
-
-		mShadowState     = false;
-		mShadowX         = 1.3;
-		mShadowY         = 1.3;
-		mShadowColorNode = ColorNode( QColor( 0, 0, 0 ) );
-		mShadowOpacity   = 0.5;
-
-		mSelectedFlag = false;
-
-		mOutline = nullptr;
-	}
+		///
+		/// Next Object ID
+		///
+		int ModelObject::msNextId = 0;
 
 
-	///
-	/// Constructor
-	///
-	ModelObject::ModelObject( const Distance&  x0,
-	                          const Distance&  y0,
-	                          const Distance&  w,
-	                          const Distance&  h,
-	                          const QMatrix&   matrix,
-	                          bool             shadowState,
-	                          const Distance&  shadowX,
-	                          const Distance&  shadowY,
-	                          double           shadowOpacity,
-	                          const ColorNode& shadowColorNode ) : QObject(nullptr)
-	{
-		mId = msNextId++;
-
-		mX0 = x0;
-		mY0 = y0;
-		mW  = w;
-		mH  = h;
-		mMatrix = matrix;
-
-		mShadowState     = shadowState;
-		mShadowX         = shadowX;
-		mShadowY         = shadowY;
-		mShadowColorNode = shadowColorNode;
-		mShadowOpacity   = shadowOpacity;
-
-		mSelectedFlag = false;
-
-		mOutline = nullptr;
-	}
-	
-		
-	///
-	/// Copy constructor
-	///
-	ModelObject::ModelObject( const ModelObject* object )
-	{
-		mId = msNextId++;
-
-		mSelectedFlag    = object->mSelectedFlag;
-
-		mX0              = object->mX0;
-		mY0              = object->mY0;
-		mW               = object->mW;
-		mH               = object->mH;
-
-		mShadowState     = object->mShadowState;
-		mShadowX         = object->mShadowX;
-		mShadowY         = object->mShadowY;
-		mShadowOpacity   = object->mShadowOpacity;
-		mShadowColorNode = object->mShadowColorNode;
-
-		foreach ( Handle* handle, object->mHandles )
-		{
-			mHandles.append( handle->clone( this ) );
-		}
-	
-		if ( object->mOutline )
-		{
-			mOutline = object->mOutline->clone( this );
-		}
-		else
+		///
+		/// Constructor
+		///
+		ModelObject::ModelObject() : QObject(nullptr)
 		{
+			mId = msNextId++;
+
+			mX0 = 0;
+			mY0 = 0;
+			mW  = 0;
+			mH  = 0;
+			mMatrix = QMatrix();
+
+			mShadowState     = false;
+			mShadowX         = 1.3;
+			mShadowY         = 1.3;
+			mShadowColorNode = ColorNode( QColor( 0, 0, 0 ) );
+			mShadowOpacity   = 0.5;
+
+			mSelectedFlag = false;
+
 			mOutline = nullptr;
 		}
 
-		mMatrix          = object->mMatrix;
-	}
 
-
-	///
-	/// Destructor
-	///
-	ModelObject::~ModelObject()
-	{
-		// empty
-	}
-
-
-	///
-	/// ID Property Getter
-	///
-	int ModelObject::id() const
-	{
-		return mId;
-	}
-
-
-	///
-	/// Selected Property Getter
-	///
-	bool ModelObject::isSelected() const
-	{
-		return mSelectedFlag;
-	}
-
-
-	///
-	/// Selected Property Setter
-	///
-	void ModelObject::select( bool value )
-	{
-		mSelectedFlag = value;
-	}
-
-
-	///
-	/// Clear Selected Property Setter
-	///
-	void ModelObject::unselect()
-	{
-		mSelectedFlag = false;
-	}
-
-
-	///
-	/// X0 Property Getter
-	///
-	Distance ModelObject::x0() const
-	{
-		return mX0;
-	}
-
-
-	///
-	/// X0 Property Setter
-	///
-	void ModelObject::setX0( const Distance& value )
-	{
-		if ( mX0 != value )
+		///
+		/// Constructor
+		///
+		ModelObject::ModelObject( const Distance&  x0,
+		                          const Distance&  y0,
+		                          const Distance&  w,
+		                          const Distance&  h,
+		                          const QMatrix&   matrix,
+		                          bool             shadowState,
+		                          const Distance&  shadowX,
+		                          const Distance&  shadowY,
+		                          double           shadowOpacity,
+		                          const ColorNode& shadowColorNode ) : QObject(nullptr)
 		{
-			mX0 = value;
-			emit moved();
-		}
-	}
-		
+			mId = msNextId++;
 
-	///
-	/// Y0 Property Getter
-	///
-	Distance ModelObject::y0() const
-	{
-		return mY0;
-	}
-
-
-	///
-	/// Y0 Property Setter
-	///
-	void ModelObject::setY0( const Distance& value )
-	{
-		if ( mY0 != value )
-		{
-			mY0 = value;
-			emit moved();
-		}
-	}
-		
-
-	///
-	/// W (Width) Property Getter
-	///
-	Distance ModelObject::w() const
-	{
-		return mW;
-	}
-
-
-	///
-	/// W (Width) Property Setter
-	///
-	void ModelObject::setW( const Distance& value )
-	{
-		if ( mW != value )
-		{
-			mW = value;
-			sizeUpdated();
-			emit changed();
-		}
-	}
-		
-
-	///
-	/// H (Height) Property Getter
-	///
-	Distance ModelObject::h() const
-	{
-		return mH;
-	}
-
-
-	///
-	/// H (Height) Property Setter
-	///
-	void ModelObject::setH( const Distance& value )
-	{
-		if ( mH != value )
-		{
-			mH = value;
-			sizeUpdated();
-			emit changed();
-		}
-	}
-
-
-	///
-	/// Matrix Property Getter
-	///
-	QMatrix ModelObject::matrix() const
-	{
-		return mMatrix;
-	}
-
-
-	///
-	/// Matrix Property Setter
-	///
-	void ModelObject::setMatrix( const QMatrix& value )
-	{
-		if ( mMatrix != value )
-		{
-			mMatrix = value;
-			emit changed();
-		}
-	}
-
-
-	///
-	/// Shadow State Property Getter
-	///
-	bool ModelObject::shadow() const
-	{
-		return mShadowState;
-	}
-
-
-	///
-	/// Shadow State Property Setter
-	///
-	void ModelObject::setShadow( bool value )
-	{
-		if ( mShadowState != value )
-		{
-			mShadowState = value;
-			emit changed();
-		}
-	}
-
-
-	///
-	/// Shadow X Property Getter
-	///
-	Distance ModelObject::shadowX() const
-	{
-		return mShadowX;
-	}
-
-
-	///
-	/// Shadow X Property Setter
-	///
-	void ModelObject::setShadowX( const Distance& value )
-	{
-		if ( mShadowX != value )
-		{
-			mShadowX = value;
-			emit changed();
-		}
-	}
-		
-
-	///
-	/// Shadow Y Property Getter
-	///
-	Distance ModelObject::shadowY() const
-	{
-		return mShadowY;
-	}
-
-
-	///
-	/// Shadow Y Property Setter
-	///
-	void ModelObject::setShadowY( const Distance& value )
-	{
-		if ( mShadowY != value )
-		{
-			mShadowY = value;
-			emit changed();
-		}
-	}
-		
-
-	///
-	/// Shadow Opacity Property Getter
-	///
-	double ModelObject::shadowOpacity() const
-	{
-		return mShadowOpacity;
-	}
-
-
-	///
-	/// Shadow Opacity Property Setter
-	///
-	void ModelObject::setShadowOpacity( double value )
-	{
-		if ( mShadowOpacity != value )
-		{
-			mShadowOpacity = value;
-			emit changed();
-		}
-	}
-		
-
-	///
-	/// Shadow Color Node Property Getter
-	///
-	ColorNode ModelObject::shadowColorNode() const
-	{
-		return mShadowColorNode;
-	}
-
-
-	///
-	/// Shadow Color Node Property Setter
-	///
-	void ModelObject::setShadowColorNode( const ColorNode& value )
-	{
-		if ( mShadowColorNode != value )
-		{
-			mShadowColorNode = value;
-			emit changed();
-		}
-	}
-		
-
-	///
-	/// Virtual Natural Size Property Default Getter
-	/// (Overridden by concrete class)
-	///
-	Size ModelObject::naturalSize() const
-	{
-		return Size( Distance::pt(0), Distance::pt(0) );
-	}
-
-
-	///
-	/// Virtual Text Property Default Getter
-	/// (Overridden by concrete class)
-	///
-	QString ModelObject::text() const
-	{
-		return "";
-	}
-
-
-	///
-	/// Virtual Text Property Default Setter
-	/// (Overridden by concrete class)
-	///
-	void ModelObject::setText( const QString& value )
-	{
-		// empty
-	}
-
-
-	///
-	/// Virtual Font Family Property Default Getter
-	/// (Overridden by concrete class)
-	///
-	QString ModelObject::fontFamily() const
-	{
-		return "";
-	}
-
-
-	///
-	/// Virtual Font Family Property Default Setter
-	/// (Overridden by concrete class)
-	///
-	void ModelObject::setFontFamily( const QString& value )
-	{
-		// empty
-	}
-
-
-	///
-	/// Virtual Font Size Property Default Getter
-	/// (Overridden by concrete class)
-	///
-	double ModelObject::fontSize() const
-	{
-		return 0;
-	}
-
-
-	///
-	/// Virtual Font Size Property Default Setter
-	/// (Overridden by concrete class)
-	///
-	void ModelObject::setFontSize( double value )
-	{
-		// empty
-	}
-
-
-	///
-	/// Virtual Font Weight Property Default Getter
-	/// (Overridden by concrete class)
-	///
-	QFont::Weight ModelObject::fontWeight() const
-	{
-		return QFont::Normal;
-	}
-
-
-	///
-	/// Virtual Font Weight Property Default Setter
-	/// (Overridden by concrete class)
-	///
-	void ModelObject::setFontWeight( QFont::Weight value )
-	{
-		// empty
-	}
-
-
-	///
-	/// Virtual Font Italic Flag Property Default Getter
-	/// (Overridden by concrete class)
-	///
-	bool ModelObject::fontItalicFlag() const
-	{
-		return false;
-	}
-
-
-	///
-	/// Virtual Font Italic Flag Property Default Setter
-	/// (Overridden by concrete class)
-	///
-	void ModelObject::setFontItalicFlag( bool value )
-	{
-		// empty
-	}
-
-
-	///
-	/// Virtual Font Underline Flag Property Default Getter
-	/// (Overridden by concrete class)
-	///
-	bool ModelObject::fontUnderlineFlag() const
-	{
-		return false;
-	}
-
-
-	///
-	/// Virtual Font Underline Flag Property Default Setter
-	/// (Overridden by concrete class)
-	///
-	void ModelObject::setFontUnderlineFlag( bool value )
-	{
-		// empty
-	}
-
-
-	///
-	/// Virtual Text Color Node Property Default Getter
-	/// (Overridden by concrete class)
-	///
-	ColorNode ModelObject::textColorNode() const
-	{
-		return ColorNode( QColor::fromRgba(0x00000000) );
-	}
-
-
-	///
-	/// Virtual Text Color Node Property Default Setter
-	/// (Overridden by concrete class)
-	///
-	void ModelObject::setTextColorNode( const ColorNode &value )
-	{
-		// empty
-	}
-		
-
-	///
-	/// Virtual Text Horizontal Alignment Property Default Getter
-	/// (Overridden by concrete class)
-	///
-	Qt::Alignment ModelObject::textHAlign() const
-	{
-		return Qt::AlignLeft;
-	}
-
-
-	///
-	/// Virtual Text Horizontal Alignment Property Default Setter
-	/// (Overridden by concrete class)
-	///
-	void ModelObject::setTextHAlign( Qt::Alignment value )
-	{
-		// empty
-	}
-
-
-	///
-	/// Virtual Text Vertical Alignment Property Default Getter
-	/// (Overridden by concrete class)
-	///
-	Qt::Alignment ModelObject::textVAlign() const
-	{
-		return Qt::AlignTop;
-	}
-
-
-	///
-	/// Virtual Text Vertical Alignment Property Default Setter
-	/// (Overridden by concrete class)
-	///
-	void ModelObject::setTextVAlign( Qt::Alignment value )
-	{
-		// empty
-	}
-
-
-	///
-	/// Virtual Text Line Spacing Property Default Getter
-	/// (Overridden by concrete class)
-	///
-	double ModelObject::textLineSpacing() const
-	{
-		return 0;
-	}
-
-
-	///
-	/// Virtual Text Line Spacing Property Default Setter
-	/// (Overridden by concrete class)
-	///
-	void ModelObject::setTextLineSpacing( double value )
-	{
-		// empty
-	}
-
-
-	///
-	/// Virtual Filename Node Property Default Getter
-	/// (Overridden by concrete class)
-	///
-	TextNode ModelObject::filenameNode() const
-	{
-		return TextNode();
-	}
-
-
-	///
-	/// Virtual Filename Node Property Default Setter
-	/// (Overridden by concrete class)
-	///
-	void ModelObject::setFilenameNode( const TextNode& value )
-	{
-		// empty
-	}
-		
-
-	///
-	/// Virtual Image Property Default Getter
-	/// (Overridden by concrete class)
-	///
-	const QImage* ModelObject::image() const
-	{
-		return nullptr;
-	}
-
-
-	///
-	/// Virtual Image Property Default Setter
-	/// (Overridden by concrete class)
-	///
-	void ModelObject::setImage( const QImage& value )
-	{
-		// empty
-	}
-		
-
-	///
-	/// Virtual Image Property Default Setter
-	/// (Overridden by concrete class)
-	///
-	void ModelObject::setImage( const QString& name, const QImage& value )
-	{
-		// empty
-	}
-		
-
-	///
-	/// Virtual SVG Property Default Getter
-	/// (Overridden by concrete class)
-	///
-	QByteArray ModelObject::svg() const
-	{
-		return QByteArray();
-	}
-
-
-	///
-	/// Virtual SVG Property Default Setter
-	/// (Overridden by concrete class)
-	///
-	void ModelObject::setSvg( const QString& name, const QByteArray& value )
-	{
-		// empty
-	}
-		
-
-	///
-	/// Virtual Line Width Property Default Getter
-	/// (Overridden by concrete class)
-	///
-	Distance ModelObject::lineWidth() const
-	{
-		return 0;
-	}
-
-
-	///
-	/// Virtual Line Width Property Default Setter
-	/// (Overridden by concrete class)
-	///
-	void ModelObject::setLineWidth( const Distance& value )
-	{
-		// empty
-	}
-
-
-	///
-	/// Virtual Line Color Node Property Default Getter
-	/// (Overridden by concrete class)
-	///
-	ColorNode ModelObject::lineColorNode() const
-	{
-		return ColorNode( QColor::fromRgba(0x00000000) );
-	}
-
-
-	///
-	/// Virtual Line Color Node Property Default Setter
-	/// (Overridden by concrete class)
-	///
-	void ModelObject::setLineColorNode( const ColorNode &value )
-	{
-		// empty
-	}
-		
-
-	///
-	/// Virtual Fill Color Node Property Default Getter
-	/// (Overridden by concrete class)
-	///
-	ColorNode ModelObject::fillColorNode() const
-	{
-		return ColorNode( QColor::fromRgba(0x00000000) );
-	}
-
-
-	///
-	/// Virtual Fill Color Node Property Default Setter
-	/// (Overridden by concrete class)
-	///
-	void ModelObject::setFillColorNode( const ColorNode &value )
-	{
-		// empty
-	}
-		
-
-	///
-	/// Virtual Barcode Data Property Default Getter
-	/// (Overridden by concrete class)
-	///
-	QString ModelObject::bcData() const
-	{
-		return QString();
-	}
-
-
-	///
-	/// Virtual Barcode Data Node Property Default Setter
-	/// (Overridden by concrete class)
-	///
-	void ModelObject::setBcData( const QString& value )
-	{
-		// empty
-	}
-		
-
-	///
-	/// Virtual Barcode Text Flag Property Default Getter
-	/// (Overridden by concrete class)
-	///
-	bool ModelObject::bcTextFlag() const
-	{
-		return false;
-	}
-
-
-	///
-	/// Virtual Barcode Text Flag Property Default Setter
-	/// (Overridden by concrete class)
-	///
-	void ModelObject::setBcTextFlag( bool value )
-	{
-		// empty
-	}
-
-
-	///
-	/// Virtual Barcode Checksum Flag Property Default Getter
-	/// (Overridden by concrete class)
-	///
-	bool ModelObject::bcChecksumFlag() const
-	{
-		return false;
-	}
-
-
-	///
-	/// Virtual Barcode Checksum Flag Property Default Setter
-	/// (Overridden by concrete class)
-	///
-	void ModelObject::setBcChecksumFlag( bool value )
-	{
-		// empty
-	}
-
-
-	///
-	/// Virtual Barcode Color Node Property Default Getter
-	/// (Overridden by concrete class)
-	///
-	ColorNode ModelObject::bcColorNode() const
-	{
-		return ColorNode( QColor::fromRgba(0x00000000) );
-	}
-
-
-	///
-	/// Virtual Barcode Color Node Property Default Setter
-	/// (Overridden by concrete class)
-	///
-	void ModelObject::setBcColorNode( const ColorNode &value )
-	{
-		// empty
-	}
-		
-
-	///
-	/// Virtual Barcode Style Property Default Getter
-	/// (Overridden by concrete class)
-	///
-	barcode::Style ModelObject::bcStyle() const
-	{
-		return barcode::Style();
-	}
-
-
-	///
-	/// Virtual Barcode Style Property Default Setter
-	/// (Overridden by concrete class)
-	///
-	void ModelObject::setBcStyle( const barcode::Style &value )
-	{
-		// empty
-	}
-		
-
-	///
-	/// Virtual Barcode Format Digits Property Default Getter
-	/// (Overridden by concrete class)
-	///
-	int ModelObject::bcFormatDigits() const
-	{
-		return 0;
-	}
-
-
-	///
-	/// Virtual Barcode Format Digits Property Default Setter
-	/// (Overridden by concrete class)
-	///
-	void ModelObject::setBcFormatDigits( int value )
-	{
-		// empty
-	}
-
-
-	///
-	/// Virtual Can Text Capability Read-Only Property Default Getter
-	/// (Overridden by concrete class)
-	///
-	bool ModelObject::canText() const
-	{
-		return false;
-	}
-
-
-	///
-	/// Virtual Can Fill Capability Read-Only Property Default Getter
-	/// (Overridden by concrete class)
-	///
-	bool ModelObject::canFill() const
-	{
-		return false;
-	}
-
-
-	///
-	/// Virtual Can Line Color Capability Read-Only Property Default Getter
-	/// (Overridden by concrete class)
-	///
-	bool ModelObject::canLineColor() const
-	{ 
-		return false;
-	}
-
-
-	///
-	/// Virtual Can Line Width Capability Read-Only Property Default Getter
-	/// (Overridden by concrete class)
-	///
-	bool ModelObject::canLineWidth() const
-	{
-		return false;
-	}
-
-
-	///
-	/// Set Absolute Position
-	///
-	void ModelObject::setPosition( const Distance& x0,
-	                               const Distance& y0 )
-	{
-		if ( ( mX0 != x0 ) || ( mY0 != y0 ) )
-		{
 			mX0 = x0;
 			mY0 = y0;
+			mW  = w;
+			mH  = h;
+			mMatrix = matrix;
 
-			emit moved();
+			mShadowState     = shadowState;
+			mShadowX         = shadowX;
+			mShadowY         = shadowY;
+			mShadowColorNode = shadowColorNode;
+			mShadowOpacity   = shadowOpacity;
+
+			mSelectedFlag = false;
+
+			mOutline = nullptr;
 		}
-	}
-
-
-	///
-	/// Set Relative Position
-	///
-	void ModelObject::setPositionRelative( const Distance& dx,
-	                                       const Distance& dy )
-	{
-		if ( ( dx != 0 ) || ( dy != 0 ) )
-		{
-			mX0 += dx;
-			mY0 += dy;
-
-			emit moved();
-		}
-	}
-
-
-	///
-	/// Get Size
-	///
-	Size ModelObject::size() const
-	{
-		return Size( mW, mH );
-	}
-
-
-	///
-	/// Set Size
-	///
-	void ModelObject::setSize( const Distance& w,
-	                           const Distance& h )
-	{
-		mW = w;
-		mH = h;
-
-		sizeUpdated();
-		emit changed();
-	}
-
-
-	///
-	/// Set Size
-	///
-	void ModelObject::setSize( const Size& size )
-	{
-		mW = size.w();
-		mH = size.h();
-
-		sizeUpdated();
-		emit changed();
-	}
-
-
-	///
-	/// Set Size (But Maintain Current Aspect Ratio)
-	///
-	void ModelObject::setSizeHonorAspect( const Distance& w,
-	                                      const Distance& h )
-	{
-		double aspectRatio = mH / mW;
-		Distance wNew = w;
-		Distance hNew = h;
+	
 		
-		if ( h > (w*aspectRatio) )
+		///
+		/// Copy constructor
+		///
+		ModelObject::ModelObject( const ModelObject* object )
 		{
-			hNew = w*aspectRatio;
-		}
-		else
-		{
-			wNew = h/aspectRatio;
+			mId = msNextId++;
+
+			mSelectedFlag    = object->mSelectedFlag;
+
+			mX0              = object->mX0;
+			mY0              = object->mY0;
+			mW               = object->mW;
+			mH               = object->mH;
+
+			mShadowState     = object->mShadowState;
+			mShadowX         = object->mShadowX;
+			mShadowY         = object->mShadowY;
+			mShadowOpacity   = object->mShadowOpacity;
+			mShadowColorNode = object->mShadowColorNode;
+
+			foreach ( Handle* handle, object->mHandles )
+			{
+				mHandles.append( handle->clone( this ) );
+			}
+	
+			if ( object->mOutline )
+			{
+				mOutline = object->mOutline->clone( this );
+			}
+			else
+			{
+				mOutline = nullptr;
+			}
+
+			mMatrix          = object->mMatrix;
 		}
 
-		setSize( wNew, hNew );
-	}
+
+		///
+		/// Destructor
+		///
+		ModelObject::~ModelObject()
+		{
+			// empty
+		}
 
 
-	///
-	/// Set Width (But Maintain Current Aspect Ratio)
-	///
-	void ModelObject::setWHonorAspect( const Distance& w )
-	{
-		double aspectRatio = mH / mW;
-		Distance h = w * aspectRatio;
+		///
+		/// ID Property Getter
+		///
+		int ModelObject::id() const
+		{
+			return mId;
+		}
 
-		if ( ( mW != w ) || ( mH != h ) )
+
+		///
+		/// Selected Property Getter
+		///
+		bool ModelObject::isSelected() const
+		{
+			return mSelectedFlag;
+		}
+
+
+		///
+		/// Selected Property Setter
+		///
+		void ModelObject::select( bool value )
+		{
+			mSelectedFlag = value;
+		}
+
+
+		///
+		/// Clear Selected Property Setter
+		///
+		void ModelObject::unselect()
+		{
+			mSelectedFlag = false;
+		}
+
+
+		///
+		/// X0 Property Getter
+		///
+		Distance ModelObject::x0() const
+		{
+			return mX0;
+		}
+
+
+		///
+		/// X0 Property Setter
+		///
+		void ModelObject::setX0( const Distance& value )
+		{
+			if ( mX0 != value )
+			{
+				mX0 = value;
+				emit moved();
+			}
+		}
+		
+
+		///
+		/// Y0 Property Getter
+		///
+		Distance ModelObject::y0() const
+		{
+			return mY0;
+		}
+
+
+		///
+		/// Y0 Property Setter
+		///
+		void ModelObject::setY0( const Distance& value )
+		{
+			if ( mY0 != value )
+			{
+				mY0 = value;
+				emit moved();
+			}
+		}
+		
+
+		///
+		/// W (Width) Property Getter
+		///
+		Distance ModelObject::w() const
+		{
+			return mW;
+		}
+
+
+		///
+		/// W (Width) Property Setter
+		///
+		void ModelObject::setW( const Distance& value )
+		{
+			if ( mW != value )
+			{
+				mW = value;
+				sizeUpdated();
+				emit changed();
+			}
+		}
+		
+
+		///
+		/// H (Height) Property Getter
+		///
+		Distance ModelObject::h() const
+		{
+			return mH;
+		}
+
+
+		///
+		/// H (Height) Property Setter
+		///
+		void ModelObject::setH( const Distance& value )
+		{
+			if ( mH != value )
+			{
+				mH = value;
+				sizeUpdated();
+				emit changed();
+			}
+		}
+
+
+		///
+		/// Matrix Property Getter
+		///
+		QMatrix ModelObject::matrix() const
+		{
+			return mMatrix;
+		}
+
+
+		///
+		/// Matrix Property Setter
+		///
+		void ModelObject::setMatrix( const QMatrix& value )
+		{
+			if ( mMatrix != value )
+			{
+				mMatrix = value;
+				emit changed();
+			}
+		}
+
+
+		///
+		/// Shadow State Property Getter
+		///
+		bool ModelObject::shadow() const
+		{
+			return mShadowState;
+		}
+
+
+		///
+		/// Shadow State Property Setter
+		///
+		void ModelObject::setShadow( bool value )
+		{
+			if ( mShadowState != value )
+			{
+				mShadowState = value;
+				emit changed();
+			}
+		}
+
+
+		///
+		/// Shadow X Property Getter
+		///
+		Distance ModelObject::shadowX() const
+		{
+			return mShadowX;
+		}
+
+
+		///
+		/// Shadow X Property Setter
+		///
+		void ModelObject::setShadowX( const Distance& value )
+		{
+			if ( mShadowX != value )
+			{
+				mShadowX = value;
+				emit changed();
+			}
+		}
+		
+
+		///
+		/// Shadow Y Property Getter
+		///
+		Distance ModelObject::shadowY() const
+		{
+			return mShadowY;
+		}
+
+
+		///
+		/// Shadow Y Property Setter
+		///
+		void ModelObject::setShadowY( const Distance& value )
+		{
+			if ( mShadowY != value )
+			{
+				mShadowY = value;
+				emit changed();
+			}
+		}
+		
+
+		///
+		/// Shadow Opacity Property Getter
+		///
+		double ModelObject::shadowOpacity() const
+		{
+			return mShadowOpacity;
+		}
+
+
+		///
+		/// Shadow Opacity Property Setter
+		///
+		void ModelObject::setShadowOpacity( double value )
+		{
+			if ( mShadowOpacity != value )
+			{
+				mShadowOpacity = value;
+				emit changed();
+			}
+		}
+		
+
+		///
+		/// Shadow Color Node Property Getter
+		///
+		ColorNode ModelObject::shadowColorNode() const
+		{
+			return mShadowColorNode;
+		}
+
+
+		///
+		/// Shadow Color Node Property Setter
+		///
+		void ModelObject::setShadowColorNode( const ColorNode& value )
+		{
+			if ( mShadowColorNode != value )
+			{
+				mShadowColorNode = value;
+				emit changed();
+			}
+		}
+		
+
+		///
+		/// Virtual Natural Size Property Default Getter
+		/// (Overridden by concrete class)
+		///
+		Size ModelObject::naturalSize() const
+		{
+			return Size( Distance::pt(0), Distance::pt(0) );
+		}
+
+
+		///
+		/// Virtual Text Property Default Getter
+		/// (Overridden by concrete class)
+		///
+		QString ModelObject::text() const
+		{
+			return "";
+		}
+
+
+		///
+		/// Virtual Text Property Default Setter
+		/// (Overridden by concrete class)
+		///
+		void ModelObject::setText( const QString& value )
+		{
+			// empty
+		}
+
+
+		///
+		/// Virtual Font Family Property Default Getter
+		/// (Overridden by concrete class)
+		///
+		QString ModelObject::fontFamily() const
+		{
+			return "";
+		}
+
+
+		///
+		/// Virtual Font Family Property Default Setter
+		/// (Overridden by concrete class)
+		///
+		void ModelObject::setFontFamily( const QString& value )
+		{
+			// empty
+		}
+
+
+		///
+		/// Virtual Font Size Property Default Getter
+		/// (Overridden by concrete class)
+		///
+		double ModelObject::fontSize() const
+		{
+			return 0;
+		}
+
+
+		///
+		/// Virtual Font Size Property Default Setter
+		/// (Overridden by concrete class)
+		///
+		void ModelObject::setFontSize( double value )
+		{
+			// empty
+		}
+
+
+		///
+		/// Virtual Font Weight Property Default Getter
+		/// (Overridden by concrete class)
+		///
+		QFont::Weight ModelObject::fontWeight() const
+		{
+			return QFont::Normal;
+		}
+
+
+		///
+		/// Virtual Font Weight Property Default Setter
+		/// (Overridden by concrete class)
+		///
+		void ModelObject::setFontWeight( QFont::Weight value )
+		{
+			// empty
+		}
+
+
+		///
+		/// Virtual Font Italic Flag Property Default Getter
+		/// (Overridden by concrete class)
+		///
+		bool ModelObject::fontItalicFlag() const
+		{
+			return false;
+		}
+
+
+		///
+		/// Virtual Font Italic Flag Property Default Setter
+		/// (Overridden by concrete class)
+		///
+		void ModelObject::setFontItalicFlag( bool value )
+		{
+			// empty
+		}
+
+
+		///
+		/// Virtual Font Underline Flag Property Default Getter
+		/// (Overridden by concrete class)
+		///
+		bool ModelObject::fontUnderlineFlag() const
+		{
+			return false;
+		}
+
+
+		///
+		/// Virtual Font Underline Flag Property Default Setter
+		/// (Overridden by concrete class)
+		///
+		void ModelObject::setFontUnderlineFlag( bool value )
+		{
+			// empty
+		}
+
+
+		///
+		/// Virtual Text Color Node Property Default Getter
+		/// (Overridden by concrete class)
+		///
+		ColorNode ModelObject::textColorNode() const
+		{
+			return ColorNode( QColor::fromRgba(0x00000000) );
+		}
+
+
+		///
+		/// Virtual Text Color Node Property Default Setter
+		/// (Overridden by concrete class)
+		///
+		void ModelObject::setTextColorNode( const ColorNode &value )
+		{
+			// empty
+		}
+		
+
+		///
+		/// Virtual Text Horizontal Alignment Property Default Getter
+		/// (Overridden by concrete class)
+		///
+		Qt::Alignment ModelObject::textHAlign() const
+		{
+			return Qt::AlignLeft;
+		}
+
+
+		///
+		/// Virtual Text Horizontal Alignment Property Default Setter
+		/// (Overridden by concrete class)
+		///
+		void ModelObject::setTextHAlign( Qt::Alignment value )
+		{
+			// empty
+		}
+
+
+		///
+		/// Virtual Text Vertical Alignment Property Default Getter
+		/// (Overridden by concrete class)
+		///
+		Qt::Alignment ModelObject::textVAlign() const
+		{
+			return Qt::AlignTop;
+		}
+
+
+		///
+		/// Virtual Text Vertical Alignment Property Default Setter
+		/// (Overridden by concrete class)
+		///
+		void ModelObject::setTextVAlign( Qt::Alignment value )
+		{
+			// empty
+		}
+
+
+		///
+		/// Virtual Text Line Spacing Property Default Getter
+		/// (Overridden by concrete class)
+		///
+		double ModelObject::textLineSpacing() const
+		{
+			return 0;
+		}
+
+
+		///
+		/// Virtual Text Line Spacing Property Default Setter
+		/// (Overridden by concrete class)
+		///
+		void ModelObject::setTextLineSpacing( double value )
+		{
+			// empty
+		}
+
+
+		///
+		/// Virtual Filename Node Property Default Getter
+		/// (Overridden by concrete class)
+		///
+		TextNode ModelObject::filenameNode() const
+		{
+			return TextNode();
+		}
+
+
+		///
+		/// Virtual Filename Node Property Default Setter
+		/// (Overridden by concrete class)
+		///
+		void ModelObject::setFilenameNode( const TextNode& value )
+		{
+			// empty
+		}
+		
+
+		///
+		/// Virtual Image Property Default Getter
+		/// (Overridden by concrete class)
+		///
+		const QImage* ModelObject::image() const
+		{
+			return nullptr;
+		}
+
+
+		///
+		/// Virtual Image Property Default Setter
+		/// (Overridden by concrete class)
+		///
+		void ModelObject::setImage( const QImage& value )
+		{
+			// empty
+		}
+		
+
+		///
+		/// Virtual Image Property Default Setter
+		/// (Overridden by concrete class)
+		///
+		void ModelObject::setImage( const QString& name, const QImage& value )
+		{
+			// empty
+		}
+		
+
+		///
+		/// Virtual SVG Property Default Getter
+		/// (Overridden by concrete class)
+		///
+		QByteArray ModelObject::svg() const
+		{
+			return QByteArray();
+		}
+
+
+		///
+		/// Virtual SVG Property Default Setter
+		/// (Overridden by concrete class)
+		///
+		void ModelObject::setSvg( const QString& name, const QByteArray& value )
+		{
+			// empty
+		}
+		
+
+		///
+		/// Virtual Line Width Property Default Getter
+		/// (Overridden by concrete class)
+		///
+		Distance ModelObject::lineWidth() const
+		{
+			return 0;
+		}
+
+
+		///
+		/// Virtual Line Width Property Default Setter
+		/// (Overridden by concrete class)
+		///
+		void ModelObject::setLineWidth( const Distance& value )
+		{
+			// empty
+		}
+
+
+		///
+		/// Virtual Line Color Node Property Default Getter
+		/// (Overridden by concrete class)
+		///
+		ColorNode ModelObject::lineColorNode() const
+		{
+			return ColorNode( QColor::fromRgba(0x00000000) );
+		}
+
+
+		///
+		/// Virtual Line Color Node Property Default Setter
+		/// (Overridden by concrete class)
+		///
+		void ModelObject::setLineColorNode( const ColorNode &value )
+		{
+			// empty
+		}
+		
+
+		///
+		/// Virtual Fill Color Node Property Default Getter
+		/// (Overridden by concrete class)
+		///
+		ColorNode ModelObject::fillColorNode() const
+		{
+			return ColorNode( QColor::fromRgba(0x00000000) );
+		}
+
+
+		///
+		/// Virtual Fill Color Node Property Default Setter
+		/// (Overridden by concrete class)
+		///
+		void ModelObject::setFillColorNode( const ColorNode &value )
+		{
+			// empty
+		}
+		
+
+		///
+		/// Virtual Barcode Data Property Default Getter
+		/// (Overridden by concrete class)
+		///
+		QString ModelObject::bcData() const
+		{
+			return QString();
+		}
+
+
+		///
+		/// Virtual Barcode Data Node Property Default Setter
+		/// (Overridden by concrete class)
+		///
+		void ModelObject::setBcData( const QString& value )
+		{
+			// empty
+		}
+		
+
+		///
+		/// Virtual Barcode Text Flag Property Default Getter
+		/// (Overridden by concrete class)
+		///
+		bool ModelObject::bcTextFlag() const
+		{
+			return false;
+		}
+
+
+		///
+		/// Virtual Barcode Text Flag Property Default Setter
+		/// (Overridden by concrete class)
+		///
+		void ModelObject::setBcTextFlag( bool value )
+		{
+			// empty
+		}
+
+
+		///
+		/// Virtual Barcode Checksum Flag Property Default Getter
+		/// (Overridden by concrete class)
+		///
+		bool ModelObject::bcChecksumFlag() const
+		{
+			return false;
+		}
+
+
+		///
+		/// Virtual Barcode Checksum Flag Property Default Setter
+		/// (Overridden by concrete class)
+		///
+		void ModelObject::setBcChecksumFlag( bool value )
+		{
+			// empty
+		}
+
+
+		///
+		/// Virtual Barcode Color Node Property Default Getter
+		/// (Overridden by concrete class)
+		///
+		ColorNode ModelObject::bcColorNode() const
+		{
+			return ColorNode( QColor::fromRgba(0x00000000) );
+		}
+
+
+		///
+		/// Virtual Barcode Color Node Property Default Setter
+		/// (Overridden by concrete class)
+		///
+		void ModelObject::setBcColorNode( const ColorNode &value )
+		{
+			// empty
+		}
+		
+
+		///
+		/// Virtual Barcode Style Property Default Getter
+		/// (Overridden by concrete class)
+		///
+		barcode::Style ModelObject::bcStyle() const
+		{
+			return barcode::Style();
+		}
+
+
+		///
+		/// Virtual Barcode Style Property Default Setter
+		/// (Overridden by concrete class)
+		///
+		void ModelObject::setBcStyle( const barcode::Style &value )
+		{
+			// empty
+		}
+		
+
+		///
+		/// Virtual Barcode Format Digits Property Default Getter
+		/// (Overridden by concrete class)
+		///
+		int ModelObject::bcFormatDigits() const
+		{
+			return 0;
+		}
+
+
+		///
+		/// Virtual Barcode Format Digits Property Default Setter
+		/// (Overridden by concrete class)
+		///
+		void ModelObject::setBcFormatDigits( int value )
+		{
+			// empty
+		}
+
+
+		///
+		/// Virtual Can Text Capability Read-Only Property Default Getter
+		/// (Overridden by concrete class)
+		///
+		bool ModelObject::canText() const
+		{
+			return false;
+		}
+
+
+		///
+		/// Virtual Can Fill Capability Read-Only Property Default Getter
+		/// (Overridden by concrete class)
+		///
+		bool ModelObject::canFill() const
+		{
+			return false;
+		}
+
+
+		///
+		/// Virtual Can Line Color Capability Read-Only Property Default Getter
+		/// (Overridden by concrete class)
+		///
+		bool ModelObject::canLineColor() const
+		{ 
+			return false;
+		}
+
+
+		///
+		/// Virtual Can Line Width Capability Read-Only Property Default Getter
+		/// (Overridden by concrete class)
+		///
+		bool ModelObject::canLineWidth() const
+		{
+			return false;
+		}
+
+
+		///
+		/// Set Absolute Position
+		///
+		void ModelObject::setPosition( const Distance& x0,
+		                               const Distance& y0 )
+		{
+			if ( ( mX0 != x0 ) || ( mY0 != y0 ) )
+			{
+				mX0 = x0;
+				mY0 = y0;
+
+				emit moved();
+			}
+		}
+
+
+		///
+		/// Set Relative Position
+		///
+		void ModelObject::setPositionRelative( const Distance& dx,
+		                                       const Distance& dy )
+		{
+			if ( ( dx != 0 ) || ( dy != 0 ) )
+			{
+				mX0 += dx;
+				mY0 += dy;
+
+				emit moved();
+			}
+		}
+
+
+		///
+		/// Get Size
+		///
+		Size ModelObject::size() const
+		{
+			return Size( mW, mH );
+		}
+
+
+		///
+		/// Set Size
+		///
+		void ModelObject::setSize( const Distance& w,
+		                           const Distance& h )
 		{
 			mW = w;
 			mH = h;
@@ -1009,206 +957,261 @@ namespace glabels::model
 			sizeUpdated();
 			emit changed();
 		}
-	}
 
 
-	///
-	/// Set Height (But Maintain Current Aspect Ratio)
-	///
-	void ModelObject::setHHonorAspect( const Distance& h )
-	{
-		double aspectRatio = mH / mW;
-		Distance w = h / aspectRatio;
-
-		if ( ( mW != w ) || ( mH != h ) )
+		///
+		/// Set Size
+		///
+		void ModelObject::setSize( const Size& size )
 		{
-			mW = w;
-			mH = h;
+			mW = size.w();
+			mH = size.h();
 
 			sizeUpdated();
 			emit changed();
 		}
-	}
 
 
-	///
-	/// Get Extent of Bounding Box
-	///
-	Region ModelObject::getExtent()
-	{
-		QPointF a1( (   - lineWidth()/2).pt(), (   - lineWidth()/2).pt() );
-		QPointF a2( (mW + lineWidth()/2).pt(), (   - lineWidth()/2).pt() );
-		QPointF a3( (mW + lineWidth()/2).pt(), (mH + lineWidth()/2).pt() );
-		QPointF a4( (   - lineWidth()/2).pt(), (mH + lineWidth()/2).pt() );
+		///
+		/// Set Size (But Maintain Current Aspect Ratio)
+		///
+		void ModelObject::setSizeHonorAspect( const Distance& w,
+		                                      const Distance& h )
+		{
+			double aspectRatio = mH / mW;
+			Distance wNew = w;
+			Distance hNew = h;
+		
+			if ( h > (w*aspectRatio) )
+			{
+				hNew = w*aspectRatio;
+			}
+			else
+			{
+				wNew = h/aspectRatio;
+			}
 
-		a1 = mMatrix.map( a1 );
-		a2 = mMatrix.map( a2 );
-		a3 = mMatrix.map( a3 );
-		a4 = mMatrix.map( a4 );
-
-		Region region;
-		region.setX1( min( a1.x(), min( a2.x(), min( a3.x(), a4.x() ) ) ) + mX0 );
-		region.setY1( min( a1.y(), min( a2.y(), min( a3.y(), a4.y() ) ) ) + mY0 );
-		region.setX2( max( a1.x(), max( a2.x(), max( a3.x(), a4.x() ) ) ) + mX0 );
-		region.setY2( max( a1.y(), max( a2.y(), max( a3.y(), a4.y() ) ) ) + mY0 );
-
-		return region;
-	}
+			setSize( wNew, hNew );
+		}
 
 
-	///
-	/// Rotate Object
-	///
-	void ModelObject::rotate( double thetaDegs )
-	{
-		if ( thetaDegs != 0 )
+		///
+		/// Set Width (But Maintain Current Aspect Ratio)
+		///
+		void ModelObject::setWHonorAspect( const Distance& w )
+		{
+			double aspectRatio = mH / mW;
+			Distance h = w * aspectRatio;
+
+			if ( ( mW != w ) || ( mH != h ) )
+			{
+				mW = w;
+				mH = h;
+
+				sizeUpdated();
+				emit changed();
+			}
+		}
+
+
+		///
+		/// Set Height (But Maintain Current Aspect Ratio)
+		///
+		void ModelObject::setHHonorAspect( const Distance& h )
+		{
+			double aspectRatio = mH / mW;
+			Distance w = h / aspectRatio;
+
+			if ( ( mW != w ) || ( mH != h ) )
+			{
+				mW = w;
+				mH = h;
+
+				sizeUpdated();
+				emit changed();
+			}
+		}
+
+
+		///
+		/// Get Extent of Bounding Box
+		///
+		Region ModelObject::getExtent()
+		{
+			QPointF a1( (   - lineWidth()/2).pt(), (   - lineWidth()/2).pt() );
+			QPointF a2( (mW + lineWidth()/2).pt(), (   - lineWidth()/2).pt() );
+			QPointF a3( (mW + lineWidth()/2).pt(), (mH + lineWidth()/2).pt() );
+			QPointF a4( (   - lineWidth()/2).pt(), (mH + lineWidth()/2).pt() );
+
+			a1 = mMatrix.map( a1 );
+			a2 = mMatrix.map( a2 );
+			a3 = mMatrix.map( a3 );
+			a4 = mMatrix.map( a4 );
+
+			Region region;
+			region.setX1( min( a1.x(), min( a2.x(), min( a3.x(), a4.x() ) ) ) + mX0 );
+			region.setY1( min( a1.y(), min( a2.y(), min( a3.y(), a4.y() ) ) ) + mY0 );
+			region.setX2( max( a1.x(), max( a2.x(), max( a3.x(), a4.x() ) ) ) + mX0 );
+			region.setY2( max( a1.y(), max( a2.y(), max( a3.y(), a4.y() ) ) ) + mY0 );
+
+			return region;
+		}
+
+
+		///
+		/// Rotate Object
+		///
+		void ModelObject::rotate( double thetaDegs )
+		{
+			if ( thetaDegs != 0 )
+			{
+				QMatrix m;
+				m.rotate( thetaDegs );
+				mMatrix *= m;
+
+				emit changed();
+			}
+		}
+
+
+		///
+		/// Flip Object Horizontally
+		///
+		void ModelObject::flipHoriz()
 		{
 			QMatrix m;
-			m.rotate( thetaDegs );
+			m.scale( -1, 1 );
 			mMatrix *= m;
 
 			emit changed();
 		}
-	}
 
 
-	///
-	/// Flip Object Horizontally
-	///
-	void ModelObject::flipHoriz()
-	{
-		QMatrix m;
-		m.scale( -1, 1 );
-		mMatrix *= m;
-
-		emit changed();
-	}
-
-
-	///
-	/// Flip Object Vertically
-	///
-	void ModelObject::flipVert()
-	{
-		QMatrix m;
-		m.scale( 1, -1 );
-		mMatrix *= m;
-
-		emit changed();
-	}
-
-
-	///
-	/// Is this object located at x,y?
-	///
-	bool ModelObject::isLocatedAt( double          scale,
-	                               const Distance& x,
-	                               const Distance& y ) const
-	{
-		QPointF p( x.pt(), y.pt() );
-
-		/*
-		 * Change point to object relative coordinates
-		 */
-		p -= QPointF( mX0.pt(), mY0.pt() ); // Translate point to x0,y0
-		p = mMatrix.inverted().map( p );
-
-		if ( hoverPath( scale ).contains( p ) )
+		///
+		/// Flip Object Vertically
+		///
+		void ModelObject::flipVert()
 		{
-			return true;
+			QMatrix m;
+			m.scale( 1, -1 );
+			mMatrix *= m;
+
+			emit changed();
 		}
-		else if ( isSelected() && mOutline )
+
+
+		///
+		/// Is this object located at x,y?
+		///
+		bool ModelObject::isLocatedAt( double          scale,
+		                               const Distance& x,
+		                               const Distance& y ) const
 		{
-			if ( mOutline->hoverPath( scale ).contains( p ) )
+			QPointF p( x.pt(), y.pt() );
+
+			/*
+			 * Change point to object relative coordinates
+			 */
+			p -= QPointF( mX0.pt(), mY0.pt() ); // Translate point to x0,y0
+			p = mMatrix.inverted().map( p );
+
+			if ( hoverPath( scale ).contains( p ) )
 			{
 				return true;
 			}
-		}
-
-		return false;
-	}
-
-
-	///
-	/// Is one of this object's handles locate at x,y?  If so, return it.
-	///
-	Handle* ModelObject::handleAt( double          scale,
-	                               const Distance& x,
-	                               const Distance& y ) const
-	{
-		if ( mSelectedFlag )
-		{
-			QPointF p( x.pt(), y.pt() );
-			p -= QPointF( mX0.pt(), mY0.pt() ); // Translate point to x0,y0
-
-			foreach ( Handle* handle, mHandles )
+			else if ( isSelected() && mOutline )
 			{
-				QPainterPath handlePath = mMatrix.map( handle->path( scale ) );
-				if ( handlePath.contains( p ) )
+				if ( mOutline->hoverPath( scale ).contains( p ) )
 				{
-					return handle;
+					return true;
 				}
 			}
+
+			return false;
 		}
 
-		return nullptr;
-	}
+
+		///
+		/// Is one of this object's handles locate at x,y?  If so, return it.
+		///
+		Handle* ModelObject::handleAt( double          scale,
+		                               const Distance& x,
+		                               const Distance& y ) const
+		{
+			if ( mSelectedFlag )
+			{
+				QPointF p( x.pt(), y.pt() );
+				p -= QPointF( mX0.pt(), mY0.pt() ); // Translate point to x0,y0
+
+				foreach ( Handle* handle, mHandles )
+				{
+					QPainterPath handlePath = mMatrix.map( handle->path( scale ) );
+					if ( handlePath.contains( p ) )
+					{
+						return handle;
+					}
+				}
+			}
+
+			return nullptr;
+		}
 
 
-	///
-	/// Draw object + shadow
-	///
-	void ModelObject::draw( QPainter* painter, bool inEditor, merge::Record* record ) const
-	{
-		painter->save();
-		painter->translate( mX0.pt(), mY0.pt() );
-
-		if ( mShadowState )
+		///
+		/// Draw object + shadow
+		///
+		void ModelObject::draw( QPainter* painter, bool inEditor, merge::Record* record ) const
 		{
 			painter->save();
-			painter->translate( mShadowX.pt(), mShadowY.pt() );
+			painter->translate( mX0.pt(), mY0.pt() );
+
+			if ( mShadowState )
+			{
+				painter->save();
+				painter->translate( mShadowX.pt(), mShadowY.pt() );
+				painter->setMatrix( mMatrix, true );
+				drawShadow( painter, inEditor, record );
+				painter->restore();
+			}
+
 			painter->setMatrix( mMatrix, true );
-			drawShadow( painter, inEditor, record );
+			drawObject( painter, inEditor, record );
+
 			painter->restore();
 		}
 
-		painter->setMatrix( mMatrix, true );
-		drawObject( painter, inEditor, record );
 
-		painter->restore();
-	}
-
-
-	///
-	/// Draw selection highlights
-	///
-	void ModelObject::drawSelectionHighlight( QPainter* painter, double scale ) const
-	{
-		painter->save();
-
-		painter->translate( mX0.pt(), mY0.pt() );
-		painter->setMatrix( mMatrix, true );
-
-		if ( mOutline )
+		///
+		/// Draw selection highlights
+		///
+		void ModelObject::drawSelectionHighlight( QPainter* painter, double scale ) const
 		{
-			mOutline->draw( painter );
-		}
+			painter->save();
 
-		foreach( Handle* handle, mHandles )
-		{
-			handle->draw( painter, scale );
-		}
+			painter->translate( mX0.pt(), mY0.pt() );
+			painter->setMatrix( mMatrix, true );
+
+			if ( mOutline )
+			{
+				mOutline->draw( painter );
+			}
+
+			foreach( Handle* handle, mHandles )
+			{
+				handle->draw( painter, scale );
+			}
 		
-		painter->restore();
+			painter->restore();
+		}
+
+
+		///
+		/// Default sizeUpdated implementation.
+		///
+		void ModelObject::sizeUpdated()
+		{
+			// empty
+		}
+
 	}
-
-
-	///
-	/// Default sizeUpdated implementation.
-	///
-	void ModelObject::sizeUpdated()
-	{
-		// empty
-	}
-
-} // namespace glabels::model
+}
diff --git a/model/ModelObject.h b/model/ModelObject.h
index 313886a..d443492 100644
--- a/model/ModelObject.h
+++ b/model/ModelObject.h
@@ -37,399 +37,402 @@
 #include <QPainter>
 
 
-namespace glabels::model
+namespace glabels
 {
-
-	// Forward References
-	class Region;
-	class Size;
-
-
-	///
-	/// Label Model Object Base Class
-	///
-	class ModelObject : public QObject
+	namespace model
 	{
-		Q_OBJECT
 
-		///////////////////////////////////////////////////////////////
-		// Lifecycle Methods
-		///////////////////////////////////////////////////////////////
-	protected:
-		ModelObject();
-		
-		ModelObject( const Distance&  x0,
-		             const Distance&  y0,
-		             const Distance&  w,
-		             const Distance&  h,
-		             const QMatrix&   matrix = QMatrix(),
-		             bool             shadowState = false,
-		             const Distance&  shadowX = 0,
-		             const Distance&  shadowY = 0,
-		             double           shadowOpacity = 1.0,
-		             const ColorNode& shadowColorNode = ColorNode() );
-		
-		ModelObject( const ModelObject* object );
-		
-	public:
-		~ModelObject() override;
+		// Forward References
+		class Region;
+		class Size;
 
 
-		///////////////////////////////////////////////////////////////
-		// Object duplication
-		///////////////////////////////////////////////////////////////
-		virtual ModelObject* clone() const = 0;
+		///
+		/// Label Model Object Base Class
+		///
+		class ModelObject : public QObject
+		{
+			Q_OBJECT
+
+			///////////////////////////////////////////////////////////////
+			// Lifecycle Methods
+			///////////////////////////////////////////////////////////////
+		protected:
+			ModelObject();
+		
+			ModelObject( const Distance&  x0,
+			             const Distance&  y0,
+			             const Distance&  w,
+			             const Distance&  h,
+			             const QMatrix&   matrix = QMatrix(),
+			             bool             shadowState = false,
+			             const Distance&  shadowX = 0,
+			             const Distance&  shadowY = 0,
+			             double           shadowOpacity = 1.0,
+			             const ColorNode& shadowColorNode = ColorNode() );
+		
+			ModelObject( const ModelObject* object );
+		
+		public:
+			~ModelObject() override;
+
+
+			///////////////////////////////////////////////////////////////
+			// Object duplication
+			///////////////////////////////////////////////////////////////
+			virtual ModelObject* clone() const = 0;
 
 	
-		///////////////////////////////////////////////////////////////
-		// Signals
-		///////////////////////////////////////////////////////////////
-	signals:
-		void moved();
-		void changed();
+			///////////////////////////////////////////////////////////////
+			// Signals
+			///////////////////////////////////////////////////////////////
+		signals:
+			void moved();
+			void changed();
 
 
-		///////////////////////////////////////////////////////////////
-		// Common Properties
-		///////////////////////////////////////////////////////////////
-	public:
-		//
-		// ID Property.
-		//
-		int id() const;
+			///////////////////////////////////////////////////////////////
+			// Common Properties
+			///////////////////////////////////////////////////////////////
+		public:
+			//
+			// ID Property.
+			//
+			int id() const;
 
-		//
-		// Selected Property.
-		//
-		bool isSelected() const;
-		void select( bool value = true );
-		void unselect();
+			//
+			// Selected Property.
+			//
+			bool isSelected() const;
+			void select( bool value = true );
+			void unselect();
 
 
-		//
-		// x0 Property ( x coordinate of origin )
-		//
-		Distance x0() const;
-		void setX0( const Distance& value );
+			//
+			// x0 Property ( x coordinate of origin )
+			//
+			Distance x0() const;
+			void setX0( const Distance& value );
 		
 
-		//
-		// y0 Property ( y coordinate of origin )
-		//
-		Distance y0() const;
-		void setY0( const Distance& value );
+			//
+			// y0 Property ( y coordinate of origin )
+			//
+			Distance y0() const;
+			void setY0( const Distance& value );
 		
 
-		//
-		// w Property ( width of bounding box )
-		//
-		Distance w() const;
-		void setW( const Distance& value );
+			//
+			// w Property ( width of bounding box )
+			//
+			Distance w() const;
+			void setW( const Distance& value );
 		
 
-		//
-		// h Property ( height of bounding box )
-		//
-		Distance h() const;
-		void setH( const Distance& value );
+			//
+			// h Property ( height of bounding box )
+			//
+			Distance h() const;
+			void setH( const Distance& value );
 
 
-		//
-		// Transformation Matrix Property
-		//
-		QMatrix matrix() const;
-		void setMatrix( const QMatrix& value );
+			//
+			// Transformation Matrix Property
+			//
+			QMatrix matrix() const;
+			void setMatrix( const QMatrix& value );
 
 
-		//
-		// Shadow State Property
-		//
-		bool shadow() const;
-		void setShadow( bool value );
+			//
+			// Shadow State Property
+			//
+			bool shadow() const;
+			void setShadow( bool value );
 
 
-		//
-		// Shadow x Offset Property
-		//
-		Distance shadowX() const;
-		void setShadowX( const Distance& value );
+			//
+			// Shadow x Offset Property
+			//
+			Distance shadowX() const;
+			void setShadowX( const Distance& value );
 		
 
-		//
-		// Shadow y Offset Property
-		//
-		Distance shadowY() const;
-		void setShadowY( const Distance& value );
+			//
+			// Shadow y Offset Property
+			//
+			Distance shadowY() const;
+			void setShadowY( const Distance& value );
 		
 
-		//
-		// Shadow opacity Property
-		//
-		double shadowOpacity() const;
-		void setShadowOpacity( double value );
+			//
+			// Shadow opacity Property
+			//
+			double shadowOpacity() const;
+			void setShadowOpacity( double value );
 		
 
-		//
-		// Shadow Color Property
-		//
-		ColorNode shadowColorNode() const;
-		void setShadowColorNode( const ColorNode& value );
+			//
+			// Shadow Color Property
+			//
+			ColorNode shadowColorNode() const;
+			void setShadowColorNode( const ColorNode& value );
 		
 
-		//
-		// Natural Size Property (read-only)
-		//
-		virtual Size naturalSize() const;
+			//
+			// Natural Size Property (read-only)
+			//
+			virtual Size naturalSize() const;
 
 
-		///////////////////////////////////////////////////////////////
-		// Text Properties Virtual Interface
-		///////////////////////////////////////////////////////////////
-	public:
-		//
-		// Virtual Text Property: text
-		//
-		virtual QString text() const;
-		virtual void setText( const QString &value );
+			///////////////////////////////////////////////////////////////
+			// Text Properties Virtual Interface
+			///////////////////////////////////////////////////////////////
+		public:
+			//
+			// Virtual Text Property: text
+			//
+			virtual QString text() const;
+			virtual void setText( const QString &value );
 
 
-		//
-		// Virtual Text Property: fontFamily
-		//
-		virtual QString fontFamily() const;
-		virtual void setFontFamily( const QString &value );
+			//
+			// Virtual Text Property: fontFamily
+			//
+			virtual QString fontFamily() const;
+			virtual void setFontFamily( const QString &value );
 
 
-		//
-		// Virtual Text Property: fontSize
-		//
-		virtual double fontSize() const;
-		virtual void setFontSize( double value );
+			//
+			// Virtual Text Property: fontSize
+			//
+			virtual double fontSize() const;
+			virtual void setFontSize( double value );
 
 
-		//
-		// Virtual Text Property: fontWeight
-		//
-		virtual QFont::Weight fontWeight() const;
-		virtual void setFontWeight( QFont::Weight value );
+			//
+			// Virtual Text Property: fontWeight
+			//
+			virtual QFont::Weight fontWeight() const;
+			virtual void setFontWeight( QFont::Weight value );
 
 
-		//
-		// Virtual Text Property: fontItalicFlag
-		//
-		virtual bool fontItalicFlag() const;
-		virtual void setFontItalicFlag( bool value );
+			//
+			// Virtual Text Property: fontItalicFlag
+			//
+			virtual bool fontItalicFlag() const;
+			virtual void setFontItalicFlag( bool value );
 
 
-		//
-		// Virtual Text Property: fontUnderlineFlag
-		//
-		virtual bool fontUnderlineFlag() const;
-		virtual void setFontUnderlineFlag( bool value );
+			//
+			// Virtual Text Property: fontUnderlineFlag
+			//
+			virtual bool fontUnderlineFlag() const;
+			virtual void setFontUnderlineFlag( bool value );
 
 
-		//
-		// Virtual Text Property: textColorNode
-		//
-		virtual ColorNode textColorNode() const;
-		virtual void setTextColorNode( const ColorNode &value );
+			//
+			// Virtual Text Property: textColorNode
+			//
+			virtual ColorNode textColorNode() const;
+			virtual void setTextColorNode( const ColorNode &value );
 		
 
-		//
-		// Virtual Text Property: textHAlign
-		//
-		virtual Qt::Alignment textHAlign() const;
-		virtual void setTextHAlign( Qt::Alignment value );
+			//
+			// Virtual Text Property: textHAlign
+			//
+			virtual Qt::Alignment textHAlign() const;
+			virtual void setTextHAlign( Qt::Alignment value );
 
 
-		//
-		// Virtual Text Property: textVAlign
-		//
-		virtual Qt::Alignment textVAlign() const;
-		virtual void setTextVAlign( Qt::Alignment value );
+			//
+			// Virtual Text Property: textVAlign
+			//
+			virtual Qt::Alignment textVAlign() const;
+			virtual void setTextVAlign( Qt::Alignment value );
 
 
-		//
-		// Virtual Text Property: textLineSpacing
-		//
-		virtual double textLineSpacing() const;
-		virtual void setTextLineSpacing( double value );
+			//
+			// Virtual Text Property: textLineSpacing
+			//
+			virtual double textLineSpacing() const;
+			virtual void setTextLineSpacing( double value );
 
 
-		///////////////////////////////////////////////////////////////
-		// Image Properties Virtual Interface
-		///////////////////////////////////////////////////////////////
-	public:
-		//
-		// Virtual Image Property: filenameNode
-		//
-		virtual TextNode filenameNode() const;
-		virtual void setFilenameNode( const TextNode &value );
+			///////////////////////////////////////////////////////////////
+			// Image Properties Virtual Interface
+			///////////////////////////////////////////////////////////////
+		public:
+			//
+			// Virtual Image Property: filenameNode
+			//
+			virtual TextNode filenameNode() const;
+			virtual void setFilenameNode( const TextNode &value );
 
 
-		//
-		// Virtual Image Property: image
-		//
-		virtual const QImage* image() const;
-		virtual void setImage( const QImage& value );
-		virtual void setImage( const QString& name, const QImage& value );
+			//
+			// Virtual Image Property: image
+			//
+			virtual const QImage* image() const;
+			virtual void setImage( const QImage& value );
+			virtual void setImage( const QString& name, const QImage& value );
 
 
-		//
-		// Virtual Image Property: svg
-		//
-		virtual QByteArray svg() const;
-		virtual void setSvg( const QString& name, const QByteArray& value );
+			//
+			// Virtual Image Property: svg
+			//
+			virtual QByteArray svg() const;
+			virtual void setSvg( const QString& name, const QByteArray& value );
 
 
-		///////////////////////////////////////////////////////////////
-		// Shape Properties Virtual Interface
-		///////////////////////////////////////////////////////////////
-	public:
-		//
-		// Virtual Shape Property: lineWidth
-		//
-		virtual Distance lineWidth() const;
-		virtual void setLineWidth( const Distance& value );
+			///////////////////////////////////////////////////////////////
+			// Shape Properties Virtual Interface
+			///////////////////////////////////////////////////////////////
+		public:
+			//
+			// Virtual Shape Property: lineWidth
+			//
+			virtual Distance lineWidth() const;
+			virtual void setLineWidth( const Distance& value );
 
 
-		//
-		// Virtual Shape Property: lineColorNode
-		//
-		virtual ColorNode lineColorNode() const;
-		virtual void setLineColorNode( const ColorNode &value );
+			//
+			// Virtual Shape Property: lineColorNode
+			//
+			virtual ColorNode lineColorNode() const;
+			virtual void setLineColorNode( const ColorNode &value );
 		
 
-		//
-		// Virtual Shape Property: fillColorNode
-		//
-		virtual ColorNode fillColorNode() const;
-		virtual void setFillColorNode( const ColorNode &value );
+			//
+			// Virtual Shape Property: fillColorNode
+			//
+			virtual ColorNode fillColorNode() const;
+			virtual void setFillColorNode( const ColorNode &value );
 		
 
-		///////////////////////////////////////////////////////////////
-		// Barcode Properties Virtual Interface
-		///////////////////////////////////////////////////////////////
-	public:
-		//
-		// Virtual Barcode Property: bcData
-		//
-		virtual QString bcData() const;
-		virtual void setBcData( const QString& value );
+			///////////////////////////////////////////////////////////////
+			// Barcode Properties Virtual Interface
+			///////////////////////////////////////////////////////////////
+		public:
+			//
+			// Virtual Barcode Property: bcData
+			//
+			virtual QString bcData() const;
+			virtual void setBcData( const QString& value );
 		
 
-		//
-		// Virtual Barcode Property: bcTextFlag
-		//
-		virtual bool bcTextFlag() const;
-		virtual void setBcTextFlag( bool value );
+			//
+			// Virtual Barcode Property: bcTextFlag
+			//
+			virtual bool bcTextFlag() const;
+			virtual void setBcTextFlag( bool value );
 
 
-		//
-		// Virtual Barcode Property: bcChecksumFlag
-		//
-		virtual bool bcChecksumFlag() const;
-		virtual void setBcChecksumFlag( bool value );
+			//
+			// Virtual Barcode Property: bcChecksumFlag
+			//
+			virtual bool bcChecksumFlag() const;
+			virtual void setBcChecksumFlag( bool value );
 
 
-		//
-		// Virtual Barcode Property: bcColorNode
-		//
-		virtual ColorNode bcColorNode() const;
-		virtual void setBcColorNode( const ColorNode &value );
+			//
+			// Virtual Barcode Property: bcColorNode
+			//
+			virtual ColorNode bcColorNode() const;
+			virtual void setBcColorNode( const ColorNode &value );
 		
 
-		//
-		// Virtual Barcode Property: bcStyle
-		//
-		virtual barcode::Style bcStyle() const;
-		virtual void setBcStyle( const barcode::Style &value );
+			//
+			// Virtual Barcode Property: bcStyle
+			//
+			virtual barcode::Style bcStyle() const;
+			virtual void setBcStyle( const barcode::Style &value );
 		
 
-		//
-		// Virtual Barcode Property: bcFormatDigits
-		//
-		virtual int bcFormatDigits() const;
-		virtual void setBcFormatDigits( int value );
+			//
+			// Virtual Barcode Property: bcFormatDigits
+			//
+			virtual int bcFormatDigits() const;
+			virtual void setBcFormatDigits( int value );
 
 
-		///////////////////////////////////////////////////////////////
-		// Capabilities (Overridden by concrete classes.)
-		///////////////////////////////////////////////////////////////
-	public:
-		virtual bool canText() const;
-		virtual bool canFill() const;
-		virtual bool canLineColor() const;
-		virtual bool canLineWidth() const;
+			///////////////////////////////////////////////////////////////
+			// Capabilities (Overridden by concrete classes.)
+			///////////////////////////////////////////////////////////////
+		public:
+			virtual bool canText() const;
+			virtual bool canFill() const;
+			virtual bool canLineColor() const;
+			virtual bool canLineWidth() const;
 
 
-		///////////////////////////////////////////////////////////////
-		// Position and Size methods
-		///////////////////////////////////////////////////////////////
-	public:
-		void setPosition( const Distance& x0, const Distance& y0 );
-		void setPositionRelative( const Distance& dx, const Distance& dy );
-		Size size() const;
-		void setSize( const Distance& w, const Distance& h );
-		void setSize( const Size& size );
-		void setSizeHonorAspect( const Distance& w, const Distance& h );
-		void setWHonorAspect( const Distance& w );
-		void setHHonorAspect( const Distance& h );
-		Region getExtent();
-		void rotate( double thetaDegs );
-		void flipHoriz();
-		void flipVert();
-		bool isLocatedAt( double scale, const Distance& x, const Distance& y ) const;
-		Handle* handleAt( double scale, const Distance& x, const Distance& y ) const;
+			///////////////////////////////////////////////////////////////
+			// Position and Size methods
+			///////////////////////////////////////////////////////////////
+		public:
+			void setPosition( const Distance& x0, const Distance& y0 );
+			void setPositionRelative( const Distance& dx, const Distance& dy );
+			Size size() const;
+			void setSize( const Distance& w, const Distance& h );
+			void setSize( const Size& size );
+			void setSizeHonorAspect( const Distance& w, const Distance& h );
+			void setWHonorAspect( const Distance& w );
+			void setHHonorAspect( const Distance& h );
+			Region getExtent();
+			void rotate( double thetaDegs );
+			void flipHoriz();
+			void flipVert();
+			bool isLocatedAt( double scale, const Distance& x, const Distance& y ) const;
+			Handle* handleAt( double scale, const Distance& x, const Distance& y ) const;
 
 
-		///////////////////////////////////////////////////////////////
-		// Drawing operations
-		///////////////////////////////////////////////////////////////
-	public:
-		void draw( QPainter* painter, bool inEditor, merge::Record* record ) const;
-		void drawSelectionHighlight( QPainter* painter, double scale ) const;
+			///////////////////////////////////////////////////////////////
+			// Drawing operations
+			///////////////////////////////////////////////////////////////
+		public:
+			void draw( QPainter* painter, bool inEditor, merge::Record* record ) const;
+			void drawSelectionHighlight( QPainter* painter, double scale ) const;
 
-	protected:
-		virtual void drawShadow( QPainter* painter, bool inEditor, merge::Record* record ) const = 0;
-		virtual void drawObject( QPainter* painter, bool inEditor, merge::Record* record ) const = 0;
-		virtual QPainterPath hoverPath( double scale ) const = 0;
+		protected:
+			virtual void drawShadow( QPainter* painter, bool inEditor, merge::Record* record ) const = 0;
+			virtual void drawObject( QPainter* painter, bool inEditor, merge::Record* record ) const = 0;
+			virtual QPainterPath hoverPath( double scale ) const = 0;
 
-		virtual void sizeUpdated();
+			virtual void sizeUpdated();
 
 		
-		///////////////////////////////////////////////////////////////
-		// Protected Members
-		///////////////////////////////////////////////////////////////
-	protected:
-		bool              mSelectedFlag;
+			///////////////////////////////////////////////////////////////
+			// Protected Members
+			///////////////////////////////////////////////////////////////
+		protected:
+			bool              mSelectedFlag;
 
-		Distance          mX0;
-		Distance          mY0;
-		Distance          mW;
-		Distance          mH;
+			Distance          mX0;
+			Distance          mY0;
+			Distance          mW;
+			Distance          mH;
 
-		bool              mShadowState;
-		Distance          mShadowX;
-		Distance          mShadowY;
-		double            mShadowOpacity;
-		ColorNode         mShadowColorNode;
+			bool              mShadowState;
+			Distance          mShadowX;
+			Distance          mShadowY;
+			double            mShadowOpacity;
+			ColorNode         mShadowColorNode;
 
-		QList<Handle*>    mHandles;
-		Outline*          mOutline;
+			QList<Handle*>    mHandles;
+			Outline*          mOutline;
 
 
-		///////////////////////////////////////////////////////////////
-		// Private Members
-		///////////////////////////////////////////////////////////////
-	private:
-		static int msNextId;
-		int        mId;
+			///////////////////////////////////////////////////////////////
+			// Private Members
+			///////////////////////////////////////////////////////////////
+		private:
+			static int msNextId;
+			int        mId;
 
-		QMatrix    mMatrix;
+			QMatrix    mMatrix;
 
-	};
+		};
 
+	}
 }
 
 
diff --git a/model/ModelShapeObject.cpp b/model/ModelShapeObject.cpp
index f359af7..383f377 100644
--- a/model/ModelShapeObject.cpp
+++ b/model/ModelShapeObject.cpp
@@ -24,184 +24,187 @@
 #include <QPen>
 
 
-namespace glabels::model
+namespace glabels
 {
-
-	///
-	/// Constructor
-	///
-	ModelShapeObject::ModelShapeObject()
+	namespace model
 	{
-		mOutline = new Outline( this );
 
-		mHandles << new HandleNorthWest( this );
-		mHandles << new HandleNorth( this );
-		mHandles << new HandleNorthEast( this );
-		mHandles << new HandleEast( this );
-		mHandles << new HandleSouthEast( this );
-		mHandles << new HandleSouth( this );
-		mHandles << new HandleSouthWest( this );
-		mHandles << new HandleWest( this );
+		///
+		/// Constructor
+		///
+		ModelShapeObject::ModelShapeObject()
+		{
+			mOutline = new Outline( this );
 
-		mLineWidth       = 1.0;
-		mLineColorNode   = ColorNode( QColor( 0, 0, 0 ) );
-		mFillColorNode   = ColorNode( QColor( 0, 255, 0 ) );
-	}
+			mHandles << new HandleNorthWest( this );
+			mHandles << new HandleNorth( this );
+			mHandles << new HandleNorthEast( this );
+			mHandles << new HandleEast( this );
+			mHandles << new HandleSouthEast( this );
+			mHandles << new HandleSouth( this );
+			mHandles << new HandleSouthWest( this );
+			mHandles << new HandleWest( this );
+
+			mLineWidth       = 1.0;
+			mLineColorNode   = ColorNode( QColor( 0, 0, 0 ) );
+			mFillColorNode   = ColorNode( QColor( 0, 255, 0 ) );
+		}
 
 
-	///
-	/// Constructor
-	///
-	ModelShapeObject::ModelShapeObject( const Distance&  x0,
-	                                    const Distance&  y0,
-	                                    const Distance&  w,
-	                                    const Distance&  h,
-	                                    const Distance&  lineWidth,
-	                                    const ColorNode& lineColorNode,
-	                                    const ColorNode& fillColorNode,
-	                                    const QMatrix&   matrix,
-	                                    bool             shadowState,
-	                                    const Distance&  shadowX,
-	                                    const Distance&  shadowY,
-	                                    double           shadowOpacity,
-	                                    const ColorNode& shadowColorNode )
-	: ModelObject( x0, y0, w, h,
-	               matrix,
-	               shadowState, shadowX, shadowY, shadowOpacity, shadowColorNode )
-	{
-		mOutline = new Outline( this );
+		///
+		/// Constructor
+		///
+		ModelShapeObject::ModelShapeObject( const Distance&  x0,
+		                                    const Distance&  y0,
+		                                    const Distance&  w,
+		                                    const Distance&  h,
+		                                    const Distance&  lineWidth,
+		                                    const ColorNode& lineColorNode,
+		                                    const ColorNode& fillColorNode,
+		                                    const QMatrix&   matrix,
+		                                    bool             shadowState,
+		                                    const Distance&  shadowX,
+		                                    const Distance&  shadowY,
+		                                    double           shadowOpacity,
+		                                    const ColorNode& shadowColorNode )
+		: ModelObject( x0, y0, w, h,
+		               matrix,
+		               shadowState, shadowX, shadowY, shadowOpacity, shadowColorNode )
+		{
+			mOutline = new Outline( this );
 
-		mHandles << new HandleNorthWest( this );
-		mHandles << new HandleNorth( this );
-		mHandles << new HandleNorthEast( this );
-		mHandles << new HandleEast( this );
-		mHandles << new HandleSouthEast( this );
-		mHandles << new HandleSouth( this );
-		mHandles << new HandleSouthWest( this );
-		mHandles << new HandleWest( this );
+			mHandles << new HandleNorthWest( this );
+			mHandles << new HandleNorth( this );
+			mHandles << new HandleNorthEast( this );
+			mHandles << new HandleEast( this );
+			mHandles << new HandleSouthEast( this );
+			mHandles << new HandleSouth( this );
+			mHandles << new HandleSouthWest( this );
+			mHandles << new HandleWest( this );
 
-		mLineWidth       = lineWidth;
-		mLineColorNode   = lineColorNode;
-		mFillColorNode   = fillColorNode;
-	}
+			mLineWidth       = lineWidth;
+			mLineColorNode   = lineColorNode;
+			mFillColorNode   = fillColorNode;
+		}
 
 	
-	///
-	/// Copy constructor
-	///
-	ModelShapeObject::ModelShapeObject( const ModelShapeObject* object ) : ModelObject(object)
-	{
-		mLineWidth       = object->mLineWidth;
-		mLineColorNode   = object->mLineColorNode;
-		mFillColorNode   = object->mFillColorNode;
-	}
-
-
-	///
-	/// Destructor
-	///
-	ModelShapeObject::~ModelShapeObject()
-	{
-		delete mOutline;
-
-		foreach( Handle* handle, mHandles )
+		///
+		/// Copy constructor
+		///
+		ModelShapeObject::ModelShapeObject( const ModelShapeObject* object ) : ModelObject(object)
 		{
-			delete handle;
+			mLineWidth       = object->mLineWidth;
+			mLineColorNode   = object->mLineColorNode;
+			mFillColorNode   = object->mFillColorNode;
 		}
-		mHandles.clear();
-	}
 
 
-	///
-	/// Line Width Property Getter
-	///
-	Distance ModelShapeObject::lineWidth() const
-	{
-		return mLineWidth;
-	}
-
-
-	///
-	/// Line Width Property Setter
-	///
-	void ModelShapeObject::setLineWidth( const Distance& value )
-	{
-		if ( mLineWidth != value )
+		///
+		/// Destructor
+		///
+		ModelShapeObject::~ModelShapeObject()
 		{
-			mLineWidth = value;
-			emit changed();
+			delete mOutline;
+
+			foreach( Handle* handle, mHandles )
+			{
+				delete handle;
+			}
+			mHandles.clear();
 		}
-	}
 
 
-	///
-	/// Line Color Node Property Getter
-	///
-	ColorNode ModelShapeObject::lineColorNode() const
-	{
-		return mLineColorNode;
-	}
-
-
-	///
-	/// Line Color Node Property Setter
-	///
-	void ModelShapeObject::setLineColorNode( const ColorNode& value )
-	{
-		if ( mLineColorNode != value )
+		///
+		/// Line Width Property Getter
+		///
+		Distance ModelShapeObject::lineWidth() const
 		{
-			mLineColorNode = value;
-			emit changed();
+			return mLineWidth;
+		}
+
+
+		///
+		/// Line Width Property Setter
+		///
+		void ModelShapeObject::setLineWidth( const Distance& value )
+		{
+			if ( mLineWidth != value )
+			{
+				mLineWidth = value;
+				emit changed();
+			}
+		}
+
+
+		///
+		/// Line Color Node Property Getter
+		///
+		ColorNode ModelShapeObject::lineColorNode() const
+		{
+			return mLineColorNode;
+		}
+
+
+		///
+		/// Line Color Node Property Setter
+		///
+		void ModelShapeObject::setLineColorNode( const ColorNode& value )
+		{
+			if ( mLineColorNode != value )
+			{
+				mLineColorNode = value;
+				emit changed();
+			}
 		}
-	}
 		
 
-	///
-	/// Fill Color Node Property Getter
-	///
-	ColorNode ModelShapeObject::fillColorNode() const
-	{
-		return mFillColorNode;
-	}
-
-
-	///
-	/// Fill Color Node Property Setter
-	///
-	void ModelShapeObject::setFillColorNode( const ColorNode& value )
-	{
-		if ( mFillColorNode != value )
+		///
+		/// Fill Color Node Property Getter
+		///
+		ColorNode ModelShapeObject::fillColorNode() const
 		{
-			mFillColorNode = value;
-			emit changed();
+			return mFillColorNode;
+		}
+
+
+		///
+		/// Fill Color Node Property Setter
+		///
+		void ModelShapeObject::setFillColorNode( const ColorNode& value )
+		{
+			if ( mFillColorNode != value )
+			{
+				mFillColorNode = value;
+				emit changed();
+			}
 		}
-	}
 		
 
-	///
-	/// Can Fill Capability Implementation
-	///
-	bool ModelShapeObject::canFill()
-	{
-		return true;
+		///
+		/// Can Fill Capability Implementation
+		///
+		bool ModelShapeObject::canFill()
+		{
+			return true;
+		}
+
+
+		///
+		/// Can Line Color Capability Implementation
+		///
+		bool ModelShapeObject::canLineColor()
+		{
+			return true;
+		}
+
+
+		///
+		/// Can Line Width Capability Implementation
+		///
+		bool ModelShapeObject::canLineWidth()
+		{
+			return true;
+		}
+
 	}
-
-
-	///
-	/// Can Line Color Capability Implementation
-	///
-	bool ModelShapeObject::canLineColor()
-	{
-		return true;
-	}
-
-
-	///
-	/// Can Line Width Capability Implementation
-	///
-	bool ModelShapeObject::canLineWidth()
-	{
-		return true;
-	}
-
-} // namespace glabels::model
+}
diff --git a/model/ModelShapeObject.h b/model/ModelShapeObject.h
index 06f2bdf..658cc72 100644
--- a/model/ModelShapeObject.h
+++ b/model/ModelShapeObject.h
@@ -25,85 +25,88 @@
 #include "ModelObject.h"
 
 
-namespace glabels::model
+namespace glabels
 {
-
-	///
-	/// Label Model Shape Object (Box or Ellipse)
-	///
-	class ModelShapeObject : public ModelObject
+	namespace model
 	{
-		Q_OBJECT
 
-		///////////////////////////////////////////////////////////////
-		// Lifecycle Methods
-		///////////////////////////////////////////////////////////////
-	protected:
-		ModelShapeObject();
+		///
+		/// Label Model Shape Object (Box or Ellipse)
+		///
+		class ModelShapeObject : public ModelObject
+		{
+			Q_OBJECT
 
-		ModelShapeObject( const Distance&  x0,
-		                  const Distance&  y0,
-		                  const Distance&  w,
-		                  const Distance&  h,
-		                  const Distance&  lineWidth,
-		                  const ColorNode& lineColorNode,
-		                  const ColorNode& fillColorNode,
-		                  const QMatrix&   matrix,
-		                  bool             shadowState,
-		                  const Distance&  shadowX,
-		                  const Distance&  shadowY,
-		                  double           shadowOpacity,
-		                  const ColorNode& shadowColorNode );
+			///////////////////////////////////////////////////////////////
+			// Lifecycle Methods
+			///////////////////////////////////////////////////////////////
+		protected:
+			ModelShapeObject();
 
-		ModelShapeObject( const ModelShapeObject* object );
-	public:
-		~ModelShapeObject() override;
+			ModelShapeObject( const Distance&  x0,
+			                  const Distance&  y0,
+			                  const Distance&  w,
+			                  const Distance&  h,
+			                  const Distance&  lineWidth,
+			                  const ColorNode& lineColorNode,
+			                  const ColorNode& fillColorNode,
+			                  const QMatrix&   matrix,
+			                  bool             shadowState,
+			                  const Distance&  shadowX,
+			                  const Distance&  shadowY,
+			                  double           shadowOpacity,
+			                  const ColorNode& shadowColorNode );
+
+			ModelShapeObject( const ModelShapeObject* object );
+		public:
+			~ModelShapeObject() override;
 
 
-		///////////////////////////////////////////////////////////////
-		// Property Implementations
-		///////////////////////////////////////////////////////////////
-	public:
-		//
-		// Shape Property: lineWidth
-		//
-		Distance lineWidth() const override;
-		void setLineWidth( const Distance& value ) override;
+			///////////////////////////////////////////////////////////////
+			// Property Implementations
+			///////////////////////////////////////////////////////////////
+		public:
+			//
+			// Shape Property: lineWidth
+			//
+			Distance lineWidth() const override;
+			void setLineWidth( const Distance& value ) override;
 
 
-		//
-		// Shape Property: lineColorNode
-		//
-		ColorNode lineColorNode() const override;
-		void setLineColorNode( const ColorNode& value ) override;
+			//
+			// Shape Property: lineColorNode
+			//
+			ColorNode lineColorNode() const override;
+			void setLineColorNode( const ColorNode& value ) override;
 		
 
-		//
-		// Shape Property: fillColorNode
-		//
-		ColorNode fillColorNode() const override;
-		void setFillColorNode( const ColorNode& value ) override;
+			//
+			// Shape Property: fillColorNode
+			//
+			ColorNode fillColorNode() const override;
+			void setFillColorNode( const ColorNode& value ) override;
 		
 
-		///////////////////////////////////////////////////////////////
-		// Capability Implementations
-		///////////////////////////////////////////////////////////////
-	public:
-		virtual bool canFill();
-		virtual bool canLineColor();
-		virtual bool canLineWidth();
+			///////////////////////////////////////////////////////////////
+			// Capability Implementations
+			///////////////////////////////////////////////////////////////
+		public:
+			virtual bool canFill();
+			virtual bool canLineColor();
+			virtual bool canLineWidth();
 
 
-		///////////////////////////////////////////////////////////////
-		// Private Members
-		///////////////////////////////////////////////////////////////
-	protected:
-		Distance             mLineWidth;
-		ColorNode            mLineColorNode;
-		ColorNode            mFillColorNode;
+			///////////////////////////////////////////////////////////////
+			// Private Members
+			///////////////////////////////////////////////////////////////
+		protected:
+			Distance             mLineWidth;
+			ColorNode            mLineColorNode;
+			ColorNode            mFillColorNode;
 
-	};
+		};
 
+	}
 }
 
 
diff --git a/model/ModelTextObject.cpp b/model/ModelTextObject.cpp
index df02622..c99b105 100644
--- a/model/ModelTextObject.cpp
+++ b/model/ModelTextObject.cpp
@@ -30,691 +30,694 @@
 #include <QtDebug>
 
 
-namespace glabels::model
+namespace glabels
 {
-
-	//
-	// Private
-	//
-	namespace
+	namespace model
 	{
-		const double marginPts = 3;
-	}
+
+		//
+		// Private
+		//
+		namespace
+		{
+			const double marginPts = 3;
+		}
 
 
-	///
-	/// Constructor
-	///
-	ModelTextObject::ModelTextObject()
-	{
-		mOutline = new Outline( this );
+		///
+		/// Constructor
+		///
+		ModelTextObject::ModelTextObject()
+		{
+			mOutline = new Outline( this );
 
-		mHandles << new HandleNorthWest( this );
-		mHandles << new HandleNorth( this );
-		mHandles << new HandleNorthEast( this );
-		mHandles << new HandleEast( this );
-		mHandles << new HandleSouthEast( this );
-		mHandles << new HandleSouth( this );
-		mHandles << new HandleSouthWest( this );
-		mHandles << new HandleWest( this );
+			mHandles << new HandleNorthWest( this );
+			mHandles << new HandleNorth( this );
+			mHandles << new HandleNorthEast( this );
+			mHandles << new HandleEast( this );
+			mHandles << new HandleSouthEast( this );
+			mHandles << new HandleSouth( this );
+			mHandles << new HandleSouthWest( this );
+			mHandles << new HandleWest( this );
 
-		mText              = "";
-		mFontFamily        = "Sans";
-		mFontSize          = 10;
-		mFontWeight        = QFont::Normal;
-		mFontItalicFlag    = false;
-		mFontUnderlineFlag = false;
-		mTextColorNode     = ColorNode( QColor( 0, 0, 0 ) );
-		mTextHAlign        = Qt::AlignLeft;
-		mTextVAlign        = Qt::AlignTop;
-		mTextLineSpacing   = 1;
-	}
+			mText              = "";
+			mFontFamily        = "Sans";
+			mFontSize          = 10;
+			mFontWeight        = QFont::Normal;
+			mFontItalicFlag    = false;
+			mFontUnderlineFlag = false;
+			mTextColorNode     = ColorNode( QColor( 0, 0, 0 ) );
+			mTextHAlign        = Qt::AlignLeft;
+			mTextVAlign        = Qt::AlignTop;
+			mTextLineSpacing   = 1;
+		}
 
 
-	///
-	/// Constructor
-	///
-	ModelTextObject::ModelTextObject( const Distance&  x0,
-	                                  const Distance&  y0,
-	                                  const Distance&  w,
-	                                  const Distance&  h,
-	                                  const QString&   text,
-	                                  const QString&   fontFamily,
-	                                  double           fontSize,
-	                                  QFont::Weight    fontWeight,
-	                                  bool             fontItalicFlag,
-	                                  bool             fontUnderlineFlag,
-	                                  ColorNode        textColorNode,
-	                                  Qt::Alignment    textHAlign,
-	                                  Qt::Alignment    textVAlign,
-	                                  double           textLineSpacing,
-	                                  const QMatrix&   matrix,
-	                                  bool             shadowState,
-	                                  const Distance&  shadowX,
-	                                  const Distance&  shadowY,
-	                                  double           shadowOpacity,
-	                                  const ColorNode& shadowColorNode )
-	: ModelObject( x0, y0, w, h,
-	               matrix,
-	               shadowState, shadowX, shadowY, shadowOpacity, shadowColorNode )
-	{
-		mOutline = new Outline( this );
+		///
+		/// Constructor
+		///
+		ModelTextObject::ModelTextObject( const Distance&  x0,
+		                                  const Distance&  y0,
+		                                  const Distance&  w,
+		                                  const Distance&  h,
+		                                  const QString&   text,
+		                                  const QString&   fontFamily,
+		                                  double           fontSize,
+		                                  QFont::Weight    fontWeight,
+		                                  bool             fontItalicFlag,
+		                                  bool             fontUnderlineFlag,
+		                                  ColorNode        textColorNode,
+		                                  Qt::Alignment    textHAlign,
+		                                  Qt::Alignment    textVAlign,
+		                                  double           textLineSpacing,
+		                                  const QMatrix&   matrix,
+		                                  bool             shadowState,
+		                                  const Distance&  shadowX,
+		                                  const Distance&  shadowY,
+		                                  double           shadowOpacity,
+		                                  const ColorNode& shadowColorNode )
+		: ModelObject( x0, y0, w, h,
+		               matrix,
+		               shadowState, shadowX, shadowY, shadowOpacity, shadowColorNode )
+		{
+			mOutline = new Outline( this );
 
-		mHandles << new HandleNorthWest( this );
-		mHandles << new HandleNorth( this );
-		mHandles << new HandleNorthEast( this );
-		mHandles << new HandleEast( this );
-		mHandles << new HandleSouthEast( this );
-		mHandles << new HandleSouth( this );
-		mHandles << new HandleSouthWest( this );
-		mHandles << new HandleWest( this );
+			mHandles << new HandleNorthWest( this );
+			mHandles << new HandleNorth( this );
+			mHandles << new HandleNorthEast( this );
+			mHandles << new HandleEast( this );
+			mHandles << new HandleSouthEast( this );
+			mHandles << new HandleSouth( this );
+			mHandles << new HandleSouthWest( this );
+			mHandles << new HandleWest( this );
 
-		mText              = text;
-		mFontFamily        = fontFamily;
-		mFontSize          = fontSize;
-		mFontWeight        = fontWeight;
-		mFontItalicFlag    = fontItalicFlag;
-		mFontUnderlineFlag = fontUnderlineFlag;
-		mTextColorNode     = textColorNode;
-		mTextHAlign        = textHAlign;
-		mTextVAlign        = textVAlign;
-		mTextLineSpacing   = textLineSpacing;
+			mText              = text;
+			mFontFamily        = fontFamily;
+			mFontSize          = fontSize;
+			mFontWeight        = fontWeight;
+			mFontItalicFlag    = fontItalicFlag;
+			mFontUnderlineFlag = fontUnderlineFlag;
+			mTextColorNode     = textColorNode;
+			mTextHAlign        = textHAlign;
+			mTextVAlign        = textVAlign;
+			mTextLineSpacing   = textLineSpacing;
 
-		update(); // Initialize cached editor layouts
-	}
+			update(); // Initialize cached editor layouts
+		}
 
 	
-	///
-	/// Copy constructor
-	///
-	ModelTextObject::ModelTextObject( const ModelTextObject* object )
-		: ModelObject(object)
-	{
-		mText              = object->mText;
-		mFontFamily        = object->mFontFamily;
-		mFontSize          = object->mFontSize;
-		mFontWeight        = object->mFontWeight;
-		mFontItalicFlag    = object->mFontItalicFlag;
-		mFontUnderlineFlag = object->mFontUnderlineFlag;
-		mTextColorNode     = object->mTextColorNode;
-		mTextHAlign        = object->mTextHAlign;
-		mTextVAlign        = object->mTextVAlign;
-		mTextLineSpacing   = object->mTextLineSpacing;
-
-		update(); // Initialize cached editor layouts
-	}
-
-
-	///
-	/// Destructor
-	///
-	ModelTextObject::~ModelTextObject()
-	{
-		delete mOutline;
-
-		foreach( Handle* handle, mHandles )
+		///
+		/// Copy constructor
+		///
+		ModelTextObject::ModelTextObject( const ModelTextObject* object )
+			: ModelObject(object)
 		{
-			delete handle;
+			mText              = object->mText;
+			mFontFamily        = object->mFontFamily;
+			mFontSize          = object->mFontSize;
+			mFontWeight        = object->mFontWeight;
+			mFontItalicFlag    = object->mFontItalicFlag;
+			mFontUnderlineFlag = object->mFontUnderlineFlag;
+			mTextColorNode     = object->mTextColorNode;
+			mTextHAlign        = object->mTextHAlign;
+			mTextVAlign        = object->mTextVAlign;
+			mTextLineSpacing   = object->mTextLineSpacing;
+
+			update(); // Initialize cached editor layouts
 		}
-		mHandles.clear();
-	}
 
 
-	///
-	/// Clone
-	///
-	ModelTextObject* ModelTextObject::clone() const
-	{
-		return new ModelTextObject( this );
-	}
-
-
-	///
-	/// Text Property Getter
-	///
-	QString ModelTextObject::text() const
-	{
-		return mText.toString();
-	}
-
-
-	///
-	/// Text Property Setter
-	///
-	void ModelTextObject::setText( const QString& value )
-	{
-		if ( mText.toString() != value )
+		///
+		/// Destructor
+		///
+		ModelTextObject::~ModelTextObject()
 		{
-			mText = value;
-			update();
-			emit changed();
-		}
-	}
+			delete mOutline;
 
-
-	///
-	/// FontFamily Property Getter
-	///
-	QString ModelTextObject::fontFamily() const
-	{
-		return mFontFamily;
-	}
-
-
-	///
-	/// FontFamily Property Setter
-	///
-	void ModelTextObject::setFontFamily( const QString& value )
-	{
-		if ( mFontFamily != value )
-		{
-			mFontFamily = value;
-			update();
-			emit changed();
-		}
-	}
-
-
-	///
-	/// FontSize Property Getter
-	///
-	double ModelTextObject::fontSize() const
-	{
-		return mFontSize;
-	}
-
-
-	///
-	/// FontSize Property Setter
-	///
-	void ModelTextObject::setFontSize( double value )
-	{
-		if ( mFontSize != value )
-		{
-			mFontSize = value;
-			update();
-			emit changed();
-		}
-	}
-
-
-	///
-	/// FontWeight Property Getter
-	///
-	QFont::Weight ModelTextObject::fontWeight() const
-	{
-		return mFontWeight;
-	}
-
-
-	///
-	/// FontWeight Property Setter
-	///
-	void ModelTextObject::setFontWeight( QFont::Weight value )
-	{
-		if ( mFontWeight != value )
-		{
-			mFontWeight = value;
-			update();
-			emit changed();
-		}
-	}
-
-
-	///
-	/// FontItalicFlag Property Getter
-	///
-	bool ModelTextObject::fontItalicFlag() const
-	{
-		return mFontItalicFlag;
-	}
-
-
-	///
-	/// FontItalicFlag Property Setter
-	///
-	void ModelTextObject::setFontItalicFlag( bool value )
-	{
-		if ( mFontItalicFlag != value )
-		{
-			mFontItalicFlag = value;
-			update();
-			emit changed();
-		}
-	}
-
-
-	///
-	/// FontUnderlineFlag Property Getter
-	///
-	bool ModelTextObject::fontUnderlineFlag() const
-	{
-		return mFontUnderlineFlag;
-	}
-
-
-	///
-	/// FontUnderlineFlag Property Setter
-	///
-	void ModelTextObject::setFontUnderlineFlag( bool value )
-	{
-		if ( mFontUnderlineFlag != value )
-		{
-			mFontUnderlineFlag = value;
-			update();
-			emit changed();
-		}
-	}
-
-
-	///
-	/// Text Color Node Property Getter
-	///
-	ColorNode ModelTextObject::textColorNode() const
-	{
-		return mTextColorNode;
-	}
-
-
-	///
-	/// Text Color Node Property Setter
-	///
-	void ModelTextObject::setTextColorNode( const ColorNode& value )
-	{
-		if ( mTextColorNode != value )
-		{
-			mTextColorNode = value;
-			update();
-			emit changed();
-		}
-	}
-		
-
-	///
-	/// TextHAlign Property Getter
-	///
-	Qt::Alignment ModelTextObject::textHAlign() const
-	{
-		return mTextHAlign;
-	}
-
-
-	///
-	/// TextHAlign Property Setter
-	///
-	void ModelTextObject::setTextHAlign( Qt::Alignment value )
-	{
-		if ( mTextHAlign != value )
-		{
-			mTextHAlign = value;
-			update();
-			emit changed();
-		}
-	}
-
-
-	///
-	/// TextVAlign Property Getter
-	///
-	Qt::Alignment ModelTextObject::textVAlign() const
-	{
-		return mTextVAlign;
-	}
-
-
-	///
-	/// TextVAlign Property Setter
-	///
-	void ModelTextObject::setTextVAlign( Qt::Alignment value )
-	{
-		if ( mTextVAlign != value )
-		{
-			mTextVAlign = value;
-			update();
-			emit changed();
-		}
-	}
-
-
-	///
-	/// TextLineSpacing Property Getter
-	///
-	double ModelTextObject::textLineSpacing() const
-	{
-		return mTextLineSpacing;
-	}
-
-
-	///
-	/// TextLineSpacing Property Setter
-	///
-	void ModelTextObject::setTextLineSpacing( double value )
-	{
-		if ( mTextLineSpacing != value )
-		{
-			mTextLineSpacing = value;
-			update();
-			emit changed();
-		}
-	}
-
-
-	///
-	/// NaturalSize Property Getter
-	///
-	Size ModelTextObject::naturalSize() const
-	{
-		QFont font;
-		font.setFamily( mFontFamily );
-		font.setPointSizeF( mFontSize );
-		font.setWeight( mFontWeight );
-		font.setItalic( mFontItalicFlag );
-		font.setUnderline( mFontUnderlineFlag );
-
-		QTextOption textOption;
-		textOption.setAlignment( mTextHAlign );
-		textOption.setWrapMode( QTextOption::WordWrap );
-
-		QFontMetricsF fontMetrics( font );
-		double dy = fontMetrics.lineSpacing() * mTextLineSpacing;
-
-		QString displayText = mText.isEmpty() ? tr("Text") : mText.toString();
-		QTextDocument document( displayText );
-
-		// Do layouts
-		double x = 0;
-		double y = 0;
-		QRectF boundingRect;
-		for ( int i = 0; i < document.blockCount(); i++ )
-		{
-			QTextLayout* layout = new QTextLayout( document.findBlockByNumber(i).text() );
-		
-			layout->setFont( font );
-			layout->setTextOption( textOption );
-			layout->setCacheEnabled(true);
-
-			layout->beginLayout();
-			for ( QTextLine l = layout->createLine(); l.isValid(); l = layout->createLine() )
+			foreach( Handle* handle, mHandles )
 			{
-				l.setPosition( QPointF( x, y ) );
-				y += dy;
+				delete handle;
 			}
-			layout->endLayout();
-
-			boundingRect = layout->boundingRect().united( boundingRect );
+			mHandles.clear();
 		}
 
-		return Size( boundingRect.width() + 2*marginPts, boundingRect.height() + 2*marginPts );
-	}
 
-
-	///
-	/// Can Text Capability Implementation
-	///
-	bool ModelTextObject::canText()
-	{
-		return true;
-	}
-
-
-	///
-	/// Draw shadow of object
-	///
-	void ModelTextObject::drawShadow( QPainter*      painter,
-	                                  bool           inEditor,
-	                                  merge::Record* record ) const
-	{
-		QColor textColor = mTextColorNode.color( record );
-
-		if ( textColor.alpha() )
+		///
+		/// Clone
+		///
+		ModelTextObject* ModelTextObject::clone() const
 		{
-			QColor shadowColor = mShadowColorNode.color( record );
-			shadowColor.setAlphaF( mShadowOpacity );
+			return new ModelTextObject( this );
+		}
+
+
+		///
+		/// Text Property Getter
+		///
+		QString ModelTextObject::text() const
+		{
+			return mText.toString();
+		}
+
+
+		///
+		/// Text Property Setter
+		///
+		void ModelTextObject::setText( const QString& value )
+		{
+			if ( mText.toString() != value )
+			{
+				mText = value;
+				update();
+				emit changed();
+			}
+		}
+
+
+		///
+		/// FontFamily Property Getter
+		///
+		QString ModelTextObject::fontFamily() const
+		{
+			return mFontFamily;
+		}
+
+
+		///
+		/// FontFamily Property Setter
+		///
+		void ModelTextObject::setFontFamily( const QString& value )
+		{
+			if ( mFontFamily != value )
+			{
+				mFontFamily = value;
+				update();
+				emit changed();
+			}
+		}
+
+
+		///
+		/// FontSize Property Getter
+		///
+		double ModelTextObject::fontSize() const
+		{
+			return mFontSize;
+		}
+
+
+		///
+		/// FontSize Property Setter
+		///
+		void ModelTextObject::setFontSize( double value )
+		{
+			if ( mFontSize != value )
+			{
+				mFontSize = value;
+				update();
+				emit changed();
+			}
+		}
+
+
+		///
+		/// FontWeight Property Getter
+		///
+		QFont::Weight ModelTextObject::fontWeight() const
+		{
+			return mFontWeight;
+		}
+
+
+		///
+		/// FontWeight Property Setter
+		///
+		void ModelTextObject::setFontWeight( QFont::Weight value )
+		{
+			if ( mFontWeight != value )
+			{
+				mFontWeight = value;
+				update();
+				emit changed();
+			}
+		}
+
+
+		///
+		/// FontItalicFlag Property Getter
+		///
+		bool ModelTextObject::fontItalicFlag() const
+		{
+			return mFontItalicFlag;
+		}
+
+
+		///
+		/// FontItalicFlag Property Setter
+		///
+		void ModelTextObject::setFontItalicFlag( bool value )
+		{
+			if ( mFontItalicFlag != value )
+			{
+				mFontItalicFlag = value;
+				update();
+				emit changed();
+			}
+		}
+
+
+		///
+		/// FontUnderlineFlag Property Getter
+		///
+		bool ModelTextObject::fontUnderlineFlag() const
+		{
+			return mFontUnderlineFlag;
+		}
+
+
+		///
+		/// FontUnderlineFlag Property Setter
+		///
+		void ModelTextObject::setFontUnderlineFlag( bool value )
+		{
+			if ( mFontUnderlineFlag != value )
+			{
+				mFontUnderlineFlag = value;
+				update();
+				emit changed();
+			}
+		}
+
+
+		///
+		/// Text Color Node Property Getter
+		///
+		ColorNode ModelTextObject::textColorNode() const
+		{
+			return mTextColorNode;
+		}
+
+
+		///
+		/// Text Color Node Property Setter
+		///
+		void ModelTextObject::setTextColorNode( const ColorNode& value )
+		{
+			if ( mTextColorNode != value )
+			{
+				mTextColorNode = value;
+				update();
+				emit changed();
+			}
+		}
+		
+
+		///
+		/// TextHAlign Property Getter
+		///
+		Qt::Alignment ModelTextObject::textHAlign() const
+		{
+			return mTextHAlign;
+		}
+
+
+		///
+		/// TextHAlign Property Setter
+		///
+		void ModelTextObject::setTextHAlign( Qt::Alignment value )
+		{
+			if ( mTextHAlign != value )
+			{
+				mTextHAlign = value;
+				update();
+				emit changed();
+			}
+		}
+
+
+		///
+		/// TextVAlign Property Getter
+		///
+		Qt::Alignment ModelTextObject::textVAlign() const
+		{
+			return mTextVAlign;
+		}
+
+
+		///
+		/// TextVAlign Property Setter
+		///
+		void ModelTextObject::setTextVAlign( Qt::Alignment value )
+		{
+			if ( mTextVAlign != value )
+			{
+				mTextVAlign = value;
+				update();
+				emit changed();
+			}
+		}
+
+
+		///
+		/// TextLineSpacing Property Getter
+		///
+		double ModelTextObject::textLineSpacing() const
+		{
+			return mTextLineSpacing;
+		}
+
+
+		///
+		/// TextLineSpacing Property Setter
+		///
+		void ModelTextObject::setTextLineSpacing( double value )
+		{
+			if ( mTextLineSpacing != value )
+			{
+				mTextLineSpacing = value;
+				update();
+				emit changed();
+			}
+		}
+
+
+		///
+		/// NaturalSize Property Getter
+		///
+		Size ModelTextObject::naturalSize() const
+		{
+			QFont font;
+			font.setFamily( mFontFamily );
+			font.setPointSizeF( mFontSize );
+			font.setWeight( mFontWeight );
+			font.setItalic( mFontItalicFlag );
+			font.setUnderline( mFontUnderlineFlag );
+
+			QTextOption textOption;
+			textOption.setAlignment( mTextHAlign );
+			textOption.setWrapMode( QTextOption::WordWrap );
+
+			QFontMetricsF fontMetrics( font );
+			double dy = fontMetrics.lineSpacing() * mTextLineSpacing;
+
+			QString displayText = mText.isEmpty() ? tr("Text") : mText.toString();
+			QTextDocument document( displayText );
+
+			// Do layouts
+			double x = 0;
+			double y = 0;
+			QRectF boundingRect;
+			for ( int i = 0; i < document.blockCount(); i++ )
+			{
+				QTextLayout* layout = new QTextLayout( document.findBlockByNumber(i).text() );
+		
+				layout->setFont( font );
+				layout->setTextOption( textOption );
+				layout->setCacheEnabled(true);
+
+				layout->beginLayout();
+				for ( QTextLine l = layout->createLine(); l.isValid(); l = layout->createLine() )
+				{
+					l.setPosition( QPointF( x, y ) );
+					y += dy;
+				}
+				layout->endLayout();
+
+				boundingRect = layout->boundingRect().united( boundingRect );
+			}
+
+			return Size( boundingRect.width() + 2*marginPts, boundingRect.height() + 2*marginPts );
+		}
+
+
+		///
+		/// Can Text Capability Implementation
+		///
+		bool ModelTextObject::canText()
+		{
+			return true;
+		}
+
+
+		///
+		/// Draw shadow of object
+		///
+		void ModelTextObject::drawShadow( QPainter*      painter,
+		                                  bool           inEditor,
+		                                  merge::Record* record ) const
+		{
+			QColor textColor = mTextColorNode.color( record );
+
+			if ( textColor.alpha() )
+			{
+				QColor shadowColor = mShadowColorNode.color( record );
+				shadowColor.setAlphaF( mShadowOpacity );
+
+				if ( inEditor )
+				{
+					drawTextInEditor( painter, shadowColor );
+				}
+				else
+				{
+					drawText( painter, shadowColor, record );
+				}
+			}
+		}
+
+	
+		///
+		/// Draw object itself
+		///
+		void ModelTextObject::drawObject( QPainter*      painter,
+		                                  bool           inEditor,
+		                                  merge::Record* record ) const
+		{
+			QColor textColor = mTextColorNode.color( record );
 
 			if ( inEditor )
 			{
-				drawTextInEditor( painter, shadowColor );
+				drawTextInEditor( painter, textColor );
 			}
 			else
 			{
-				drawText( painter, shadowColor, record );
+				drawText( painter, textColor, record );
 			}
 		}
-	}
 
-	
-	///
-	/// Draw object itself
-	///
-	void ModelTextObject::drawObject( QPainter*      painter,
-	                                  bool           inEditor,
-	                                  merge::Record* record ) const
-	{
-		QColor textColor = mTextColorNode.color( record );
 
-		if ( inEditor )
+		///
+		/// Path to test for hover condition
+		///
+		QPainterPath ModelTextObject::hoverPath( double scale ) const
 		{
-			drawTextInEditor( painter, textColor );
+			return mHoverPath;
 		}
-		else
+
+
+		///
+		/// Size updated
+		///
+		void ModelTextObject::sizeUpdated()
 		{
-			drawText( painter, textColor, record );
+			update();
 		}
-	}
 
 
-	///
-	/// Path to test for hover condition
-	///
-	QPainterPath ModelTextObject::hoverPath( double scale ) const
-	{
-		return mHoverPath;
-	}
-
-
-	///
-	/// Size updated
-	///
-	void ModelTextObject::sizeUpdated()
-	{
-		update();
-	}
-
-
-	///
-	/// Update cached information for editor view
-	///
-	void ModelTextObject::update()
-	{
-		QFont font;
-		font.setFamily( mFontFamily );
-		font.setPointSizeF( mFontSize );
-		font.setWeight( mFontWeight );
-		font.setItalic( mFontItalicFlag );
-		font.setUnderline( mFontUnderlineFlag );
-
-		QTextOption textOption;
-		textOption.setAlignment( mTextHAlign );
-		textOption.setWrapMode( QTextOption::WordWrap );
-
-		QFontMetricsF fontMetrics( font );
-		double dy = fontMetrics.lineSpacing() * mTextLineSpacing;
-
-		QString displayText = mText.isEmpty() ? tr("Text") : mText.toString();
-		QTextDocument document( displayText );
-
-		qDeleteAll( mEditorLayouts );
-		mEditorLayouts.clear();
-
-		// Pass #1 -- do initial layouts
-		double x = 0;
-		double y = 0;
-		QRectF boundingRect;
-		for ( int i = 0; i < document.blockCount(); i++ )
+		///
+		/// Update cached information for editor view
+		///
+		void ModelTextObject::update()
 		{
-			QTextLayout* layout = new QTextLayout( document.findBlockByNumber(i).text() );
+			QFont font;
+			font.setFamily( mFontFamily );
+			font.setPointSizeF( mFontSize );
+			font.setWeight( mFontWeight );
+			font.setItalic( mFontItalicFlag );
+			font.setUnderline( mFontUnderlineFlag );
+
+			QTextOption textOption;
+			textOption.setAlignment( mTextHAlign );
+			textOption.setWrapMode( QTextOption::WordWrap );
+
+			QFontMetricsF fontMetrics( font );
+			double dy = fontMetrics.lineSpacing() * mTextLineSpacing;
+
+			QString displayText = mText.isEmpty() ? tr("Text") : mText.toString();
+			QTextDocument document( displayText );
+
+			qDeleteAll( mEditorLayouts );
+			mEditorLayouts.clear();
+
+			// Pass #1 -- do initial layouts
+			double x = 0;
+			double y = 0;
+			QRectF boundingRect;
+			for ( int i = 0; i < document.blockCount(); i++ )
+			{
+				QTextLayout* layout = new QTextLayout( document.findBlockByNumber(i).text() );
 		
-			layout->setFont( font );
-			layout->setTextOption( textOption );
-			layout->setCacheEnabled(true);
+				layout->setFont( font );
+				layout->setTextOption( textOption );
+				layout->setCacheEnabled(true);
 
-			layout->beginLayout();
-			for ( QTextLine l = layout->createLine(); l.isValid(); l = layout->createLine() )
-			{
-				l.setLineWidth( mW.pt() - 2*marginPts );
-				l.setPosition( QPointF( x, y ) );
-				y += dy;
+				layout->beginLayout();
+				for ( QTextLine l = layout->createLine(); l.isValid(); l = layout->createLine() )
+				{
+					l.setLineWidth( mW.pt() - 2*marginPts );
+					l.setPosition( QPointF( x, y ) );
+					y += dy;
+				}
+				layout->endLayout();
+
+				mEditorLayouts.append( layout );
+
+				boundingRect = layout->boundingRect().united( boundingRect );
 			}
-			layout->endLayout();
-
-			mEditorLayouts.append( layout );
-
-			boundingRect = layout->boundingRect().united( boundingRect );
-		}
-		double h = boundingRect.height();
+			double h = boundingRect.height();
 
 
-		// Pass #2 -- adjust layout positions for vertical alignment and create hover path
-		x = marginPts;
-		switch ( mTextVAlign )
-		{
-		case Qt::AlignVCenter:
-			y = mH.pt()/2 - h/2;
-			break;
-		case Qt::AlignBottom:
-			y = mH.pt() - h - marginPts;
-			break;
-		default:
-			y = marginPts;
-			break;
-		}
-		QPainterPath hoverPath; // new empty hover path
-		foreach ( QTextLayout* layout, mEditorLayouts )
-		{
-			for ( int j = 0; j < layout->lineCount(); j++ )
+			// Pass #2 -- adjust layout positions for vertical alignment and create hover path
+			x = marginPts;
+			switch ( mTextVAlign )
 			{
-				QTextLine l = layout->lineAt(j);
-				l.setPosition( QPointF( x, y ) );
-				y += dy;
-
-				hoverPath.addRect( l.naturalTextRect() ); // add to new hover path
+			case Qt::AlignVCenter:
+				y = mH.pt()/2 - h/2;
+				break;
+			case Qt::AlignBottom:
+				y = mH.pt() - h - marginPts;
+				break;
+			default:
+				y = marginPts;
+				break;
+			}
+			QPainterPath hoverPath; // new empty hover path
+			foreach ( QTextLayout* layout, mEditorLayouts )
+			{
+				for ( int j = 0; j < layout->lineCount(); j++ )
+				{
+					QTextLine l = layout->lineAt(j);
+					l.setPosition( QPointF( x, y ) );
+					y += dy;
+
+					hoverPath.addRect( l.naturalTextRect() ); // add to new hover path
+				}
 			}
-		}
 	
-		mHoverPath = hoverPath; // save new hover path
-	}
-
-
-	///
-	/// Draw text in editor from cached information
-	///
-	void ModelTextObject::drawTextInEditor( QPainter* painter, const QColor& color ) const
-	{
-		if ( mText.isEmpty() )
-		{
-			QColor mutedColor = color;
-			mutedColor.setAlphaF( 0.5 * color.alphaF() );
-			painter->setPen( QPen( mutedColor ) );
+			mHoverPath = hoverPath; // save new hover path
 		}
-		else
+
+
+		///
+		/// Draw text in editor from cached information
+		///
+		void ModelTextObject::drawTextInEditor( QPainter* painter, const QColor& color ) const
 		{
+			if ( mText.isEmpty() )
+			{
+				QColor mutedColor = color;
+				mutedColor.setAlphaF( 0.5 * color.alphaF() );
+				painter->setPen( QPen( mutedColor ) );
+			}
+			else
+			{
+				painter->setPen( QPen( color ) );
+			}
+
+			foreach ( QTextLayout* layout, mEditorLayouts )
+			{
+				layout->draw( painter, QPointF( 0, 0 ) );
+			}
+		}
+
+
+		///
+		/// Draw text in final printout or preview
+		///
+		void
+		ModelTextObject::drawText( QPainter*      painter,
+		                           const QColor&  color,
+		                           merge::Record* record ) const
+		{
+			QFont font;
+			font.setFamily( mFontFamily );
+			font.setPointSizeF( mFontSize );
+			font.setWeight( mFontWeight );
+			font.setItalic( mFontItalicFlag );
+			font.setUnderline( mFontUnderlineFlag );
+
+			QTextOption textOption;
+			textOption.setAlignment( mTextHAlign );
+			textOption.setWrapMode( QTextOption::WordWrap );
+
+			QFontMetricsF fontMetrics( font );
+			double dy = fontMetrics.lineSpacing() * mTextLineSpacing;
+
+			QTextDocument document( mText.expand( record ) );
+
+			QList<QTextLayout*> layouts;
+
+			// Pass #1 -- do initial layouts
+			double x = 0;
+			double y = 0;
+			QRectF boundingRect;
+			for ( int i = 0; i < document.blockCount(); i++ )
+			{
+				QTextLayout* layout = new QTextLayout( document.findBlockByNumber(i).text() );
+		
+				layout->setFont( font );
+				layout->setTextOption( textOption );
+				layout->setCacheEnabled(true);
+
+				layout->beginLayout();
+				for ( QTextLine l = layout->createLine(); l.isValid(); l = layout->createLine() )
+				{
+					l.setLineWidth( mW.pt() - 2*marginPts );
+					l.setPosition( QPointF( x, y ) );
+					y += dy;
+				}
+				layout->endLayout();
+
+				layouts.append( layout );
+
+				boundingRect = layout->boundingRect().united( boundingRect );
+			}
+			double h = boundingRect.height();
+
+
+			// Pass #2 -- adjust layout positions for vertical alignment and create hover path
+			x = marginPts;
+			switch ( mTextVAlign )
+			{
+			case Qt::AlignVCenter:
+				y = mH.pt()/2 - h/2;
+				break;
+			case Qt::AlignBottom:
+				y = mH.pt() - h - marginPts;
+				break;
+			default:
+				y = marginPts;
+				break;
+			}
+			foreach ( QTextLayout* layout, layouts )
+			{
+				for ( int j = 0; j < layout->lineCount(); j++ )
+				{
+					QTextLine l = layout->lineAt(j);
+					l.setPosition( QPointF( x, y ) );
+					y += dy;
+				}
+			}
+
+			// Draw layouts
 			painter->setPen( QPen( color ) );
-		}
-
-		foreach ( QTextLayout* layout, mEditorLayouts )
-		{
-			layout->draw( painter, QPointF( 0, 0 ) );
-		}
-	}
-
-
-	///
-	/// Draw text in final printout or preview
-	///
-	void
-	ModelTextObject::drawText( QPainter*      painter,
-	                           const QColor&  color,
-	                           merge::Record* record ) const
-	{
-		QFont font;
-		font.setFamily( mFontFamily );
-		font.setPointSizeF( mFontSize );
-		font.setWeight( mFontWeight );
-		font.setItalic( mFontItalicFlag );
-		font.setUnderline( mFontUnderlineFlag );
-
-		QTextOption textOption;
-		textOption.setAlignment( mTextHAlign );
-		textOption.setWrapMode( QTextOption::WordWrap );
-
-		QFontMetricsF fontMetrics( font );
-		double dy = fontMetrics.lineSpacing() * mTextLineSpacing;
-
-		QTextDocument document( mText.expand( record ) );
-
-		QList<QTextLayout*> layouts;
-
-		// Pass #1 -- do initial layouts
-		double x = 0;
-		double y = 0;
-		QRectF boundingRect;
-		for ( int i = 0; i < document.blockCount(); i++ )
-		{
-			QTextLayout* layout = new QTextLayout( document.findBlockByNumber(i).text() );
-		
-			layout->setFont( font );
-			layout->setTextOption( textOption );
-			layout->setCacheEnabled(true);
-
-			layout->beginLayout();
-			for ( QTextLine l = layout->createLine(); l.isValid(); l = layout->createLine() )
+			foreach ( QTextLayout* layout, layouts )
 			{
-				l.setLineWidth( mW.pt() - 2*marginPts );
-				l.setPosition( QPointF( x, y ) );
-				y += dy;
+				layout->draw( painter, QPointF( 0, 0 ) );
 			}
-			layout->endLayout();
 
-			layouts.append( layout );
-
-			boundingRect = layout->boundingRect().united( boundingRect );
-		}
-		double h = boundingRect.height();
-
-
-		// Pass #2 -- adjust layout positions for vertical alignment and create hover path
-		x = marginPts;
-		switch ( mTextVAlign )
-		{
-		case Qt::AlignVCenter:
-			y = mH.pt()/2 - h/2;
-			break;
-		case Qt::AlignBottom:
-			y = mH.pt() - h - marginPts;
-			break;
-		default:
-			y = marginPts;
-			break;
-		}
-		foreach ( QTextLayout* layout, layouts )
-		{
-			for ( int j = 0; j < layout->lineCount(); j++ )
-			{
-				QTextLine l = layout->lineAt(j);
-				l.setPosition( QPointF( x, y ) );
-				y += dy;
-			}
+			// Cleanup
+			qDeleteAll( layouts );
 		}
 
-		// Draw layouts
-		painter->setPen( QPen( color ) );
-		foreach ( QTextLayout* layout, layouts )
-		{
-			layout->draw( painter, QPointF( 0, 0 ) );
-		}
-
-		// Cleanup
-		qDeleteAll( layouts );
 	}
-
-} // namespace glabels::model
+}
diff --git a/model/ModelTextObject.h b/model/ModelTextObject.h
index fab6753..e0efaf2 100644
--- a/model/ModelTextObject.h
+++ b/model/ModelTextObject.h
@@ -28,181 +28,184 @@
 #include <QTextLayout>
 
 
-namespace glabels::model
+namespace glabels
 {
-
-	///
-	/// Label Model Line Object
-	///
-	class ModelTextObject : public ModelObject
+	namespace model
 	{
-		Q_OBJECT
 
-		///////////////////////////////////////////////////////////////
-		// Lifecycle Methods
-		///////////////////////////////////////////////////////////////
-	public:
-		ModelTextObject();
+		///
+		/// Label Model Line Object
+		///
+		class ModelTextObject : public ModelObject
+		{
+			Q_OBJECT
+
+			///////////////////////////////////////////////////////////////
+			// Lifecycle Methods
+			///////////////////////////////////////////////////////////////
+		public:
+			ModelTextObject();
 		
-		ModelTextObject( const Distance&  x0,
-		                 const Distance&  y0,
-		                 const Distance&  w,
-		                 const Distance&  h,
-		                 const QString&   text,
-		                 const QString&   fontFamily,
-		                 double           fontSize,
-		                 QFont::Weight    fontWeight,
-		                 bool             fontItalicFlag,
-		                 bool             fontUnderlineFlag,
-		                 ColorNode        textColorNode,
-		                 Qt::Alignment    textHAlign,
-		                 Qt::Alignment    textVAlign,
-		                 double           textLineSpacing,
-		                 const QMatrix&   matrix = QMatrix(),
-		                 bool             shadowState = false,
-		                 const Distance&  shadowX = 0,
-		                 const Distance&  shadowY = 0,
-		                 double           shadowOpacity = 1.0,
-		                 const ColorNode& shadowColorNode = ColorNode() );
+			ModelTextObject( const Distance&  x0,
+			                 const Distance&  y0,
+			                 const Distance&  w,
+			                 const Distance&  h,
+			                 const QString&   text,
+			                 const QString&   fontFamily,
+			                 double           fontSize,
+			                 QFont::Weight    fontWeight,
+			                 bool             fontItalicFlag,
+			                 bool             fontUnderlineFlag,
+			                 ColorNode        textColorNode,
+			                 Qt::Alignment    textHAlign,
+			                 Qt::Alignment    textVAlign,
+			                 double           textLineSpacing,
+			                 const QMatrix&   matrix = QMatrix(),
+			                 bool             shadowState = false,
+			                 const Distance&  shadowX = 0,
+			                 const Distance&  shadowY = 0,
+			                 double           shadowOpacity = 1.0,
+			                 const ColorNode& shadowColorNode = ColorNode() );
 
-		ModelTextObject( const ModelTextObject* object );
+			ModelTextObject( const ModelTextObject* object );
 		
-		~ModelTextObject() override;
+			~ModelTextObject() override;
 
 
-		///////////////////////////////////////////////////////////////
-		// Object duplication
-		///////////////////////////////////////////////////////////////
-		ModelTextObject* clone() const override;
+			///////////////////////////////////////////////////////////////
+			// Object duplication
+			///////////////////////////////////////////////////////////////
+			ModelTextObject* clone() const override;
 
 
-		///////////////////////////////////////////////////////////////
-		// Property Implementations
-		///////////////////////////////////////////////////////////////
-	public:
-		//
-		// Text Property: text
-		//
-		QString text() const override;
-		void setText( const QString &value ) override;
+			///////////////////////////////////////////////////////////////
+			// Property Implementations
+			///////////////////////////////////////////////////////////////
+		public:
+			//
+			// Text Property: text
+			//
+			QString text() const override;
+			void setText( const QString &value ) override;
 
 
-		//
-		// Text Property: fontFamily
-		//
-		QString fontFamily() const override;
-		void setFontFamily( const QString &value ) override;
+			//
+			// Text Property: fontFamily
+			//
+			QString fontFamily() const override;
+			void setFontFamily( const QString &value ) override;
 
 
-		//
-		// Text Property: fontSize
-		//
-		double fontSize() const override;
-		void setFontSize( double value ) override;
+			//
+			// Text Property: fontSize
+			//
+			double fontSize() const override;
+			void setFontSize( double value ) override;
 
 
-		//
-		// Text Property: fontWeight
-		//
-		QFont::Weight fontWeight() const override;
-		void setFontWeight( QFont::Weight value ) override;
+			//
+			// Text Property: fontWeight
+			//
+			QFont::Weight fontWeight() const override;
+			void setFontWeight( QFont::Weight value ) override;
 
 
-		//
-		// Text Property: fontItalicFlag
-		//
-		bool fontItalicFlag() const override;
-		void setFontItalicFlag( bool value ) override;
+			//
+			// Text Property: fontItalicFlag
+			//
+			bool fontItalicFlag() const override;
+			void setFontItalicFlag( bool value ) override;
 
 
-		//
-		// Text Property: fontUnderlineFlag
-		//
-		bool fontUnderlineFlag() const override;
-		void setFontUnderlineFlag( bool value ) override;
+			//
+			// Text Property: fontUnderlineFlag
+			//
+			bool fontUnderlineFlag() const override;
+			void setFontUnderlineFlag( bool value ) override;
 
 
-		//
-		// Text Property: textColorNode
-		//
-		ColorNode textColorNode() const override;
-		void setTextColorNode( const ColorNode &value ) override;
+			//
+			// Text Property: textColorNode
+			//
+			ColorNode textColorNode() const override;
+			void setTextColorNode( const ColorNode &value ) override;
 		
 
-		//
-		// Text Property: textHAlign
-		//
-		Qt::Alignment textHAlign() const override;
-		void setTextHAlign( Qt::Alignment value ) override;
+			//
+			// Text Property: textHAlign
+			//
+			Qt::Alignment textHAlign() const override;
+			void setTextHAlign( Qt::Alignment value ) override;
 
 
-		//
-		// Text Property: textVAlign
-		//
-		Qt::Alignment textVAlign() const override;
-		void setTextVAlign( Qt::Alignment value ) override;
+			//
+			// Text Property: textVAlign
+			//
+			Qt::Alignment textVAlign() const override;
+			void setTextVAlign( Qt::Alignment value ) override;
 
 
-		//
-		// Text Property: textLineSpacing
-		//
-		double textLineSpacing() const override;
-		void setTextLineSpacing( double value ) override;
+			//
+			// Text Property: textLineSpacing
+			//
+			double textLineSpacing() const override;
+			void setTextLineSpacing( double value ) override;
 
 
-		//
-		// Property: naturalSize
-		//
-		Size naturalSize() const override;
+			//
+			// Property: naturalSize
+			//
+			Size naturalSize() const override;
 
 
-		///////////////////////////////////////////////////////////////
-		// Capability Implementations
-		///////////////////////////////////////////////////////////////
-	public:
-		virtual bool canText();
+			///////////////////////////////////////////////////////////////
+			// Capability Implementations
+			///////////////////////////////////////////////////////////////
+		public:
+			virtual bool canText();
 
 
-		///////////////////////////////////////////////////////////////
-		// Drawing operations
-		///////////////////////////////////////////////////////////////
-	protected:
-		void drawShadow( QPainter* painter, bool inEditor, merge::Record* record ) const override;
-		void drawObject( QPainter* painter, bool inEditor, merge::Record* record ) const override;
-		QPainterPath hoverPath( double scale ) const override;
+			///////////////////////////////////////////////////////////////
+			// Drawing operations
+			///////////////////////////////////////////////////////////////
+		protected:
+			void drawShadow( QPainter* painter, bool inEditor, merge::Record* record ) const override;
+			void drawObject( QPainter* painter, bool inEditor, merge::Record* record ) const override;
+			QPainterPath hoverPath( double scale ) const override;
 
 
-		///////////////////////////////////////////////////////////////
-		// Private methods
-		///////////////////////////////////////////////////////////////
-	private:
-		void sizeUpdated() override;
-		void update();
-		void drawTextInEditor( QPainter* painter, const QColor& color ) const;
-		void drawText( QPainter* painter, const QColor&color, merge::Record* record ) const;
-		QString expandText( QString text, merge::Record* record ) const;
+			///////////////////////////////////////////////////////////////
+			// Private methods
+			///////////////////////////////////////////////////////////////
+		private:
+			void sizeUpdated() override;
+			void update();
+			void drawTextInEditor( QPainter* painter, const QColor& color ) const;
+			void drawText( QPainter* painter, const QColor&color, merge::Record* record ) const;
+			QString expandText( QString text, merge::Record* record ) const;
 	
 
-		///////////////////////////////////////////////////////////////
-		// Private Members
-		///////////////////////////////////////////////////////////////
-	private:
-		RawText              mText;
-		QString              mFontFamily;
-		double               mFontSize;
-		QFont::Weight        mFontWeight;
-		bool                 mFontItalicFlag;
-		bool                 mFontUnderlineFlag;
-		ColorNode            mTextColorNode;
-		Qt::Alignment        mTextHAlign;
-		Qt::Alignment        mTextVAlign;
-		double               mTextLineSpacing;
+			///////////////////////////////////////////////////////////////
+			// Private Members
+			///////////////////////////////////////////////////////////////
+		private:
+			RawText              mText;
+			QString              mFontFamily;
+			double               mFontSize;
+			QFont::Weight        mFontWeight;
+			bool                 mFontItalicFlag;
+			bool                 mFontUnderlineFlag;
+			ColorNode            mTextColorNode;
+			Qt::Alignment        mTextHAlign;
+			Qt::Alignment        mTextVAlign;
+			double               mTextLineSpacing;
 
-		QList<QTextLayout*>  mEditorLayouts;
-		QPainterPath         mHoverPath;
+			QList<QTextLayout*>  mEditorLayouts;
+			QPainterPath         mHoverPath;
 
-	};
+		};
 
+	}
 }
 
 
diff --git a/model/Outline.cpp b/model/Outline.cpp
index 0727f3b..15173c7 100644
--- a/model/Outline.cpp
+++ b/model/Outline.cpp
@@ -25,111 +25,114 @@
 #include <QColor>
 
 
-namespace glabels::model
+namespace glabels
 {
-
-	//
-	// Private
-	//
-	namespace
+	namespace model
 	{
-		const qreal dashSize = 2;
 
-		const double slopPixels = 2;
-		const double outlineWidthPixels = 1;
-		const QColor outlineColor1(   0,   0,   0 );
-		const QColor outlineColor2( 255, 255, 255 );
-	}
+		//
+		// Private
+		//
+		namespace
+		{
+			const qreal dashSize = 2;
+
+			const double slopPixels = 2;
+			const double outlineWidthPixels = 1;
+			const QColor outlineColor1(   0,   0,   0 );
+			const QColor outlineColor2( 255, 255, 255 );
+		}
 
 
-	///
-	/// Outline Constructor
-	///
-	Outline::Outline( ModelObject* owner )
-		: mOwner(owner)
-	{
-		mDashes << dashSize << dashSize;
+		///
+		/// Outline Constructor
+		///
+		Outline::Outline( ModelObject* owner )
+			: mOwner(owner)
+		{
+			mDashes << dashSize << dashSize;
 
-		mPen1.setColor( outlineColor1 );
-		mPen1.setWidth( outlineWidthPixels );
-		mPen1.setCosmetic( true );
-		mPen1.setCapStyle( Qt::FlatCap );
-		mPen1.setDashPattern( mDashes );
+			mPen1.setColor( outlineColor1 );
+			mPen1.setWidth( outlineWidthPixels );
+			mPen1.setCosmetic( true );
+			mPen1.setCapStyle( Qt::FlatCap );
+			mPen1.setDashPattern( mDashes );
 
-		mPen2.setColor( outlineColor2 );
-		mPen2.setWidth( outlineWidthPixels );
-		mPen2.setCosmetic( true );
-		mPen2.setCapStyle( Qt::FlatCap );
-		mPen2.setDashPattern( mDashes );
-		mPen2.setDashOffset( dashSize );
-	}
+			mPen2.setColor( outlineColor2 );
+			mPen2.setWidth( outlineWidthPixels );
+			mPen2.setCosmetic( true );
+			mPen2.setCapStyle( Qt::FlatCap );
+			mPen2.setDashPattern( mDashes );
+			mPen2.setDashOffset( dashSize );
+		}
 
 
-	///
-	/// Outline Copy constructor
-	///
-	Outline::Outline( const Outline* outline, ModelObject* newOwner )
-		: mOwner(newOwner)
-	{
-		mDashes = outline->mDashes;
-		mPen1   = outline->mPen1;
-		mPen2   = outline->mPen2;
-	}
+		///
+		/// Outline Copy constructor
+		///
+		Outline::Outline( const Outline* outline, ModelObject* newOwner )
+			: mOwner(newOwner)
+		{
+			mDashes = outline->mDashes;
+			mPen1   = outline->mPen1;
+			mPen2   = outline->mPen2;
+		}
 
 
-	///
-	/// Outline Destructor
-	///
-	Outline::~Outline()
-	{
-		// empty
-	}
+		///
+		/// Outline Destructor
+		///
+		Outline::~Outline()
+		{
+			// empty
+		}
 
 
-	///
-	/// Clone Outline
-	///
-	Outline* Outline::clone( ModelObject* newOwner ) const
-	{
-		return new Outline( this, newOwner );
-	}
+		///
+		/// Clone Outline
+		///
+		Outline* Outline::clone( ModelObject* newOwner ) const
+		{
+			return new Outline( this, newOwner );
+		}
 
 
-	///
-	/// Draw Outline
-	///
-	void Outline::draw( QPainter* painter ) const
-	{
-		painter->save();
+		///
+		/// Draw Outline
+		///
+		void Outline::draw( QPainter* painter ) const
+		{
+			painter->save();
 
-		painter->setBrush( Qt::NoBrush );
+			painter->setBrush( Qt::NoBrush );
 
-		painter->setPen( mPen1 );
-		painter->drawRect( QRectF( 0, 0, mOwner->w().pt(), mOwner->h().pt() ) );
+			painter->setPen( mPen1 );
+			painter->drawRect( QRectF( 0, 0, mOwner->w().pt(), mOwner->h().pt() ) );
 
-		painter->setPen( mPen2 );
-		painter->drawRect( QRectF( 0, 0, mOwner->w().pt(), mOwner->h().pt() ) );
+			painter->setPen( mPen2 );
+			painter->drawRect( QRectF( 0, 0, mOwner->w().pt(), mOwner->h().pt() ) );
 
-		painter->restore();
-	}
+			painter->restore();
+		}
 
 
-	///
-	/// Create path for testing for hover condition
-	///
-	QPainterPath Outline::hoverPath( double scale ) const
-	{
-		double s = 1 / scale;
+		///
+		/// Create path for testing for hover condition
+		///
+		QPainterPath Outline::hoverPath( double scale ) const
+		{
+			double s = 1 / scale;
 
-		QPainterPath path;
+			QPainterPath path;
 
-		path.addRect( -s*slopPixels, -s*slopPixels,
-		              mOwner->w().pt()+s*2*slopPixels, mOwner->h().pt()+s*2*slopPixels );
-		path.closeSubpath();
-		path.addRect( s*slopPixels, s*slopPixels,
-		              mOwner->w().pt()-s*2*slopPixels, mOwner->h().pt()-s*2*slopPixels );
+			path.addRect( -s*slopPixels, -s*slopPixels,
+			              mOwner->w().pt()+s*2*slopPixels, mOwner->h().pt()+s*2*slopPixels );
+			path.closeSubpath();
+			path.addRect( s*slopPixels, s*slopPixels,
+			              mOwner->w().pt()-s*2*slopPixels, mOwner->h().pt()-s*2*slopPixels );
 	
-		return path;
-	}
+			return path;
+		}
 
-} // namespace glabels::model
+	}
+}
diff --git a/model/Outline.h b/model/Outline.h
index ae2c596..0fbbf83 100644
--- a/model/Outline.h
+++ b/model/Outline.h
@@ -26,53 +26,56 @@
 #include <QPainterPath>
 
 
-namespace glabels::model
+namespace glabels
 {
-
-	// Forward references
-	class ModelObject;
-
-
-	///
-	/// Outline Base Class
-	///
-	class Outline
+	namespace model
 	{
-		////////////////////////////
-		// Lifecycle Methods
-		////////////////////////////
-	public:
-		Outline( ModelObject* owner );
-		Outline( const Outline* outline, ModelObject* newOwner );
-		virtual ~Outline();
+
+		// Forward references
+		class ModelObject;
+
+
+		///
+		/// Outline Base Class
+		///
+		class Outline
+		{
+			////////////////////////////
+			// Lifecycle Methods
+			////////////////////////////
+		public:
+			Outline( ModelObject* owner );
+			Outline( const Outline* outline, ModelObject* newOwner );
+			virtual ~Outline();
 
 	
-		////////////////////////////
-		// Duplication
-		////////////////////////////
-		Outline* clone( ModelObject* newOwner ) const;
+			////////////////////////////
+			// Duplication
+			////////////////////////////
+			Outline* clone( ModelObject* newOwner ) const;
 
 
-		////////////////////////////
-		// Drawing Methods
-		////////////////////////////
-	public:
-		void draw( QPainter* painter ) const;
-		QPainterPath hoverPath( double scale ) const;
+			////////////////////////////
+			// Drawing Methods
+			////////////////////////////
+		public:
+			void draw( QPainter* painter ) const;
+			QPainterPath hoverPath( double scale ) const;
 
 
-		////////////////////////////
-		// Private Data
-		////////////////////////////
-	private:
-		ModelObject* mOwner;
+			////////////////////////////
+			// Private Data
+			////////////////////////////
+		private:
+			ModelObject* mOwner;
 
-		QVector<qreal> mDashes;
-		QPen           mPen1;
-		QPen           mPen2;
+			QVector<qreal> mDashes;
+			QPen           mPen1;
+			QPen           mPen2;
 	
-	};
+		};
 
+	}
 }
 
 
diff --git a/model/PageRenderer.cpp b/model/PageRenderer.cpp
index 29fd7db..190bba4 100644
--- a/model/PageRenderer.cpp
+++ b/model/PageRenderer.cpp
@@ -29,401 +29,404 @@
 #include <QtDebug>
 
 
-namespace glabels::model
+namespace glabels
 {
+	namespace model
+	{
 	
-	//
-	// Private
-	//
-	namespace
-	{
-		const QColor labelOutlineColor( 0, 0, 0 );
-		const double labelOutlineWidth = 0.25;
-		const double tickOffset = 2.25;
-		const double tickLength = 18;
-	}
-
-
-	PageRenderer::PageRenderer( const Model* model )
-		: mModel(nullptr), mNCopies(0), mStartLabel(0),
-		  mPrintOutlines(false), mPrintCropMarks(false), mPrintReverse(false),
-		  mIPage(0), mIsMerge(false), mNPages(0)
-	{
-		if ( model )
+		//
+		// Private
+		//
+		namespace
 		{
-			setModel( model );
+			const QColor labelOutlineColor( 0, 0, 0 );
+			const double labelOutlineWidth = 0.25;
+			const double tickOffset = 2.25;
+			const double tickLength = 18;
 		}
-	}
 
 
-	void PageRenderer::setModel( const Model* model )
-	{
-		mModel = model;
-
-		connect( mModel, SIGNAL(changed()), this, SLOT(onModelChanged()) );
-	
-		onModelChanged();
-	}
-
-	
-	const Model* PageRenderer::model() const
-	{
-		return mModel;
-	}
-
-
-	void PageRenderer::onModelChanged()
-	{
-		mMerge = mModel->merge();
-		mOrigins = mModel->frame()->getOrigins();
-		mNLabelsPerPage = mModel->frame()->nLabels();
-		mIsMerge = ( dynamic_cast<const merge::None*>(mMerge) == nullptr );
-		updateNPages();
-
-		emit changed();
-	}
-
-
-	void PageRenderer::setNCopies( int nCopies )
-	{
-		mNCopies = nCopies;
-		updateNPages();
-
-		emit changed();
-	}
-
-
-	void PageRenderer::setStartLabel( int startLabel )
-	{
-		mStartLabel = startLabel;
-		updateNPages();
-
-		emit changed();
-	}
-
-	
-	void PageRenderer::setPrintOutlines( bool printOutlinesFlag )
-	{
-		mPrintOutlines = printOutlinesFlag;
-
-		emit changed();
-	}
-
-	
-	void PageRenderer::setPrintCropMarks( bool printCropMarksFlag )
-	{
-		mPrintCropMarks = printCropMarksFlag;
-
-		emit changed();
-	}
-
-	
-	void PageRenderer::setPrintReverse( bool printReverseFlag )
-	{
-		mPrintReverse = printReverseFlag;
-
-		emit changed();
-	}
-
-	
-	void PageRenderer::setIPage( int iPage )
-	{
-		mIPage = iPage;
-
-		emit changed();
-	}
-
-	
-	int PageRenderer::nItems() const
-	{
-		return mLastLabel - mStartLabel;
-	}
-			
-	
-	int PageRenderer::nPages() const
-	{
-		return mNPages;
-	}
-			
-	
-	QRectF PageRenderer::pageRect() const
-	{
-		if ( mModel )
+		PageRenderer::PageRenderer( const Model* model )
+			: mModel(nullptr), mNCopies(0), mStartLabel(0),
+			  mPrintOutlines(false), mPrintCropMarks(false), mPrintReverse(false),
+			  mIPage(0), mIsMerge(false), mNPages(0)
 		{
-			return QRectF( 0, 0, mModel->tmplate()->pageWidth().pt(), mModel->tmplate()->pageHeight().pt() );
-		}
-		else
-		{
-			return QRectF( 0, 0, 0, 0 );
-		}
-	}
-			
-	
-	void PageRenderer::updateNPages()
-	{
-		if ( mModel )
-		{
-			if ( mIsMerge )
+			if ( model )
 			{
-				mLastLabel = mStartLabel + mNCopies*mMerge->nSelectedRecords();
+				setModel( model );
+			}
+		}
+
+
+		void PageRenderer::setModel( const Model* model )
+		{
+			mModel = model;
+
+			connect( mModel, SIGNAL(changed()), this, SLOT(onModelChanged()) );
+	
+			onModelChanged();
+		}
+
+	
+		const Model* PageRenderer::model() const
+		{
+			return mModel;
+		}
+
+
+		void PageRenderer::onModelChanged()
+		{
+			mMerge = mModel->merge();
+			mOrigins = mModel->frame()->getOrigins();
+			mNLabelsPerPage = mModel->frame()->nLabels();
+			mIsMerge = ( dynamic_cast<const merge::None*>(mMerge) == nullptr );
+			updateNPages();
+
+			emit changed();
+		}
+
+
+		void PageRenderer::setNCopies( int nCopies )
+		{
+			mNCopies = nCopies;
+			updateNPages();
+
+			emit changed();
+		}
+
+
+		void PageRenderer::setStartLabel( int startLabel )
+		{
+			mStartLabel = startLabel;
+			updateNPages();
+
+			emit changed();
+		}
+
+	
+		void PageRenderer::setPrintOutlines( bool printOutlinesFlag )
+		{
+			mPrintOutlines = printOutlinesFlag;
+
+			emit changed();
+		}
+
+	
+		void PageRenderer::setPrintCropMarks( bool printCropMarksFlag )
+		{
+			mPrintCropMarks = printCropMarksFlag;
+
+			emit changed();
+		}
+
+	
+		void PageRenderer::setPrintReverse( bool printReverseFlag )
+		{
+			mPrintReverse = printReverseFlag;
+
+			emit changed();
+		}
+
+	
+		void PageRenderer::setIPage( int iPage )
+		{
+			mIPage = iPage;
+
+			emit changed();
+		}
+
+	
+		int PageRenderer::nItems() const
+		{
+			return mLastLabel - mStartLabel;
+		}
+			
+	
+		int PageRenderer::nPages() const
+		{
+			return mNPages;
+		}
+			
+	
+		QRectF PageRenderer::pageRect() const
+		{
+			if ( mModel )
+			{
+				return QRectF( 0, 0, mModel->tmplate()->pageWidth().pt(), mModel->tmplate()->pageHeight().pt() );
 			}
 			else
 			{
-				mLastLabel = mStartLabel + mNCopies;
+				return QRectF( 0, 0, 0, 0 );
 			}
+		}
+			
+	
+		void PageRenderer::updateNPages()
+		{
+			if ( mModel )
+			{
+				if ( mIsMerge )
+				{
+					mLastLabel = mStartLabel + mNCopies*mMerge->nSelectedRecords();
+				}
+				else
+				{
+					mLastLabel = mStartLabel + mNCopies;
+				}
 		
-			mNPages = mLastLabel / mNLabelsPerPage;
-			if ( mLastLabel % mNLabelsPerPage )
-			{
-				mNPages++;
-			}
-		}
-		else
-		{
-			mNPages = 0;
-		}
-	}
-
-	
-	///
-	/// Print
-	///
-	void PageRenderer::print( QPrinter* printer ) const
-	{
-		QSizeF pageSize( mModel->tmplate()->pageWidth().pt(), mModel->tmplate()->pageHeight().pt() );
-		printer->setPageSize( QPageSize(pageSize, QPageSize::Point) );
-		printer->setFullPage( true );
-		printer->setPageMargins( 0, 0, 0, 0, QPrinter::Point );
-
-		QPainter painter( printer );
-			
-		QRectF rectPx  = printer->paperRect( QPrinter::DevicePixel );
-		QRectF rectPts = printer->paperRect( QPrinter::Point );
-		painter.scale( rectPx.width()/rectPts.width(), rectPx.height()/rectPts.height() );
-
-		for ( int iPage = 0; iPage < mNPages; iPage++ )
-		{
-			if ( iPage )
-			{
-				printer->newPage();
-			}
-
-			printPage( &painter, iPage );
-		}
-	}
-
-
-	///
-	/// Print page using persistent page number
-	///
-	void PageRenderer::printPage( QPainter* painter ) const
-	{
-		printPage( painter, mIPage );
-	}
-
-
-	///
-	/// Print page
-	///
-	void PageRenderer::printPage( QPainter* painter, int iPage ) const
-	{
-		if ( mModel )
-		{
-			if ( mIsMerge )
-			{
-				printMergePage( painter, iPage );
+				mNPages = mLastLabel / mNLabelsPerPage;
+				if ( mLastLabel % mNLabelsPerPage )
+				{
+					mNPages++;
+				}
 			}
 			else
 			{
-				printSimplePage( painter, iPage );
+				mNPages = 0;
 			}
 		}
-	}
-
-
-	void PageRenderer::printSimplePage( QPainter* painter, int iPage ) const
-	{
-		int iStart = 0;
-		int iEnd = mNLabelsPerPage;
-
-		if ( iPage == 0 )
-		{
-			iStart = mStartLabel;
-		}
-
-		if ( (mLastLabel / mNLabelsPerPage) == iPage )
-		{
-			iEnd = mLastLabel % mNLabelsPerPage;
-		}
-
-		printCropMarks( painter );
-
-		for ( int i = iStart; i < iEnd; i++ )
-		{
-			painter->save();
-
-			painter->translate( mOrigins[i].x().pt(), mOrigins[i].y().pt() );
-			
-			painter->save();
-
-			clipLabel( painter );
-			printLabel( painter, nullptr );
-
-			painter->restore();  // From before clip
-
-			printOutline( painter );
-			
-			painter->restore();  // From before translation
-		}
-	}
 
 	
-	void PageRenderer::printMergePage( QPainter* painter, int iPage ) const
-	{
-		int iRecord = 0;
-		int iStart = 0;
-		int iEnd = mNLabelsPerPage;
-
-		if ( iPage == 0 )
+		///
+		/// Print
+		///
+		void PageRenderer::print( QPrinter* printer ) const
 		{
-			iStart = mStartLabel;
-		}
+			QSizeF pageSize( mModel->tmplate()->pageWidth().pt(), mModel->tmplate()->pageHeight().pt() );
+			printer->setPageSize( QPageSize(pageSize, QPageSize::Point) );
+			printer->setFullPage( true );
+			printer->setPageMargins( 0, 0, 0, 0, QPrinter::Point );
 
-		if ( (mLastLabel / mNLabelsPerPage) == iPage )
-		{
-			iEnd = mLastLabel % mNLabelsPerPage;
-		}
-
-		const QList<merge::Record*> records = mMerge->selectedRecords();
-		if ( records.size() )
-		{
-			iRecord = (iPage*mNLabelsPerPage + iStart - mStartLabel) % records.size();
-		}
-
-		printCropMarks( painter );
-
-		for ( int i = iStart; i < iEnd; i++ )
-		{
-			painter->save();
-
-			painter->translate( mOrigins[i].x().pt(), mOrigins[i].y().pt() );
+			QPainter painter( printer );
 			
-			painter->save();
+			QRectF rectPx  = printer->paperRect( QPrinter::DevicePixel );
+			QRectF rectPts = printer->paperRect( QPrinter::Point );
+			painter.scale( rectPx.width()/rectPts.width(), rectPx.height()/rectPts.height() );
 
-			clipLabel( painter );
-			printLabel( painter, records[iRecord] );
-
-			painter->restore();  // From before clip
-
-			printOutline( painter );
-			
-			painter->restore();  // From before translation
-
-			iRecord = (iRecord + 1) % records.size();
-		}
-	}
-	
-	
-	void PageRenderer::printCropMarks( QPainter* painter ) const
-	{
-		if ( mPrintCropMarks )
-		{
-			painter->save();
-
-			painter->setBrush( QBrush( Qt::NoBrush ) );
-			painter->setPen( QPen( labelOutlineColor, labelOutlineWidth ) );
-
-			Distance w = mModel->frame()->w();
-			Distance h = mModel->frame()->h();
-
-			foreach ( Layout* layout, mModel->frame()->layouts() )
+			for ( int iPage = 0; iPage < mNPages; iPage++ )
 			{
-				Distance xMin = layout->x0();
-				Distance yMin = layout->y0();
-				Distance xMax = layout->x0() + layout->dx()*(layout->nx()-1) + w;
-				Distance yMax = layout->y0() + layout->dy()*(layout->ny()-1) + h;
-
-				for ( int ix = 0; ix < layout->nx(); ix++ )
+				if ( iPage )
 				{
-					Distance x1 = xMin + ix*layout->dx();
-					Distance x2 = x1 + w;
-
-					Distance y1 = max( yMin-tickOffset, Distance::pt(0) );
-					Distance y2 = max( y1-tickLength, Distance::pt(0) );
-
-					Distance y3 = min( yMax+tickOffset, mModel->tmplate()->pageHeight() );
-					Distance y4 = min( y3+tickLength, mModel->tmplate()->pageHeight() );
-
-					painter->drawLine( x1.pt(), y1.pt(), x1.pt(), y2.pt() );
-					painter->drawLine( x2.pt(), y1.pt(), x2.pt(), y2.pt() );
-					painter->drawLine( x1.pt(), y3.pt(), x1.pt(), y4.pt() );
-					painter->drawLine( x2.pt(), y3.pt(), x2.pt(), y4.pt() );
+					printer->newPage();
 				}
 
-				for ( int iy = 0; iy < layout->ny(); iy++ )
+				printPage( &painter, iPage );
+			}
+		}
+
+
+		///
+		/// Print page using persistent page number
+		///
+		void PageRenderer::printPage( QPainter* painter ) const
+		{
+			printPage( painter, mIPage );
+		}
+
+
+		///
+		/// Print page
+		///
+		void PageRenderer::printPage( QPainter* painter, int iPage ) const
+		{
+			if ( mModel )
+			{
+				if ( mIsMerge )
 				{
-					Distance y1 = yMin + iy*layout->dy();
-					Distance y2 = y1 + h;
-
-					Distance x1 = max( xMin-tickOffset, Distance::pt(0) );
-					Distance x2 = max( x1-tickLength, Distance::pt(0) );
-
-					Distance x3 = min( xMax+tickOffset, mModel->tmplate()->pageWidth() );
-					Distance x4 = min( x3+tickLength, mModel->tmplate()->pageWidth() );
-
-					painter->drawLine( x1.pt(), y1.pt(), x2.pt(), y1.pt() );
-					painter->drawLine( x1.pt(), y2.pt(), x2.pt(), y2.pt() );
-					painter->drawLine( x3.pt(), y1.pt(), x4.pt(), y1.pt() );
-					painter->drawLine( x3.pt(), y2.pt(), x4.pt(), y2.pt() );
+					printMergePage( painter, iPage );
+				}
+				else
+				{
+					printSimplePage( painter, iPage );
 				}
 			}
-
-			painter->restore();
 		}
-	}
+
+
+		void PageRenderer::printSimplePage( QPainter* painter, int iPage ) const
+		{
+			int iStart = 0;
+			int iEnd = mNLabelsPerPage;
+
+			if ( iPage == 0 )
+			{
+				iStart = mStartLabel;
+			}
+
+			if ( (mLastLabel / mNLabelsPerPage) == iPage )
+			{
+				iEnd = mLastLabel % mNLabelsPerPage;
+			}
+
+			printCropMarks( painter );
+
+			for ( int i = iStart; i < iEnd; i++ )
+			{
+				painter->save();
+
+				painter->translate( mOrigins[i].x().pt(), mOrigins[i].y().pt() );
+			
+				painter->save();
+
+				clipLabel( painter );
+				printLabel( painter, nullptr );
+
+				painter->restore();  // From before clip
+
+				printOutline( painter );
+			
+				painter->restore();  // From before translation
+			}
+		}
 
 	
-	void PageRenderer::printOutline( QPainter* painter ) const
-	{
-		if ( mPrintOutlines )
+		void PageRenderer::printMergePage( QPainter* painter, int iPage ) const
+		{
+			int iRecord = 0;
+			int iStart = 0;
+			int iEnd = mNLabelsPerPage;
+
+			if ( iPage == 0 )
+			{
+				iStart = mStartLabel;
+			}
+
+			if ( (mLastLabel / mNLabelsPerPage) == iPage )
+			{
+				iEnd = mLastLabel % mNLabelsPerPage;
+			}
+
+			const QList<merge::Record*> records = mMerge->selectedRecords();
+			if ( records.size() )
+			{
+				iRecord = (iPage*mNLabelsPerPage + iStart - mStartLabel) % records.size();
+			}
+
+			printCropMarks( painter );
+
+			for ( int i = iStart; i < iEnd; i++ )
+			{
+				painter->save();
+
+				painter->translate( mOrigins[i].x().pt(), mOrigins[i].y().pt() );
+			
+				painter->save();
+
+				clipLabel( painter );
+				printLabel( painter, records[iRecord] );
+
+				painter->restore();  // From before clip
+
+				printOutline( painter );
+			
+				painter->restore();  // From before translation
+
+				iRecord = (iRecord + 1) % records.size();
+			}
+		}
+	
+	
+		void PageRenderer::printCropMarks( QPainter* painter ) const
+		{
+			if ( mPrintCropMarks )
+			{
+				painter->save();
+
+				painter->setBrush( QBrush( Qt::NoBrush ) );
+				painter->setPen( QPen( labelOutlineColor, labelOutlineWidth ) );
+
+				Distance w = mModel->frame()->w();
+				Distance h = mModel->frame()->h();
+
+				foreach ( Layout* layout, mModel->frame()->layouts() )
+				{
+					Distance xMin = layout->x0();
+					Distance yMin = layout->y0();
+					Distance xMax = layout->x0() + layout->dx()*(layout->nx()-1) + w;
+					Distance yMax = layout->y0() + layout->dy()*(layout->ny()-1) + h;
+
+					for ( int ix = 0; ix < layout->nx(); ix++ )
+					{
+						Distance x1 = xMin + ix*layout->dx();
+						Distance x2 = x1 + w;
+
+						Distance y1 = max( yMin-tickOffset, Distance::pt(0) );
+						Distance y2 = max( y1-tickLength, Distance::pt(0) );
+
+						Distance y3 = min( yMax+tickOffset, mModel->tmplate()->pageHeight() );
+						Distance y4 = min( y3+tickLength, mModel->tmplate()->pageHeight() );
+
+						painter->drawLine( x1.pt(), y1.pt(), x1.pt(), y2.pt() );
+						painter->drawLine( x2.pt(), y1.pt(), x2.pt(), y2.pt() );
+						painter->drawLine( x1.pt(), y3.pt(), x1.pt(), y4.pt() );
+						painter->drawLine( x2.pt(), y3.pt(), x2.pt(), y4.pt() );
+					}
+
+					for ( int iy = 0; iy < layout->ny(); iy++ )
+					{
+						Distance y1 = yMin + iy*layout->dy();
+						Distance y2 = y1 + h;
+
+						Distance x1 = max( xMin-tickOffset, Distance::pt(0) );
+						Distance x2 = max( x1-tickLength, Distance::pt(0) );
+
+						Distance x3 = min( xMax+tickOffset, mModel->tmplate()->pageWidth() );
+						Distance x4 = min( x3+tickLength, mModel->tmplate()->pageWidth() );
+
+						painter->drawLine( x1.pt(), y1.pt(), x2.pt(), y1.pt() );
+						painter->drawLine( x1.pt(), y2.pt(), x2.pt(), y2.pt() );
+						painter->drawLine( x3.pt(), y1.pt(), x4.pt(), y1.pt() );
+						painter->drawLine( x3.pt(), y2.pt(), x4.pt(), y2.pt() );
+					}
+				}
+
+				painter->restore();
+			}
+		}
+
+	
+		void PageRenderer::printOutline( QPainter* painter ) const
+		{
+			if ( mPrintOutlines )
+			{
+				painter->save();
+
+				painter->setBrush( QBrush( Qt::NoBrush ) );
+				painter->setPen( QPen( labelOutlineColor, labelOutlineWidth ) );
+
+				painter->drawPath( mModel->frame()->path() );
+			
+				painter->restore();
+			}
+		}
+
+	
+		void PageRenderer::clipLabel( QPainter* painter ) const
+		{
+			painter->setClipPath( mModel->frame()->clipPath() );
+		}
+
+	
+		void PageRenderer::printLabel( QPainter* painter, merge::Record* record ) const
 		{
 			painter->save();
 
-			painter->setBrush( QBrush( Qt::NoBrush ) );
-			painter->setPen( QPen( labelOutlineColor, labelOutlineWidth ) );
+			if ( mModel->rotate() )
+			{
+				painter->rotate( -90.0 );
+				painter->translate( -mModel->w().pt(), 0 );
+			}
+
+			if ( mPrintReverse )
+			{
+				painter->translate( mModel->w().pt(), 0 );
+				painter->scale( -1, 1 );
+			}
+
+			mModel->draw( painter, false, record );
 
-			painter->drawPath( mModel->frame()->path() );
-			
 			painter->restore();
 		}
+
 	}
-
-	
-	void PageRenderer::clipLabel( QPainter* painter ) const
-	{
-		painter->setClipPath( mModel->frame()->clipPath() );
-	}
-
-	
-	void PageRenderer::printLabel( QPainter* painter, merge::Record* record ) const
-	{
-		painter->save();
-
-		if ( mModel->rotate() )
-		{
-			painter->rotate( -90.0 );
-			painter->translate( -mModel->w().pt(), 0 );
-		}
-
-		if ( mPrintReverse )
-		{
-			painter->translate( mModel->w().pt(), 0 );
-			painter->scale( -1, 1 );
-		}
-
-		mModel->draw( painter, false, record );
-
-		painter->restore();
-	}
-
-} // namespace glabels::model
+}
diff --git a/model/PageRenderer.h b/model/PageRenderer.h
index ea9694b..2db3ae4 100644
--- a/model/PageRenderer.h
+++ b/model/PageRenderer.h
@@ -33,96 +33,99 @@
 #include <QVector>
 
 
-namespace glabels::model
+namespace glabels
 {
-
-	// Forward references
-	class Model;
-
-
-	///
-	///  PageRenderer Widget
-	///
-	class PageRenderer : public QObject
+	namespace model
 	{
-		Q_OBJECT
+
+		// Forward references
+		class Model;
+
+
+		///
+		///  PageRenderer Widget
+		///
+		class PageRenderer : public QObject
+		{
+			Q_OBJECT
 	
-		/////////////////////////////////
-		// Life Cycle
-		/////////////////////////////////
-	public:
-		PageRenderer( const Model* model = nullptr );
+			/////////////////////////////////
+			// Life Cycle
+			/////////////////////////////////
+		public:
+			PageRenderer( const Model* model = nullptr );
 
 
-		/////////////////////////////////
-		// Public Methods
-		/////////////////////////////////
-	public:
-		void setModel( const Model* model );
-		const Model* model() const;
-		void setNCopies( int nCopies );
-		void setStartLabel( int startLabel );
-		void setPrintOutlines( bool printOutlinesFlag );
-		void setPrintCropMarks( bool printCropMarksFlag );
-		void setPrintReverse( bool printReverseFlag );
-		void setIPage( int iPage );
-		int nItems() const;
-		int nPages() const;
-		QRectF pageRect() const;
-		void print( QPrinter* printer ) const;
-		void printPage( QPainter* painter ) const;
-		void printPage( QPainter* painter, int iPage ) const;
+			/////////////////////////////////
+			// Public Methods
+			/////////////////////////////////
+		public:
+			void setModel( const Model* model );
+			const Model* model() const;
+			void setNCopies( int nCopies );
+			void setStartLabel( int startLabel );
+			void setPrintOutlines( bool printOutlinesFlag );
+			void setPrintCropMarks( bool printCropMarksFlag );
+			void setPrintReverse( bool printReverseFlag );
+			void setIPage( int iPage );
+			int nItems() const;
+			int nPages() const;
+			QRectF pageRect() const;
+			void print( QPrinter* printer ) const;
+			void printPage( QPainter* painter ) const;
+			void printPage( QPainter* painter, int iPage ) const;
 
 
-		/////////////////////////////////
-		// Signals
-		/////////////////////////////////
-	signals:
-		void changed();
+			/////////////////////////////////
+			// Signals
+			/////////////////////////////////
+		signals:
+			void changed();
 	
 
-		/////////////////////////////////
-		// Private slots
-		/////////////////////////////////
-	private slots:
-		void onModelChanged();
+			/////////////////////////////////
+			// Private slots
+			/////////////////////////////////
+		private slots:
+			void onModelChanged();
 
 
-		/////////////////////////////////
-		// Internal Methods
-		/////////////////////////////////
-	private:
-		void updateNPages();
-		void printSimplePage( QPainter* painter, int iPage ) const;
-		void printMergePage( QPainter* painter, int iPage ) const;
-		void printCropMarks( QPainter* painter ) const;
-		void printOutline( QPainter* painter ) const;
-		void clipLabel( QPainter* painter ) const;
-		void printLabel( QPainter* painter, merge::Record* record ) const;
+			/////////////////////////////////
+			// Internal Methods
+			/////////////////////////////////
+		private:
+			void updateNPages();
+			void printSimplePage( QPainter* painter, int iPage ) const;
+			void printMergePage( QPainter* painter, int iPage ) const;
+			void printCropMarks( QPainter* painter ) const;
+			void printOutline( QPainter* painter ) const;
+			void clipLabel( QPainter* painter ) const;
+			void printLabel( QPainter* painter, merge::Record* record ) const;
 
 
-		/////////////////////////////////
-		// Private Data
-		/////////////////////////////////
-	private:
-		const Model*        mModel;
-		const merge::Merge* mMerge;
+			/////////////////////////////////
+			// Private Data
+			/////////////////////////////////
+		private:
+			const Model*        mModel;
+			const merge::Merge* mMerge;
 	
-		int               mNCopies;
-		int               mStartLabel;
-		int               mLastLabel;
-		bool              mPrintOutlines;
-		bool              mPrintCropMarks;
-		bool              mPrintReverse;
-		int               mIPage;
+			int               mNCopies;
+			int               mStartLabel;
+			int               mLastLabel;
+			bool              mPrintOutlines;
+			bool              mPrintCropMarks;
+			bool              mPrintReverse;
+			int               mIPage;
 
-		bool              mIsMerge;
-		int               mNPages;
-		int               mNLabelsPerPage;
+			bool              mIsMerge;
+			int               mNPages;
+			int               mNLabelsPerPage;
 
-		QVector<Point>    mOrigins;
-	};
+			QVector<Point>    mOrigins;
+		};
 
+	}
 }
 
 
diff --git a/model/Paper.cpp b/model/Paper.cpp
index b6d69ef..e9e3f1c 100644
--- a/model/Paper.cpp
+++ b/model/Paper.cpp
@@ -21,59 +21,62 @@
 #include "Paper.h"
 
 
-namespace glabels::model
+namespace glabels
 {
+	namespace model
+	{
 	
-	Paper::Paper( const QString&  id,
-		      const QString&  name,
-		      const Distance& width,
-		      const Distance& height,
-		      const QString&  pwgSize )
-		: mId(id), mName(name), mWidth(width), mHeight(height), mPwgSize(pwgSize)
-	{
-		// empty
-	}
+		Paper::Paper( const QString&  id,
+		              const QString&  name,
+		              const Distance& width,
+		              const Distance& height,
+		              const QString&  pwgSize )
+			: mId(id), mName(name), mWidth(width), mHeight(height), mPwgSize(pwgSize)
+		{
+			// empty
+		}
 
 
-	QString Paper::id() const
-	{
-		return mId;
-	}
+		QString Paper::id() const
+		{
+			return mId;
+		}
 
 	
-	QString Paper::name() const
-	{
-		return mName;
-	}
+		QString Paper::name() const
+		{
+			return mName;
+		}
 
 	
-	Distance Paper::width() const
-	{
-		return mWidth;
-	}
+		Distance Paper::width() const
+		{
+			return mWidth;
+		}
 
 	
-	Distance Paper::height() const
-	{
-		return mHeight;
-	}
+		Distance Paper::height() const
+		{
+			return mHeight;
+		}
 
 	
-	QString Paper::pwgSize() const
-	{
-		return mPwgSize;
-	}
+		QString Paper::pwgSize() const
+		{
+			return mPwgSize;
+		}
 	
 
-	bool Paper::isSizeIso() const
-	{
-		return mPwgSize.startsWith( "iso_" );
-	}
+		bool Paper::isSizeIso() const
+		{
+			return mPwgSize.startsWith( "iso_" );
+		}
 
 	
-	bool Paper::isSizeUs() const
-	{
-		return mPwgSize.startsWith( "na_" );
-	}
+		bool Paper::isSizeUs() const
+		{
+			return mPwgSize.startsWith( "na_" );
+		}
 
-} // namespace glabels::model
+	}
+}
diff --git a/model/Paper.h b/model/Paper.h
index 55fb990..9c0eb7f 100644
--- a/model/Paper.h
+++ b/model/Paper.h
@@ -27,41 +27,44 @@
 #include <QString>
 
 
-namespace glabels::model
+namespace glabels
 {
-
-	class Paper
+	namespace model
 	{
-	public:
-		Paper( const QString&  id,
-		       const QString&  name,
-		       const Distance& width,
-		       const Distance& height,
-		       const QString&  pwgSize );
 
-		QString id() const;
-		QString name() const;
+		class Paper
+		{
+		public:
+			Paper( const QString&  id,
+			       const QString&  name,
+			       const Distance& width,
+			       const Distance& height,
+			       const QString&  pwgSize );
 
-		/* Width */
-		Distance width() const;
+			QString id() const;
+			QString name() const;
 
-		/* Height */
-		Distance height() const;
+			/* Width */
+			Distance width() const;
 
-		/* PWG 5101.1-2002 size name */
-		QString pwgSize() const;
+			/* Height */
+			Distance height() const;
 
-		bool isSizeIso() const;
-		bool isSizeUs() const;
+			/* PWG 5101.1-2002 size name */
+			QString pwgSize() const;
 
-	private:
-		QString  mId;
-		QString  mName;
-		Distance mWidth;
-		Distance mHeight;
-		QString  mPwgSize;
-	};
+			bool isSizeIso() const;
+			bool isSizeUs() const;
 
+		private:
+			QString  mId;
+			QString  mName;
+			Distance mWidth;
+			Distance mHeight;
+			QString  mPwgSize;
+		};
+
+	}
 }
 
 
diff --git a/model/Point.cpp b/model/Point.cpp
index c24af07..15f9c09 100644
--- a/model/Point.cpp
+++ b/model/Point.cpp
@@ -21,44 +21,47 @@
 #include "Point.h"
 
 
-namespace glabels::model
+namespace glabels
 {
-
-	Point::Point() : mX(Distance(0)), mY(Distance(0))
+	namespace model
 	{
-		// empty
-	}
+
+		Point::Point() : mX(Distance(0)), mY(Distance(0))
+		{
+			// empty
+		}
 
 
-	Point::Point( Distance x, Distance y ) : mX(x), mY(y)
-	{
-		// empty
-	}
+		Point::Point( Distance x, Distance y ) : mX(x), mY(y)
+		{
+			// empty
+		}
 
 
-	Distance Point::x() const
-	{
-		return mX;
-	}
+		Distance Point::x() const
+		{
+			return mX;
+		}
 
 	
-	Distance Point::y() const
-	{
-		return mY;
-	}
-
-
-	bool Point::operator<( const Point &other ) const
-	{
-		if ( mY < other.mY )
+		Distance Point::y() const
 		{
-			return true;
+			return mY;
 		}
-		else if ( mY == other.mY )
-		{
-			return mX < other.mX;
-		}
-		return false;
-	}
 
-} // namespace glabels::model
+
+		bool Point::operator<( const Point &other ) const
+		{
+			if ( mY < other.mY )
+			{
+				return true;
+			}
+			else if ( mY == other.mY )
+			{
+				return mX < other.mX;
+			}
+			return false;
+		}
+
+	}
+}
diff --git a/model/Point.h b/model/Point.h
index 89d2ffe..bee0f75 100644
--- a/model/Point.h
+++ b/model/Point.h
@@ -25,27 +25,30 @@
 #include "Distance.h"
 
 
-namespace glabels::model
+namespace glabels
 {
-
-	class Point
+	namespace model
 	{
-	public:
-		Point();
+
+		class Point
+		{
+		public:
+			Point();
 		
-		Point( Distance x, Distance y );
+			Point( Distance x, Distance y );
 
-		Distance x() const;
-		Distance y() const;
+			Distance x() const;
+			Distance y() const;
 
-		bool operator<( const Point &other ) const;
+			bool operator<( const Point &other ) const;
 
 
-	private:
-		Distance  mX;
-		Distance  mY;
-	};
+		private:
+			Distance  mX;
+			Distance  mY;
+		};
 
+	}
 }
 
 
diff --git a/model/RawText.cpp b/model/RawText.cpp
index e15390e..08ee6bf 100644
--- a/model/RawText.cpp
+++ b/model/RawText.cpp
@@ -22,128 +22,131 @@
 
 #include <QRegularExpression>
 
-namespace glabels::model
+namespace glabels
 {
-
-	///
-	/// Constructor from QString
-	///
-	RawText::RawText( const QString& string ) : mString(string)
+	namespace model
 	{
-		tokenize();
-	}
 
-
-	///
-	/// Constructor from C string operator
-	///
-	RawText::RawText( const char* cString ) : mString(QString(cString))
-	{
-		tokenize();
-	}
-
-	
-	///
-	/// Access as QString
-	///
-	QString RawText::toString() const
-	{
-		return mString;
-	}
-	
-
-	///
-	/// Access as std::string
-	///
-	std::string RawText::toStdString() const
-	{
-		return mString.toStdString();
-	}
-	
-
-	///
-	/// Expand all place holders
-	///
-	QString RawText::expand( merge::Record* record ) const
-	{
-		QString text;
-		
-		foreach ( const Token& token, mTokens )
+		///
+		/// Constructor from QString
+		///
+		RawText::RawText( const QString& string ) : mString(string)
 		{
-			if ( token.isField )
-			{
-				text += token.field.evaluate( record );
-			}
-			else
-			{
-				text += token.text;
-			}
+			tokenize();
 		}
 
-		return text;
-	}
 
-
-	///
-	/// Does raw text contain place holders?
-	///
-	bool RawText::hasPlaceHolders() const
-	{
-		QRegularExpression re("\\${\\w+}");
-		return mString.contains( re );
-	}
-
-
-	///
-	/// Is raw text empty?
-	///
-	bool RawText::isEmpty() const
-	{
-		return mString.isEmpty();
-	}
-
-
-	///
-	/// Tokenize string
-	///
-	void RawText::tokenize()
-	{
-		Token token;
-
-		QStringRef s = &mString;
-		while ( s.size() )
+		///
+		/// Constructor from C string operator
+		///
+		RawText::RawText( const char* cString ) : mString(QString(cString))
 		{
-			SubstitutionField field;
-			if ( SubstitutionField::parse( s, field ) )
+			tokenize();
+		}
+
+	
+		///
+		/// Access as QString
+		///
+		QString RawText::toString() const
+		{
+			return mString;
+		}
+	
+
+		///
+		/// Access as std::string
+		///
+		std::string RawText::toStdString() const
+		{
+			return mString.toStdString();
+		}
+	
+
+		///
+		/// Expand all place holders
+		///
+		QString RawText::expand( merge::Record* record ) const
+		{
+			QString text;
+		
+			foreach ( const Token& token, mTokens )
 			{
-				// Finalize current text token, if apropos
-				if ( !token.text.isEmpty() )
+				if ( token.isField )
 				{
-					token.isField = false;
+					text += token.field.evaluate( record );
+				}
+				else
+				{
+					text += token.text;
+				}
+			}
+
+			return text;
+		}
+
+
+		///
+		/// Does raw text contain place holders?
+		///
+		bool RawText::hasPlaceHolders() const
+		{
+			QRegularExpression re("\\${\\w+}");
+			return mString.contains( re );
+		}
+
+
+		///
+		/// Is raw text empty?
+		///
+		bool RawText::isEmpty() const
+		{
+			return mString.isEmpty();
+		}
+
+
+		///
+		/// Tokenize string
+		///
+		void RawText::tokenize()
+		{
+			Token token;
+
+			QStringRef s = &mString;
+			while ( s.size() )
+			{
+				SubstitutionField field;
+				if ( SubstitutionField::parse( s, field ) )
+				{
+					// Finalize current text token, if apropos
+					if ( !token.text.isEmpty() )
+					{
+						token.isField = false;
+						mTokens.append( token );
+					}
+				
+					// Create and finalize field token
+					token.isField = true;
+					token.text = "";
+					token.field = field;
 					mTokens.append( token );
 				}
-				
-				// Create and finalize field token
-				token.isField = true;
-				token.text = "";
-				token.field = field;
+				else
+				{
+					token.text += s[0];
+					s = s.mid(1);
+				}
+			}
+
+			// Finalize last text token, if apropos
+			if ( !token.text.isEmpty() )
+			{
+				token.isField = false;
 				mTokens.append( token );
 			}
-			else
-			{
-				token.text += s[0];
-				s = s.mid(1);
-			}
-		}
-
-		// Finalize last text token, if apropos
-		if ( !token.text.isEmpty() )
-		{
-			token.isField = false;
-			mTokens.append( token );
-		}
 				
-	}
+		}
 
 	
-} // namespace glabels::model
+	}
+}
diff --git a/model/RawText.h b/model/RawText.h
index b747b8f..9b19084 100644
--- a/model/RawText.h
+++ b/model/RawText.h
@@ -27,57 +27,60 @@
 #include <QString>
 
 
-namespace glabels::model
+namespace glabels
 {
-
-	///
-	/// Raw Text Type
-	///
-	struct RawText
+	namespace model
 	{
 
-		/////////////////////////////////
-		// Life Cycle
-		/////////////////////////////////
-	public:
-		RawText() = default;
-		RawText( const QString& string );
-		RawText( const char* cString );
-
-
-		/////////////////////////////////
-		// Misc. Methods
-		/////////////////////////////////
-		QString toString() const;
-		std::string toStdString() const;
-		QString expand( merge::Record* record ) const;
-		bool hasPlaceHolders() const;
-		bool isEmpty() const;
-
-		
-		/////////////////////////////////
-		// Private Methods
-		/////////////////////////////////
-	private:
-		void tokenize();
-		
-		/////////////////////////////////
-		// Private Data
-		/////////////////////////////////
-	private:
-		QString mString;
-
-		struct Token
+		///
+		/// Raw Text Type
+		///
+		struct RawText
 		{
-			bool              isField;
-			QString           text;
-			SubstitutionField field;
-		};
+
+			/////////////////////////////////
+			// Life Cycle
+			/////////////////////////////////
+		public:
+			RawText() = default;
+			RawText( const QString& string );
+			RawText( const char* cString );
+
+
+			/////////////////////////////////
+			// Misc. Methods
+			/////////////////////////////////
+			QString toString() const;
+			std::string toStdString() const;
+			QString expand( merge::Record* record ) const;
+			bool hasPlaceHolders() const;
+			bool isEmpty() const;
+
 		
-		QList<Token> mTokens;
+			/////////////////////////////////
+			// Private Methods
+			/////////////////////////////////
+		private:
+			void tokenize();
+		
+			/////////////////////////////////
+			// Private Data
+			/////////////////////////////////
+		private:
+			QString mString;
 
-	};
+			struct Token
+			{
+				bool              isField;
+				QString           text;
+				SubstitutionField field;
+			};
+		
+			QList<Token> mTokens;
 
+		};
+
+	}
 }
 
 
diff --git a/model/Region.cpp b/model/Region.cpp
index ed5a93d..8090792 100644
--- a/model/Region.cpp
+++ b/model/Region.cpp
@@ -21,114 +21,117 @@
 #include "Region.h"
 
 
-namespace glabels::model
+namespace glabels
 {
-
-	///
-	/// Constructor
-	///
-	Region::Region() : mX1(0), mY1(0), mX2(0), mY2(0)
+	namespace model
 	{
-		// empty
+
+		///
+		/// Constructor
+		///
+		Region::Region() : mX1(0), mY1(0), mX2(0), mY2(0)
+		{
+			// empty
+		}
+
+
+		///
+		/// Constructor
+		///
+		Region::Region( const Distance& x1, const Distance& y1,
+		                const Distance& x2, const Distance& y2 )
+			: mX1(x1), mY1(y1), mX2(x2), mY2(y2)
+		{
+			// empty
+		}
+
+
+		///
+		/// Get x1
+		///
+		Distance Region::x1() const
+		{
+			return mX1;
+		}
+
+
+		///
+		/// Set x1
+		///
+		void Region::setX1( const Distance& value )
+		{
+			mX1 = value;
+		}
+
+
+		///
+		/// Get y1
+		///
+		Distance Region::y1() const
+		{
+			return mY1;
+		}
+
+
+		///
+		/// Set y1
+		///
+		void Region::setY1( const Distance& value )
+		{
+			mY1 = value;
+		}
+
+
+		///
+		/// Get x2
+		///
+		Distance Region::x2() const
+		{
+			return mX2;
+		}
+
+
+		///
+		/// Set x2
+		///
+		void Region::setX2( const Distance& value )
+		{
+			mX2 = value;
+		}
+
+
+		///
+		/// Get y2
+		///
+		Distance Region::y2() const
+		{
+			return mY2;
+		}
+
+
+		///
+		/// Set y2
+		///
+		void Region::setY2( const Distance& value )
+		{
+			mY2 = value;
+		}
+
+
+		///
+		/// Convert to a QRectF
+		///
+		QRectF Region::rect() const
+		{
+			QRectF r;
+
+			r.setX( min( mX1, mX2 ).pt() );
+			r.setY( min( mY1, mY2 ).pt() );
+			r.setWidth( fabs( mX2 - mX1 ).pt() );
+			r.setHeight( fabs( mY2 - mY1 ).pt() );
+
+			return r;
+		}
+
 	}
-
-
-	///
-	/// Constructor
-	///
-	Region::Region( const Distance& x1, const Distance& y1,
-	                const Distance& x2, const Distance& y2 )
-		: mX1(x1), mY1(y1), mX2(x2), mY2(y2)
-	{
-		// empty
-	}
-
-
-	///
-	/// Get x1
-	///
-	Distance Region::x1() const
-	{
-		return mX1;
-	}
-
-
-	///
-	/// Set x1
-	///
-	void Region::setX1( const Distance& value )
-	{
-		mX1 = value;
-	}
-
-
-	///
-	/// Get y1
-	///
-	Distance Region::y1() const
-	{
-		return mY1;
-	}
-
-
-	///
-	/// Set y1
-	///
-	void Region::setY1( const Distance& value )
-	{
-		mY1 = value;
-	}
-
-
-	///
-	/// Get x2
-	///
-	Distance Region::x2() const
-	{
-		return mX2;
-	}
-
-
-	///
-	/// Set x2
-	///
-	void Region::setX2( const Distance& value )
-	{
-		mX2 = value;
-	}
-
-
-	///
-	/// Get y2
-	///
-	Distance Region::y2() const
-	{
-		return mY2;
-	}
-
-
-	///
-	/// Set y2
-	///
-	void Region::setY2( const Distance& value )
-	{
-		mY2 = value;
-	}
-
-
-	///
-	/// Convert to a QRectF
-	///
-	QRectF Region::rect() const
-	{
-		QRectF r;
-
-		r.setX( min( mX1, mX2 ).pt() );
-		r.setY( min( mY1, mY2 ).pt() );
-		r.setWidth( fabs( mX2 - mX1 ).pt() );
-		r.setHeight( fabs( mY2 - mY1 ).pt() );
-
-		return r;
-	}
-
-} // namespace glabels::model
+}
diff --git a/model/Region.h b/model/Region.h
index 5268ad1..0622f37 100644
--- a/model/Region.h
+++ b/model/Region.h
@@ -27,74 +27,77 @@
 #include <QRectF>
 
 
-namespace glabels::model
+namespace glabels
 {
-
-	///
-	/// Label Region Type
-	///
-	struct Region
+	namespace model
 	{
 
-		/////////////////////////////////
-		// Constructors
-		/////////////////////////////////
-	public:
-		Region();
-		Region( const Distance& x1, const Distance& y1,
-		        const Distance& x2, const Distance& y2 );
+		///
+		/// Label Region Type
+		///
+		struct Region
+		{
+
+			/////////////////////////////////
+			// Constructors
+			/////////////////////////////////
+		public:
+			Region();
+			Region( const Distance& x1, const Distance& y1,
+			        const Distance& x2, const Distance& y2 );
 	
 
-		/////////////////////////////////
-		// Properties
-		/////////////////////////////////
-	public:
-		//
-		// X1 Property
-		//
-		Distance x1() const;
-		void setX1( const Distance& value );
+			/////////////////////////////////
+			// Properties
+			/////////////////////////////////
+		public:
+			//
+			// X1 Property
+			//
+			Distance x1() const;
+			void setX1( const Distance& value );
 
 
-		//
-		// Y1 Property
-		//
-		Distance y1() const;
-		void setY1( const Distance& value );
+			//
+			// Y1 Property
+			//
+			Distance y1() const;
+			void setY1( const Distance& value );
 
 
-		//
-		// X2 Property
-		//
-		Distance x2() const;
-		void setX2( const Distance& value );
+			//
+			// X2 Property
+			//
+			Distance x2() const;
+			void setX2( const Distance& value );
 
 
 
-		//
-		// Y2 Property
-		//
-		Distance y2() const;
-		void setY2( const Distance& value );
+			//
+			// Y2 Property
+			//
+			Distance y2() const;
+			void setY2( const Distance& value );
 
 
-		/////////////////////////////////
-		// Methods
-		/////////////////////////////////
-	public:
-		QRectF rect() const;
+			/////////////////////////////////
+			// Methods
+			/////////////////////////////////
+		public:
+			QRectF rect() const;
 
 
-		/////////////////////////////////
-		// Private Data
-		/////////////////////////////////
-	private:
-		Distance mX1;
-		Distance mY1;
-		Distance mX2;
-		Distance mY2;
-	};
+			/////////////////////////////////
+			// Private Data
+			/////////////////////////////////
+		private:
+			Distance mX1;
+			Distance mY1;
+			Distance mX2;
+			Distance mY2;
+		};
 
+	}
 }
 
 
diff --git a/model/Settings.cpp b/model/Settings.cpp
index 6b84063..b8096b8 100644
--- a/model/Settings.cpp
+++ b/model/Settings.cpp
@@ -25,237 +25,240 @@
 #include <QtDebug>
 
 
-namespace glabels::model
+namespace glabels
 {
-
-	//
-	// Static data
-	//
-	Settings* Settings::mInstance = nullptr;
-
-
-	Settings::Settings()
+	namespace model
 	{
-		// empty
-	}
+
+		//
+		// Static data
+		//
+		Settings* Settings::mInstance = nullptr;
 
 
-	void Settings::init()
-	{
-		if ( mInstance == nullptr )
+		Settings::Settings()
 		{
-			mInstance = new Settings();
-		}
-	}
-
-
-	Settings* Settings::instance()
-	{
-		init();
-
-		return mInstance;
-	}
-
-
-	Units Settings::units()
-	{
-		// Guess at a suitable default
-		QString defaultIdString;
-		if ( QLocale::system().measurementSystem() == QLocale::ImperialSystem )
-		{
-			defaultIdString = Units(Units::IN).toIdString();
-		}
-		else
-		{
-			defaultIdString = Units(Units::MM).toIdString();
-		}
-	
-		mInstance->beginGroup( "Locale" );
-		QString idString = mInstance->value( "units", defaultIdString ).toString();
-		mInstance->endGroup();
-
-		return Units( idString );
-	}
-
-
-	void Settings::setUnits( const Units& units )
-	{
-		QString idString = units.toIdString();
-
-		mInstance->beginGroup( "Locale" );
-		mInstance->setValue( "units", idString );
-		mInstance->endGroup();
-
-		emit mInstance->changed();
-	}
-
-
-	bool Settings::searchIsoPaperSizes()
-	{
-		// Guess at a suitable default
-		bool defaultValue;
-		switch (QLocale::system().country())
-		{
-		case QLocale::UnitedStates:
-		case QLocale::Canada:
-			defaultValue = false;
-			break;
-
-		default:
-			defaultValue = true;
-			break;
-		}
-	
-		mInstance->beginGroup( "Search" );
-		bool returnValue = mInstance->value( "isoPaperSizes", defaultValue ).toBool();
-		mInstance->endGroup();
-
-		return returnValue;
-	}
-
-
-	void Settings::setSearchIsoPaperSizes( bool searchIsoPaperSizes )
-	{
-		mInstance->beginGroup( "Search" );
-		mInstance->setValue( "isoPaperSizes", searchIsoPaperSizes );
-		mInstance->endGroup();
-
-		emit mInstance->changed();
-	}
-
-
-	bool Settings::searchUsPaperSizes()
-	{
-		// Guess at a suitable default
-		bool defaultValue;
-		switch (QLocale::system().country())
-		{
-		case QLocale::UnitedStates:
-		case QLocale::Canada:
-			defaultValue = true;
-			break;
-
-		default:
-			defaultValue = false;
-			break;
-		}
-	
-		mInstance->beginGroup( "Search" );
-		bool returnValue = mInstance->value( "usPaperSizes", defaultValue ).toBool();
-		mInstance->endGroup();
-
-		return returnValue;
-	}
-
-
-	void Settings::setSearchUsPaperSizes( bool searchUsPaperSizes )
-	{
-		mInstance->beginGroup( "Search" );
-		mInstance->setValue( "usPaperSizes", searchUsPaperSizes );
-		mInstance->endGroup();
-
-		emit mInstance->changed();
-	}
-
-
-	bool Settings::searchOtherPaperSizes()
-	{
-		// Guess at a suitable default
-		bool defaultValue = true;
-	
-		mInstance->beginGroup( "Search" );
-		bool returnValue = mInstance->value( "otherPaperSizes", defaultValue ).toBool();
-		mInstance->endGroup();
-
-		return returnValue;
-	}
-
-
-	void Settings::setSearchOtherPaperSizes( bool searchOtherPaperSizes )
-	{
-		mInstance->beginGroup( "Search" );
-		mInstance->setValue( "otherPaperSizes", searchOtherPaperSizes );
-		mInstance->endGroup();
-
-		emit mInstance->changed();
-	}
-
-
-	bool Settings::searchAllCategories()
-	{
-		// Guess at a suitable default
-		bool defaultValue = true;
-	
-		mInstance->beginGroup( "Search" );
-		bool returnValue = mInstance->value( "allCategories", defaultValue ).toBool();
-		mInstance->endGroup();
-
-		return returnValue;
-	}
-
-
-	void Settings::setSearchAllCategories( bool searchAllCategories )
-	{
-		mInstance->beginGroup( "Search" );
-		mInstance->setValue( "allCategories", searchAllCategories );
-		mInstance->endGroup();
-
-		emit mInstance->changed();
-	}
-
-
-	QStringList Settings::searchCategoryList()
-	{
-		QStringList defaultList;
-	
-		mInstance->beginGroup( "Search" );
-		QStringList returnList = mInstance->value( "categoryList", defaultList ).toStringList();
-		mInstance->endGroup();
-
-		return returnList;
-	}
-
-
-	void Settings::setSearchCategoryList( const QStringList& searchCategoryList )
-	{
-		mInstance->beginGroup( "Search" );
-		mInstance->setValue( "categoryList", searchCategoryList );
-		mInstance->endGroup();
-
-		emit mInstance->changed();
-	}
-
-
-	QStringList Settings::recentTemplateList()
-	{
-		QStringList defaultList;
-	
-		mInstance->beginGroup( "Recent" );
-		QStringList returnList = mInstance->value( "templates", defaultList ).toStringList();
-		mInstance->endGroup();
-
-		return returnList;
-	}
-
-
-	void Settings::addToRecentTemplateList( const QString& name )
-	{
-		mInstance->beginGroup( "Recent" );
-
-		QStringList list = mInstance->value( "templates" ).toStringList();
-
-		list.removeAll( name );
-		list.prepend( name );
-		while ( list.count() > 10 )
-		{
-			list.removeLast();
+			// empty
 		}
 
-		mInstance->setValue( "templates", list );
 
-		mInstance->endGroup();
+		void Settings::init()
+		{
+			if ( mInstance == nullptr )
+			{
+				mInstance = new Settings();
+			}
+		}
+
+
+		Settings* Settings::instance()
+		{
+			init();
+
+			return mInstance;
+		}
+
+
+		Units Settings::units()
+		{
+			// Guess at a suitable default
+			QString defaultIdString;
+			if ( QLocale::system().measurementSystem() == QLocale::ImperialSystem )
+			{
+				defaultIdString = Units(Units::IN).toIdString();
+			}
+			else
+			{
+				defaultIdString = Units(Units::MM).toIdString();
+			}
+	
+			mInstance->beginGroup( "Locale" );
+			QString idString = mInstance->value( "units", defaultIdString ).toString();
+			mInstance->endGroup();
+
+			return Units( idString );
+		}
+
+
+		void Settings::setUnits( const Units& units )
+		{
+			QString idString = units.toIdString();
+
+			mInstance->beginGroup( "Locale" );
+			mInstance->setValue( "units", idString );
+			mInstance->endGroup();
+
+			emit mInstance->changed();
+		}
+
+
+		bool Settings::searchIsoPaperSizes()
+		{
+			// Guess at a suitable default
+			bool defaultValue;
+			switch (QLocale::system().country())
+			{
+			case QLocale::UnitedStates:
+			case QLocale::Canada:
+				defaultValue = false;
+				break;
+
+			default:
+				defaultValue = true;
+				break;
+			}
+	
+			mInstance->beginGroup( "Search" );
+			bool returnValue = mInstance->value( "isoPaperSizes", defaultValue ).toBool();
+			mInstance->endGroup();
+
+			return returnValue;
+		}
+
+
+		void Settings::setSearchIsoPaperSizes( bool searchIsoPaperSizes )
+		{
+			mInstance->beginGroup( "Search" );
+			mInstance->setValue( "isoPaperSizes", searchIsoPaperSizes );
+			mInstance->endGroup();
+
+			emit mInstance->changed();
+		}
+
+
+		bool Settings::searchUsPaperSizes()
+		{
+			// Guess at a suitable default
+			bool defaultValue;
+			switch (QLocale::system().country())
+			{
+			case QLocale::UnitedStates:
+			case QLocale::Canada:
+				defaultValue = true;
+				break;
+
+			default:
+				defaultValue = false;
+				break;
+			}
+	
+			mInstance->beginGroup( "Search" );
+			bool returnValue = mInstance->value( "usPaperSizes", defaultValue ).toBool();
+			mInstance->endGroup();
+
+			return returnValue;
+		}
+
+
+		void Settings::setSearchUsPaperSizes( bool searchUsPaperSizes )
+		{
+			mInstance->beginGroup( "Search" );
+			mInstance->setValue( "usPaperSizes", searchUsPaperSizes );
+			mInstance->endGroup();
+
+			emit mInstance->changed();
+		}
+
+
+		bool Settings::searchOtherPaperSizes()
+		{
+			// Guess at a suitable default
+			bool defaultValue = true;
+	
+			mInstance->beginGroup( "Search" );
+			bool returnValue = mInstance->value( "otherPaperSizes", defaultValue ).toBool();
+			mInstance->endGroup();
+
+			return returnValue;
+		}
+
+
+		void Settings::setSearchOtherPaperSizes( bool searchOtherPaperSizes )
+		{
+			mInstance->beginGroup( "Search" );
+			mInstance->setValue( "otherPaperSizes", searchOtherPaperSizes );
+			mInstance->endGroup();
+
+			emit mInstance->changed();
+		}
+
+
+		bool Settings::searchAllCategories()
+		{
+			// Guess at a suitable default
+			bool defaultValue = true;
+	
+			mInstance->beginGroup( "Search" );
+			bool returnValue = mInstance->value( "allCategories", defaultValue ).toBool();
+			mInstance->endGroup();
+
+			return returnValue;
+		}
+
+
+		void Settings::setSearchAllCategories( bool searchAllCategories )
+		{
+			mInstance->beginGroup( "Search" );
+			mInstance->setValue( "allCategories", searchAllCategories );
+			mInstance->endGroup();
+
+			emit mInstance->changed();
+		}
+
+
+		QStringList Settings::searchCategoryList()
+		{
+			QStringList defaultList;
+	
+			mInstance->beginGroup( "Search" );
+			QStringList returnList = mInstance->value( "categoryList", defaultList ).toStringList();
+			mInstance->endGroup();
+
+			return returnList;
+		}
+
+
+		void Settings::setSearchCategoryList( const QStringList& searchCategoryList )
+		{
+			mInstance->beginGroup( "Search" );
+			mInstance->setValue( "categoryList", searchCategoryList );
+			mInstance->endGroup();
+
+			emit mInstance->changed();
+		}
+
+
+		QStringList Settings::recentTemplateList()
+		{
+			QStringList defaultList;
+	
+			mInstance->beginGroup( "Recent" );
+			QStringList returnList = mInstance->value( "templates", defaultList ).toStringList();
+			mInstance->endGroup();
+
+			return returnList;
+		}
+
+
+		void Settings::addToRecentTemplateList( const QString& name )
+		{
+			mInstance->beginGroup( "Recent" );
+
+			QStringList list = mInstance->value( "templates" ).toStringList();
+
+			list.removeAll( name );
+			list.prepend( name );
+			while ( list.count() > 10 )
+			{
+				list.removeLast();
+			}
+
+			mInstance->setValue( "templates", list );
+
+			mInstance->endGroup();
+
+			emit mInstance->changed();
+		}
 
-		emit mInstance->changed();
 	}
-
-} // namespace glabels::model
+}
diff --git a/model/Settings.h b/model/Settings.h
index f303003..bd950d4 100644
--- a/model/Settings.h
+++ b/model/Settings.h
@@ -28,69 +28,72 @@
 #include <QStringList>
 
 
-namespace glabels::model
+namespace glabels
 {
-
-	///
-	/// Settings Singleton Class
-	///
-	class Settings : public QSettings
+	namespace model
 	{
-		Q_OBJECT
+
+		///
+		/// Settings Singleton Class
+		///
+		class Settings : public QSettings
+		{
+			Q_OBJECT
 	
-	public:
-		enum class PageSizeFamilty { ISO, US, };
+		public:
+			enum class PageSizeFamilty { ISO, US, };
 
 
-		/////////////////////////////////
-		// Life Cycle
-		/////////////////////////////////
-	private:
-		Settings();
+			/////////////////////////////////
+			// Life Cycle
+			/////////////////////////////////
+		private:
+			Settings();
 
-	public:
-		static void init();
-		static Settings* instance();
+		public:
+			static void init();
+			static Settings* instance();
 
 	
-		/////////////////////////////////
-		// Signals
-		/////////////////////////////////
-	signals:
-		void changed();
+			/////////////////////////////////
+			// Signals
+			/////////////////////////////////
+		signals:
+			void changed();
 	
 
-		/////////////////////////////////
-		// Accessors
-		/////////////////////////////////
-	public:
-		static Units units();
-		static void setUnits( const Units& units );
+			/////////////////////////////////
+			// Accessors
+			/////////////////////////////////
+		public:
+			static Units units();
+			static void setUnits( const Units& units );
 
-		static bool searchIsoPaperSizes();
-		static void setSearchIsoPaperSizes( bool searchIsoPaperSizes );
+			static bool searchIsoPaperSizes();
+			static void setSearchIsoPaperSizes( bool searchIsoPaperSizes );
 
-		static bool searchUsPaperSizes();
-		static void setSearchUsPaperSizes( bool searchUsPaperSizes );
+			static bool searchUsPaperSizes();
+			static void setSearchUsPaperSizes( bool searchUsPaperSizes );
 
-		static bool searchOtherPaperSizes();
-		static void setSearchOtherPaperSizes( bool searchOtherPaperSizes );
+			static bool searchOtherPaperSizes();
+			static void setSearchOtherPaperSizes( bool searchOtherPaperSizes );
 
-		static bool searchAllCategories();
-		static void setSearchAllCategories( bool searchAllCategories );
+			static bool searchAllCategories();
+			static void setSearchAllCategories( bool searchAllCategories );
 
-		static QStringList searchCategoryList();
-		static void setSearchCategoryList( const QStringList& searchCategoryList );
+			static QStringList searchCategoryList();
+			static void setSearchCategoryList( const QStringList& searchCategoryList );
 
-		static QStringList recentTemplateList();
-		static void addToRecentTemplateList( const QString& name );
+			static QStringList recentTemplateList();
+			static void addToRecentTemplateList( const QString& name );
 
 
-	private:
-		static Settings* mInstance;
+		private:
+			static Settings* mInstance;
 
-	};
+		};
 
+	}
 }
 
 
diff --git a/model/Size.cpp b/model/Size.cpp
index e104d77..bd2148d 100644
--- a/model/Size.cpp
+++ b/model/Size.cpp
@@ -21,74 +21,77 @@
 #include "Size.h"
 
 
-namespace glabels::model
+namespace glabels
 {
-
-	///
-	/// Constructor
-	///
-	Size::Size() : mW(0), mH(0)
+	namespace model
 	{
-		// empty
+
+		///
+		/// Constructor
+		///
+		Size::Size() : mW(0), mH(0)
+		{
+			// empty
+		}
+
+
+		///
+		/// Constructor
+		///
+		Size::Size( const Distance& w, const Distance& h ) : mW(w), mH(h)
+		{
+			// empty
+		}
+
+
+		///
+		/// Get w
+		///
+		Distance Size::w() const
+		{
+			return mW;
+		}
+
+
+		///
+		/// Set w
+		///
+		void Size::setW( const Distance& value )
+		{
+			mW = value;
+		}
+
+
+		///
+		/// Get h
+		///
+		Distance Size::h() const
+		{
+			return mH;
+		}
+
+
+		///
+		/// Set h
+		///
+		void Size::setH( const Distance& value )
+		{
+			mH = value;
+		}
+
+
+		///
+		/// Convert to a QSizeF
+		///
+		QSizeF Size::qSizeF() const
+		{
+			QSizeF s;
+
+			s.setWidth( mW.pt() );
+			s.setHeight( mH.pt() );
+
+			return s;
+		}
+
 	}
-
-
-	///
-	/// Constructor
-	///
-	Size::Size( const Distance& w, const Distance& h ) : mW(w), mH(h)
-	{
-		// empty
-	}
-
-
-	///
-	/// Get w
-	///
-	Distance Size::w() const
-	{
-		return mW;
-	}
-
-
-	///
-	/// Set w
-	///
-	void Size::setW( const Distance& value )
-	{
-		mW = value;
-	}
-
-
-	///
-	/// Get h
-	///
-	Distance Size::h() const
-	{
-		return mH;
-	}
-
-
-	///
-	/// Set h
-	///
-	void Size::setH( const Distance& value )
-	{
-		mH = value;
-	}
-
-
-	///
-	/// Convert to a QSizeF
-	///
-	QSizeF Size::qSizeF() const
-	{
-		QSizeF s;
-
-		s.setWidth( mW.pt() );
-		s.setHeight( mH.pt() );
-
-		return s;
-	}
-
-} // namespace glabels::model
+}
diff --git a/model/Size.h b/model/Size.h
index db3ab8e..b684942 100644
--- a/model/Size.h
+++ b/model/Size.h
@@ -27,57 +27,60 @@
 #include <QSizeF>
 
 
-namespace glabels::model
+namespace glabels
 {
-
-	///
-	/// Size Type
-	///
-	class Size
+	namespace model
 	{
 
-		/////////////////////////////////
-		// Constructors
-		/////////////////////////////////
-	public:
-		Size();
-		Size( const Distance& w, const Distance& h );
+		///
+		/// Size Type
+		///
+		class Size
+		{
+
+			/////////////////////////////////
+			// Constructors
+			/////////////////////////////////
+		public:
+			Size();
+			Size( const Distance& w, const Distance& h );
 	
 
-		/////////////////////////////////
-		// Properties
-		/////////////////////////////////
-	public:
-		//
-		// w Property
-		//
-		Distance w() const;
-		void setW( const Distance& value );
+			/////////////////////////////////
+			// Properties
+			/////////////////////////////////
+		public:
+			//
+			// w Property
+			//
+			Distance w() const;
+			void setW( const Distance& value );
 
 
-		//
-		// H Property
-		//
-		Distance h() const;
-		void setH( const Distance& value );
+			//
+			// H Property
+			//
+			Distance h() const;
+			void setH( const Distance& value );
 
 
-		/////////////////////////////////
-		// Methods
-		/////////////////////////////////
-	public:
-		QSizeF qSizeF() const;
+			/////////////////////////////////
+			// Methods
+			/////////////////////////////////
+		public:
+			QSizeF qSizeF() const;
 
 
-		/////////////////////////////////
-		// Private Data
-		/////////////////////////////////
-	private:
-		Distance mW;
-		Distance mH;
+			/////////////////////////////////
+			// Private Data
+			/////////////////////////////////
+		private:
+			Distance mW;
+			Distance mH;
 
-	};
+		};
 
+	}
 }
 
 
diff --git a/model/StrUtil.cpp b/model/StrUtil.cpp
index 76d2285..a8c1f41 100644
--- a/model/StrUtil.cpp
+++ b/model/StrUtil.cpp
@@ -23,189 +23,192 @@
 #include <QtMath>
 
 
-namespace glabels::model
+namespace glabels
 {
-
-	//
-	// Private
-	//
-	namespace
-	{
-		const double FRAC_EPSILON = 0.00005;
-		const double denom[]        = {  1.0,  2.0, 3.0,  4.0,  8.0,  16.0,  32.0,  0.0 };
-		const char*  denom_string[] = { "1", "₂", "₃", "₄", "₈", "₁₆", "₃₂", nullptr };
-		const char*  num_string[]   = {  "⁰",  "¹",  "²",  "³",  "⁴",  "⁵",  "⁶",  "⁷",  "⁸",  "⁹",
-		                                 "¹⁰", "¹¹", "¹²", "¹³", "¹⁴", "¹⁵", "¹⁶", "¹⁷", "¹⁸", "¹⁹",
-		                                 "²⁰", "²¹", "²²", "²³", "²⁴", "²⁵", "²⁶", "²⁷", "²⁸", "²⁹",
-		                                 "³⁰", "³¹" };
-	}
-
-
-	namespace StrUtil
+	namespace model
 	{
 
-		QString formatFraction( double x )
+		//
+		// Private
+		//
+		namespace
 		{
-                        int i;
-                        double product, remainder;
-
-                        for ( i=0; denom[i] != 0.0; i++ )
-                        {
-                                product = x * denom[i];
-                                remainder = qFabs(product - ((int)(product+0.5)));
-                                if ( remainder < FRAC_EPSILON ) break;
-                        }
-
-                        if ( denom[i] == 0.0 )
-                        {
-                                /* None of our denominators work. */
-                                return QString().sprintf( "%.5g", x );
-                        }
-                        if ( denom[i] == 1.0 )
-                        {
-                                /* Simple integer. */
-                                return QString().sprintf( "%.0f", x );
-                        }
-                        int n = (int)( x * denom[i] + 0.5 );
-                        int d = (int)denom[i];
-                        if ( n > d )
-                        {
-                                return QString::number(n/d) +
-					QString::fromUtf8(num_string[n%d]) + "/" + QString::fromUtf8(denom_string[i]);
-                        }
-                        else
-                        {
-                                return QString::fromUtf8(num_string[n%d]) + "/" + QString::fromUtf8(denom_string[i]);
-                        }
+			const double FRAC_EPSILON = 0.00005;
+			const double denom[]        = {  1.0,  2.0, 3.0,  4.0,  8.0,  16.0,  32.0,  0.0 };
+			const char*  denom_string[] = { "1", "₂", "₃", "₄", "₈", "₁₆", "₃₂", nullptr };
+			const char*  num_string[]   = {  "⁰",  "¹",  "²",  "³",  "⁴",  "⁵",  "⁶",  "⁷",  "⁸",  "⁹",
+			                                 "¹⁰", "¹¹", "¹²", "¹³", "¹⁴", "¹⁵", "¹⁶", "¹⁷", "¹⁸", "¹⁹",
+			                                 "²⁰", "²¹", "²²", "²³", "²⁴", "²⁵", "²⁶", "²⁷", "²⁸", "²⁹",
+			                                 "³⁰", "³¹" };
 		}
 
 
-		QString spanDigits( const QString &s, int *i )
+		namespace StrUtil
 		{
-			QString chunk;
 
-			for ( int j = *i; (j < s.size()) && s.at(j).isNumber(); j++ )
+			QString formatFraction( double x )
 			{
-				chunk.append( s.at(j) );
-				*i = j+1; /* only advance i, if character is used. */
-			}
+				int i;
+				double product, remainder;
 
-			return chunk;
-		}
-
-
-		QString spanNonDigits( const QString &s, int *i )
-		{
-			QString chunk;
-
-			for ( int j = *i; (j < s.size()) && !s.at(j).isNumber(); j++ )
-			{
-				chunk.append( s.at(j) );
-				*i = j+1; /* only advance i, if character is used. */
-			}
-
-			return chunk;
-		}
-
-
-		/**
-		 * Compare part names
-		 * @s1: string to compare with s2.
-		 * @s2: string to compare with s1.
-		 *
-		 * Compare two strings representing part names or numbers.  This function
-		 * uses a natural sort order:
-		 *
-		 *  - Ignores case.
-		 *
-		 *  - Strings are divided into chunks (numeric and non-numeric)
-		 *
-		 *  - Non-numeric chunks are compared character by character
-		 *
-		 *  - Numerical chunks are compared numerically, so that "20" precedes "100".
-		 *
-		 *  - Comparison of chunks is performed left to right until the first difference
-		 *    is encountered or all chunks evaluate as equal.
-		 *
-		 * Numeric chunks are converted to 64 bit unsigned integers for comparison,
-		 * so the behaviour may be unpredictable for numeric chunks that exceed
-		 * 18446744073709551615.
-		 *
-		 * Returns: 0 if the strings match, a negative value if s1 < s2,
-		 *          or a positive value if s1 > s2.
-		 *
-		 */
-		int comparePartNames( const QString &s1, const QString &s2 )
-		{
-			if ( s1 == s2 ) return 0;
-			if ( s1 == "" ) return -1;
-			if ( s2 == "" ) return 1;
-
-			QString folded_s1 = s1.toUpper();
-			QString folded_s2 = s2.toUpper();
-
-			int i1 = 0;
-			int i2 = 0;
-			int result = 0;
-			bool done = false;
-
-			while ( (result == 0) && !done )
-			{
-				QString chunk1, chunk2;
-				bool   isnum1, isnum2;
-
-				if ( (i1 < folded_s1.size()) && folded_s1.at( i1 ).isNumber() )
+				for ( i=0; denom[i] != 0.0; i++ )
 				{
-					chunk1 = spanDigits( folded_s1, &i1 );
-					isnum1 = true;
+					product = x * denom[i];
+					remainder = qFabs(product - ((int)(product+0.5)));
+					if ( remainder < FRAC_EPSILON ) break;
+				}
+
+				if ( denom[i] == 0.0 )
+				{
+					/* None of our denominators work. */
+					return QString().sprintf( "%.5g", x );
+				}
+				if ( denom[i] == 1.0 )
+				{
+					/* Simple integer. */
+					return QString().sprintf( "%.0f", x );
+				}
+				int n = (int)( x * denom[i] + 0.5 );
+				int d = (int)denom[i];
+				if ( n > d )
+				{
+					return QString::number(n/d) +
+						QString::fromUtf8(num_string[n%d]) + "/" + QString::fromUtf8(denom_string[i]);
 				}
 				else
 				{
-					chunk1 = spanNonDigits( folded_s1, &i1 );
-					isnum1 = false;
+					return QString::fromUtf8(num_string[n%d]) + "/" + QString::fromUtf8(denom_string[i]);
 				}
+			}
+
+
+			QString spanDigits( const QString &s, int *i )
+			{
+				QString chunk;
+
+				for ( int j = *i; (j < s.size()) && s.at(j).isNumber(); j++ )
+				{
+					chunk.append( s.at(j) );
+					*i = j+1; /* only advance i, if character is used. */
+				}
+
+				return chunk;
+			}
+
+
+			QString spanNonDigits( const QString &s, int *i )
+			{
+				QString chunk;
+
+				for ( int j = *i; (j < s.size()) && !s.at(j).isNumber(); j++ )
+				{
+					chunk.append( s.at(j) );
+					*i = j+1; /* only advance i, if character is used. */
+				}
+
+				return chunk;
+			}
+
+
+			/**
+			 * Compare part names
+			 * @s1: string to compare with s2.
+			 * @s2: string to compare with s1.
+			 *
+			 * Compare two strings representing part names or numbers.  This function
+			 * uses a natural sort order:
+			 *
+			 *  - Ignores case.
+			 *
+			 *  - Strings are divided into chunks (numeric and non-numeric)
+			 *
+			 *  - Non-numeric chunks are compared character by character
+			 *
+			 *  - Numerical chunks are compared numerically, so that "20" precedes "100".
+			 *
+			 *  - Comparison of chunks is performed left to right until the first difference
+			 *    is encountered or all chunks evaluate as equal.
+			 *
+			 * Numeric chunks are converted to 64 bit unsigned integers for comparison,
+			 * so the behaviour may be unpredictable for numeric chunks that exceed
+			 * 18446744073709551615.
+			 *
+			 * Returns: 0 if the strings match, a negative value if s1 < s2,
+			 *          or a positive value if s1 > s2.
+			 *
+			 */
+			int comparePartNames( const QString &s1, const QString &s2 )
+			{
+				if ( s1 == s2 ) return 0;
+				if ( s1 == "" ) return -1;
+				if ( s2 == "" ) return 1;
+
+				QString folded_s1 = s1.toUpper();
+				QString folded_s2 = s2.toUpper();
+
+				int i1 = 0;
+				int i2 = 0;
+				int result = 0;
+				bool done = false;
+
+				while ( (result == 0) && !done )
+				{
+					QString chunk1, chunk2;
+					bool   isnum1, isnum2;
+
+					if ( (i1 < folded_s1.size()) && folded_s1.at( i1 ).isNumber() )
+					{
+						chunk1 = spanDigits( folded_s1, &i1 );
+						isnum1 = true;
+					}
+					else
+					{
+						chunk1 = spanNonDigits( folded_s1, &i1 );
+						isnum1 = false;
+					}
                 
-				if ( (i2 < folded_s2.size()) && folded_s2.at( i2 ).isNumber() )
-				{
-					chunk2 = spanDigits( folded_s2, &i2 );
-					isnum2 = true;
-				}
-				else
-				{
-					chunk2 = spanNonDigits( folded_s2, &i2 );
-					isnum2 = false;
-				}
+					if ( (i2 < folded_s2.size()) && folded_s2.at( i2 ).isNumber() )
+					{
+						chunk2 = spanDigits( folded_s2, &i2 );
+						isnum2 = true;
+					}
+					else
+					{
+						chunk2 = spanNonDigits( folded_s2, &i2 );
+						isnum2 = false;
+					}
 
 
-				if ( ( chunk1 == "" ) && ( chunk2 == "" ) )
-				{
-					/* Case 1: Both are empty. */
-					done = true;
-				}
-				else if ( isnum1 && isnum2 )
-				{
-					/* Case 2: They both contain numbers */
-					qlonglong n1 = chunk1.toLongLong();
-					qlonglong n2 = chunk2.toLongLong();
+					if ( ( chunk1 == "" ) && ( chunk2 == "" ) )
+					{
+						/* Case 1: Both are empty. */
+						done = true;
+					}
+					else if ( isnum1 && isnum2 )
+					{
+						/* Case 2: They both contain numbers */
+						qlonglong n1 = chunk1.toLongLong();
+						qlonglong n2 = chunk2.toLongLong();
+
+						if ( n1 < n2 ) result = -1;
+						else if ( n1 > n2 ) result =  1;
+					}
+					else
+					{
+						/* Case 3: One or both do not contain numbers */
+						if ( chunk1 < chunk2 ) result = -1;
+						else if( chunk1 > chunk2 ) result = 1;
+					}
 
-					if ( n1 < n2 ) result = -1;
-					else if ( n1 > n2 ) result =  1;
-				}
-				else
-				{
-					/* Case 3: One or both do not contain numbers */
-					if ( chunk1 < chunk2 ) result = -1;
-					else if( chunk1 > chunk2 ) result = 1;
 				}
 
+				return result;
 			}
 
-			return result;
+
+
 		}
 
 
-
 	}
-
-
-} // namespace glabels::model
+}
diff --git a/model/StrUtil.h b/model/StrUtil.h
index 3e4f3ec..dc0f710 100644
--- a/model/StrUtil.h
+++ b/model/StrUtil.h
@@ -25,18 +25,21 @@
 #include <QString>
 
 
-namespace glabels::model
+namespace glabels
 {
-
-	namespace StrUtil
+	namespace model
 	{
 
-		QString formatFraction( double x );
+		namespace StrUtil
+		{
 
-		int comparePartNames( const QString &s1, const QString &s2 );
+			QString formatFraction( double x );
+
+			int comparePartNames( const QString &s1, const QString &s2 );
+
+		}
 
 	}
-
 }
 
 
diff --git a/model/SubstitutionField.cpp b/model/SubstitutionField.cpp
index a1385b9..4dab782 100644
--- a/model/SubstitutionField.cpp
+++ b/model/SubstitutionField.cpp
@@ -23,269 +23,271 @@
 #include <QTextStream>
 
 
-namespace glabels::model
+namespace glabels
 {
-
-	SubstitutionField::SubstitutionField()
-		: mNewLine(false), mFormatType(0)
+	namespace model
 	{
-	}
 
-
-	SubstitutionField::SubstitutionField( const QString& string )
-		: mNewLine(false), mFormatType(0)
-	{
-		QStringRef s(&string);
-		parse( s, *this );
-	}
-
-
-	QString SubstitutionField::evaluate( const merge::Record* record ) const
-	{
-		QString value = mDefaultValue;
-
-		if ( record && record->contains(mFieldName) && !record->value(mFieldName).isEmpty() )
+		SubstitutionField::SubstitutionField()
+			: mNewLine(false), mFormatType(0)
 		{
-			value = record->value(mFieldName);
 		}
 
-		if ( !mFormatType.isNull() )
+
+		SubstitutionField::SubstitutionField( const QString& string )
+			: mNewLine(false), mFormatType(0)
 		{
-			value = formatValue( value );
+			QStringRef s(&string);
+			parse( s, *this );
 		}
 
-		if ( record && record->contains(mFieldName) && !record->value(mFieldName).isEmpty() && mNewLine )
+
+		QString SubstitutionField::evaluate( const merge::Record* record ) const
 		{
-			value = "\n" + value;
-		}
+			QString value = mDefaultValue;
 
-		return value;
-	}
-
-
-	QString SubstitutionField::fieldName() const
-	{
-		return mFieldName;
-	}
-
-
-	QString SubstitutionField::defaultValue() const
-	{
-		return mDefaultValue;
-	}
-
-
-	QString SubstitutionField::format() const
-	{
-		return mFormat;
-	}
-
-
-	QChar SubstitutionField::formatType() const
-	{
-		return mFormatType;
-	}
-
-
-	bool SubstitutionField::newLine() const
-	{
-		return mNewLine;
-	}
-
-
-	bool SubstitutionField::parse( QStringRef& s, SubstitutionField& field )
-	{
-		QStringRef sTmp = s;
-		
-		if ( sTmp.startsWith( "${" ) )
-		{
-			sTmp = sTmp.mid(2);
-
-			if ( parseFieldName( sTmp, field ) )
+			if ( record && record->contains(mFieldName) && !record->value(mFieldName).isEmpty() )
 			{
-				while ( sTmp.size() && sTmp[0] == ':' )
+				value = record->value(mFieldName);
+			}
+
+			if ( !mFormatType.isNull() )
+			{
+				value = formatValue( value );
+			}
+
+			if ( record && record->contains(mFieldName) && !record->value(mFieldName).isEmpty() && mNewLine )
+			{
+				value = "\n" + value;
+			}
+
+			return value;
+		}
+
+
+		QString SubstitutionField::fieldName() const
+		{
+			return mFieldName;
+		}
+
+
+		QString SubstitutionField::defaultValue() const
+		{
+			return mDefaultValue;
+		}
+
+
+		QString SubstitutionField::format() const
+		{
+			return mFormat;
+		}
+
+
+		QChar SubstitutionField::formatType() const
+		{
+			return mFormatType;
+		}
+
+
+		bool SubstitutionField::newLine() const
+		{
+			return mNewLine;
+		}
+
+
+		bool SubstitutionField::parse( QStringRef& s, SubstitutionField& field )
+		{
+			QStringRef sTmp = s;
+		
+			if ( sTmp.startsWith( "${" ) )
+			{
+				sTmp = sTmp.mid(2);
+
+				if ( parseFieldName( sTmp, field ) )
 				{
-					sTmp = sTmp.mid(1);
-					if ( !parseModifier( sTmp, field ) )
+					while ( sTmp.size() && sTmp[0] == ':' )
 					{
-						return false;
+						sTmp = sTmp.mid(1);
+						if ( !parseModifier( sTmp, field ) )
+						{
+							return false;
+						}
+					}
+
+					if ( sTmp.size() && sTmp[0] == '}' )
+					{
+						sTmp = sTmp.mid(1);
+
+						// Success.  Update s.
+						s = sTmp;
+						return true;
 					}
 				}
-
-				if ( sTmp.size() && sTmp[0] == '}' )
-				{
-					sTmp = sTmp.mid(1);
-
-					// Success.  Update s.
-					s = sTmp;
-					return true;
-				}
 			}
+
+			return false;
 		}
 
-		return false;
-	}
 
-
-	bool SubstitutionField::parseFieldName( QStringRef& s, SubstitutionField& field )
-	{
-		bool success = false;
+		bool SubstitutionField::parseFieldName( QStringRef& s, SubstitutionField& field )
+		{
+			bool success = false;
 		
-		while ( s.size() && (s[0].isDigit() || s[0].isLetter() || s[0] == '_' || s[0] == '-') )
-		{
-			field.mFieldName.append( s[0] );
-			s = s.mid(1);
-
-			success = true;
-		}
-
-		return success;
-	}
-
-	
-	bool SubstitutionField::parseModifier( QStringRef& s, SubstitutionField& field )
-	{
-		bool success = false;
-		
-		if ( s.size() && s[0] == '%' )
-		{
-			s = s.mid(1);
-			success = parseFormatModifier( s, field );
-		}
-		else if ( s.size() && s[0] == '=' )
-		{
-			s = s.mid(1);
-			success = parseDefaultValueModifier( s, field );
-		}
-		else if ( s.size() && s[0] == 'n' )
-		{
-			s = s.mid(1);
-			success = parseNewLineModifier( s, field );
-		}
-
-		return success;
-	}
-
-	
-	bool SubstitutionField::parseDefaultValueModifier( QStringRef& s, SubstitutionField& field )
-	{
-		field.mDefaultValue.clear();
-
-		while ( s.size() && !QString( ":}" ).contains( s[0] ) )
-		{
-			if ( s[0] == '\\' )
+			while ( s.size() && (s[0].isDigit() || s[0].isLetter() || s[0] == '_' || s[0] == '-') )
 			{
-				s = s.mid(1); // Skip escape
-				if ( s.size() )
+				field.mFieldName.append( s[0] );
+				s = s.mid(1);
+
+				success = true;
+			}
+
+			return success;
+		}
+
+	
+		bool SubstitutionField::parseModifier( QStringRef& s, SubstitutionField& field )
+		{
+			bool success = false;
+		
+			if ( s.size() && s[0] == '%' )
+			{
+				s = s.mid(1);
+				success = parseFormatModifier( s, field );
+			}
+			else if ( s.size() && s[0] == '=' )
+			{
+				s = s.mid(1);
+				success = parseDefaultValueModifier( s, field );
+			}
+			else if ( s.size() && s[0] == 'n' )
+			{
+				s = s.mid(1);
+				success = parseNewLineModifier( s, field );
+			}
+
+			return success;
+		}
+
+	
+		bool SubstitutionField::parseDefaultValueModifier( QStringRef& s, SubstitutionField& field )
+		{
+			field.mDefaultValue.clear();
+
+			while ( s.size() && !QString( ":}" ).contains( s[0] ) )
+			{
+				if ( s[0] == '\\' )
+				{
+					s = s.mid(1); // Skip escape
+					if ( s.size() )
+					{
+						field.mDefaultValue.append( s[0] );
+						s = s.mid(1);
+					}
+				}
+				else
 				{
 					field.mDefaultValue.append( s[0] );
 					s = s.mid(1);
 				}
 			}
-			else
+
+			return true;
+		}
+
+	
+		bool SubstitutionField::parseFormatModifier( QStringRef& s, SubstitutionField& field )
+		{
+			bool success = false;
+		
+			field.mFormat = "%";
+
+			parseFormatFlags( s, field );
+			parseFormatWidth( s, field );
+		
+			if ( s.size() && s[0] == '.' )
 			{
-				field.mDefaultValue.append( s[0] );
+				field.mFormat += ".";
 				s = s.mid(1);
+				parseFormatPrecision( s, field );
 			}
+
+			parseFormatType( s, field );
+
+			return true; // Don't let invalid formats kill entire SubstitutionField
 		}
 
-		return true;
-	}
-
 	
-	bool SubstitutionField::parseFormatModifier( QStringRef& s, SubstitutionField& field )
-	{
-		bool success = false;
-		
-		field.mFormat = "%";
-
-		parseFormatFlags( s, field );
-		parseFormatWidth( s, field );
-		
-		if ( s.size() && s[0] == '.' )
+		bool SubstitutionField::parseFormatFlags( QStringRef& s, SubstitutionField& field )
 		{
-			field.mFormat += ".";
-			s = s.mid(1);
-			parseFormatPrecision( s, field );
-		}
-
-		parseFormatType( s, field );
-
-		return true; // Don't let invalid formats kill entire SubstitutionField
-	}
-
-	
-	bool SubstitutionField::parseFormatFlags( QStringRef& s, SubstitutionField& field )
-	{
-		while ( s.size() && QString( "-+ 0" ).contains( s[0] ) )
-		{
-			field.mFormat += s[0];
-			s = s.mid(1);
-		}
-
-		return true;
-	}
-
-	
-	bool SubstitutionField::parseFormatWidth( QStringRef& s, SubstitutionField& field )
-	{
-		return parseNaturalInteger( s, field );
-	}
-
-
-	bool SubstitutionField::parseFormatPrecision( QStringRef& s, SubstitutionField& field )
-	{
-		return parseNaturalInteger( s, field );
-	}
-
-	
-	bool SubstitutionField::parseFormatType( QStringRef& s, SubstitutionField& field )
-	{
-		bool success = false;
-
-		if ( s.size() && QString( "diufFeEgGxXos" ).contains( s[0] ) )
-		{
-			field.mFormatType = s[0];
-			field.mFormat += s[0];
-			s = s.mid(1);
-			success = true;
-		}
-
-		return success;
-	}
-
-	
-	bool SubstitutionField::parseNaturalInteger( QStringRef& s, SubstitutionField& field )
-	{
-		bool success = false;
-
-		if ( s.size() && s[0] >= '1' && s[0] <= '9' )
-		{
-			field.mFormat += s[0];
-			s = s.mid(1);
-
-			while ( s.size() && s[0].isDigit() )
+			while ( s.size() && QString( "-+ 0" ).contains( s[0] ) )
 			{
 				field.mFormat += s[0];
 				s = s.mid(1);
 			}
 
-			success = true;
+			return true;
 		}
+
+	
+		bool SubstitutionField::parseFormatWidth( QStringRef& s, SubstitutionField& field )
+		{
+			return parseNaturalInteger( s, field );
+		}
+
+
+		bool SubstitutionField::parseFormatPrecision( QStringRef& s, SubstitutionField& field )
+		{
+			return parseNaturalInteger( s, field );
+		}
+
+	
+		bool SubstitutionField::parseFormatType( QStringRef& s, SubstitutionField& field )
+		{
+			bool success = false;
+
+			if ( s.size() && QString( "diufFeEgGxXos" ).contains( s[0] ) )
+			{
+				field.mFormatType = s[0];
+				field.mFormat += s[0];
+				s = s.mid(1);
+				success = true;
+			}
+
+			return success;
+		}
+
+	
+		bool SubstitutionField::parseNaturalInteger( QStringRef& s, SubstitutionField& field )
+		{
+			bool success = false;
+
+			if ( s.size() && s[0] >= '1' && s[0] <= '9' )
+			{
+				field.mFormat += s[0];
+				s = s.mid(1);
+
+				while ( s.size() && s[0].isDigit() )
+				{
+					field.mFormat += s[0];
+					s = s.mid(1);
+				}
+
+				success = true;
+			}
 		
-		return success;
-	}
+			return success;
+		}
 	
 
-	bool SubstitutionField::parseNewLineModifier( QStringRef& s, SubstitutionField& field )
-	{
-		field.mNewLine = true;
-		return true;
-	}
+		bool SubstitutionField::parseNewLineModifier( QStringRef& s, SubstitutionField& field )
+		{
+			field.mNewLine = true;
+			return true;
+		}
 
 	
-	QString SubstitutionField::formatValue( const QString& value ) const
-	{
+		QString SubstitutionField::formatValue( const QString& value ) const
+		{
 			switch (mFormatType.unicode())
 			{
 				
@@ -325,7 +327,8 @@ namespace glabels::model
 				break;
 
 			}
-	}
+		}
 	
 
-} // namespace glabels::model
+	}
+}
diff --git a/model/SubstitutionField.h b/model/SubstitutionField.h
index 2f8c943..ec08a00 100644
--- a/model/SubstitutionField.h
+++ b/model/SubstitutionField.h
@@ -28,49 +28,52 @@
 #include <QStringRef>
 
 
-namespace glabels::model
+namespace glabels
 {
-
-	class SubstitutionField
+	namespace model
 	{
-	public:
-		SubstitutionField();
-		SubstitutionField( const QString& string );
 
-		QString evaluate( const merge::Record* record ) const;
+		class SubstitutionField
+		{
+		public:
+			SubstitutionField();
+			SubstitutionField( const QString& string );
+
+			QString evaluate( const merge::Record* record ) const;
 		
-		QString fieldName() const;
-		QString defaultValue() const;
-		QString format() const;
-		QChar   formatType() const;
-		bool    newLine() const;
+			QString fieldName() const;
+			QString defaultValue() const;
+			QString format() const;
+			QChar   formatType() const;
+			bool    newLine() const;
 
-		static bool parse( QStringRef& s, SubstitutionField& field );
+			static bool parse( QStringRef& s, SubstitutionField& field );
 
-	private:
-		static bool parseFieldName( QStringRef& s, SubstitutionField& field );
-		static bool parseModifier( QStringRef& s, SubstitutionField& field );
-		static bool parseDefaultValueModifier( QStringRef& s, SubstitutionField& field );
-		static bool parseFormatModifier( QStringRef& s, SubstitutionField& field );
-		static bool parseFormatFlags( QStringRef& s, SubstitutionField& field );
-		static bool parseFormatWidth( QStringRef& s, SubstitutionField& field );
-		static bool parseFormatPrecision( QStringRef& s, SubstitutionField& field );
-		static bool parseFormatType( QStringRef& s, SubstitutionField& field );
-		static bool parseNaturalInteger( QStringRef& s, SubstitutionField& field );
-		static bool parseNewLineModifier( QStringRef& s, SubstitutionField& field );
+		private:
+			static bool parseFieldName( QStringRef& s, SubstitutionField& field );
+			static bool parseModifier( QStringRef& s, SubstitutionField& field );
+			static bool parseDefaultValueModifier( QStringRef& s, SubstitutionField& field );
+			static bool parseFormatModifier( QStringRef& s, SubstitutionField& field );
+			static bool parseFormatFlags( QStringRef& s, SubstitutionField& field );
+			static bool parseFormatWidth( QStringRef& s, SubstitutionField& field );
+			static bool parseFormatPrecision( QStringRef& s, SubstitutionField& field );
+			static bool parseFormatType( QStringRef& s, SubstitutionField& field );
+			static bool parseNaturalInteger( QStringRef& s, SubstitutionField& field );
+			static bool parseNewLineModifier( QStringRef& s, SubstitutionField& field );
 
-		QString formatValue( const QString& value ) const;
+			QString formatValue( const QString& value ) const;
 
-		QString mFieldName;
+			QString mFieldName;
 
-		QString mDefaultValue;
+			QString mDefaultValue;
 
-		QString mFormat;
-		QChar   mFormatType;
+			QString mFormat;
+			QChar   mFormatType;
 
-		bool    mNewLine;
-	};
+			bool    mNewLine;
+		};
 
+	}
 }
 
 
diff --git a/model/Template.cpp b/model/Template.cpp
index 52daf12..eaffb1e 100644
--- a/model/Template.cpp
+++ b/model/Template.cpp
@@ -25,264 +25,267 @@
 #include <QtDebug>
 
 
-namespace glabels::model
+namespace glabels
 {
-
-	Template::Template( const QString&  brand,
-			    const QString&  part,
-			    const QString&  description,
-			    const QString&  paperId,
-			    const Distance& pageWidth,
-			    const Distance& pageHeight )
-		: mBrand(brand),
-		  mPart(part),
-		  mDescription(description),
-		  mPaperId(paperId),
-		  mPageWidth(pageWidth),
-		  mPageHeight(pageHeight),
-		  mIsSizeIso(false),
-		  mIsSizeUs(false),
-		  mName("")
+	namespace model
 	{
-		mName.append( brand ).append( " " ).append( part );
 
-		if ( Db::isPaperIdKnown( paperId ) )
+		Template::Template( const QString&  brand,
+		                    const QString&  part,
+		                    const QString&  description,
+		                    const QString&  paperId,
+		                    const Distance& pageWidth,
+		                    const Distance& pageHeight )
+			: mBrand(brand),
+			  mPart(part),
+			  mDescription(description),
+			  mPaperId(paperId),
+			  mPageWidth(pageWidth),
+			  mPageHeight(pageHeight),
+			  mIsSizeIso(false),
+			  mIsSizeUs(false),
+			  mName("")
 		{
-			const Paper* paper = Db::lookupPaperFromId( paperId );
-			mIsSizeIso = paper->isSizeIso();
-			mIsSizeUs  = paper->isSizeUs();
-		}
-	}
+			mName.append( brand ).append( " " ).append( part );
 
-
-	Template::Template( const Template& other )
-	{
-		mBrand       = other.mBrand;
-		mPart        = other.mPart;
-		mDescription = other.mDescription;
-		mPaperId     = other.mPaperId;
-		mPageWidth   = other.mPageWidth;
-		mPageHeight  = other.mPageHeight;
-		mIsSizeIso   = other.mIsSizeIso;
-		mIsSizeUs    = other.mIsSizeUs;
-		mEquivPart   = other.mEquivPart;
-		mName        = other.mName;
-		mProductUrl  = other.mProductUrl;
-
-		foreach ( Frame* frame, other.mFrames )
-		{
-			addFrame( frame );
+			if ( Db::isPaperIdKnown( paperId ) )
+			{
+				const Paper* paper = Db::lookupPaperFromId( paperId );
+				mIsSizeIso = paper->isSizeIso();
+				mIsSizeUs  = paper->isSizeUs();
+			}
 		}
 
-		foreach ( QString categoryId, other.mCategoryIds )
+
+		Template::Template( const Template& other )
 		{
-			addCategory( categoryId );
+			mBrand       = other.mBrand;
+			mPart        = other.mPart;
+			mDescription = other.mDescription;
+			mPaperId     = other.mPaperId;
+			mPageWidth   = other.mPageWidth;
+			mPageHeight  = other.mPageHeight;
+			mIsSizeIso   = other.mIsSizeIso;
+			mIsSizeUs    = other.mIsSizeUs;
+			mEquivPart   = other.mEquivPart;
+			mName        = other.mName;
+			mProductUrl  = other.mProductUrl;
+
+			foreach ( Frame* frame, other.mFrames )
+			{
+				addFrame( frame );
+			}
+
+			foreach ( QString categoryId, other.mCategoryIds )
+			{
+				addCategory( categoryId );
+			}
 		}
-	}
 
 
-	Template* Template::dup() const
-	{
-		return new Template( *this );
-	}
-
-
-	// Generic full page template
-	Template* Template::fullPage( const QString& paperId )
-	{
-		// TODO
-		return nullptr;
-	}
-
-
-	// From equivalent part number
-	Template* Template::fromEquiv( const QString& brand,
-				       const QString& part,
-				       const QString& equivPart )
-	{
-		const Template* other = Db::lookupTemplateFromBrandPart( brand, equivPart );
-		if ( other != nullptr )
+		Template* Template::dup() const
 		{
-			Template* tmplate = other->dup();
-
-			tmplate->mPart      = part;
-			tmplate->mEquivPart = equivPart;
-
-			tmplate->mName = "";
-			tmplate->mName.append( brand ).append( " " ).append( part );
-
-			return tmplate;
+			return new Template( *this );
 		}
-		else
+
+
+		// Generic full page template
+		Template* Template::fullPage( const QString& paperId )
 		{
-			qWarning() << "Error: cannot create equivalent template for "
-				   << brand << ", " << equivPart
-				   << ". Forward references not supported.";
+			// TODO
 			return nullptr;
 		}
-	}
 
 
-	QString Template::brand() const
-	{
-		return mBrand;
-	}
-
-	
-	QString Template::part() const
-	{
-		return mPart;
-	}
-
-	
-	QString Template::description() const
-	{
-		return mDescription;
-	}
-	
-
-	QString Template::paperId() const
-	{
-		return mPaperId;
-	}
-
-	
-	Distance Template::pageWidth() const
-	{
-		return mPageWidth;
-	}
-
-	
-	Distance Template::pageHeight() const
-	{
-		return mPageHeight;
-	}
-
-	
-	bool Template::isSizeIso() const
-	{
-		return mIsSizeIso;
-	}
-
-	
-	bool Template::isSizeUs() const
-	{
-		return mIsSizeUs;
-	}
-
-	
-	bool Template::isSizeOther() const
-	{
-		return !mIsSizeIso && !mIsSizeUs;
-	}
-	
-
-	QString Template::equivPart() const
-	{
-		return mEquivPart;
-	}
-
-	
-	void Template::setEquivPart( const QString& value )
-	{
-		mEquivPart = value;
-	}
-	
-
-	QString Template::productUrl() const
-	{
-		return mProductUrl;
-	}
-
-	
-	void Template::setProductUrl( const QString& value )
-	{
-		mProductUrl = value;
-	}
-	
-
-	QString Template::name() const
-	{
-		return mName;
-	}
-	
-
-	const QList<Frame*>& Template::frames() const
-	{
-		return mFrames;
-	}
-
-
-	void Template::addCategory( const QString& categoryId )
-	{
-		mCategoryIds << categoryId;
-	}
-
-
-	void Template::addFrame( Frame* frame )
-	{
-		mFrames << frame;
-	}
-
-
-	bool Template::operator==( const Template& other ) const
-	{
-		return (mBrand == other.mBrand) && (mPart == other.mPart);
-	}
-
-
-	bool Template::hasCategory( const QString& categoryId ) const
-	{
-		foreach ( QString testCategoryId, mCategoryIds )
+		// From equivalent part number
+		Template* Template::fromEquiv( const QString& brand,
+		                               const QString& part,
+		                               const QString& equivPart )
 		{
-			if ( categoryId == testCategoryId )
+			const Template* other = Db::lookupTemplateFromBrandPart( brand, equivPart );
+			if ( other != nullptr )
 			{
-				return true;
+				Template* tmplate = other->dup();
+
+				tmplate->mPart      = part;
+				tmplate->mEquivPart = equivPart;
+
+				tmplate->mName = "";
+				tmplate->mName.append( brand ).append( " " ).append( part );
+
+				return tmplate;
+			}
+			else
+			{
+				qWarning() << "Error: cannot create equivalent template for "
+				           << brand << ", " << equivPart
+				           << ". Forward references not supported.";
+				return nullptr;
 			}
 		}
 
-		return false;
-	}
 
-
-	bool Template::isSimilarTo( const Template* other ) const
-	{
-		// Does page size match?
-		if ( (mPaperId    != other->mPaperId)    ||
-		     (mPageWidth  != other->mPageWidth ) ||
-		     (mPageHeight != other->mPageHeight ) )
+		QString Template::brand() const
 		{
-			return false;
+			return mBrand;
 		}
 
-		// Are frames similar
-		Frame* frame1 = mFrames.first();
-		Frame* frame2 = other->mFrames.first();
-		if ( !frame1->isSimilarTo( frame2 ) )
+	
+		QString Template::part() const
 		{
-			return false;
+			return mPart;
 		}
 
-		// Are they layed out similarly?
-		foreach ( Layout* layout1, frame1->layouts() )
+	
+		QString Template::description() const
 		{
-			bool matchFound = false;
-			foreach ( Layout* layout2, frame2->layouts() )
+			return mDescription;
+		}
+	
+
+		QString Template::paperId() const
+		{
+			return mPaperId;
+		}
+
+	
+		Distance Template::pageWidth() const
+		{
+			return mPageWidth;
+		}
+
+	
+		Distance Template::pageHeight() const
+		{
+			return mPageHeight;
+		}
+
+	
+		bool Template::isSizeIso() const
+		{
+			return mIsSizeIso;
+		}
+
+	
+		bool Template::isSizeUs() const
+		{
+			return mIsSizeUs;
+		}
+
+	
+		bool Template::isSizeOther() const
+		{
+			return !mIsSizeIso && !mIsSizeUs;
+		}
+	
+
+		QString Template::equivPart() const
+		{
+			return mEquivPart;
+		}
+
+	
+		void Template::setEquivPart( const QString& value )
+		{
+			mEquivPart = value;
+		}
+	
+
+		QString Template::productUrl() const
+		{
+			return mProductUrl;
+		}
+
+	
+		void Template::setProductUrl( const QString& value )
+		{
+			mProductUrl = value;
+		}
+	
+
+		QString Template::name() const
+		{
+			return mName;
+		}
+	
+
+		const QList<Frame*>& Template::frames() const
+		{
+			return mFrames;
+		}
+
+
+		void Template::addCategory( const QString& categoryId )
+		{
+			mCategoryIds << categoryId;
+		}
+
+
+		void Template::addFrame( Frame* frame )
+		{
+			mFrames << frame;
+		}
+
+
+		bool Template::operator==( const Template& other ) const
+		{
+			return (mBrand == other.mBrand) && (mPart == other.mPart);
+		}
+
+
+		bool Template::hasCategory( const QString& categoryId ) const
+		{
+			foreach ( QString testCategoryId, mCategoryIds )
 			{
-				if ( layout1->isSimilarTo(layout2) )
+				if ( categoryId == testCategoryId )
 				{
-					matchFound = true;
-					break;
+					return true;
 				}
 			}
-			if ( !matchFound )
+
+			return false;
+		}
+
+
+		bool Template::isSimilarTo( const Template* other ) const
+		{
+			// Does page size match?
+			if ( (mPaperId    != other->mPaperId)    ||
+			     (mPageWidth  != other->mPageWidth ) ||
+			     (mPageHeight != other->mPageHeight ) )
 			{
 				return false;
 			}
+
+			// Are frames similar
+			Frame* frame1 = mFrames.first();
+			Frame* frame2 = other->mFrames.first();
+			if ( !frame1->isSimilarTo( frame2 ) )
+			{
+				return false;
+			}
+
+			// Are they layed out similarly?
+			foreach ( Layout* layout1, frame1->layouts() )
+			{
+				bool matchFound = false;
+				foreach ( Layout* layout2, frame2->layouts() )
+				{
+					if ( layout1->isSimilarTo(layout2) )
+					{
+						matchFound = true;
+						break;
+					}
+				}
+				if ( !matchFound )
+				{
+					return false;
+				}
+			}
+
+			return true;
 		}
 
-		return true;
+
 	}
-
-
-} // namespace glabels::model
+}
diff --git a/model/Template.h b/model/Template.h
index 2495de5..b05d087 100644
--- a/model/Template.h
+++ b/model/Template.h
@@ -32,85 +32,88 @@
 #include <QList>
 
 
-namespace glabels::model
+namespace glabels
 {
-
-	class Template
+	namespace model
 	{
-		Q_DECLARE_TR_FUNCTIONS(Template)
 
-	public:
+		class Template
+		{
+			Q_DECLARE_TR_FUNCTIONS(Template)
 
-		Template( const QString&  brand,
-			  const QString&  part,
-			  const QString&  description,
-			  const QString&  paperId,
-		          const Distance& pageWidth,
-		          const Distance& pageHeight );
+		public:
 
-		Template( const Template& other );
+			Template( const QString&  brand,
+			          const QString&  part,
+			          const QString&  description,
+			          const QString&  paperId,
+			          const Distance& pageWidth,
+			          const Distance& pageHeight );
 
-		Template* dup() const;
+			Template( const Template& other );
 
-		// Generic full page template
-		static Template* fullPage( const QString& paperId );
+			Template* dup() const;
 
-		// From equivalent part number
-		static Template* fromEquiv( const QString& brand,
-					    const QString& part,
-					    const QString& equivPart );
+			// Generic full page template
+			static Template* fullPage( const QString& paperId );
+
+			// From equivalent part number
+			static Template* fromEquiv( const QString& brand,
+			                            const QString& part,
+			                            const QString& equivPart );
 
 
-		QString brand() const;
-		QString part() const;
-		QString description() const;
+			QString brand() const;
+			QString part() const;
+			QString description() const;
 
-		QString paperId() const;
-		Distance pageWidth() const;
-		Distance pageHeight() const;
-		bool isSizeIso() const;
-		bool isSizeUs() const;
-		bool isSizeOther() const;
+			QString paperId() const;
+			Distance pageWidth() const;
+			Distance pageHeight() const;
+			bool isSizeIso() const;
+			bool isSizeUs() const;
+			bool isSizeOther() const;
 
-		QString equivPart() const;
-		void setEquivPart( const QString& value );
+			QString equivPart() const;
+			void setEquivPart( const QString& value );
 
-		QString productUrl() const;
-		void setProductUrl( const QString& value );
+			QString productUrl() const;
+			void setProductUrl( const QString& value );
 
-		QString name() const;
+			QString name() const;
 
-		void addCategory( const QString& categoryId );
-		void addFrame( Frame* frame );
+			void addCategory( const QString& categoryId );
+			void addFrame( Frame* frame );
 
-		const QList<Frame*>& frames() const;
+			const QList<Frame*>& frames() const;
 
-		bool operator==( const Template& other ) const;
+			bool operator==( const Template& other ) const;
 
-		bool hasCategory( const QString& categoryId ) const;
-		bool isSimilarTo( const Template* other ) const;
+			bool hasCategory( const QString& categoryId ) const;
+			bool isSimilarTo( const Template* other ) const;
 
 
-	private:
-		QString mBrand;
-		QString mPart;
-		QString mDescription;
+		private:
+			QString mBrand;
+			QString mPart;
+			QString mDescription;
 
-		QString  mPaperId;
-		Distance mPageWidth;
-		Distance mPageHeight;
-		bool     mIsSizeIso;
-		bool     mIsSizeUs;
+			QString  mPaperId;
+			Distance mPageWidth;
+			Distance mPageHeight;
+			bool     mIsSizeIso;
+			bool     mIsSizeUs;
 
-		QString mEquivPart;
-		QString mName;
+			QString mEquivPart;
+			QString mName;
 
-		QString        mProductUrl;
-		QStringList    mCategoryIds;
+			QString        mProductUrl;
+			QStringList    mCategoryIds;
 
-		QList<Frame*>  mFrames;
-	};
+			QList<Frame*>  mFrames;
+		};
 
+	}
 }
 
 
diff --git a/model/TextNode.cpp b/model/TextNode.cpp
index 54ddf70..332367e 100644
--- a/model/TextNode.cpp
+++ b/model/TextNode.cpp
@@ -21,129 +21,132 @@
 #include "TextNode.h"
 
 
-namespace glabels::model
+namespace glabels
 {
-
-	///
-	/// Default Constructor
-	///
-	TextNode::TextNode()
-		: mIsField(false), mData("")
+	namespace model
 	{
-		// empty
-	}
 
-
-	///
-	/// Constructor from Data
-	///
-	TextNode::TextNode( bool isField, const QString &data )
-		: mIsField(isField), mData(data)
-	{
-		// empty
-	}
-
-
-	///
-	/// == Operator
-	///
-	bool TextNode::operator==( const TextNode& other )
-	{
-		return (mIsField == other.mIsField) &&
-			(mData    == other.mData);
-	}
-
-
-	///
-	/// != Operator
-	///
-	bool TextNode::operator!=( const TextNode& other )
-	{
-		return (mIsField != other.mIsField) ||
-			(mData    != other.mData);
-	}
-
-
-	///
-	/// isField? Property Getter
-	///
-	bool TextNode::isField() const
-	{
-		return mIsField;
-	}
-
-
-	///
-	/// isField Flag Property Setter
-	///
-	void TextNode::setField( bool isField )
-	{
-		mIsField = isField;
-	}
-
-
-	///
-	/// Data Property Getter
-	///
-	const QString& TextNode::data() const
-	{
-		return mData;
-	}
-
-
-	///
-	/// Data Property Setter
-	///
-	void TextNode::setData( const QString& data )
-	{
-		mData = data;
-	}
-
-
-	///
-	/// Get text, expand if necessary
-	///
-	QString TextNode::text( merge::Record* record ) const
-	{
-		if ( mIsField )
+		///
+		/// Default Constructor
+		///
+		TextNode::TextNode()
+			: mIsField(false), mData("")
 		{
-			if ( !record )
-			{
-				return QString("${%1}").arg( mData );
-			}
-			else
-			{
-				if ( record->contains( mData ) )
-				{
-					return (*record)[ mData ];
-				}
-				else
-				{
-					return "";
-				}
-			}
+			// empty
 		}
-		else
+
+
+		///
+		/// Constructor from Data
+		///
+		TextNode::TextNode( bool isField, const QString &data )
+			: mIsField(isField), mData(data)
+		{
+			// empty
+		}
+
+
+		///
+		/// == Operator
+		///
+		bool TextNode::operator==( const TextNode& other )
+		{
+			return (mIsField == other.mIsField) &&
+				(mData    == other.mData);
+		}
+
+
+		///
+		/// != Operator
+		///
+		bool TextNode::operator!=( const TextNode& other )
+		{
+			return (mIsField != other.mIsField) ||
+				(mData    != other.mData);
+		}
+
+
+		///
+		/// isField? Property Getter
+		///
+		bool TextNode::isField() const
+		{
+			return mIsField;
+		}
+
+
+		///
+		/// isField Flag Property Setter
+		///
+		void TextNode::setField( bool isField )
+		{
+			mIsField = isField;
+		}
+
+
+		///
+		/// Data Property Getter
+		///
+		const QString& TextNode::data() const
 		{
 			return mData;
 		}
-	}
 
 
-	///
-	/// Is it an empty field
-	///
-	bool TextNode::isEmptyField( merge::Record* record ) const
-	{
-		if ( record && mIsField )
+		///
+		/// Data Property Setter
+		///
+		void TextNode::setData( const QString& data )
 		{
-			if ( record->contains( mData ) )
+			mData = data;
+		}
+
+
+		///
+		/// Get text, expand if necessary
+		///
+		QString TextNode::text( merge::Record* record ) const
+		{
+			if ( mIsField )
 			{
-				return (*record)[mData].isEmpty();
+				if ( !record )
+				{
+					return QString("${%1}").arg( mData );
+				}
+				else
+				{
+					if ( record->contains( mData ) )
+					{
+						return (*record)[ mData ];
+					}
+					else
+					{
+						return "";
+					}
+				}
+			}
+			else
+			{
+				return mData;
 			}
 		}
 
-		return false;
-	}
 
-} // namespace glabels::model
+		///
+		/// Is it an empty field
+		///
+		bool TextNode::isEmptyField( merge::Record* record ) const
+		{
+			if ( record && mIsField )
+			{
+				if ( record->contains( mData ) )
+				{
+					return (*record)[mData].isEmpty();
+				}
+			}
+
+			return false;
+		}
+
+	}
+}
diff --git a/model/TextNode.h b/model/TextNode.h
index e2e2e6f..499f863 100644
--- a/model/TextNode.h
+++ b/model/TextNode.h
@@ -27,67 +27,70 @@
 #include <QString>
 
 
-namespace glabels::model
+namespace glabels
 {
-
-	///
-	/// Text Node Type
-	///
-	struct TextNode
+	namespace model
 	{
 
-		/////////////////////////////////
-		// Life Cycle
-		/////////////////////////////////
-	public:
-		TextNode();
+		///
+		/// Text Node Type
+		///
+		struct TextNode
+		{
 
-		TextNode( bool isField, const QString &data );
+			/////////////////////////////////
+			// Life Cycle
+			/////////////////////////////////
+		public:
+			TextNode();
+
+			TextNode( bool isField, const QString &data );
 
 
-		/////////////////////////////////
-		// Operators
-		/////////////////////////////////
-	public:
-		bool operator==( const TextNode& other );
+			/////////////////////////////////
+			// Operators
+			/////////////////////////////////
+		public:
+			bool operator==( const TextNode& other );
 
-		bool operator!=( const TextNode& other );
+			bool operator!=( const TextNode& other );
 
 
-		/////////////////////////////////
-		// Properties
-		/////////////////////////////////
-	public:
-		//
-		// is field? Property
-		//
-		bool isField() const;
-		void setField( bool isField );
+			/////////////////////////////////
+			// Properties
+			/////////////////////////////////
+		public:
+			//
+			// is field? Property
+			//
+			bool isField() const;
+			void setField( bool isField );
 
-		//
-		// Data Property
-		//
-		const QString& data() const;
-		void setData( const QString& data );
+			//
+			// Data Property
+			//
+			const QString& data() const;
+			void setData( const QString& data );
 
 
-		/////////////////////////////////
-		// Misc. Methods
-		/////////////////////////////////
-		QString text( merge::Record* record ) const;
-		bool isEmptyField( merge::Record* record ) const;
+			/////////////////////////////////
+			// Misc. Methods
+			/////////////////////////////////
+			QString text( merge::Record* record ) const;
+			bool isEmptyField( merge::Record* record ) const;
 
 
-		/////////////////////////////////
-		// Private Data
-		/////////////////////////////////
-	private:
+			/////////////////////////////////
+			// Private Data
+			/////////////////////////////////
+		private:
 
-		bool    mIsField;
-		QString mData;
+			bool    mIsField;
+			QString mData;
 
-	};
+		};
 
+	}
 }
 
 
diff --git a/model/Units.cpp b/model/Units.cpp
index 74ce06f..e349afb 100644
--- a/model/Units.cpp
+++ b/model/Units.cpp
@@ -24,236 +24,239 @@
 #include <QtDebug>
 
 
-namespace glabels::model
+namespace glabels
 {
-
-
-	Units::Units() : mEnumValue(PT)
+	namespace model
 	{
-		// empty
-	}
+
+
+		Units::Units() : mEnumValue(PT)
+		{
+			// empty
+		}
 
 	
-	Units::Units( Units::Enum enumValue ) : mEnumValue(enumValue)
-	{
-		switch (enumValue)
+		Units::Units( Units::Enum enumValue ) : mEnumValue(enumValue)
 		{
-		case PT:
-		case IN:
-		case MM:
-		case CM:
-		case PC:
-			/* Catch all valid enum values. */
-			break;
-		default:
-			/* Catch invalid enum values, reset to PT. */
-			qWarning() << "Bad Units::Enum value = " << enumValue << ".";
-			mEnumValue = PT;
-			break;
+			switch (enumValue)
+			{
+			case PT:
+			case IN:
+			case MM:
+			case CM:
+			case PC:
+				/* Catch all valid enum values. */
+				break;
+			default:
+				/* Catch invalid enum values, reset to PT. */
+				qWarning() << "Bad Units::Enum value = " << enumValue << ".";
+				mEnumValue = PT;
+				break;
+			}
 		}
-	}
 
 
-	Units::Units( const QString& idString )
-	{
-		if ( idString == "pt" )
+		Units::Units( const QString& idString )
 		{
-			mEnumValue = PT;
+			if ( idString == "pt" )
+			{
+				mEnumValue = PT;
+			}
+			else if ( idString == "in" )
+			{
+				mEnumValue = IN;
+			}
+			else if ( idString == "mm" )
+			{
+				mEnumValue = MM;
+			}
+			else if ( idString == "cm" )
+			{
+				mEnumValue = CM;
+			}
+			else if ( idString == "pc" )
+			{
+				mEnumValue = PC;
+			}
+			else
+			{
+				mEnumValue = PT;
+			}
 		}
-		else if ( idString == "in" )
-		{
-			mEnumValue = IN;
-		}
-		else if ( idString == "mm" )
-		{
-			mEnumValue = MM;
-		}
-		else if ( idString == "cm" )
-		{
-			mEnumValue = CM;
-		}
-		else if ( idString == "pc" )
-		{
-			mEnumValue = PC;
-		}
-		else
-		{
-			mEnumValue = PT;
-		}
-	}
 
 
-	Units Units::pt()
-	{
-		return Units(PT);
-	}
+		Units Units::pt()
+		{
+			return Units(PT);
+		}
 
 	
-	Units Units::in()
-	{
-		return Units(IN);
-	}
+		Units Units::in()
+		{
+			return Units(IN);
+		}
 
 	
-	Units Units::mm()
-	{
-		return Units(MM);
-	}
+		Units Units::mm()
+		{
+			return Units(MM);
+		}
 
 	
-	Units Units::cm()
-	{
-		return Units(CM);
-	}
+		Units Units::cm()
+		{
+			return Units(CM);
+		}
 
 	
-	Units Units::pc()
-	{
-		return Units(PC);
-	}
+		Units Units::pc()
+		{
+			return Units(PC);
+		}
 
 
-	Units::Enum Units::toEnum() const
-	{
-		return mEnumValue;
-	}
+		Units::Enum Units::toEnum() const
+		{
+			return mEnumValue;
+		}
 	
 	
-	QString Units::toIdString() const
-	{
-		QString idString;
+		QString Units::toIdString() const
+		{
+			QString idString;
 		
-		switch (mEnumValue)
-		{
-		case Units::PT:
-			idString = "pt";
-			break;
-		case Units::IN:
-			idString = "in";
-			break;
-		case Units::MM:
-			idString = "mm";
-			break;
-		case Units::CM:
-			idString = "cm";
-			break;
-		case Units::PC:
-			idString = "pc";
-			break;
-		}
+			switch (mEnumValue)
+			{
+			case Units::PT:
+				idString = "pt";
+				break;
+			case Units::IN:
+				idString = "in";
+				break;
+			case Units::MM:
+				idString = "mm";
+				break;
+			case Units::CM:
+				idString = "cm";
+				break;
+			case Units::PC:
+				idString = "pc";
+				break;
+			}
 
-		return idString;
-	}
+			return idString;
+		}
 
 	
-	QString Units::toTrName() const
-	{
-		QString nameString;
-		
-		switch (mEnumValue)
+		QString Units::toTrName() const
 		{
-		case Units::PT:
-			nameString = tr("points");
-			break;
-		case Units::IN:
-			nameString = tr("inches");
-			break;
-		case Units::MM:
-			nameString = tr("mm");
-			break;
-		case Units::CM:
-			nameString = tr("cm");
-			break;
-		case Units::PC:
-			nameString = tr("picas");
-			break;
+			QString nameString;
+		
+			switch (mEnumValue)
+			{
+			case Units::PT:
+				nameString = tr("points");
+				break;
+			case Units::IN:
+				nameString = tr("inches");
+				break;
+			case Units::MM:
+				nameString = tr("mm");
+				break;
+			case Units::CM:
+				nameString = tr("cm");
+				break;
+			case Units::PC:
+				nameString = tr("picas");
+				break;
+			}
+
+			return nameString;
 		}
 
-		return nameString;
-	}
 
-
-	double Units::resolution() const
-	{
-		double value;
-		
-		switch (mEnumValue)
+		double Units::resolution() const
 		{
-		case Units::PT:
-			value = 0.01;
-			break;
-		case Units::IN:
-			value = 0.001;
-			break;
-		case Units::MM:
-			value = 0.01;
-			break;
-		case Units::CM:
-			value = 0.001;
-			break;
-		case Units::PC:
-			value = 0.01;
-			break;
-		}
+			double value;
+		
+			switch (mEnumValue)
+			{
+			case Units::PT:
+				value = 0.01;
+				break;
+			case Units::IN:
+				value = 0.001;
+				break;
+			case Units::MM:
+				value = 0.01;
+				break;
+			case Units::CM:
+				value = 0.001;
+				break;
+			case Units::PC:
+				value = 0.01;
+				break;
+			}
 
-		return value;
-	}
+			return value;
+		}
 
 	
-	int Units::resolutionDigits() const
-	{
-		int digits;
+		int Units::resolutionDigits() const
+		{
+			int digits;
 		
-		switch (mEnumValue)
-		{
-		case Units::PT:
-			digits = 2;
-			break;
-		case Units::IN:
-			digits = 3;
-			break;
-		case Units::MM:
-			digits = 2;
-			break;
-		case Units::CM:
-			digits = 3;
-			break;
-		case Units::PC:
-			digits = 2;
-			break;
+			switch (mEnumValue)
+			{
+			case Units::PT:
+				digits = 2;
+				break;
+			case Units::IN:
+				digits = 3;
+				break;
+			case Units::MM:
+				digits = 2;
+				break;
+			case Units::CM:
+				digits = 3;
+				break;
+			case Units::PC:
+				digits = 2;
+				break;
+			}
+
+			return digits;
 		}
 
-		return digits;
-	}
 
-
-	bool Units::isIdValid( const QString& idString )
-	{
-		bool retValue = false;
+		bool Units::isIdValid( const QString& idString )
+		{
+			bool retValue = false;
 		
-		if ( idString == "pt" )
-		{
-			retValue = true;
-		}
-		else if ( idString == "in" )
-		{
-			retValue = true;
-		}
-		else if ( idString == "mm" )
-		{
-			retValue = true;
-		}
-		else if ( idString == "cm" )
-		{
-			retValue = true;
-		}
-		else if ( idString == "pc" )
-		{
-			retValue = true;
+			if ( idString == "pt" )
+			{
+				retValue = true;
+			}
+			else if ( idString == "in" )
+			{
+				retValue = true;
+			}
+			else if ( idString == "mm" )
+			{
+				retValue = true;
+			}
+			else if ( idString == "cm" )
+			{
+				retValue = true;
+			}
+			else if ( idString == "pc" )
+			{
+				retValue = true;
+			}
+
+			return retValue;
 		}
 
-		return retValue;
+
 	}
-
-
-} // namespace glabels::model
+}
diff --git a/model/Units.h b/model/Units.h
index 2d364bd..5d25472 100644
--- a/model/Units.h
+++ b/model/Units.h
@@ -26,43 +26,46 @@
 #include <QString>
 
 
-namespace glabels::model
+namespace glabels
 {
-
-
-	class Units
+	namespace model
 	{
-		Q_DECLARE_TR_FUNCTIONS(Units)
 
-	public:
-		enum Enum { PT, IN, MM, CM, PC };
 
-		Units();
-		Units( Enum enumValue );
-		Units( const QString& idString );
+		class Units
+		{
+			Q_DECLARE_TR_FUNCTIONS(Units)
 
-		static Units pt();
-		static Units in();
-		static Units mm();
-		static Units cm();
-		static Units pc();
+		public:
+			enum Enum { PT, IN, MM, CM, PC };
 
-		Enum toEnum() const;
+			Units();
+			Units( Enum enumValue );
+			Units( const QString& idString );
+
+			static Units pt();
+			static Units in();
+			static Units mm();
+			static Units cm();
+			static Units pc();
+
+			Enum toEnum() const;
 		
-		QString toIdString() const;
-		QString toTrName() const;
+			QString toIdString() const;
+			QString toTrName() const;
 
-		double resolution() const;
-		int resolutionDigits() const;
+			double resolution() const;
+			int resolutionDigits() const;
 
-		static bool isIdValid( const QString& unitsId );
+			static bool isIdValid( const QString& unitsId );
 
 		
-	private:
-		Enum mEnumValue;
+		private:
+			Enum mEnumValue;
 
-	};
+		};
 
+	}
 }
 
 
diff --git a/model/Vendor.cpp b/model/Vendor.cpp
index 2351643..fa3ae0e 100644
--- a/model/Vendor.cpp
+++ b/model/Vendor.cpp
@@ -21,24 +21,27 @@
 #include "Vendor.h"
 
 
-namespace glabels::model
+namespace glabels
 {
-
-	Vendor::Vendor( const QString &name, const QString &url ) : mName(name), mUrl(url)
+	namespace model
 	{
-		// empty
-	}
+
+		Vendor::Vendor( const QString &name, const QString &url ) : mName(name), mUrl(url)
+		{
+			// empty
+		}
 
 
-	QString Vendor::name() const
-	{
-		return mName;
-	}
+		QString Vendor::name() const
+		{
+			return mName;
+		}
 
 	
-	QString Vendor::url() const
-	{
-		return mUrl;
-	}
+		QString Vendor::url() const
+		{
+			return mUrl;
+		}
 
-} // namespace glabels::model
+	}
+}
diff --git a/model/Vendor.h b/model/Vendor.h
index 4a9a1d6..bc763f1 100644
--- a/model/Vendor.h
+++ b/model/Vendor.h
@@ -25,22 +25,25 @@
 #include <QString>
 
 
-namespace glabels::model
+namespace glabels
 {
-
-	class Vendor
+	namespace model
 	{
-	public:
-		Vendor( const QString &name, const QString &url );
 
-		QString name() const;
-		QString url() const;
+		class Vendor
+		{
+		public:
+			Vendor( const QString &name, const QString &url );
 
-	private:
-		QString mName;
-		QString mUrl;
-	};
+			QString name() const;
+			QString url() const;
 
+		private:
+			QString mName;
+			QString mUrl;
+		};
+
+	}
 }
 
 
diff --git a/model/Version.h.in b/model/Version.h.in
index 69263c2..a4cf197 100644
--- a/model/Version.h.in
+++ b/model/Version.h.in
@@ -22,17 +22,22 @@
 #define model_Version_h
 
 
-namespace glabels::model
+namespace glabels
 {
-	namespace Version
+	namespace model
 	{
-		const QString WEBSITE = "@Website@";
 
-		const int     MAJOR   = @Major_Version@;
-		const int     MINOR   = @Minor_Version@;
-		const int     MICRO   = @Micro_Version@;
+		namespace Version
+		{
+			const QString WEBSITE = "@Website@";
+
+			const int     MAJOR   = @Major_Version@;
+			const int     MINOR   = @Minor_Version@;
+			const int     MICRO   = @Micro_Version@;
+
+			const QString STRING  = "@Full_Version@";
+		}
 
-		const QString STRING  = "@Full_Version@";
 	}
 }
 
diff --git a/model/XmlCategoryParser.cpp b/model/XmlCategoryParser.cpp
index be96647..218ae47 100644
--- a/model/XmlCategoryParser.cpp
+++ b/model/XmlCategoryParser.cpp
@@ -30,74 +30,78 @@
 #include <QtDebug>
 
 
-namespace glabels::model
+namespace glabels
 {
-
-	bool XmlCategoryParser::readFile( const QString &fileName )
+	namespace model
 	{
-		QFile file( fileName );
 
-		if ( !file.open( QFile::ReadOnly | QFile::Text) )
+		bool XmlCategoryParser::readFile( const QString &fileName )
 		{
-			qWarning() << "Error: Cannot read file " << fileName
-				   << ": " << file.errorString();
-			return false;
-		}
+			QFile file( fileName );
 
-
-		QDomDocument doc;
-		QString      errorString;
-		int          errorLine;
-		int          errorColumn;
-
-		if ( !doc.setContent( &file, false, &errorString, &errorLine, &errorColumn ) )
-		{
-			qWarning() << "Error: Parse error at line " << errorLine
-				   << "column " << errorColumn
-				   << ": " << errorString;
-			return false;
-		}
-
-		QDomElement root = doc.documentElement();
-		if ( root.tagName() != "Glabels-categories" )
-		{
-			qWarning() << "Error: Not a Glabels-categories file.";
-			return false;
-		}
-
-		parseRootNode( root );
-		return true;
-	}
-
-
-	void XmlCategoryParser::parseRootNode( const QDomElement &node )
-	{
-		for ( QDomNode child = node.firstChild(); !child.isNull(); child = child.nextSibling() )
-		{
-			if ( child.toElement().tagName() == "Category" )
+			if ( !file.open( QFile::ReadOnly | QFile::Text) )
 			{
-				parseCategoryNode( child.toElement() );
+				qWarning() << "Error: Cannot read file " << fileName
+				           << ": " << file.errorString();
+				return false;
 			}
-			else if ( !child.isComment() )
+
+
+			QDomDocument doc;
+			QString      errorString;
+			int          errorLine;
+			int          errorColumn;
+
+			if ( !doc.setContent( &file, false, &errorString, &errorLine, &errorColumn ) )
 			{
-				qWarning() << "Warning: bad element: "
-					   << child.toElement().tagName()
-					   << ", Ignored.";
+				qWarning() << "Error: Parse error at line " << errorLine
+				           << "column " << errorColumn
+				           << ": " << errorString;
+				return false;
+			}
+
+			QDomElement root = doc.documentElement();
+			if ( root.tagName() != "Glabels-categories" )
+			{
+				qWarning() << "Error: Not a Glabels-categories file.";
+				return false;
+			}
+
+			parseRootNode( root );
+			return true;
+		}
+
+
+		void XmlCategoryParser::parseRootNode( const QDomElement &node )
+		{
+			for ( QDomNode child = node.firstChild(); !child.isNull(); child = child.nextSibling() )
+			{
+				if ( child.toElement().tagName() == "Category" )
+				{
+					parseCategoryNode( child.toElement() );
+				}
+				else if ( !child.isComment() )
+				{
+					qWarning() << "Warning: bad element: "
+					           << child.toElement().tagName()
+					           << ", Ignored.";
+				}
 			}
 		}
-	}
 
 
-	void XmlCategoryParser::parseCategoryNode( const QDomElement &node )
-	{
-		QString id   = XmlUtil::getStringAttr( node, "id", "" );
-		QString name = XmlUtil::getI18nAttr( node, "name", "" );
-
-		Category *category = new Category( id, name );
-		if ( category != nullptr )
+		void XmlCategoryParser::parseCategoryNode( const QDomElement &node )
 		{
-			Db::registerCategory( category );
-		}
-	}
+			QString id   = XmlUtil::getStringAttr( node, "id", "" );
+			QString name = XmlUtil::getI18nAttr( node, "name", "" );
 
-} // namespace glabels::model
+			Category *category = new Category( id, name );
+			if ( category != nullptr )
+			{
+				Db::registerCategory( category );
+			}
+		}
+
+
+	}
+}
diff --git a/model/XmlCategoryParser.h b/model/XmlCategoryParser.h
index 380bb05..d4d251d 100644
--- a/model/XmlCategoryParser.h
+++ b/model/XmlCategoryParser.h
@@ -26,21 +26,24 @@
 #include <QString>
 
 
-namespace glabels::model
+namespace glabels
 {
-
-	class XmlCategoryParser
+	namespace model
 	{
-	public:
-		XmlCategoryParser() {}
 
-		bool readFile( const QString &fileName );
+		class XmlCategoryParser
+		{
+		public:
+			XmlCategoryParser() {}
 
-	private:
-		void parseRootNode( const QDomElement &node );
-		void parseCategoryNode( const QDomElement &node );
-	};
+			bool readFile( const QString &fileName );
 
+		private:
+			void parseRootNode( const QDomElement &node );
+			void parseCategoryNode( const QDomElement &node );
+		};
+
+	}
 }
 
 
diff --git a/model/XmlLabelCreator.cpp b/model/XmlLabelCreator.cpp
index ebfe8e4..91f87c4 100644
--- a/model/XmlLabelCreator.cpp
+++ b/model/XmlLabelCreator.cpp
@@ -42,480 +42,484 @@
 #include <QtDebug>
 
 
-namespace glabels::model
+namespace glabels
 {
-
-	void
-	XmlLabelCreator::writeFile( const Model* label, const QString& fileName )
+	namespace model
 	{
-		QDomDocument doc;
 
-		createDoc( doc, label );
-		QByteArray buffer = doc.toByteArray( 2 );
-
-		QFile file( fileName );
-
-		if ( !file.open( QFile::WriteOnly | QFile::Text) )
+		void
+		XmlLabelCreator::writeFile( const Model* label, const QString& fileName )
 		{
-			qWarning() << "Error: Cannot write file " << fileName
-			           << ": " << file.errorString();
+			QDomDocument doc;
+
+			createDoc( doc, label );
+			QByteArray buffer = doc.toByteArray( 2 );
+
+			QFile file( fileName );
+
+			if ( !file.open( QFile::WriteOnly | QFile::Text) )
+			{
+				qWarning() << "Error: Cannot write file " << fileName
+				           << ": " << file.errorString();
+			}
+
+			file.write( buffer.data(), buffer.size() );
 		}
 
-		file.write( buffer.data(), buffer.size() );
-	}
 
-
-	void
-	XmlLabelCreator::writeBuffer( const Model* label, QByteArray& buffer )
-	{
-		QDomDocument doc;
-
-		createDoc( doc, label );
-		buffer = doc.toByteArray( 2 );
-	}
-
-
-	void
-	XmlLabelCreator::serializeObjects( const QList<ModelObject*>& objects,
-	                                   QByteArray&                     buffer )
-	{
-		QDomDocument doc;
-
-		QDomNode xmlNode( doc.createProcessingInstruction( "xml", "version=\"1.0\"" ) );
-		doc.appendChild( xmlNode );
-
-		QDomElement root = doc.createElement( "Glabels-objects" );
-		doc.appendChild( root );
-		XmlUtil::setStringAttr( root, "version", "4.0" );
-
-		createDataNode( root, objects );
-		createObjectsNode( root, objects, false );
-
-		buffer = doc.toByteArray( 2 );
-	}
-
-
-	void
-	XmlLabelCreator::createDoc( QDomDocument& doc, const Model* label )
-	{
-		QDomNode xmlNode( doc.createProcessingInstruction( "xml", "version=\"1.0\"" ) );
-		doc.appendChild( xmlNode );
-
-		QDomElement root = doc.createElement( "Glabels-document" );
-		doc.appendChild( root );
-		XmlUtil::setStringAttr( root, "version", "4.0" );
-
-		XmlTemplateCreator().createTemplateNode( root, label->tmplate() );
-
-		createObjectsNode( root, label->objectList(), label->rotate() );
-
-		if ( label->merge() && !dynamic_cast<merge::None*>(label->merge()) )
+		void
+		XmlLabelCreator::writeBuffer( const Model* label, QByteArray& buffer )
 		{
-			createMergeNode( root, label );
+			QDomDocument doc;
+
+			createDoc( doc, label );
+			buffer = doc.toByteArray( 2 );
 		}
 
-		createDataNode( root, label->objectList() );
-	}
 
-
-	void
-	XmlLabelCreator::createObjectsNode( QDomElement &parent, const QList<ModelObject*>& objects, bool rotate )
-	{
-		QDomDocument doc = parent.ownerDocument();
-		QDomElement node = doc.createElement( "Objects" );
-		parent.appendChild( node );
-
-		XmlUtil::setStringAttr( node, "id", "0" );
-		XmlUtil::setBoolAttr( node, "rotate", rotate );
-
-		foreach ( ModelObject* object, objects )
+		void
+		XmlLabelCreator::serializeObjects( const QList<ModelObject*>& objects,
+		                                   QByteArray&                     buffer )
 		{
-			if ( ModelBoxObject* boxObject = dynamic_cast<ModelBoxObject*>(object) )
+			QDomDocument doc;
+
+			QDomNode xmlNode( doc.createProcessingInstruction( "xml", "version=\"1.0\"" ) );
+			doc.appendChild( xmlNode );
+
+			QDomElement root = doc.createElement( "Glabels-objects" );
+			doc.appendChild( root );
+			XmlUtil::setStringAttr( root, "version", "4.0" );
+
+			createDataNode( root, objects );
+			createObjectsNode( root, objects, false );
+
+			buffer = doc.toByteArray( 2 );
+		}
+
+
+		void
+		XmlLabelCreator::createDoc( QDomDocument& doc, const Model* label )
+		{
+			QDomNode xmlNode( doc.createProcessingInstruction( "xml", "version=\"1.0\"" ) );
+			doc.appendChild( xmlNode );
+
+			QDomElement root = doc.createElement( "Glabels-document" );
+			doc.appendChild( root );
+			XmlUtil::setStringAttr( root, "version", "4.0" );
+
+			XmlTemplateCreator().createTemplateNode( root, label->tmplate() );
+
+			createObjectsNode( root, label->objectList(), label->rotate() );
+
+			if ( label->merge() && !dynamic_cast<merge::None*>(label->merge()) )
 			{
-				createObjectBoxNode( node, boxObject );
+				createMergeNode( root, label );
 			}
-			else if ( ModelEllipseObject* ellipseObject = dynamic_cast<ModelEllipseObject*>(object) )
+
+			createDataNode( root, label->objectList() );
+		}
+
+
+		void
+		XmlLabelCreator::createObjectsNode( QDomElement &parent, const QList<ModelObject*>& objects, bool rotate )
+		{
+			QDomDocument doc = parent.ownerDocument();
+			QDomElement node = doc.createElement( "Objects" );
+			parent.appendChild( node );
+
+			XmlUtil::setStringAttr( node, "id", "0" );
+			XmlUtil::setBoolAttr( node, "rotate", rotate );
+
+			foreach ( ModelObject* object, objects )
 			{
-				createObjectEllipseNode( node, ellipseObject );
+				if ( ModelBoxObject* boxObject = dynamic_cast<ModelBoxObject*>(object) )
+				{
+					createObjectBoxNode( node, boxObject );
+				}
+				else if ( ModelEllipseObject* ellipseObject = dynamic_cast<ModelEllipseObject*>(object) )
+				{
+					createObjectEllipseNode( node, ellipseObject );
+				}
+				else if ( ModelLineObject* lineObject = dynamic_cast<ModelLineObject*>(object) )
+				{
+					createObjectLineNode( node, lineObject );
+				}
+				else if ( ModelImageObject* imageObject = dynamic_cast<ModelImageObject*>(object) )
+				{
+					createObjectImageNode( node, imageObject );
+				}
+				else if ( ModelBarcodeObject* barcodeObject = dynamic_cast<ModelBarcodeObject*>(object) )
+				{
+					createObjectBarcodeNode( node, barcodeObject );
+				}
+				else if ( ModelTextObject* textObject = dynamic_cast<ModelTextObject*>(object) )
+				{
+					createObjectTextNode( node, textObject );
+				}
+				else
+				{
+					Q_ASSERT_X( false, "XmlLabelCreator::createObjectsNode", "Invalid object type." );
+				}
 			}
-			else if ( ModelLineObject* lineObject = dynamic_cast<ModelLineObject*>(object) )
+		}
+
+
+		void
+		XmlLabelCreator::createObjectBoxNode( QDomElement &parent, const ModelBoxObject* object )
+		{
+			QDomDocument doc = parent.ownerDocument();
+			QDomElement node = doc.createElement( "Object-box" );
+			parent.appendChild( node );
+
+			/* position attrs */
+			createPositionAttrs( node, object );
+
+			/* size attrs */
+			createSizeAttrs( node, object );
+
+			/* line attrs */
+			createLineAttrs( node, object );
+
+			/* fill attrs */
+			createFillAttrs( node, object );
+
+			/* affine attrs */
+			createAffineAttrs( node, object );
+
+			/* shadow attrs */
+			createShadowAttrs( node, object );
+		}
+
+
+		void
+		XmlLabelCreator::createObjectEllipseNode( QDomElement &parent, const ModelEllipseObject* object )
+		{
+			QDomDocument doc = parent.ownerDocument();
+			QDomElement node = doc.createElement( "Object-ellipse" );
+			parent.appendChild( node );
+
+			/* position attrs */
+			createPositionAttrs( node, object );
+
+			/* size attrs */
+			createSizeAttrs( node, object );
+
+			/* line attrs */
+			createLineAttrs( node, object );
+
+			/* fill attrs */
+			createFillAttrs( node, object );
+
+			/* affine attrs */
+			createAffineAttrs( node, object );
+
+			/* shadow attrs */
+			createShadowAttrs( node, object );
+		}
+
+
+		void
+		XmlLabelCreator::createObjectLineNode( QDomElement &parent, const ModelLineObject* object )
+		{
+			QDomDocument doc = parent.ownerDocument();
+			QDomElement node = doc.createElement( "Object-line" );
+			parent.appendChild( node );
+
+			/* position attrs */
+			createPositionAttrs( node, object );
+
+			/* size attrs of line */
+			XmlUtil::setLengthAttr( node, "dx", object->w() );
+			XmlUtil::setLengthAttr( node, "dy", object->h() );
+
+			/* line attrs */
+			createLineAttrs( node, object );
+
+			/* affine attrs */
+			createAffineAttrs( node, object );
+
+			/* shadow attrs */
+			createShadowAttrs( node, object );
+		}
+
+
+		void
+		XmlLabelCreator::createObjectImageNode( QDomElement &parent, const ModelImageObject* object )
+		{
+			QDomDocument doc = parent.ownerDocument();
+			QDomElement node = doc.createElement( "Object-image" );
+			parent.appendChild( node );
+
+			/* position attrs */
+			createPositionAttrs( node, object );
+
+			/* size attrs */
+			createSizeAttrs( node, object );
+
+			/* file attrs */
+			if ( object->filenameNode().isField() )
 			{
-				createObjectLineNode( node, lineObject );
-			}
-			else if ( ModelImageObject* imageObject = dynamic_cast<ModelImageObject*>(object) )
-			{
-				createObjectImageNode( node, imageObject );
-			}
-			else if ( ModelBarcodeObject* barcodeObject = dynamic_cast<ModelBarcodeObject*>(object) )
-			{
-				createObjectBarcodeNode( node, barcodeObject );
-			}
-			else if ( ModelTextObject* textObject = dynamic_cast<ModelTextObject*>(object) )
-			{
-				createObjectTextNode( node, textObject );
+				XmlUtil::setStringAttr( node, "src_field", object->filenameNode().data() );
 			}
 			else
 			{
-				Q_ASSERT_X( false, "XmlLabelCreator::createObjectsNode", "Invalid object type." );
+				XmlUtil::setStringAttr( node, "src", object->filenameNode().data() );
+			}
+
+			/* affine attrs */
+			createAffineAttrs( node, object );
+
+			/* shadow attrs */
+			createShadowAttrs( node, object );
+		}
+
+
+		void
+		XmlLabelCreator::createObjectBarcodeNode( QDomElement &parent, const ModelBarcodeObject* object )
+		{
+			QDomDocument doc = parent.ownerDocument();
+			QDomElement node = doc.createElement( "Object-barcode" );
+			parent.appendChild( node );
+
+			/* position attrs */
+			createPositionAttrs( node, object );
+
+			/* size attrs */
+			createSizeAttrs( node, object );
+
+			/* barcode attrs */
+			XmlUtil::setStringAttr( node, "backend", object->bcStyle().backendId() );
+			XmlUtil::setStringAttr( node, "style", object->bcStyle().id() );
+			XmlUtil::setBoolAttr( node, "text", object->bcTextFlag() );
+			XmlUtil::setBoolAttr( node, "checksum", object->bcChecksumFlag() );
+			if ( object->bcColorNode().isField() )
+			{
+				XmlUtil::setStringAttr( node, "color_field", object->bcColorNode().key() );
+			}
+			else
+			{
+				XmlUtil::setUIntAttr( node, "color", object->bcColorNode().rgba() );
+			}
+			XmlUtil::setStringAttr( node, "data", object->bcData() );
+
+			/* affine attrs */
+			createAffineAttrs( node, object );
+		}
+
+
+		void
+		XmlLabelCreator::createObjectTextNode( QDomElement &parent, const ModelTextObject* object )
+		{
+			QDomDocument doc = parent.ownerDocument();
+			QDomElement node = doc.createElement( "Object-text" );
+			parent.appendChild( node );
+
+			/* position attrs */
+			createPositionAttrs( node, object );
+
+			/* size attrs */
+			createSizeAttrs( node, object );
+
+			/* color attr */
+			if ( object->textColorNode().isField() )
+			{
+				XmlUtil::setStringAttr( node, "color_field", object->textColorNode().key() );
+			}
+			else
+			{
+				XmlUtil::setUIntAttr( node, "color", object->textColorNode().rgba() );
+			}
+
+			/* font attrs */
+			XmlUtil::setStringAttr( node, "font_family", object->fontFamily() );
+			XmlUtil::setDoubleAttr( node, "font_size", object->fontSize() );
+			XmlUtil::setWeightAttr( node, "font_weight", object->fontWeight() );
+			XmlUtil::setBoolAttr( node, "font_italic", object->fontItalicFlag() );
+			XmlUtil::setBoolAttr( node, "font_underline", object->fontUnderlineFlag() );
+
+			/* text attrs */
+			XmlUtil::setDoubleAttr( node, "line_spacing", object->textLineSpacing() );
+			XmlUtil::setAlignmentAttr( node, "align", object->textHAlign() );
+			XmlUtil::setAlignmentAttr( node, "valign", object->textVAlign() );
+
+			/* affine attrs */
+			createAffineAttrs( node, object );
+
+			/* shadow attrs */
+			createShadowAttrs( node, object );
+
+			/* serialize text contents */
+			QTextDocument document( object->text() );
+			int nBlocks = document.blockCount();
+			for ( int iBlock = 0; iBlock < nBlocks; iBlock++ )
+			{
+				createPNode( node, document.findBlockByNumber(iBlock).text() );
 			}
 		}
-	}
 
 
-	void
-	XmlLabelCreator::createObjectBoxNode( QDomElement &parent, const ModelBoxObject* object )
-	{
-		QDomDocument doc = parent.ownerDocument();
-		QDomElement node = doc.createElement( "Object-box" );
-		parent.appendChild( node );
-
-		/* position attrs */
-		createPositionAttrs( node, object );
-
-		/* size attrs */
-		createSizeAttrs( node, object );
-
-		/* line attrs */
-		createLineAttrs( node, object );
-
-		/* fill attrs */
-		createFillAttrs( node, object );
-
-		/* affine attrs */
-		createAffineAttrs( node, object );
-
-		/* shadow attrs */
-		createShadowAttrs( node, object );
-	}
-
-
-	void
-	XmlLabelCreator::createObjectEllipseNode( QDomElement &parent, const ModelEllipseObject* object )
-	{
-		QDomDocument doc = parent.ownerDocument();
-		QDomElement node = doc.createElement( "Object-ellipse" );
-		parent.appendChild( node );
-
-		/* position attrs */
-		createPositionAttrs( node, object );
-
-		/* size attrs */
-		createSizeAttrs( node, object );
-
-		/* line attrs */
-		createLineAttrs( node, object );
-
-		/* fill attrs */
-		createFillAttrs( node, object );
-
-		/* affine attrs */
-		createAffineAttrs( node, object );
-
-		/* shadow attrs */
-		createShadowAttrs( node, object );
-	}
-
-
-	void
-	XmlLabelCreator::createObjectLineNode( QDomElement &parent, const ModelLineObject* object )
-	{
-		QDomDocument doc = parent.ownerDocument();
-		QDomElement node = doc.createElement( "Object-line" );
-		parent.appendChild( node );
-
-		/* position attrs */
-		createPositionAttrs( node, object );
-
-		/* size attrs of line */
-		XmlUtil::setLengthAttr( node, "dx", object->w() );
-		XmlUtil::setLengthAttr( node, "dy", object->h() );
-
-		/* line attrs */
-		createLineAttrs( node, object );
-
-		/* affine attrs */
-		createAffineAttrs( node, object );
-
-		/* shadow attrs */
-		createShadowAttrs( node, object );
-	}
-
-
-	void
-	XmlLabelCreator::createObjectImageNode( QDomElement &parent, const ModelImageObject* object )
-	{
-		QDomDocument doc = parent.ownerDocument();
-		QDomElement node = doc.createElement( "Object-image" );
-		parent.appendChild( node );
-
-		/* position attrs */
-		createPositionAttrs( node, object );
-
-		/* size attrs */
-		createSizeAttrs( node, object );
-
-		/* file attrs */
-		if ( object->filenameNode().isField() )
+		void
+		XmlLabelCreator::createPNode( QDomElement &parent, const QString& blockText )
 		{
-			XmlUtil::setStringAttr( node, "src_field", object->filenameNode().data() );
-		}
-		else
-		{
-			XmlUtil::setStringAttr( node, "src", object->filenameNode().data() );
+			QDomDocument doc = parent.ownerDocument();
+			QDomElement node = doc.createElement( "p" );
+			parent.appendChild( node );
+
+			node.appendChild( doc.createTextNode( blockText ) );
 		}
 
-		/* affine attrs */
-		createAffineAttrs( node, object );
 
-		/* shadow attrs */
-		createShadowAttrs( node, object );
-	}
-
-
-	void
-	XmlLabelCreator::createObjectBarcodeNode( QDomElement &parent, const ModelBarcodeObject* object )
-	{
-		QDomDocument doc = parent.ownerDocument();
-		QDomElement node = doc.createElement( "Object-barcode" );
-		parent.appendChild( node );
-
-		/* position attrs */
-		createPositionAttrs( node, object );
-
-		/* size attrs */
-		createSizeAttrs( node, object );
-
-		/* barcode attrs */
-		XmlUtil::setStringAttr( node, "backend", object->bcStyle().backendId() );
-		XmlUtil::setStringAttr( node, "style", object->bcStyle().id() );
-		XmlUtil::setBoolAttr( node, "text", object->bcTextFlag() );
-		XmlUtil::setBoolAttr( node, "checksum", object->bcChecksumFlag() );
-		if ( object->bcColorNode().isField() )
+		void
+		XmlLabelCreator::createPositionAttrs( QDomElement &node, const ModelObject* object )
 		{
-			XmlUtil::setStringAttr( node, "color_field", object->bcColorNode().key() );
+			XmlUtil::setLengthAttr( node, "x", object->x0() );
+			XmlUtil::setLengthAttr( node, "y", object->y0() );
 		}
-		else
-		{
-			XmlUtil::setUIntAttr( node, "color", object->bcColorNode().rgba() );
-		}
-		XmlUtil::setStringAttr( node, "data", object->bcData() );
-
-		/* affine attrs */
-		createAffineAttrs( node, object );
-	}
-
-
-	void
-	XmlLabelCreator::createObjectTextNode( QDomElement &parent, const ModelTextObject* object )
-	{
-		QDomDocument doc = parent.ownerDocument();
-		QDomElement node = doc.createElement( "Object-text" );
-		parent.appendChild( node );
-
-		/* position attrs */
-		createPositionAttrs( node, object );
-
-		/* size attrs */
-		createSizeAttrs( node, object );
-
-		/* color attr */
-		if ( object->textColorNode().isField() )
-		{
-			XmlUtil::setStringAttr( node, "color_field", object->textColorNode().key() );
-		}
-		else
-		{
-			XmlUtil::setUIntAttr( node, "color", object->textColorNode().rgba() );
-		}
-
-		/* font attrs */
-		XmlUtil::setStringAttr( node, "font_family", object->fontFamily() );
-		XmlUtil::setDoubleAttr( node, "font_size", object->fontSize() );
-		XmlUtil::setWeightAttr( node, "font_weight", object->fontWeight() );
-		XmlUtil::setBoolAttr( node, "font_italic", object->fontItalicFlag() );
-		XmlUtil::setBoolAttr( node, "font_underline", object->fontUnderlineFlag() );
-
-		/* text attrs */
-		XmlUtil::setDoubleAttr( node, "line_spacing", object->textLineSpacing() );
-		XmlUtil::setAlignmentAttr( node, "align", object->textHAlign() );
-		XmlUtil::setAlignmentAttr( node, "valign", object->textVAlign() );
-
-		/* affine attrs */
-		createAffineAttrs( node, object );
-
-		/* shadow attrs */
-		createShadowAttrs( node, object );
-
-		/* serialize text contents */
-		QTextDocument document( object->text() );
-		int nBlocks = document.blockCount();
-		for ( int iBlock = 0; iBlock < nBlocks; iBlock++ )
-		{
-			createPNode( node, document.findBlockByNumber(iBlock).text() );
-		}
-	}
-
-
-	void
-	XmlLabelCreator::createPNode( QDomElement &parent, const QString& blockText )
-	{
-		QDomDocument doc = parent.ownerDocument();
-		QDomElement node = doc.createElement( "p" );
-		parent.appendChild( node );
-
-		node.appendChild( doc.createTextNode( blockText ) );
-	}
-
-
-	void
-	XmlLabelCreator::createPositionAttrs( QDomElement &node, const ModelObject* object )
-	{
-		XmlUtil::setLengthAttr( node, "x", object->x0() );
-		XmlUtil::setLengthAttr( node, "y", object->y0() );
-	}
 
 	
-	void
-	XmlLabelCreator::createSizeAttrs( QDomElement &node, const ModelObject* object )
-	{
-		XmlUtil::setLengthAttr( node, "w", object->w() );
-		XmlUtil::setLengthAttr( node, "h", object->h() );
-	}
+		void
+		XmlLabelCreator::createSizeAttrs( QDomElement &node, const ModelObject* object )
+		{
+			XmlUtil::setLengthAttr( node, "w", object->w() );
+			XmlUtil::setLengthAttr( node, "h", object->h() );
+		}
 
 	
-	void
-	XmlLabelCreator::createLineAttrs( QDomElement &node, const ModelObject* object )
-	{
-		XmlUtil::setLengthAttr( node, "line_width", object->lineWidth() );
-		if ( object->lineColorNode().isField() )
+		void
+		XmlLabelCreator::createLineAttrs( QDomElement &node, const ModelObject* object )
 		{
-			XmlUtil::setStringAttr( node, "line_color_field", object->lineColorNode().key() );
+			XmlUtil::setLengthAttr( node, "line_width", object->lineWidth() );
+			if ( object->lineColorNode().isField() )
+			{
+				XmlUtil::setStringAttr( node, "line_color_field", object->lineColorNode().key() );
+			}
+			else
+			{
+				XmlUtil::setUIntAttr( node, "line_color", object->lineColorNode().rgba() );
+			}
 		}
-		else
-		{
-			XmlUtil::setUIntAttr( node, "line_color", object->lineColorNode().rgba() );
-		}
-	}
 
 	
-	void
-	XmlLabelCreator::createFillAttrs( QDomElement &node, const ModelObject* object )
-	{
-		if ( object->fillColorNode().isField() )
+		void
+		XmlLabelCreator::createFillAttrs( QDomElement &node, const ModelObject* object )
 		{
-			XmlUtil::setStringAttr( node, "fill_color_field", object->fillColorNode().key() );
-		}
-		else
-		{
-			XmlUtil::setUIntAttr( node, "fill_color", object->fillColorNode().rgba() );
-		}
-	}
-
-
-	void
-	XmlLabelCreator::createAffineAttrs( QDomElement &node, const ModelObject* object )
-	{
-		QMatrix a = object->matrix();
-	
-		XmlUtil::setDoubleAttr( node, "a0", a.m11() );
-		XmlUtil::setDoubleAttr( node, "a1", a.m12() );
-		XmlUtil::setDoubleAttr( node, "a2", a.m21() );
-		XmlUtil::setDoubleAttr( node, "a3", a.m22() );
-		XmlUtil::setDoubleAttr( node, "a4", a.dx() );
-		XmlUtil::setDoubleAttr( node, "a5", a.dy() );
-	}
-
-
-	void
-	XmlLabelCreator::createShadowAttrs( QDomElement &node, const ModelObject* object )
-	{
-		if ( object->shadow() )
-		{
-			XmlUtil::setBoolAttr( node, "shadow", object->shadow() );
-
-			XmlUtil::setLengthAttr( node, "shadow_x", object->shadowX() );
-			XmlUtil::setLengthAttr( node, "shadow_y", object->shadowY() );
-
 			if ( object->fillColorNode().isField() )
 			{
-				XmlUtil::setStringAttr( node, "shadow_color_field", object->shadowColorNode().key() );
+				XmlUtil::setStringAttr( node, "fill_color_field", object->fillColorNode().key() );
 			}
 			else
 			{
-				XmlUtil::setUIntAttr( node, "shadow_color", object->shadowColorNode().rgba() );
+				XmlUtil::setUIntAttr( node, "fill_color", object->fillColorNode().rgba() );
+			}
+		}
+
+
+		void
+		XmlLabelCreator::createAffineAttrs( QDomElement &node, const ModelObject* object )
+		{
+			QMatrix a = object->matrix();
+	
+			XmlUtil::setDoubleAttr( node, "a0", a.m11() );
+			XmlUtil::setDoubleAttr( node, "a1", a.m12() );
+			XmlUtil::setDoubleAttr( node, "a2", a.m21() );
+			XmlUtil::setDoubleAttr( node, "a3", a.m22() );
+			XmlUtil::setDoubleAttr( node, "a4", a.dx() );
+			XmlUtil::setDoubleAttr( node, "a5", a.dy() );
+		}
+
+
+		void
+		XmlLabelCreator::createShadowAttrs( QDomElement &node, const ModelObject* object )
+		{
+			if ( object->shadow() )
+			{
+				XmlUtil::setBoolAttr( node, "shadow", object->shadow() );
+
+				XmlUtil::setLengthAttr( node, "shadow_x", object->shadowX() );
+				XmlUtil::setLengthAttr( node, "shadow_y", object->shadowY() );
+
+				if ( object->fillColorNode().isField() )
+				{
+					XmlUtil::setStringAttr( node, "shadow_color_field", object->shadowColorNode().key() );
+				}
+				else
+				{
+					XmlUtil::setUIntAttr( node, "shadow_color", object->shadowColorNode().rgba() );
+				}
+
+				XmlUtil::setDoubleAttr( node, "shadow_opacity", object->shadowOpacity() );
+			}
+		}
+
+
+		void
+		XmlLabelCreator::createMergeNode( QDomElement &parent, const Model* label )
+		{
+			QDomDocument doc = parent.ownerDocument();
+			QDomElement node = doc.createElement( "Merge" );
+			parent.appendChild( node );
+
+			XmlUtil::setStringAttr( node, "type", label->merge()->id() );
+			XmlUtil::setStringAttr( node, "src", label->merge()->source() );
+		}
+
+
+		void
+		XmlLabelCreator::createDataNode( QDomElement &parent, const QList<ModelObject*>& objects )
+		{
+			QDomDocument doc = parent.ownerDocument();
+			QDomElement node = doc.createElement( "Data" );
+			parent.appendChild( node );
+
+			DataCache data( objects );
+
+			foreach ( QString name, data.imageNames() )
+			{
+				createPngFileNode( node, name, data.getImage( name ) );
 			}
 
-			XmlUtil::setDoubleAttr( node, "shadow_opacity", object->shadowOpacity() );
+			foreach ( QString name, data.svgNames() )
+			{
+				createSvgFileNode( node, name, data.getSvg( name ) );
+			}
 		}
-	}
 
 
-	void
-	XmlLabelCreator::createMergeNode( QDomElement &parent, const Model* label )
-	{
-		QDomDocument doc = parent.ownerDocument();
-		QDomElement node = doc.createElement( "Merge" );
-		parent.appendChild( node );
-
-		XmlUtil::setStringAttr( node, "type", label->merge()->id() );
-		XmlUtil::setStringAttr( node, "src", label->merge()->source() );
-	}
-
-
-	void
-	XmlLabelCreator::createDataNode( QDomElement &parent, const QList<ModelObject*>& objects )
-	{
-		QDomDocument doc = parent.ownerDocument();
-		QDomElement node = doc.createElement( "Data" );
-		parent.appendChild( node );
-
-		DataCache data( objects );
-
-		foreach ( QString name, data.imageNames() )
+		void
+		XmlLabelCreator::createPngFileNode( QDomElement &parent, const QString& name, const QImage& image )
 		{
-			createPngFileNode( node, name, data.getImage( name ) );
+			QDomDocument doc = parent.ownerDocument();
+			QDomElement node = doc.createElement( "File" );
+			parent.appendChild( node );
+
+			XmlUtil::setStringAttr( node, "name", name );
+			XmlUtil::setStringAttr( node, "mimetype", "image/png" );
+			XmlUtil::setStringAttr( node, "encoding", "base64" );
+
+			QByteArray ba;
+			QBuffer buffer(&ba);
+			buffer.open(QIODevice::WriteOnly);
+			image.save(&buffer, "PNG");
+			QByteArray ba64 = ba.toBase64();
+
+			node.appendChild( doc.createTextNode( QString( ba64 ) ) );
 		}
 
-		foreach ( QString name, data.svgNames() )
+
+		void
+		XmlLabelCreator::createSvgFileNode( QDomElement &parent, const QString& name, const QByteArray& svg )
 		{
-			createSvgFileNode( node, name, data.getSvg( name ) );
+			QDomDocument doc = parent.ownerDocument();
+			QDomElement node = doc.createElement( "File" );
+			parent.appendChild( node );
+
+			XmlUtil::setStringAttr( node, "name", name );
+			XmlUtil::setStringAttr( node, "mimetype", "image/svg+xml" );
+			XmlUtil::setStringAttr( node, "encoding", "cdata" );
+
+			node.appendChild( doc.createCDATASection( QString( svg ) ) );
 		}
+
+
 	}
-
-
-	void
-	XmlLabelCreator::createPngFileNode( QDomElement &parent, const QString& name, const QImage& image )
-	{
-		QDomDocument doc = parent.ownerDocument();
-		QDomElement node = doc.createElement( "File" );
-		parent.appendChild( node );
-
-		XmlUtil::setStringAttr( node, "name", name );
-		XmlUtil::setStringAttr( node, "mimetype", "image/png" );
-		XmlUtil::setStringAttr( node, "encoding", "base64" );
-
-		QByteArray ba;
-		QBuffer buffer(&ba);
-		buffer.open(QIODevice::WriteOnly);
-		image.save(&buffer, "PNG");
-		QByteArray ba64 = ba.toBase64();
-
-		node.appendChild( doc.createTextNode( QString( ba64 ) ) );
-	}
-
-
-	void
-	XmlLabelCreator::createSvgFileNode( QDomElement &parent, const QString& name, const QByteArray& svg )
-	{
-		QDomDocument doc = parent.ownerDocument();
-		QDomElement node = doc.createElement( "File" );
-		parent.appendChild( node );
-
-		XmlUtil::setStringAttr( node, "name", name );
-		XmlUtil::setStringAttr( node, "mimetype", "image/svg+xml" );
-		XmlUtil::setStringAttr( node, "encoding", "cdata" );
-
-		node.appendChild( doc.createCDATASection( QString( svg ) ) );
-	}
-
-} // namespace glabels::model
+}
diff --git a/model/XmlLabelCreator.h b/model/XmlLabelCreator.h
index 0526bc0..93c235e 100644
--- a/model/XmlLabelCreator.h
+++ b/model/XmlLabelCreator.h
@@ -26,56 +26,59 @@
 #include <QDomElement>
 
 
-namespace glabels::model
+namespace glabels
 {
-
-	// Forward references
-	class Model;
-	class ModelObject;
-	class ModelBoxObject;
-	class ModelEllipseObject;
-	class ModelLineObject;
-	class ModelImageObject;
-	class ModelBarcodeObject;
-	class ModelTextObject;
-
-
-	///
-	/// XmlLabelCreator
-	///
-	class XmlLabelCreator : public QObject
+	namespace model
 	{
-		Q_OBJECT
 
-	public:
-		static void writeFile( const Model* label, const QString& fileName );
-		static void writeBuffer( const Model* label, QByteArray& buffer );
-		static void serializeObjects( const QList<ModelObject*>& objects, QByteArray& buffer );
+		// Forward references
+		class Model;
+		class ModelObject;
+		class ModelBoxObject;
+		class ModelEllipseObject;
+		class ModelLineObject;
+		class ModelImageObject;
+		class ModelBarcodeObject;
+		class ModelTextObject;
 
-	private:
-		static void createDoc( QDomDocument& doc, const Model* label );
-		static void createRootNode( const Model* label );
-		static void createObjectsNode( QDomElement &parent, const QList<ModelObject*>& objects, bool rotate );
-		static void createObjectBoxNode( QDomElement &parent, const ModelBoxObject* object );
-		static void createObjectEllipseNode( QDomElement &parent, const ModelEllipseObject* object );
-		static void createObjectLineNode( QDomElement &parent, const ModelLineObject* object );
-		static void createObjectImageNode( QDomElement &parent, const ModelImageObject* object );
-		static void createObjectBarcodeNode( QDomElement &parent, const ModelBarcodeObject* object );
-		static void createObjectTextNode( QDomElement &parent, const ModelTextObject* object );
-		static void createPNode( QDomElement &parent, const QString& blockText );
-		static void createPositionAttrs( QDomElement &node, const ModelObject* object );
-		static void createSizeAttrs( QDomElement &node, const ModelObject* object );
-		static void createLineAttrs( QDomElement &node, const ModelObject* object );
-		static void createFillAttrs( QDomElement &node, const ModelObject* object );
-		static void createAffineAttrs( QDomElement &node, const ModelObject* object );
-		static void createShadowAttrs( QDomElement &node, const ModelObject* object );
-		static void createMergeNode( QDomElement &parent, const Model* label );
-		static void createDataNode( QDomElement &parent, const QList<ModelObject*>& objects );
-		static void createPngFileNode( QDomElement &parent, const QString& name, const QImage& image );
-		static void createSvgFileNode( QDomElement &parent, const QString& name, const QByteArray& svg );
 
-	};
+		///
+		/// XmlLabelCreator
+		///
+		class XmlLabelCreator : public QObject
+		{
+			Q_OBJECT
 
+		public:
+			static void writeFile( const Model* label, const QString& fileName );
+			static void writeBuffer( const Model* label, QByteArray& buffer );
+			static void serializeObjects( const QList<ModelObject*>& objects, QByteArray& buffer );
+
+		private:
+			static void createDoc( QDomDocument& doc, const Model* label );
+			static void createRootNode( const Model* label );
+			static void createObjectsNode( QDomElement &parent, const QList<ModelObject*>& objects, bool rotate );
+			static void createObjectBoxNode( QDomElement &parent, const ModelBoxObject* object );
+			static void createObjectEllipseNode( QDomElement &parent, const ModelEllipseObject* object );
+			static void createObjectLineNode( QDomElement &parent, const ModelLineObject* object );
+			static void createObjectImageNode( QDomElement &parent, const ModelImageObject* object );
+			static void createObjectBarcodeNode( QDomElement &parent, const ModelBarcodeObject* object );
+			static void createObjectTextNode( QDomElement &parent, const ModelTextObject* object );
+			static void createPNode( QDomElement &parent, const QString& blockText );
+			static void createPositionAttrs( QDomElement &node, const ModelObject* object );
+			static void createSizeAttrs( QDomElement &node, const ModelObject* object );
+			static void createLineAttrs( QDomElement &node, const ModelObject* object );
+			static void createFillAttrs( QDomElement &node, const ModelObject* object );
+			static void createAffineAttrs( QDomElement &node, const ModelObject* object );
+			static void createShadowAttrs( QDomElement &node, const ModelObject* object );
+			static void createMergeNode( QDomElement &parent, const Model* label );
+			static void createDataNode( QDomElement &parent, const QList<ModelObject*>& objects );
+			static void createPngFileNode( QDomElement &parent, const QString& name, const QImage& image );
+			static void createSvgFileNode( QDomElement &parent, const QString& name, const QByteArray& svg );
+
+		};
+
+	}
 }
 
 
diff --git a/model/XmlLabelParser.cpp b/model/XmlLabelParser.cpp
index 72342a9..edff48f 100644
--- a/model/XmlLabelParser.cpp
+++ b/model/XmlLabelParser.cpp
@@ -44,711 +44,715 @@
 #include <zlib.h>
 
 
-namespace glabels::model
+namespace glabels
 {
-
-	Model*
-	XmlLabelParser::readFile( const QString& fileName )
+	namespace model
 	{
-		QFile file( fileName );
 
-		if ( !file.open( QFile::ReadOnly ) )
+		Model*
+		XmlLabelParser::readFile( const QString& fileName )
 		{
-			qWarning() << "Error: Cannot read file" << fileName
-			           << ":" << file.errorString();
-			return nullptr;
-		}
+			QFile file( fileName );
 
-		QDomDocument doc;
-		bool         success;
-		QString      errorString;
-		int          errorLine;
-		int          errorColumn;
-
-		QByteArray rawData = file.readAll();
-		if ( ((rawData[0]&0xFF) == 0x1F) && ((rawData[1]&0xFF) == 0x8b) ) // gzip magic number 0x1F, 0x8B
-		{
-			// gzip compressed format
-			QByteArray unzippedData;
-			gunzip( rawData, unzippedData );
-			success = doc.setContent( unzippedData, false, &errorString, &errorLine, &errorColumn );
-		}
-		else
-		{
-			// plain text
-			success = doc.setContent( rawData, false, &errorString, &errorLine, &errorColumn );
-		}
-
-		if ( !success )
-		{
-			qWarning() << "Error: Parse error at line " << errorLine
-			           << "column " << errorColumn
-			           << ": " << errorString;
-			return nullptr;
-		}
-	
-
-		QDomElement root = doc.documentElement();
-		if ( root.tagName() != "Glabels-document" )
-		{
-			qWarning() << "Error: Not a Glabels-document file";
-			return nullptr;
-		}
-
-		return parseRootNode( root );
-	}
-
-
-	Model*
-	XmlLabelParser::readBuffer( const QByteArray& buffer )
-	{
-		QDomDocument doc;
-		QString      errorString;
-		int          errorLine;
-		int          errorColumn;
-
-		if ( !doc.setContent( buffer, false, &errorString, &errorLine, &errorColumn ) )
-		{
-			qWarning() << "Error: Parse error at line " << errorLine
-			           << "column " << errorColumn
-			           << ": " << errorString;
-			return nullptr;
-		}
-
-		QDomElement root = doc.documentElement();
-		if ( root.tagName() != "Glabels-document" )
-		{
-			qWarning() << "Error: Not a Glabels-document file";
-			return nullptr;
-		}
-
-		return parseRootNode( root );
-	}
-
-
-	QList<ModelObject*>
-	XmlLabelParser::deserializeObjects( const QByteArray& buffer )
-	{
-		QList<ModelObject*> list;
-	
-		QDomDocument doc;
-		QString      errorString;
-		int          errorLine;
-		int          errorColumn;
-
-		if ( !doc.setContent( buffer, false, &errorString, &errorLine, &errorColumn ) )
-		{
-			qWarning() << "Error: Parse error at line " << errorLine
-			           << "column " << errorColumn
-			           << ": " << errorString;
-			return list;
-		}
-
-		QDomElement root = doc.documentElement();
-		if ( root.tagName() != "Glabels-objects" )
-		{
-			qWarning() << "Error: Not a Glabels-objects stream";
-			return list;
-		}
-
-		/* Pass 1, extract data nodes to pre-load cache. */
-		DataCache data;
-		for ( QDomNode child = root.firstChild(); !child.isNull(); child = child.nextSibling() )
-		{
-			if ( child.toElement().tagName() == "Data" )
+			if ( !file.open( QFile::ReadOnly ) )
 			{
-				parseDataNode( child.toElement(), data );
-			}
-		}
-
-		/* Pass 2, now extract objects. */
-		for ( QDomNode child = root.firstChild(); !child.isNull(); child = child.nextSibling() )
-		{
-			if ( child.toElement().tagName() == "Objects" )
-			{
-				list = parseObjectsNode( child.toElement(), data );
-			}
-		}
-		return list;
-	}
-
-
-	void
-	XmlLabelParser::gunzip( const QByteArray& data, QByteArray& result )
-	{
-		result.clear();
-
-		if (data.size() <= 4) {
-			qWarning("XmlLabelParser::gunzip: Input data is truncated");
-			return;
-		}
-
-		// setup stream for inflate()
-		z_stream strm;
-		strm.zalloc = Z_NULL;
-		strm.zfree = Z_NULL;
-		strm.opaque = Z_NULL;
-		strm.avail_in = data.size();
-		strm.next_in = (Bytef*)(data.data());
-
-		int ret = inflateInit2(&strm, MAX_WBITS + 16); // gzip decoding
-		if (ret != Z_OK)
-		{
-			return;
-		}
-
-		static const int CHUNK_SIZE = 1024;
-		char out[CHUNK_SIZE];
-
-		// run inflate(), one chunk at a time
-		do {
-			strm.avail_out = CHUNK_SIZE;
-			strm.next_out = (Bytef*)(out);
-
-			ret = inflate(&strm, Z_NO_FLUSH);
-			Q_ASSERT(ret != Z_STREAM_ERROR);  // state not clobbered
-
-			if ( (ret == Z_NEED_DICT) || (ret == Z_DATA_ERROR) || (ret == Z_MEM_ERROR) )
-			{
-				// clean up
-				inflateEnd(&strm);
-				return;
+				qWarning() << "Error: Cannot read file" << fileName
+				           << ":" << file.errorString();
+				return nullptr;
 			}
 
-			result.append(out, CHUNK_SIZE - strm.avail_out);
-		} while (strm.avail_out == 0);
+			QDomDocument doc;
+			bool         success;
+			QString      errorString;
+			int          errorLine;
+			int          errorColumn;
 
-		// clean up
-		inflateEnd(&strm);
-	}
-
-
-	Model*
-	XmlLabelParser::parseRootNode( const QDomElement &node )
-	{
-		QString version = XmlUtil::getStringAttr( node, "version", "" );
-		if ( version != "4.0" )
-		{
-			qWarning() << "TODO: compatability mode.";
-		}
-
-		Model* label = new Model();
-
-		/* Pass 1, extract data nodes to pre-load cache. */
-		DataCache data;
-		for ( QDomNode child = node.firstChild(); !child.isNull(); child = child.nextSibling() )
-		{
-			if ( child.toElement().tagName() == "Data" )
+			QByteArray rawData = file.readAll();
+			if ( ((rawData[0]&0xFF) == 0x1F) && ((rawData[1]&0xFF) == 0x8b) ) // gzip magic number 0x1F, 0x8B
 			{
-				parseDataNode( child.toElement(), data );
-			}
-		}
-
-		/* Pass 2, now extract everything else. */
-		for ( QDomNode child = node.firstChild(); !child.isNull(); child = child.nextSibling() )
-		{
-			QString tagName = child.toElement().tagName();
-		
-			if ( tagName == "Template" )
-			{
-				Template* tmplate = XmlTemplateParser().parseTemplateNode( child.toElement() );
-				if ( tmplate == nullptr )
-				{
-					qWarning() << "Unable to parse template";
-					delete label;
-					return nullptr;
-				}
-				label->setTmplate( tmplate );
-			}
-			else if ( tagName == "Objects" )
-			{
-				label->setRotate( parseRotateAttr( child.toElement() ) );
-				QList<ModelObject*> list = parseObjectsNode( child.toElement(), data );
-				foreach ( ModelObject* object, list )
-				{
-					label->addObject( object );
-				}
-			}
-			else if ( tagName == "Merge" )
-			{
-				parseMergeNode( child.toElement(), label );
-			}
-			else if ( tagName == "Data" )
-			{
-				/* Handled in pass 1. */
-			}
-			else if ( !child.isComment() )
-			{
-				qWarning() << "Unexpected" << node.tagName() << "child:" << tagName;
-			}
-		}
-
-		label->clearModified();
-		return label;
-	}
-
-
-	QList<ModelObject*>
-	XmlLabelParser::parseObjectsNode( const QDomElement &node, const DataCache& data )
-	{
-		QList<ModelObject*> list;
-
-		for ( QDomNode child = node.firstChild(); !child.isNull(); child = child.nextSibling() )
-		{
-			QString tagName = child.toElement().tagName();
-		
-			if ( tagName == "Object-box" )
-			{
-				list.append( parseObjectBoxNode( child.toElement() ) );
-			}
-			else if ( tagName == "Object-ellipse" )
-			{
-				list.append( parseObjectEllipseNode( child.toElement() ) );
-			}
-			else if ( tagName == "Object-line" )
-			{
-				list.append( parseObjectLineNode( child.toElement() ) );
-			}
-			else if ( tagName == "Object-text" )
-			{
-				list.append( parseObjectTextNode( child.toElement() ) );
-			}
-			else if ( tagName == "Object-image" )
-			{
-				list.append( parseObjectImageNode( child.toElement(), data ) );
-			}
-			else if ( tagName == "Object-barcode" )
-			{
-				list.append( parseObjectBarcodeNode( child.toElement() ) );
-			}
-			else if ( !child.isComment() )
-			{
-				qWarning() << "Unexpected" << node.tagName() << "child:" << tagName;
-			}
-		}
-
-		return list;
-	}
-
-
-	ModelBoxObject*
-	XmlLabelParser::parseObjectBoxNode( const QDomElement &node )
-	{
-		/* position attrs */
-		Distance x0 = XmlUtil::getLengthAttr( node, "x", 0.0 );
-		Distance y0 = XmlUtil::getLengthAttr( node, "y", 0.0 );
-
-		/* size attrs */
-		Distance w = XmlUtil::getLengthAttr( node, "w", 0 );
-		Distance h = XmlUtil::getLengthAttr( node, "h", 0 );
-
-		/* line attrs */
-		Distance lineWidth = XmlUtil::getLengthAttr( node, "line_width", 1.0 );
-
-		QString  key        = XmlUtil::getStringAttr( node, "line_color_field", "" );
-		bool     field_flag = !key.isEmpty();
-		uint32_t color      = XmlUtil::getUIntAttr( node, "line_color", 0 );
-		ColorNode lineColorNode( field_flag, color, key );
-
-		/* fill attrs */
-		key        = XmlUtil::getStringAttr( node, "fill_color_field", "" );
-		field_flag = !key.isEmpty();
-		color      = XmlUtil::getUIntAttr( node, "fill_color", 0 );
-		ColorNode fillColorNode( field_flag, color, key );
-        
-		/* affine attrs */
-		double a[6];
-		a[0] = XmlUtil::getDoubleAttr( node, "a0", 1.0 );
-		a[1] = XmlUtil::getDoubleAttr( node, "a1", 0.0 );
-		a[2] = XmlUtil::getDoubleAttr( node, "a2", 0.0 );
-		a[3] = XmlUtil::getDoubleAttr( node, "a3", 1.0 );
-		a[4] = XmlUtil::getDoubleAttr( node, "a4", 0.0 );
-		a[5] = XmlUtil::getDoubleAttr( node, "a5", 0.0 );
-
-		/* shadow attrs */
-		bool     shadowState   = XmlUtil::getBoolAttr( node, "shadow", false );
-		Distance shadowX       = XmlUtil::getLengthAttr( node, "shadow_x", 0.0 );
-		Distance shadowY       = XmlUtil::getLengthAttr( node, "shadow_y", 0.0 );
-		double   shadowOpacity = XmlUtil::getDoubleAttr( node, "shadow_opacity", 1.0 );
-
-		key        = XmlUtil::getStringAttr( node, "shadow_color_field", "" );
-		field_flag = !key.isEmpty();
-		color      = XmlUtil::getUIntAttr( node, "shadow_color", 0 );
-		ColorNode shadowColorNode( field_flag, color, key );
-
-		return new ModelBoxObject( x0, y0, w, h,
-		                           lineWidth, lineColorNode,
-		                           fillColorNode,
-		                           QMatrix( a[0], a[1], a[2], a[3], a[4], a[5] ),
-		                           shadowState, shadowX, shadowY, shadowOpacity, shadowColorNode );
-	}
-
-
-	ModelEllipseObject*
-	XmlLabelParser::parseObjectEllipseNode( const QDomElement &node )
-	{
-		/* position attrs */
-		Distance x0 = XmlUtil::getLengthAttr( node, "x", 0.0 );
-		Distance y0 = XmlUtil::getLengthAttr( node, "y", 0.0 );
-
-		/* size attrs */
-		Distance w = XmlUtil::getLengthAttr( node, "w", 0 );
-		Distance h = XmlUtil::getLengthAttr( node, "h", 0 );
-
-		/* line attrs */
-		Distance lineWidth = XmlUtil::getLengthAttr( node, "line_width", 1.0 );
-
-		QString  key        = XmlUtil::getStringAttr( node, "line_color_field", "" );
-		bool     field_flag = !key.isEmpty();
-		uint32_t color      = XmlUtil::getUIntAttr( node, "line_color", 0 );
-		ColorNode lineColorNode( field_flag, color, key );
-
-		/* fill attrs */
-		key        = XmlUtil::getStringAttr( node, "fill_color_field", "" );
-		field_flag = !key.isEmpty();
-		color      = XmlUtil::getUIntAttr( node, "fill_color", 0 );
-		ColorNode fillColorNode( field_flag, color, key );
-        
-		/* affine attrs */
-		double a[6];
-		a[0] = XmlUtil::getDoubleAttr( node, "a0", 1.0 );
-		a[1] = XmlUtil::getDoubleAttr( node, "a1", 0.0 );
-		a[2] = XmlUtil::getDoubleAttr( node, "a2", 0.0 );
-		a[3] = XmlUtil::getDoubleAttr( node, "a3", 1.0 );
-		a[4] = XmlUtil::getDoubleAttr( node, "a4", 0.0 );
-		a[5] = XmlUtil::getDoubleAttr( node, "a5", 0.0 );
-
-		/* shadow attrs */
-		bool     shadowState   = XmlUtil::getBoolAttr( node, "shadow", false );
-		Distance shadowX       = XmlUtil::getLengthAttr( node, "shadow_x", 0.0 );
-		Distance shadowY       = XmlUtil::getLengthAttr( node, "shadow_y", 0.0 );
-		double   shadowOpacity = XmlUtil::getDoubleAttr( node, "shadow_opacity", 1.0 );
-
-		key        = XmlUtil::getStringAttr( node, "shadow_color_field", "" );
-		field_flag = !key.isEmpty();
-		color      = XmlUtil::getUIntAttr( node, "shadow_color", 0 );
-		ColorNode shadowColorNode( field_flag, color, key );
-
-		return new ModelEllipseObject( x0, y0, w, h,
-		                               lineWidth, lineColorNode,
-		                               fillColorNode,
-		                               QMatrix( a[0], a[1], a[2], a[3], a[4], a[5] ),
-		                               shadowState, shadowX, shadowY, shadowOpacity, shadowColorNode );
-	}
-
-
-	ModelLineObject*
-	XmlLabelParser::parseObjectLineNode( const QDomElement &node )
-	{
-		/* position attrs */
-		Distance x0 = XmlUtil::getLengthAttr( node, "x", 0.0 );
-		Distance y0 = XmlUtil::getLengthAttr( node, "y", 0.0 );
-
-		/* size attrs of line */
-		Distance dx = XmlUtil::getLengthAttr( node, "dx", 0 );
-		Distance dy = XmlUtil::getLengthAttr( node, "dy", 0 );
-
-		/* line attrs */
-		Distance lineWidth = XmlUtil::getLengthAttr( node, "line_width", 1.0 );
-
-		QString  key        = XmlUtil::getStringAttr( node, "line_color_field", "" );
-		bool     field_flag = !key.isEmpty();
-		uint32_t color      = XmlUtil::getUIntAttr( node, "line_color", 0 );
-		ColorNode lineColorNode( field_flag, color, key );
-
-		/* affine attrs */
-		double a[6];
-		a[0] = XmlUtil::getDoubleAttr( node, "a0", 1.0 );
-		a[1] = XmlUtil::getDoubleAttr( node, "a1", 0.0 );
-		a[2] = XmlUtil::getDoubleAttr( node, "a2", 0.0 );
-		a[3] = XmlUtil::getDoubleAttr( node, "a3", 1.0 );
-		a[4] = XmlUtil::getDoubleAttr( node, "a4", 0.0 );
-		a[5] = XmlUtil::getDoubleAttr( node, "a5", 0.0 );
-
-		/* shadow attrs */
-		bool     shadowState   = XmlUtil::getBoolAttr( node, "shadow", false );
-		Distance shadowX       = XmlUtil::getLengthAttr( node, "shadow_x", 0.0 );
-		Distance shadowY       = XmlUtil::getLengthAttr( node, "shadow_y", 0.0 );
-		double   shadowOpacity = XmlUtil::getDoubleAttr( node, "shadow_opacity", 1.0 );
-
-		key        = XmlUtil::getStringAttr( node, "shadow_color_field", "" );
-		field_flag = !key.isEmpty();
-		color      = XmlUtil::getUIntAttr( node, "shadow_color", 0 );
-		ColorNode shadowColorNode( field_flag, color, key );
-
-		return new ModelLineObject( x0, y0, dx, dy,
-		                            lineWidth, lineColorNode,
-		                            QMatrix( a[0], a[1], a[2], a[3], a[4], a[5] ),
-		                            shadowState, shadowX, shadowY, shadowOpacity, shadowColorNode );
-	}
-
-
-	ModelImageObject*
-	XmlLabelParser::parseObjectImageNode( const QDomElement &node, const DataCache& data )
-	{
-		/* position attrs */
-		Distance x0 = XmlUtil::getLengthAttr( node, "x", 0.0 );
-		Distance y0 = XmlUtil::getLengthAttr( node, "y", 0.0 );
-
-		/* size attrs */
-		Distance w = XmlUtil::getLengthAttr( node, "w", 0 );
-		Distance h = XmlUtil::getLengthAttr( node, "h", 0 );
-
-		/* file attrs */
-		QString key        = XmlUtil::getStringAttr( node, "src_field", "" );
-		bool    field_flag = !key.isEmpty();
-		QString filename   = XmlUtil::getStringAttr( node, "src", "" );
-		TextNode filenameNode( field_flag, field_flag ? key : filename );
-
-		/* affine attrs */
-		double a[6];
-		a[0] = XmlUtil::getDoubleAttr( node, "a0", 1.0 );
-		a[1] = XmlUtil::getDoubleAttr( node, "a1", 0.0 );
-		a[2] = XmlUtil::getDoubleAttr( node, "a2", 0.0 );
-		a[3] = XmlUtil::getDoubleAttr( node, "a3", 1.0 );
-		a[4] = XmlUtil::getDoubleAttr( node, "a4", 0.0 );
-		a[5] = XmlUtil::getDoubleAttr( node, "a5", 0.0 );
-
-		/* shadow attrs */
-		bool     shadowState   = XmlUtil::getBoolAttr( node, "shadow", false );
-		Distance shadowX       = XmlUtil::getLengthAttr( node, "shadow_x", 0.0 );
-		Distance shadowY       = XmlUtil::getLengthAttr( node, "shadow_y", 0.0 );
-		double   shadowOpacity = XmlUtil::getDoubleAttr( node, "shadow_opacity", 1.0 );
-
-		key            = XmlUtil::getStringAttr( node, "shadow_color_field", "" );
-		field_flag     = !key.isEmpty();
-		uint32_t color = XmlUtil::getUIntAttr( node, "shadow_color", 0 );
-		ColorNode shadowColorNode( field_flag, color, key );
-
-		if ( filenameNode.isField() )
-		{
-			return new ModelImageObject( x0, y0, w, h,
-			                             filenameNode,
-			                             QMatrix( a[0], a[1], a[2], a[3], a[4], a[5] ),
-			                             shadowState, shadowX, shadowY, shadowOpacity, shadowColorNode );
-		}
-		else
-		{
-			if ( data.hasImage( filename ) )
-			{
-				return new ModelImageObject( x0, y0, w, h,
-				                             filename, data.getImage( filename ),
-				                             QMatrix( a[0], a[1], a[2], a[3], a[4], a[5] ),
-				                             shadowState, shadowX, shadowY, shadowOpacity, shadowColorNode );
-			}
-			else if ( data.hasSvg( filename ) )
-			{
-				return new ModelImageObject( x0, y0, w, h,
-				                             filename, data.getSvg( filename ),
-				                             QMatrix( a[0], a[1], a[2], a[3], a[4], a[5] ),
-				                             shadowState, shadowX, shadowY, shadowOpacity, shadowColorNode );
+				// gzip compressed format
+				QByteArray unzippedData;
+				gunzip( rawData, unzippedData );
+				success = doc.setContent( unzippedData, false, &errorString, &errorLine, &errorColumn );
 			}
 			else
 			{
-				qWarning() << "Embedded file" << filename << "missing. Trying actual file.";
+				// plain text
+				success = doc.setContent( rawData, false, &errorString, &errorLine, &errorColumn );
+			}
+
+			if ( !success )
+			{
+				qWarning() << "Error: Parse error at line " << errorLine
+				           << "column " << errorColumn
+				           << ": " << errorString;
+				return nullptr;
+			}
+	
+
+			QDomElement root = doc.documentElement();
+			if ( root.tagName() != "Glabels-document" )
+			{
+				qWarning() << "Error: Not a Glabels-document file";
+				return nullptr;
+			}
+
+			return parseRootNode( root );
+		}
+
+
+		Model*
+		XmlLabelParser::readBuffer( const QByteArray& buffer )
+		{
+			QDomDocument doc;
+			QString      errorString;
+			int          errorLine;
+			int          errorColumn;
+
+			if ( !doc.setContent( buffer, false, &errorString, &errorLine, &errorColumn ) )
+			{
+				qWarning() << "Error: Parse error at line " << errorLine
+				           << "column " << errorColumn
+				           << ": " << errorString;
+				return nullptr;
+			}
+
+			QDomElement root = doc.documentElement();
+			if ( root.tagName() != "Glabels-document" )
+			{
+				qWarning() << "Error: Not a Glabels-document file";
+				return nullptr;
+			}
+
+			return parseRootNode( root );
+		}
+
+
+		QList<ModelObject*>
+		XmlLabelParser::deserializeObjects( const QByteArray& buffer )
+		{
+			QList<ModelObject*> list;
+	
+			QDomDocument doc;
+			QString      errorString;
+			int          errorLine;
+			int          errorColumn;
+
+			if ( !doc.setContent( buffer, false, &errorString, &errorLine, &errorColumn ) )
+			{
+				qWarning() << "Error: Parse error at line " << errorLine
+				           << "column " << errorColumn
+				           << ": " << errorString;
+				return list;
+			}
+
+			QDomElement root = doc.documentElement();
+			if ( root.tagName() != "Glabels-objects" )
+			{
+				qWarning() << "Error: Not a Glabels-objects stream";
+				return list;
+			}
+
+			/* Pass 1, extract data nodes to pre-load cache. */
+			DataCache data;
+			for ( QDomNode child = root.firstChild(); !child.isNull(); child = child.nextSibling() )
+			{
+				if ( child.toElement().tagName() == "Data" )
+				{
+					parseDataNode( child.toElement(), data );
+				}
+			}
+
+			/* Pass 2, now extract objects. */
+			for ( QDomNode child = root.firstChild(); !child.isNull(); child = child.nextSibling() )
+			{
+				if ( child.toElement().tagName() == "Objects" )
+				{
+					list = parseObjectsNode( child.toElement(), data );
+				}
+			}
+			return list;
+		}
+
+
+		void
+		XmlLabelParser::gunzip( const QByteArray& data, QByteArray& result )
+		{
+			result.clear();
+
+			if (data.size() <= 4) {
+				qWarning("XmlLabelParser::gunzip: Input data is truncated");
+				return;
+			}
+
+			// setup stream for inflate()
+			z_stream strm;
+			strm.zalloc = Z_NULL;
+			strm.zfree = Z_NULL;
+			strm.opaque = Z_NULL;
+			strm.avail_in = data.size();
+			strm.next_in = (Bytef*)(data.data());
+
+			int ret = inflateInit2(&strm, MAX_WBITS + 16); // gzip decoding
+			if (ret != Z_OK)
+			{
+				return;
+			}
+
+			static const int CHUNK_SIZE = 1024;
+			char out[CHUNK_SIZE];
+
+			// run inflate(), one chunk at a time
+			do {
+				strm.avail_out = CHUNK_SIZE;
+				strm.next_out = (Bytef*)(out);
+
+				ret = inflate(&strm, Z_NO_FLUSH);
+				Q_ASSERT(ret != Z_STREAM_ERROR);  // state not clobbered
+
+				if ( (ret == Z_NEED_DICT) || (ret == Z_DATA_ERROR) || (ret == Z_MEM_ERROR) )
+				{
+					// clean up
+					inflateEnd(&strm);
+					return;
+				}
+
+				result.append(out, CHUNK_SIZE - strm.avail_out);
+			} while (strm.avail_out == 0);
+
+			// clean up
+			inflateEnd(&strm);
+		}
+
+
+		Model*
+		XmlLabelParser::parseRootNode( const QDomElement &node )
+		{
+			QString version = XmlUtil::getStringAttr( node, "version", "" );
+			if ( version != "4.0" )
+			{
+				qWarning() << "TODO: compatability mode.";
+			}
+
+			Model* label = new Model();
+
+			/* Pass 1, extract data nodes to pre-load cache. */
+			DataCache data;
+			for ( QDomNode child = node.firstChild(); !child.isNull(); child = child.nextSibling() )
+			{
+				if ( child.toElement().tagName() == "Data" )
+				{
+					parseDataNode( child.toElement(), data );
+				}
+			}
+
+			/* Pass 2, now extract everything else. */
+			for ( QDomNode child = node.firstChild(); !child.isNull(); child = child.nextSibling() )
+			{
+				QString tagName = child.toElement().tagName();
+		
+				if ( tagName == "Template" )
+				{
+					Template* tmplate = XmlTemplateParser().parseTemplateNode( child.toElement() );
+					if ( tmplate == nullptr )
+					{
+						qWarning() << "Unable to parse template";
+						delete label;
+						return nullptr;
+					}
+					label->setTmplate( tmplate );
+				}
+				else if ( tagName == "Objects" )
+				{
+					label->setRotate( parseRotateAttr( child.toElement() ) );
+					QList<ModelObject*> list = parseObjectsNode( child.toElement(), data );
+					foreach ( ModelObject* object, list )
+					{
+						label->addObject( object );
+					}
+				}
+				else if ( tagName == "Merge" )
+				{
+					parseMergeNode( child.toElement(), label );
+				}
+				else if ( tagName == "Data" )
+				{
+					/* Handled in pass 1. */
+				}
+				else if ( !child.isComment() )
+				{
+					qWarning() << "Unexpected" << node.tagName() << "child:" << tagName;
+				}
+			}
+
+			label->clearModified();
+			return label;
+		}
+
+
+		QList<ModelObject*>
+		XmlLabelParser::parseObjectsNode( const QDomElement &node, const DataCache& data )
+		{
+			QList<ModelObject*> list;
+
+			for ( QDomNode child = node.firstChild(); !child.isNull(); child = child.nextSibling() )
+			{
+				QString tagName = child.toElement().tagName();
+		
+				if ( tagName == "Object-box" )
+				{
+					list.append( parseObjectBoxNode( child.toElement() ) );
+				}
+				else if ( tagName == "Object-ellipse" )
+				{
+					list.append( parseObjectEllipseNode( child.toElement() ) );
+				}
+				else if ( tagName == "Object-line" )
+				{
+					list.append( parseObjectLineNode( child.toElement() ) );
+				}
+				else if ( tagName == "Object-text" )
+				{
+					list.append( parseObjectTextNode( child.toElement() ) );
+				}
+				else if ( tagName == "Object-image" )
+				{
+					list.append( parseObjectImageNode( child.toElement(), data ) );
+				}
+				else if ( tagName == "Object-barcode" )
+				{
+					list.append( parseObjectBarcodeNode( child.toElement() ) );
+				}
+				else if ( !child.isComment() )
+				{
+					qWarning() << "Unexpected" << node.tagName() << "child:" << tagName;
+				}
+			}
+
+			return list;
+		}
+
+
+		ModelBoxObject*
+		XmlLabelParser::parseObjectBoxNode( const QDomElement &node )
+		{
+			/* position attrs */
+			Distance x0 = XmlUtil::getLengthAttr( node, "x", 0.0 );
+			Distance y0 = XmlUtil::getLengthAttr( node, "y", 0.0 );
+
+			/* size attrs */
+			Distance w = XmlUtil::getLengthAttr( node, "w", 0 );
+			Distance h = XmlUtil::getLengthAttr( node, "h", 0 );
+
+			/* line attrs */
+			Distance lineWidth = XmlUtil::getLengthAttr( node, "line_width", 1.0 );
+
+			QString  key        = XmlUtil::getStringAttr( node, "line_color_field", "" );
+			bool     field_flag = !key.isEmpty();
+			uint32_t color      = XmlUtil::getUIntAttr( node, "line_color", 0 );
+			ColorNode lineColorNode( field_flag, color, key );
+
+			/* fill attrs */
+			key        = XmlUtil::getStringAttr( node, "fill_color_field", "" );
+			field_flag = !key.isEmpty();
+			color      = XmlUtil::getUIntAttr( node, "fill_color", 0 );
+			ColorNode fillColorNode( field_flag, color, key );
+        
+			/* affine attrs */
+			double a[6];
+			a[0] = XmlUtil::getDoubleAttr( node, "a0", 1.0 );
+			a[1] = XmlUtil::getDoubleAttr( node, "a1", 0.0 );
+			a[2] = XmlUtil::getDoubleAttr( node, "a2", 0.0 );
+			a[3] = XmlUtil::getDoubleAttr( node, "a3", 1.0 );
+			a[4] = XmlUtil::getDoubleAttr( node, "a4", 0.0 );
+			a[5] = XmlUtil::getDoubleAttr( node, "a5", 0.0 );
+
+			/* shadow attrs */
+			bool     shadowState   = XmlUtil::getBoolAttr( node, "shadow", false );
+			Distance shadowX       = XmlUtil::getLengthAttr( node, "shadow_x", 0.0 );
+			Distance shadowY       = XmlUtil::getLengthAttr( node, "shadow_y", 0.0 );
+			double   shadowOpacity = XmlUtil::getDoubleAttr( node, "shadow_opacity", 1.0 );
+
+			key        = XmlUtil::getStringAttr( node, "shadow_color_field", "" );
+			field_flag = !key.isEmpty();
+			color      = XmlUtil::getUIntAttr( node, "shadow_color", 0 );
+			ColorNode shadowColorNode( field_flag, color, key );
+
+			return new ModelBoxObject( x0, y0, w, h,
+			                           lineWidth, lineColorNode,
+			                           fillColorNode,
+			                           QMatrix( a[0], a[1], a[2], a[3], a[4], a[5] ),
+			                           shadowState, shadowX, shadowY, shadowOpacity, shadowColorNode );
+		}
+
+
+		ModelEllipseObject*
+		XmlLabelParser::parseObjectEllipseNode( const QDomElement &node )
+		{
+			/* position attrs */
+			Distance x0 = XmlUtil::getLengthAttr( node, "x", 0.0 );
+			Distance y0 = XmlUtil::getLengthAttr( node, "y", 0.0 );
+
+			/* size attrs */
+			Distance w = XmlUtil::getLengthAttr( node, "w", 0 );
+			Distance h = XmlUtil::getLengthAttr( node, "h", 0 );
+
+			/* line attrs */
+			Distance lineWidth = XmlUtil::getLengthAttr( node, "line_width", 1.0 );
+
+			QString  key        = XmlUtil::getStringAttr( node, "line_color_field", "" );
+			bool     field_flag = !key.isEmpty();
+			uint32_t color      = XmlUtil::getUIntAttr( node, "line_color", 0 );
+			ColorNode lineColorNode( field_flag, color, key );
+
+			/* fill attrs */
+			key        = XmlUtil::getStringAttr( node, "fill_color_field", "" );
+			field_flag = !key.isEmpty();
+			color      = XmlUtil::getUIntAttr( node, "fill_color", 0 );
+			ColorNode fillColorNode( field_flag, color, key );
+        
+			/* affine attrs */
+			double a[6];
+			a[0] = XmlUtil::getDoubleAttr( node, "a0", 1.0 );
+			a[1] = XmlUtil::getDoubleAttr( node, "a1", 0.0 );
+			a[2] = XmlUtil::getDoubleAttr( node, "a2", 0.0 );
+			a[3] = XmlUtil::getDoubleAttr( node, "a3", 1.0 );
+			a[4] = XmlUtil::getDoubleAttr( node, "a4", 0.0 );
+			a[5] = XmlUtil::getDoubleAttr( node, "a5", 0.0 );
+
+			/* shadow attrs */
+			bool     shadowState   = XmlUtil::getBoolAttr( node, "shadow", false );
+			Distance shadowX       = XmlUtil::getLengthAttr( node, "shadow_x", 0.0 );
+			Distance shadowY       = XmlUtil::getLengthAttr( node, "shadow_y", 0.0 );
+			double   shadowOpacity = XmlUtil::getDoubleAttr( node, "shadow_opacity", 1.0 );
+
+			key        = XmlUtil::getStringAttr( node, "shadow_color_field", "" );
+			field_flag = !key.isEmpty();
+			color      = XmlUtil::getUIntAttr( node, "shadow_color", 0 );
+			ColorNode shadowColorNode( field_flag, color, key );
+
+			return new ModelEllipseObject( x0, y0, w, h,
+			                               lineWidth, lineColorNode,
+			                               fillColorNode,
+			                               QMatrix( a[0], a[1], a[2], a[3], a[4], a[5] ),
+			                               shadowState, shadowX, shadowY, shadowOpacity, shadowColorNode );
+		}
+
+
+		ModelLineObject*
+		XmlLabelParser::parseObjectLineNode( const QDomElement &node )
+		{
+			/* position attrs */
+			Distance x0 = XmlUtil::getLengthAttr( node, "x", 0.0 );
+			Distance y0 = XmlUtil::getLengthAttr( node, "y", 0.0 );
+
+			/* size attrs of line */
+			Distance dx = XmlUtil::getLengthAttr( node, "dx", 0 );
+			Distance dy = XmlUtil::getLengthAttr( node, "dy", 0 );
+
+			/* line attrs */
+			Distance lineWidth = XmlUtil::getLengthAttr( node, "line_width", 1.0 );
+
+			QString  key        = XmlUtil::getStringAttr( node, "line_color_field", "" );
+			bool     field_flag = !key.isEmpty();
+			uint32_t color      = XmlUtil::getUIntAttr( node, "line_color", 0 );
+			ColorNode lineColorNode( field_flag, color, key );
+
+			/* affine attrs */
+			double a[6];
+			a[0] = XmlUtil::getDoubleAttr( node, "a0", 1.0 );
+			a[1] = XmlUtil::getDoubleAttr( node, "a1", 0.0 );
+			a[2] = XmlUtil::getDoubleAttr( node, "a2", 0.0 );
+			a[3] = XmlUtil::getDoubleAttr( node, "a3", 1.0 );
+			a[4] = XmlUtil::getDoubleAttr( node, "a4", 0.0 );
+			a[5] = XmlUtil::getDoubleAttr( node, "a5", 0.0 );
+
+			/* shadow attrs */
+			bool     shadowState   = XmlUtil::getBoolAttr( node, "shadow", false );
+			Distance shadowX       = XmlUtil::getLengthAttr( node, "shadow_x", 0.0 );
+			Distance shadowY       = XmlUtil::getLengthAttr( node, "shadow_y", 0.0 );
+			double   shadowOpacity = XmlUtil::getDoubleAttr( node, "shadow_opacity", 1.0 );
+
+			key        = XmlUtil::getStringAttr( node, "shadow_color_field", "" );
+			field_flag = !key.isEmpty();
+			color      = XmlUtil::getUIntAttr( node, "shadow_color", 0 );
+			ColorNode shadowColorNode( field_flag, color, key );
+
+			return new ModelLineObject( x0, y0, dx, dy,
+			                            lineWidth, lineColorNode,
+			                            QMatrix( a[0], a[1], a[2], a[3], a[4], a[5] ),
+			                            shadowState, shadowX, shadowY, shadowOpacity, shadowColorNode );
+		}
+
+
+		ModelImageObject*
+		XmlLabelParser::parseObjectImageNode( const QDomElement &node, const DataCache& data )
+		{
+			/* position attrs */
+			Distance x0 = XmlUtil::getLengthAttr( node, "x", 0.0 );
+			Distance y0 = XmlUtil::getLengthAttr( node, "y", 0.0 );
+
+			/* size attrs */
+			Distance w = XmlUtil::getLengthAttr( node, "w", 0 );
+			Distance h = XmlUtil::getLengthAttr( node, "h", 0 );
+
+			/* file attrs */
+			QString key        = XmlUtil::getStringAttr( node, "src_field", "" );
+			bool    field_flag = !key.isEmpty();
+			QString filename   = XmlUtil::getStringAttr( node, "src", "" );
+			TextNode filenameNode( field_flag, field_flag ? key : filename );
+
+			/* affine attrs */
+			double a[6];
+			a[0] = XmlUtil::getDoubleAttr( node, "a0", 1.0 );
+			a[1] = XmlUtil::getDoubleAttr( node, "a1", 0.0 );
+			a[2] = XmlUtil::getDoubleAttr( node, "a2", 0.0 );
+			a[3] = XmlUtil::getDoubleAttr( node, "a3", 1.0 );
+			a[4] = XmlUtil::getDoubleAttr( node, "a4", 0.0 );
+			a[5] = XmlUtil::getDoubleAttr( node, "a5", 0.0 );
+
+			/* shadow attrs */
+			bool     shadowState   = XmlUtil::getBoolAttr( node, "shadow", false );
+			Distance shadowX       = XmlUtil::getLengthAttr( node, "shadow_x", 0.0 );
+			Distance shadowY       = XmlUtil::getLengthAttr( node, "shadow_y", 0.0 );
+			double   shadowOpacity = XmlUtil::getDoubleAttr( node, "shadow_opacity", 1.0 );
+
+			key            = XmlUtil::getStringAttr( node, "shadow_color_field", "" );
+			field_flag     = !key.isEmpty();
+			uint32_t color = XmlUtil::getUIntAttr( node, "shadow_color", 0 );
+			ColorNode shadowColorNode( field_flag, color, key );
+
+			if ( filenameNode.isField() )
+			{
 				return new ModelImageObject( x0, y0, w, h,
 				                             filenameNode,
 				                             QMatrix( a[0], a[1], a[2], a[3], a[4], a[5] ),
 				                             shadowState, shadowX, shadowY, shadowOpacity, shadowColorNode );
 			}
-		}
-	}
-
-
-	ModelBarcodeObject*
-	XmlLabelParser::parseObjectBarcodeNode( const QDomElement &node )
-	{
-		/* position attrs */
-		Distance x0 = XmlUtil::getLengthAttr( node, "x", 0.0 );
-		Distance y0 = XmlUtil::getLengthAttr( node, "y", 0.0 );
-
-		/* size attrs */
-		Distance w = XmlUtil::getLengthAttr( node, "w", 0 );
-		Distance h = XmlUtil::getLengthAttr( node, "h", 0 );
-
-		/* barcode attrs */
-		barcode::Style bcStyle = barcode::Backends::style( XmlUtil::getStringAttr( node, "backend", "" ),
-		                                                   XmlUtil::getStringAttr( node, "style", "") );
-		bool bcTextFlag = XmlUtil::getBoolAttr( node, "text", true );
-		bool bcChecksumFlag = XmlUtil::getBoolAttr( node, "checksum", true );
-
-		QString  key        = XmlUtil::getStringAttr( node, "color_field", "" );
-		bool     field_flag = !key.isEmpty();
-		uint32_t color      = XmlUtil::getUIntAttr( node, "color", 0 );
-		ColorNode bcColorNode( field_flag, color, key );
-
-		QString bcData = XmlUtil::getStringAttr( node, "data", "" );
-
-		/* affine attrs */
-		double a[6];
-		a[0] = XmlUtil::getDoubleAttr( node, "a0", 1.0 );
-		a[1] = XmlUtil::getDoubleAttr( node, "a1", 0.0 );
-		a[2] = XmlUtil::getDoubleAttr( node, "a2", 0.0 );
-		a[3] = XmlUtil::getDoubleAttr( node, "a3", 1.0 );
-		a[4] = XmlUtil::getDoubleAttr( node, "a4", 0.0 );
-		a[5] = XmlUtil::getDoubleAttr( node, "a5", 0.0 );
-
-		return new ModelBarcodeObject( x0, y0, w, h,
-		                               bcStyle, bcTextFlag, bcChecksumFlag, bcData, bcColorNode,
-		                               QMatrix( a[0], a[1], a[2], a[3], a[4], a[5] ) );
-	}
-
-
-	ModelTextObject*
-	XmlLabelParser::parseObjectTextNode( const QDomElement &node )
-	{
-		/* position attrs */
-		Distance x0 = XmlUtil::getLengthAttr( node, "x", 0.0 );
-		Distance y0 = XmlUtil::getLengthAttr( node, "y", 0.0 );
-
-		/* size attrs */
-		Distance w = XmlUtil::getLengthAttr( node, "w", 0 );
-		Distance h = XmlUtil::getLengthAttr( node, "h", 0 );
-
-		/* color attr */
-		QString  key        = XmlUtil::getStringAttr( node, "color_field", "" );
-		bool     field_flag = !key.isEmpty();
-		uint32_t color      = XmlUtil::getUIntAttr( node, "color", 0 );
-		ColorNode textColorNode( field_flag, color, key );
-
-		/* font attrs */
-		QString       fontFamily        = XmlUtil::getStringAttr( node, "font_family", "Sans" );
-		double        fontSize          = XmlUtil::getDoubleAttr( node, "font_size", 10 );
-		QFont::Weight fontWeight        = XmlUtil::getWeightAttr( node, "font_weight", QFont::Normal );
-		bool          fontItalicFlag    = XmlUtil::getBoolAttr( node, "font_italic", false );
-		bool          fontUnderlineFlag = XmlUtil::getBoolAttr( node, "font_underline", false );
-
-		/* text attrs */
-		double textLineSpacing   = XmlUtil::getDoubleAttr( node, "line_spacing", 1 );
-		Qt::Alignment textHAlign = XmlUtil::getAlignmentAttr( node, "align", Qt::AlignLeft );
-		Qt::Alignment textVAlign = XmlUtil::getAlignmentAttr( node, "valign", Qt::AlignTop );
-
-		/* affine attrs */
-		double a[6];
-		a[0] = XmlUtil::getDoubleAttr( node, "a0", 1.0 );
-		a[1] = XmlUtil::getDoubleAttr( node, "a1", 0.0 );
-		a[2] = XmlUtil::getDoubleAttr( node, "a2", 0.0 );
-		a[3] = XmlUtil::getDoubleAttr( node, "a3", 1.0 );
-		a[4] = XmlUtil::getDoubleAttr( node, "a4", 0.0 );
-		a[5] = XmlUtil::getDoubleAttr( node, "a5", 0.0 );
-
-		/* shadow attrs */
-		bool     shadowState   = XmlUtil::getBoolAttr( node, "shadow", false );
-		Distance shadowX       = XmlUtil::getLengthAttr( node, "shadow_x", 0.0 );
-		Distance shadowY       = XmlUtil::getLengthAttr( node, "shadow_y", 0.0 );
-		double   shadowOpacity = XmlUtil::getDoubleAttr( node, "shadow_opacity", 1.0 );
-
-		key        = XmlUtil::getStringAttr( node, "shadow_color_field", "" );
-		field_flag = !key.isEmpty();
-		color      = XmlUtil::getUIntAttr( node, "shadow_color", 0 );
-		ColorNode shadowColorNode( field_flag, color, key );
-
-		/* deserialize contents. */
-		QTextDocument document;
-		QTextCursor cursor( &document );
-		bool firstBlock = true;
-		for ( QDomNode child = node.firstChild(); !child.isNull(); child = child.nextSibling() )
-		{
-			QString tagName = child.toElement().tagName();
-		
-			if ( tagName == "p" )
+			else
 			{
-				if ( !firstBlock )
+				if ( data.hasImage( filename ) )
 				{
-					cursor.insertBlock();
+					return new ModelImageObject( x0, y0, w, h,
+					                             filename, data.getImage( filename ),
+					                             QMatrix( a[0], a[1], a[2], a[3], a[4], a[5] ),
+					                             shadowState, shadowX, shadowY, shadowOpacity, shadowColorNode );
+				}
+				else if ( data.hasSvg( filename ) )
+				{
+					return new ModelImageObject( x0, y0, w, h,
+					                             filename, data.getSvg( filename ),
+					                             QMatrix( a[0], a[1], a[2], a[3], a[4], a[5] ),
+					                             shadowState, shadowX, shadowY, shadowOpacity, shadowColorNode );
+				}
+				else
+				{
+					qWarning() << "Embedded file" << filename << "missing. Trying actual file.";
+					return new ModelImageObject( x0, y0, w, h,
+					                             filenameNode,
+					                             QMatrix( a[0], a[1], a[2], a[3], a[4], a[5] ),
+					                             shadowState, shadowX, shadowY, shadowOpacity, shadowColorNode );
 				}
-				firstBlock = false;
-				cursor.insertText( parsePNode( child.toElement() ) );
-			}
-			else if ( !child.isComment() )
-			{
-				qWarning() << "Unexpected" << node.tagName() << "child:" << tagName;
 			}
 		}
-		QString text = document.toPlainText();
-
-		return new ModelTextObject( x0, y0, w, h,
-		                            text,
-		                            fontFamily, fontSize, fontWeight, fontItalicFlag, fontUnderlineFlag,
-		                            textColorNode, textHAlign, textVAlign, textLineSpacing,
-		                            QMatrix( a[0], a[1], a[2], a[3], a[4], a[5] ),
-		                            shadowState, shadowX, shadowY, shadowOpacity, shadowColorNode );
-	}
 
 
-	QString
-	XmlLabelParser::parsePNode( const QDomElement &node )
-	{
-		return node.text();
-	}
+		ModelBarcodeObject*
+		XmlLabelParser::parseObjectBarcodeNode( const QDomElement &node )
+		{
+			/* position attrs */
+			Distance x0 = XmlUtil::getLengthAttr( node, "x", 0.0 );
+			Distance y0 = XmlUtil::getLengthAttr( node, "y", 0.0 );
+
+			/* size attrs */
+			Distance w = XmlUtil::getLengthAttr( node, "w", 0 );
+			Distance h = XmlUtil::getLengthAttr( node, "h", 0 );
+
+			/* barcode attrs */
+			barcode::Style bcStyle = barcode::Backends::style( XmlUtil::getStringAttr( node, "backend", "" ),
+			                                                   XmlUtil::getStringAttr( node, "style", "") );
+			bool bcTextFlag = XmlUtil::getBoolAttr( node, "text", true );
+			bool bcChecksumFlag = XmlUtil::getBoolAttr( node, "checksum", true );
+
+			QString  key        = XmlUtil::getStringAttr( node, "color_field", "" );
+			bool     field_flag = !key.isEmpty();
+			uint32_t color      = XmlUtil::getUIntAttr( node, "color", 0 );
+			ColorNode bcColorNode( field_flag, color, key );
+
+			QString bcData = XmlUtil::getStringAttr( node, "data", "" );
+
+			/* affine attrs */
+			double a[6];
+			a[0] = XmlUtil::getDoubleAttr( node, "a0", 1.0 );
+			a[1] = XmlUtil::getDoubleAttr( node, "a1", 0.0 );
+			a[2] = XmlUtil::getDoubleAttr( node, "a2", 0.0 );
+			a[3] = XmlUtil::getDoubleAttr( node, "a3", 1.0 );
+			a[4] = XmlUtil::getDoubleAttr( node, "a4", 0.0 );
+			a[5] = XmlUtil::getDoubleAttr( node, "a5", 0.0 );
+
+			return new ModelBarcodeObject( x0, y0, w, h,
+			                               bcStyle, bcTextFlag, bcChecksumFlag, bcData, bcColorNode,
+			                               QMatrix( a[0], a[1], a[2], a[3], a[4], a[5] ) );
+		}
 
 
-	bool
-	XmlLabelParser::parseRotateAttr( const QDomElement &node )
-	{
-		return XmlUtil::getBoolAttr( node, "rotate", false );
-	}
+		ModelTextObject*
+		XmlLabelParser::parseObjectTextNode( const QDomElement &node )
+		{
+			/* position attrs */
+			Distance x0 = XmlUtil::getLengthAttr( node, "x", 0.0 );
+			Distance y0 = XmlUtil::getLengthAttr( node, "y", 0.0 );
+
+			/* size attrs */
+			Distance w = XmlUtil::getLengthAttr( node, "w", 0 );
+			Distance h = XmlUtil::getLengthAttr( node, "h", 0 );
+
+			/* color attr */
+			QString  key        = XmlUtil::getStringAttr( node, "color_field", "" );
+			bool     field_flag = !key.isEmpty();
+			uint32_t color      = XmlUtil::getUIntAttr( node, "color", 0 );
+			ColorNode textColorNode( field_flag, color, key );
+
+			/* font attrs */
+			QString       fontFamily        = XmlUtil::getStringAttr( node, "font_family", "Sans" );
+			double        fontSize          = XmlUtil::getDoubleAttr( node, "font_size", 10 );
+			QFont::Weight fontWeight        = XmlUtil::getWeightAttr( node, "font_weight", QFont::Normal );
+			bool          fontItalicFlag    = XmlUtil::getBoolAttr( node, "font_italic", false );
+			bool          fontUnderlineFlag = XmlUtil::getBoolAttr( node, "font_underline", false );
+
+			/* text attrs */
+			double textLineSpacing   = XmlUtil::getDoubleAttr( node, "line_spacing", 1 );
+			Qt::Alignment textHAlign = XmlUtil::getAlignmentAttr( node, "align", Qt::AlignLeft );
+			Qt::Alignment textVAlign = XmlUtil::getAlignmentAttr( node, "valign", Qt::AlignTop );
+
+			/* affine attrs */
+			double a[6];
+			a[0] = XmlUtil::getDoubleAttr( node, "a0", 1.0 );
+			a[1] = XmlUtil::getDoubleAttr( node, "a1", 0.0 );
+			a[2] = XmlUtil::getDoubleAttr( node, "a2", 0.0 );
+			a[3] = XmlUtil::getDoubleAttr( node, "a3", 1.0 );
+			a[4] = XmlUtil::getDoubleAttr( node, "a4", 0.0 );
+			a[5] = XmlUtil::getDoubleAttr( node, "a5", 0.0 );
+
+			/* shadow attrs */
+			bool     shadowState   = XmlUtil::getBoolAttr( node, "shadow", false );
+			Distance shadowX       = XmlUtil::getLengthAttr( node, "shadow_x", 0.0 );
+			Distance shadowY       = XmlUtil::getLengthAttr( node, "shadow_y", 0.0 );
+			double   shadowOpacity = XmlUtil::getDoubleAttr( node, "shadow_opacity", 1.0 );
+
+			key        = XmlUtil::getStringAttr( node, "shadow_color_field", "" );
+			field_flag = !key.isEmpty();
+			color      = XmlUtil::getUIntAttr( node, "shadow_color", 0 );
+			ColorNode shadowColorNode( field_flag, color, key );
+
+			/* deserialize contents. */
+			QTextDocument document;
+			QTextCursor cursor( &document );
+			bool firstBlock = true;
+			for ( QDomNode child = node.firstChild(); !child.isNull(); child = child.nextSibling() )
+			{
+				QString tagName = child.toElement().tagName();
+		
+				if ( tagName == "p" )
+				{
+					if ( !firstBlock )
+					{
+						cursor.insertBlock();
+					}
+					firstBlock = false;
+					cursor.insertText( parsePNode( child.toElement() ) );
+				}
+				else if ( !child.isComment() )
+				{
+					qWarning() << "Unexpected" << node.tagName() << "child:" << tagName;
+				}
+			}
+			QString text = document.toPlainText();
+
+			return new ModelTextObject( x0, y0, w, h,
+			                            text,
+			                            fontFamily, fontSize, fontWeight, fontItalicFlag, fontUnderlineFlag,
+			                            textColorNode, textHAlign, textVAlign, textLineSpacing,
+			                            QMatrix( a[0], a[1], a[2], a[3], a[4], a[5] ),
+			                            shadowState, shadowX, shadowY, shadowOpacity, shadowColorNode );
+		}
+
+
+		QString
+		XmlLabelParser::parsePNode( const QDomElement &node )
+		{
+			return node.text();
+		}
+
+
+		bool
+		XmlLabelParser::parseRotateAttr( const QDomElement &node )
+		{
+			return XmlUtil::getBoolAttr( node, "rotate", false );
+		}
 
 	
-	void
-	XmlLabelParser::parseMergeNode( const QDomElement &node, Model* label )
-	{
-		QString type = XmlUtil::getStringAttr( node, "type", "None" );
-		QString src  = XmlUtil::getStringAttr( node, "src", "" );
-
-		merge::Merge* merge = merge::Factory::createMerge( type );
-		merge->setSource( src );
-
-		label->setMerge( merge );
-	}
-
-
-	void
-	XmlLabelParser::parseDataNode( const QDomElement &node, DataCache& data )
-	{
-		for ( QDomNode child = node.firstChild(); !child.isNull(); child = child.nextSibling() )
+		void
+		XmlLabelParser::parseMergeNode( const QDomElement &node, Model* label )
 		{
-			QString tagName = child.toElement().tagName();
+			QString type = XmlUtil::getStringAttr( node, "type", "None" );
+			QString src  = XmlUtil::getStringAttr( node, "src", "" );
+
+			merge::Merge* merge = merge::Factory::createMerge( type );
+			merge->setSource( src );
+
+			label->setMerge( merge );
+		}
+
+
+		void
+		XmlLabelParser::parseDataNode( const QDomElement &node, DataCache& data )
+		{
+			for ( QDomNode child = node.firstChild(); !child.isNull(); child = child.nextSibling() )
+			{
+				QString tagName = child.toElement().tagName();
 		
-			if ( tagName == "File" )
-			{
-				parseFileNode( child.toElement(), data );
-			}
-			else if ( !child.isComment() )
-			{
-				qWarning() << "Unexpected" << node.tagName() << "child:" << tagName;
+				if ( tagName == "File" )
+				{
+					parseFileNode( child.toElement(), data );
+				}
+				else if ( !child.isComment() )
+				{
+					qWarning() << "Unexpected" << node.tagName() << "child:" << tagName;
+				}
 			}
 		}
-	}
 
 
-	void
-	XmlLabelParser::parsePixdataNode( const QDomElement& node, DataCache& data )
-	{
-		// TODO, compatability with glabels-3
-	}
-
-
-	void
-	XmlLabelParser::parseFileNode( const QDomElement& node, DataCache& data )
-	{
-		QString name     = XmlUtil::getStringAttr( node, "name", "" );
-		QString mimetype = XmlUtil::getStringAttr( node, "mimetype", "image/png" );
-		QString encoding = XmlUtil::getStringAttr( node, "encoding", "base64" );
-
-		if ( mimetype == "image/png" )
+		void
+		XmlLabelParser::parsePixdataNode( const QDomElement& node, DataCache& data )
 		{
-			QByteArray ba64 = node.text().toUtf8();
-			QByteArray ba = QByteArray::fromBase64( ba64 );
-			QImage image;
-			image.loadFromData( ba, "PNG" );
-
-			data.addImage( name, image );
+			// TODO, compatability with glabels-3
 		}
-		else if ( mimetype == "image/svg+xml" )
+
+
+		void
+		XmlLabelParser::parseFileNode( const QDomElement& node, DataCache& data )
 		{
-			data.addSvg( name, node.text().toUtf8() );
-		}
-	}
+			QString name     = XmlUtil::getStringAttr( node, "name", "" );
+			QString mimetype = XmlUtil::getStringAttr( node, "mimetype", "image/png" );
+			QString encoding = XmlUtil::getStringAttr( node, "encoding", "base64" );
 
-} // namespace glabels::model
+			if ( mimetype == "image/png" )
+			{
+				QByteArray ba64 = node.text().toUtf8();
+				QByteArray ba = QByteArray::fromBase64( ba64 );
+				QImage image;
+				image.loadFromData( ba, "PNG" );
+
+				data.addImage( name, image );
+			}
+			else if ( mimetype == "image/svg+xml" )
+			{
+				data.addSvg( name, node.text().toUtf8() );
+			}
+		}
+
+
+	}
+}
diff --git a/model/XmlLabelParser.h b/model/XmlLabelParser.h
index 28de841..f135860 100644
--- a/model/XmlLabelParser.h
+++ b/model/XmlLabelParser.h
@@ -26,52 +26,55 @@
 #include <QDomElement>
 
 
-namespace glabels::model
+namespace glabels
 {
-
-	// Forward references
-	class Model;
-	class ModelObject;
-	class ModelBoxObject;
-	class ModelEllipseObject;
-	class ModelLineObject;
-	class ModelImageObject;
-	class ModelBarcodeObject;
-	class ModelTextObject;
-	class DataCache;
-
-
-	///
-	/// XmlLabelParser
-	///
-	class XmlLabelParser : public QObject
+	namespace model
 	{
-		Q_OBJECT
 
-	public:
-		static Model* readFile( const QString& fileName );
-		static Model* readBuffer( const QByteArray& buffer );
-		static QList<ModelObject*> deserializeObjects( const QByteArray& buffer );
+		// Forward references
+		class Model;
+		class ModelObject;
+		class ModelBoxObject;
+		class ModelEllipseObject;
+		class ModelLineObject;
+		class ModelImageObject;
+		class ModelBarcodeObject;
+		class ModelTextObject;
+		class DataCache;
 
-	private:
-		static void gunzip( const QByteArray& gzippedData, QByteArray& data );
-		static Model* parseRootNode( const QDomElement &node );
-		static QList<ModelObject*> parseObjectsNode( const QDomElement &node, const DataCache& data );
-		static ModelBoxObject* parseObjectBoxNode( const QDomElement &node );
-		static ModelEllipseObject* parseObjectEllipseNode( const QDomElement &node );
-		static ModelLineObject* parseObjectLineNode( const QDomElement &node );
-		static ModelImageObject* parseObjectImageNode( const QDomElement &node, const DataCache& data );
-		static ModelBarcodeObject* parseObjectBarcodeNode( const QDomElement &node );
-		static ModelTextObject* parseObjectTextNode( const QDomElement &node );
-		static QString parsePNode( const QDomElement &node );
-		static bool parseRotateAttr( const QDomElement &node );
-		static void parseMergeNode( const QDomElement &node, Model* label );
-		static void parseDataNode( const QDomElement &node, DataCache& data );
-		static void parsePixdataNode( const QDomElement &node, DataCache& data );
-		static void parseFileNode( const QDomElement &node, DataCache& data );
 
-	};
+		///
+		/// XmlLabelParser
+		///
+		class XmlLabelParser : public QObject
+		{
+			Q_OBJECT
 
+		public:
+			static Model* readFile( const QString& fileName );
+			static Model* readBuffer( const QByteArray& buffer );
+			static QList<ModelObject*> deserializeObjects( const QByteArray& buffer );
+
+		private:
+			static void gunzip( const QByteArray& gzippedData, QByteArray& data );
+			static Model* parseRootNode( const QDomElement &node );
+			static QList<ModelObject*> parseObjectsNode( const QDomElement &node, const DataCache& data );
+			static ModelBoxObject* parseObjectBoxNode( const QDomElement &node );
+			static ModelEllipseObject* parseObjectEllipseNode( const QDomElement &node );
+			static ModelLineObject* parseObjectLineNode( const QDomElement &node );
+			static ModelImageObject* parseObjectImageNode( const QDomElement &node, const DataCache& data );
+			static ModelBarcodeObject* parseObjectBarcodeNode( const QDomElement &node );
+			static ModelTextObject* parseObjectTextNode( const QDomElement &node );
+			static QString parsePNode( const QDomElement &node );
+			static bool parseRotateAttr( const QDomElement &node );
+			static void parseMergeNode( const QDomElement &node, Model* label );
+			static void parseDataNode( const QDomElement &node, DataCache& data );
+			static void parsePixdataNode( const QDomElement &node, DataCache& data );
+			static void parseFileNode( const QDomElement &node, DataCache& data );
+
+		};
+
+	}
 }
 
 
diff --git a/model/XmlPaperParser.cpp b/model/XmlPaperParser.cpp
index c3178ce..b01e848 100644
--- a/model/XmlPaperParser.cpp
+++ b/model/XmlPaperParser.cpp
@@ -30,79 +30,83 @@
 #include <QtDebug>
 
 
-namespace glabels::model
+namespace glabels
 {
-
-	bool XmlPaperParser::readFile( const QString &fileName )
+	namespace model
 	{
-		QFile file( fileName );
 
-		if ( !file.open( QFile::ReadOnly | QFile::Text ) )
+		bool XmlPaperParser::readFile( const QString &fileName )
 		{
-			qWarning() << "Error: Cannot read file " << fileName
-				   << ": " << file.errorString();
-			return false;
-		}
+			QFile file( fileName );
 
-
-		QDomDocument doc;
-		QString      errorString;
-		int          errorLine;
-		int          errorColumn;
-
-		if ( !doc.setContent( &file, false, &errorString, &errorLine, &errorColumn ) )
-		{
-			qWarning() << "Error: Parse error at line " << errorLine
-				   << "column " << errorColumn
-				   << ": " << errorString;
-			return false;
-		}
-
-		QDomElement root = doc.documentElement();
-		if ( root.tagName() != "Glabels-paper-sizes" )
-		{
-			qWarning() << "Error: Not a Glabels-paper-sizes file.";
-			return false;
-		}
-
-		parseRootNode( root );
-		return true;
-	}
-
-
-	void XmlPaperParser::parseRootNode( const QDomElement &node )
-	{
-		for ( QDomNode child = node.firstChild(); !child.isNull(); child = child.nextSibling() )
-		{
-			if ( child.toElement().tagName() == "Paper-size" )
+			if ( !file.open( QFile::ReadOnly | QFile::Text ) )
 			{
-				parsePaperSizeNode( child.toElement() );
+				qWarning() << "Error: Cannot read file " << fileName
+				           << ": " << file.errorString();
+				return false;
 			}
-			else if ( !child.isComment() )
+
+
+			QDomDocument doc;
+			QString      errorString;
+			int          errorLine;
+			int          errorColumn;
+
+			if ( !doc.setContent( &file, false, &errorString, &errorLine, &errorColumn ) )
 			{
-				qWarning() << "Warning: bad element: "
-					   << child.toElement().tagName()
-					   << ", Ignored.";
+				qWarning() << "Error: Parse error at line " << errorLine
+				           << "column " << errorColumn
+				           << ": " << errorString;
+				return false;
+			}
+
+			QDomElement root = doc.documentElement();
+			if ( root.tagName() != "Glabels-paper-sizes" )
+			{
+				qWarning() << "Error: Not a Glabels-paper-sizes file.";
+				return false;
+			}
+
+			parseRootNode( root );
+			return true;
+		}
+
+
+		void XmlPaperParser::parseRootNode( const QDomElement &node )
+		{
+			for ( QDomNode child = node.firstChild(); !child.isNull(); child = child.nextSibling() )
+			{
+				if ( child.toElement().tagName() == "Paper-size" )
+				{
+					parsePaperSizeNode( child.toElement() );
+				}
+				else if ( !child.isComment() )
+				{
+					qWarning() << "Warning: bad element: "
+					           << child.toElement().tagName()
+					           << ", Ignored.";
+				}
 			}
 		}
-	}
 
 
-	void XmlPaperParser::parsePaperSizeNode( const QDomElement &node )
-	{
-		QString id      = XmlUtil::getStringAttr( node, "id", "" );
-		QString name    = XmlUtil::getI18nAttr( node, "name", "" );
-
-		Distance width   = XmlUtil::getLengthAttr( node, "width", Distance(0) );
-		Distance height  = XmlUtil::getLengthAttr( node, "height", Distance(0) );
-
-		QString pwgSize = XmlUtil::getStringAttr( node, "pwg_size", "" );
-
-		Paper *paper = new Paper( id, name, width, height, pwgSize );
-		if ( paper != nullptr )
+		void XmlPaperParser::parsePaperSizeNode( const QDomElement &node )
 		{
-			Db::registerPaper( paper );
-		}
-	}
+			QString id      = XmlUtil::getStringAttr( node, "id", "" );
+			QString name    = XmlUtil::getI18nAttr( node, "name", "" );
 
-} // namespace glabels::model
+			Distance width   = XmlUtil::getLengthAttr( node, "width", Distance(0) );
+			Distance height  = XmlUtil::getLengthAttr( node, "height", Distance(0) );
+
+			QString pwgSize = XmlUtil::getStringAttr( node, "pwg_size", "" );
+
+			Paper *paper = new Paper( id, name, width, height, pwgSize );
+			if ( paper != nullptr )
+			{
+				Db::registerPaper( paper );
+			}
+		}
+
+
+	}
+}
diff --git a/model/XmlPaperParser.h b/model/XmlPaperParser.h
index 7ba19ad..3502453 100644
--- a/model/XmlPaperParser.h
+++ b/model/XmlPaperParser.h
@@ -26,21 +26,24 @@
 #include <QDomElement>
 
 
-namespace glabels::model
+namespace glabels
 {
-
-	class XmlPaperParser
+	namespace model
 	{
-	public:
-		XmlPaperParser() {}
 
-		bool readFile( const QString &fileName );
+		class XmlPaperParser
+		{
+		public:
+			XmlPaperParser() {}
 
-	private:
-		void parseRootNode( const QDomElement &node );
-		void parsePaperSizeNode( const QDomElement &node );
-	};
+			bool readFile( const QString &fileName );
 
+		private:
+			void parseRootNode( const QDomElement &node );
+			void parsePaperSizeNode( const QDomElement &node );
+		};
+
+	}
 }
 
 
diff --git a/model/XmlTemplateCreator.cpp b/model/XmlTemplateCreator.cpp
index 6b7f39d..2661bbf 100644
--- a/model/XmlTemplateCreator.cpp
+++ b/model/XmlTemplateCreator.cpp
@@ -29,305 +29,309 @@
 #include <QtDebug>
 
 
-namespace glabels::model
+namespace glabels
 {
-
-	bool XmlTemplateCreator::writeTemplates( const QList<const Template*> tmplates, const QString &fileName )
+	namespace model
 	{
-		QDomDocument doc( "Glabels-templates" );
-		QDomElement root = doc.createElement( "Glabels-templates" );
-		doc.appendChild( root );
 
-		foreach ( const Template* tmplate, tmplates )
+		bool XmlTemplateCreator::writeTemplates( const QList<const Template*> tmplates, const QString &fileName )
 		{
-			createTemplateNode( root, tmplate );
-		}
+			QDomDocument doc( "Glabels-templates" );
+			QDomElement root = doc.createElement( "Glabels-templates" );
+			doc.appendChild( root );
 
-		QFile file( fileName );
+			foreach ( const Template* tmplate, tmplates )
+			{
+				createTemplateNode( root, tmplate );
+			}
 
-		if ( !file.open( QFile::WriteOnly | QFile::Text) )
-		{
-			qWarning() << "Error: Cannot open file " << fileName
-				   << ": " << file.errorString();
-			return false;
-		}
+			QFile file( fileName );
+
+			if ( !file.open( QFile::WriteOnly | QFile::Text) )
+			{
+				qWarning() << "Error: Cannot open file " << fileName
+				           << ": " << file.errorString();
+				return false;
+			}
 
 
-		if ( file.write( doc.toByteArray() ) < 0 )
-		{
-			qWarning() << "Error: Cannot write file " << fileName
-				   << ": " << file.errorString();
-			return false;
-		}
+			if ( file.write( doc.toByteArray() ) < 0 )
+			{
+				qWarning() << "Error: Cannot write file " << fileName
+				           << ": " << file.errorString();
+				return false;
+			}
 			
-		return true;
-	}
-
-
-	bool XmlTemplateCreator::writeTemplate( const Template* tmplate, const QString& fileName )
-	{
-		QList<const Template*> tmplates;
-
-		tmplates.append(tmplate);
-
-		return writeTemplates( tmplates, fileName );
-	}
-
-
-	void XmlTemplateCreator::createTemplateNode( QDomElement &parent, const Template* tmplate )
-	{
-		QDomDocument doc = parent.ownerDocument();
-		QDomElement node = doc.createElement( "Template" );
-		parent.appendChild( node );
-
-		XmlUtil::setStringAttr( node, "brand", tmplate->brand() );
-		XmlUtil::setStringAttr( node, "part", tmplate->part() );
-
-		XmlUtil::setStringAttr( node, "size", tmplate->paperId() );
-		if ( tmplate->isSizeOther() )
-		{
-			XmlUtil::setLengthAttr( node, "width", tmplate->pageWidth() );
-			XmlUtil::setLengthAttr( node, "height", tmplate->pageHeight() );
+			return true;
 		}
 
 
-		XmlUtil::setStringAttr( node, "description", tmplate->description() );
-
-		if ( !tmplate->productUrl().isEmpty() )
+		bool XmlTemplateCreator::writeTemplate( const Template* tmplate, const QString& fileName )
 		{
-			createMetaNode( node, "product_url", tmplate->productUrl() );
+			QList<const Template*> tmplates;
+
+			tmplates.append(tmplate);
+
+			return writeTemplates( tmplates, fileName );
 		}
+
+
+		void XmlTemplateCreator::createTemplateNode( QDomElement &parent, const Template* tmplate )
+		{
+			QDomDocument doc = parent.ownerDocument();
+			QDomElement node = doc.createElement( "Template" );
+			parent.appendChild( node );
+
+			XmlUtil::setStringAttr( node, "brand", tmplate->brand() );
+			XmlUtil::setStringAttr( node, "part", tmplate->part() );
+
+			XmlUtil::setStringAttr( node, "size", tmplate->paperId() );
+			if ( tmplate->isSizeOther() )
+			{
+				XmlUtil::setLengthAttr( node, "width", tmplate->pageWidth() );
+				XmlUtil::setLengthAttr( node, "height", tmplate->pageHeight() );
+			}
+
+
+			XmlUtil::setStringAttr( node, "description", tmplate->description() );
+
+			if ( !tmplate->productUrl().isEmpty() )
+			{
+				createMetaNode( node, "product_url", tmplate->productUrl() );
+			}
 #if TODO
-		foreach ( QString categoryId, tmplate->categoryIds() )
-		{
-			createMetaNode( node, "category", categoryId );
-		}
+			foreach ( QString categoryId, tmplate->categoryIds() )
+			{
+				createMetaNode( node, "category", categoryId );
+			}
 #endif
 
-		foreach ( Frame* frame, tmplate->frames() )
-		{
-			createLabelNode( node, frame );
-		}
-	}
-
-
-	void XmlTemplateCreator::createMetaNode( QDomElement &parent, const QString& attr, const QString& value )
-	{
-		QDomDocument doc = parent.ownerDocument();
-		QDomElement node = doc.createElement( "Meta" );
-		parent.appendChild( node );
-
-		XmlUtil::setStringAttr( node, attr, value );
-	}
-
-
-	void XmlTemplateCreator::createLabelNode( QDomElement &parent, const Frame* frame )
-	{
-		if ( const FrameRect* frameRect = dynamic_cast<const FrameRect*>(frame) )
-		{
-			createLabelRectangleNode( parent, frameRect );
-		}
-		else if ( const FrameEllipse* frameEllipse = dynamic_cast<const FrameEllipse*>(frame) )
-		{
-			createLabelEllipseNode( parent, frameEllipse );
-		}
-		else if ( const FrameRound* frameRound = dynamic_cast<const FrameRound*>(frame) )
-		{
-			createLabelRoundNode( parent, frameRound );
-		}
-		else if ( const FrameCd* frameCd = dynamic_cast<const FrameCd*>(frame) )
-		{
-			createLabelCdNode( parent, frameCd );
-		}
-		else
-		{
-			Q_ASSERT_X( false, "XmlTemplateCreator::createLabelNode", "Invalid frame type." );
-		}
-	}
-
-
-	void XmlTemplateCreator::createLabelRectangleNode( QDomElement &parent, const FrameRect* frame )
-	{
-		QDomDocument doc = parent.ownerDocument();
-		QDomElement node = doc.createElement( "Label-rectangle" );
-		parent.appendChild( node );
-
-		XmlUtil::setStringAttr( node, "id",      frame->id() );
-		XmlUtil::setLengthAttr( node, "width",   frame->w() );
-		XmlUtil::setLengthAttr( node, "height",  frame->h() );
-		XmlUtil::setLengthAttr( node, "round",   frame->r() );
-		XmlUtil::setLengthAttr( node, "x_waste", frame->xWaste() );
-		XmlUtil::setLengthAttr( node, "y_waste", frame->yWaste() );
-
-		createLabelNodeCommon( node, frame );
-	}
-
-
-	void XmlTemplateCreator::createLabelEllipseNode( QDomElement &parent, const FrameEllipse* frame )
-	{
-		QDomDocument doc = parent.ownerDocument();
-		QDomElement node = doc.createElement( "Label-ellipse" );
-		parent.appendChild( node );
-
-		XmlUtil::setStringAttr( node, "id",      frame->id() );
-		XmlUtil::setLengthAttr( node, "width",   frame->w() );
-		XmlUtil::setLengthAttr( node, "height",  frame->h() );
-		XmlUtil::setLengthAttr( node, "waste",   frame->waste() );
-
-		createLabelNodeCommon( node, frame );
-	}
-
-
-	void XmlTemplateCreator::createLabelRoundNode( QDomElement &parent, const FrameRound* frame )
-	{
-		QDomDocument doc = parent.ownerDocument();
-		QDomElement node = doc.createElement( "Label-round" );
-		parent.appendChild( node );
-
-		XmlUtil::setStringAttr( node, "id",      frame->id() );
-		XmlUtil::setLengthAttr( node, "radius",  frame->r() );
-		XmlUtil::setLengthAttr( node, "waste",   frame->waste() );
-
-		createLabelNodeCommon( node, frame );
-	}
-
-
-	void XmlTemplateCreator::createLabelCdNode( QDomElement &parent, const FrameCd* frame )
-	{
-		QDomDocument doc = parent.ownerDocument();
-		QDomElement node = doc.createElement( "Label-cd" );
-		parent.appendChild( node );
-
-		XmlUtil::setStringAttr( node, "id",      frame->id() );
-		XmlUtil::setLengthAttr( node, "radius",  frame->r1() );
-		XmlUtil::setLengthAttr( node, "hole",    frame->r2() );
-		XmlUtil::setLengthAttr( node, "waste",   frame->waste() );
-		if ( frame->w() != Distance(0) )
-		{
-			XmlUtil::setLengthAttr( node, "width",   frame->w() );
-		}
-		if ( frame->h() != Distance(0) )
-		{
-			XmlUtil::setLengthAttr( node, "height",  frame->h() );
-		}
-
-		createLabelNodeCommon( node, frame );
-	}
-
-
-	void XmlTemplateCreator::createLabelNodeCommon( QDomElement &node, const Frame *frame )
-	{
-		foreach ( Markup* markup, frame->markups() )
-		{
-			if ( MarkupMargin* markupMargin = dynamic_cast<MarkupMargin*>(markup) )
+			foreach ( Frame* frame, tmplate->frames() )
 			{
-				createMarkupMarginNode( node, markupMargin );
+				createLabelNode( node, frame );
 			}
-			else if ( MarkupLine* markupLine = dynamic_cast<MarkupLine*>(markup) )
+		}
+
+
+		void XmlTemplateCreator::createMetaNode( QDomElement &parent, const QString& attr, const QString& value )
+		{
+			QDomDocument doc = parent.ownerDocument();
+			QDomElement node = doc.createElement( "Meta" );
+			parent.appendChild( node );
+
+			XmlUtil::setStringAttr( node, attr, value );
+		}
+
+
+		void XmlTemplateCreator::createLabelNode( QDomElement &parent, const Frame* frame )
+		{
+			if ( const FrameRect* frameRect = dynamic_cast<const FrameRect*>(frame) )
 			{
-				createMarkupLineNode( node, markupLine );
+				createLabelRectangleNode( parent, frameRect );
 			}
-			else if ( MarkupCircle* markupCircle = dynamic_cast<MarkupCircle*>(markup) )
+			else if ( const FrameEllipse* frameEllipse = dynamic_cast<const FrameEllipse*>(frame) )
 			{
-				createMarkupCircleNode( node, markupCircle );
+				createLabelEllipseNode( parent, frameEllipse );
 			}
-			else if ( MarkupRect* markupRect = dynamic_cast<MarkupRect*>(markup) )
+			else if ( const FrameRound* frameRound = dynamic_cast<const FrameRound*>(frame) )
 			{
-				createMarkupRectNode( node, markupRect );
+				createLabelRoundNode( parent, frameRound );
 			}
-			else if ( MarkupEllipse* markupEllipse = dynamic_cast<MarkupEllipse*>(markup) )
+			else if ( const FrameCd* frameCd = dynamic_cast<const FrameCd*>(frame) )
 			{
-				createMarkupEllipseNode( node, markupEllipse );
+				createLabelCdNode( parent, frameCd );
 			}
 			else
 			{
-				Q_ASSERT_X( false, "XmlTemplateCreator::createLabelNodeCommon", "Invalid markup type." );
+				Q_ASSERT_X( false, "XmlTemplateCreator::createLabelNode", "Invalid frame type." );
 			}
 		}
 
-		foreach ( Layout* layout, frame->layouts() )
+
+		void XmlTemplateCreator::createLabelRectangleNode( QDomElement &parent, const FrameRect* frame )
 		{
-			createLayoutNode( node, layout );
+			QDomDocument doc = parent.ownerDocument();
+			QDomElement node = doc.createElement( "Label-rectangle" );
+			parent.appendChild( node );
+
+			XmlUtil::setStringAttr( node, "id",      frame->id() );
+			XmlUtil::setLengthAttr( node, "width",   frame->w() );
+			XmlUtil::setLengthAttr( node, "height",  frame->h() );
+			XmlUtil::setLengthAttr( node, "round",   frame->r() );
+			XmlUtil::setLengthAttr( node, "x_waste", frame->xWaste() );
+			XmlUtil::setLengthAttr( node, "y_waste", frame->yWaste() );
+
+			createLabelNodeCommon( node, frame );
 		}
+
+
+		void XmlTemplateCreator::createLabelEllipseNode( QDomElement &parent, const FrameEllipse* frame )
+		{
+			QDomDocument doc = parent.ownerDocument();
+			QDomElement node = doc.createElement( "Label-ellipse" );
+			parent.appendChild( node );
+
+			XmlUtil::setStringAttr( node, "id",      frame->id() );
+			XmlUtil::setLengthAttr( node, "width",   frame->w() );
+			XmlUtil::setLengthAttr( node, "height",  frame->h() );
+			XmlUtil::setLengthAttr( node, "waste",   frame->waste() );
+
+			createLabelNodeCommon( node, frame );
+		}
+
+
+		void XmlTemplateCreator::createLabelRoundNode( QDomElement &parent, const FrameRound* frame )
+		{
+			QDomDocument doc = parent.ownerDocument();
+			QDomElement node = doc.createElement( "Label-round" );
+			parent.appendChild( node );
+
+			XmlUtil::setStringAttr( node, "id",      frame->id() );
+			XmlUtil::setLengthAttr( node, "radius",  frame->r() );
+			XmlUtil::setLengthAttr( node, "waste",   frame->waste() );
+
+			createLabelNodeCommon( node, frame );
+		}
+
+
+		void XmlTemplateCreator::createLabelCdNode( QDomElement &parent, const FrameCd* frame )
+		{
+			QDomDocument doc = parent.ownerDocument();
+			QDomElement node = doc.createElement( "Label-cd" );
+			parent.appendChild( node );
+
+			XmlUtil::setStringAttr( node, "id",      frame->id() );
+			XmlUtil::setLengthAttr( node, "radius",  frame->r1() );
+			XmlUtil::setLengthAttr( node, "hole",    frame->r2() );
+			XmlUtil::setLengthAttr( node, "waste",   frame->waste() );
+			if ( frame->w() != Distance(0) )
+			{
+				XmlUtil::setLengthAttr( node, "width",   frame->w() );
+			}
+			if ( frame->h() != Distance(0) )
+			{
+				XmlUtil::setLengthAttr( node, "height",  frame->h() );
+			}
+
+			createLabelNodeCommon( node, frame );
+		}
+
+
+		void XmlTemplateCreator::createLabelNodeCommon( QDomElement &node, const Frame *frame )
+		{
+			foreach ( Markup* markup, frame->markups() )
+			{
+				if ( MarkupMargin* markupMargin = dynamic_cast<MarkupMargin*>(markup) )
+				{
+					createMarkupMarginNode( node, markupMargin );
+				}
+				else if ( MarkupLine* markupLine = dynamic_cast<MarkupLine*>(markup) )
+				{
+					createMarkupLineNode( node, markupLine );
+				}
+				else if ( MarkupCircle* markupCircle = dynamic_cast<MarkupCircle*>(markup) )
+				{
+					createMarkupCircleNode( node, markupCircle );
+				}
+				else if ( MarkupRect* markupRect = dynamic_cast<MarkupRect*>(markup) )
+				{
+					createMarkupRectNode( node, markupRect );
+				}
+				else if ( MarkupEllipse* markupEllipse = dynamic_cast<MarkupEllipse*>(markup) )
+				{
+					createMarkupEllipseNode( node, markupEllipse );
+				}
+				else
+				{
+					Q_ASSERT_X( false, "XmlTemplateCreator::createLabelNodeCommon", "Invalid markup type." );
+				}
+			}
+
+			foreach ( Layout* layout, frame->layouts() )
+			{
+				createLayoutNode( node, layout );
+			}
+		}
+
+
+		void XmlTemplateCreator::createLayoutNode( QDomElement& parent, const Layout* layout )
+		{
+			QDomDocument doc = parent.ownerDocument();
+			QDomElement node = doc.createElement( "Layout" );
+			parent.appendChild( node );
+
+			XmlUtil::setIntAttr( node, "nx", layout->nx() );
+			XmlUtil::setIntAttr( node, "ny", layout->ny() );
+
+			XmlUtil::setLengthAttr( node, "x0", layout->x0() );
+			XmlUtil::setLengthAttr( node, "y0", layout->y0() );
+
+			XmlUtil::setLengthAttr( node, "dx", layout->dx() );
+			XmlUtil::setLengthAttr( node, "dy", layout->dy() );
+		}
+
+
+		void XmlTemplateCreator::createMarkupMarginNode( QDomElement& parent, const MarkupMargin* markup )
+		{
+			QDomDocument doc = parent.ownerDocument();
+			QDomElement node = doc.createElement( "Markup-margin" );
+			parent.appendChild( node );
+
+			XmlUtil::setLengthAttr( node, "size", markup->size() );
+		}
+
+
+		void XmlTemplateCreator::createMarkupLineNode( QDomElement& parent, const MarkupLine* markup )
+		{
+			QDomDocument doc = parent.ownerDocument();
+			QDomElement node = doc.createElement( "Markup-line" );
+			parent.appendChild( node );
+
+			XmlUtil::setLengthAttr( node, "x1", markup->x1() );
+			XmlUtil::setLengthAttr( node, "y1", markup->y1() );
+			XmlUtil::setLengthAttr( node, "x2", markup->x2() );
+			XmlUtil::setLengthAttr( node, "y2", markup->y2() );
+		}
+
+
+		void XmlTemplateCreator::createMarkupCircleNode( QDomElement& parent, const MarkupCircle* markup )
+		{
+			QDomDocument doc = parent.ownerDocument();
+			QDomElement node = doc.createElement( "Markup-circle" );
+			parent.appendChild( node );
+
+			XmlUtil::setLengthAttr( node, "x0", markup->x0() );
+			XmlUtil::setLengthAttr( node, "y0", markup->y0() );
+			XmlUtil::setLengthAttr( node, "radius", markup->r() );
+		}
+
+
+		void XmlTemplateCreator::createMarkupRectNode( QDomElement& parent, const MarkupRect* markup )
+		{
+			QDomDocument doc = parent.ownerDocument();
+			QDomElement node = doc.createElement( "Markup-rect" );
+			parent.appendChild( node );
+
+			XmlUtil::setLengthAttr( node, "x1", markup->x1() );
+			XmlUtil::setLengthAttr( node, "y1", markup->y1() );
+			XmlUtil::setLengthAttr( node, "w",  markup->w() );
+			XmlUtil::setLengthAttr( node, "h",  markup->h() );
+			XmlUtil::setLengthAttr( node, "r",  markup->r() );
+		}
+
+
+		void XmlTemplateCreator::createMarkupEllipseNode( QDomElement& parent, const MarkupEllipse* markup )
+		{
+			QDomDocument doc = parent.ownerDocument();
+			QDomElement node = doc.createElement( "Markup-ellipse" );
+			parent.appendChild( node );
+
+			XmlUtil::setLengthAttr( node, "x1", markup->x1() );
+			XmlUtil::setLengthAttr( node, "y1", markup->y1() );
+			XmlUtil::setLengthAttr( node, "w",  markup->w() );
+			XmlUtil::setLengthAttr( node, "h",  markup->h() );
+		}
+
+
 	}
-
-
-	void XmlTemplateCreator::createLayoutNode( QDomElement& parent, const Layout* layout )
-	{
-		QDomDocument doc = parent.ownerDocument();
-		QDomElement node = doc.createElement( "Layout" );
-		parent.appendChild( node );
-
-		XmlUtil::setIntAttr( node, "nx", layout->nx() );
-		XmlUtil::setIntAttr( node, "ny", layout->ny() );
-
-		XmlUtil::setLengthAttr( node, "x0", layout->x0() );
-		XmlUtil::setLengthAttr( node, "y0", layout->y0() );
-
-		XmlUtil::setLengthAttr( node, "dx", layout->dx() );
-		XmlUtil::setLengthAttr( node, "dy", layout->dy() );
-	}
-
-
-	void XmlTemplateCreator::createMarkupMarginNode( QDomElement& parent, const MarkupMargin* markup )
-	{
-		QDomDocument doc = parent.ownerDocument();
-		QDomElement node = doc.createElement( "Markup-margin" );
-		parent.appendChild( node );
-
-		XmlUtil::setLengthAttr( node, "size", markup->size() );
-	}
-
-
-	void XmlTemplateCreator::createMarkupLineNode( QDomElement& parent, const MarkupLine* markup )
-	{
-		QDomDocument doc = parent.ownerDocument();
-		QDomElement node = doc.createElement( "Markup-line" );
-		parent.appendChild( node );
-
-		XmlUtil::setLengthAttr( node, "x1", markup->x1() );
-		XmlUtil::setLengthAttr( node, "y1", markup->y1() );
-		XmlUtil::setLengthAttr( node, "x2", markup->x2() );
-		XmlUtil::setLengthAttr( node, "y2", markup->y2() );
-	}
-
-
-	void XmlTemplateCreator::createMarkupCircleNode( QDomElement& parent, const MarkupCircle* markup )
-	{
-		QDomDocument doc = parent.ownerDocument();
-		QDomElement node = doc.createElement( "Markup-circle" );
-		parent.appendChild( node );
-
-		XmlUtil::setLengthAttr( node, "x0", markup->x0() );
-		XmlUtil::setLengthAttr( node, "y0", markup->y0() );
-		XmlUtil::setLengthAttr( node, "radius", markup->r() );
-	}
-
-
-	void XmlTemplateCreator::createMarkupRectNode( QDomElement& parent, const MarkupRect* markup )
-	{
-		QDomDocument doc = parent.ownerDocument();
-		QDomElement node = doc.createElement( "Markup-rect" );
-		parent.appendChild( node );
-
-		XmlUtil::setLengthAttr( node, "x1", markup->x1() );
-		XmlUtil::setLengthAttr( node, "y1", markup->y1() );
-		XmlUtil::setLengthAttr( node, "w",  markup->w() );
-		XmlUtil::setLengthAttr( node, "h",  markup->h() );
-		XmlUtil::setLengthAttr( node, "r",  markup->r() );
-	}
-
-
-	void XmlTemplateCreator::createMarkupEllipseNode( QDomElement& parent, const MarkupEllipse* markup )
-	{
-		QDomDocument doc = parent.ownerDocument();
-		QDomElement node = doc.createElement( "Markup-ellipse" );
-		parent.appendChild( node );
-
-		XmlUtil::setLengthAttr( node, "x1", markup->x1() );
-		XmlUtil::setLengthAttr( node, "y1", markup->y1() );
-		XmlUtil::setLengthAttr( node, "w",  markup->w() );
-		XmlUtil::setLengthAttr( node, "h",  markup->h() );
-	}
-
-} // namespace glabels::model
+}
diff --git a/model/XmlTemplateCreator.h b/model/XmlTemplateCreator.h
index ca506e2..e921f96 100644
--- a/model/XmlTemplateCreator.h
+++ b/model/XmlTemplateCreator.h
@@ -34,35 +34,38 @@
 #include <QString>
 
 
-namespace glabels::model
+namespace glabels
 {
-
-	class XmlTemplateCreator
+	namespace model
 	{
-	public:
-		XmlTemplateCreator() {}
 
-		bool writeTemplates( const QList<const Template*> tmplates, const QString& fileName );
-		bool writeTemplate( const Template* tmplate, const QString& fileName );
-		void createTemplateNode( QDomElement& parent, const Template* tmplate );
+		class XmlTemplateCreator
+		{
+		public:
+			XmlTemplateCreator() {}
 
-	private:
-		void createMetaNode( QDomElement& parent, const QString& attr, const QString& value );
-		void createLabelNode( QDomElement& parent, const Frame* frame );
-		void createLabelRectangleNode( QDomElement& parent, const FrameRect* frame );
-		void createLabelEllipseNode( QDomElement& parent, const FrameEllipse* frame );
-		void createLabelRoundNode( QDomElement& parent, const FrameRound* frame );
-		void createLabelCdNode( QDomElement& parent, const FrameCd* frame );
-		void createLabelNodeCommon( QDomElement& node, const Frame* frame );
-		void createLayoutNode( QDomElement& parent, const Layout* layout );
-		void createMarkupMarginNode( QDomElement& parent, const MarkupMargin* markupMargin );
-		void createMarkupLineNode( QDomElement& parent, const MarkupLine* markupLine );
-		void createMarkupCircleNode( QDomElement& parent, const MarkupCircle* markupCircle );
-		void createMarkupRectNode( QDomElement& parent, const MarkupRect* markupRect );
-		void createMarkupEllipseNode( QDomElement& parent, const MarkupEllipse* markupEllipse );
+			bool writeTemplates( const QList<const Template*> tmplates, const QString& fileName );
+			bool writeTemplate( const Template* tmplate, const QString& fileName );
+			void createTemplateNode( QDomElement& parent, const Template* tmplate );
 
-	};
+		private:
+			void createMetaNode( QDomElement& parent, const QString& attr, const QString& value );
+			void createLabelNode( QDomElement& parent, const Frame* frame );
+			void createLabelRectangleNode( QDomElement& parent, const FrameRect* frame );
+			void createLabelEllipseNode( QDomElement& parent, const FrameEllipse* frame );
+			void createLabelRoundNode( QDomElement& parent, const FrameRound* frame );
+			void createLabelCdNode( QDomElement& parent, const FrameCd* frame );
+			void createLabelNodeCommon( QDomElement& node, const Frame* frame );
+			void createLayoutNode( QDomElement& parent, const Layout* layout );
+			void createMarkupMarginNode( QDomElement& parent, const MarkupMargin* markupMargin );
+			void createMarkupLineNode( QDomElement& parent, const MarkupLine* markupLine );
+			void createMarkupCircleNode( QDomElement& parent, const MarkupCircle* markupCircle );
+			void createMarkupRectNode( QDomElement& parent, const MarkupRect* markupRect );
+			void createMarkupEllipseNode( QDomElement& parent, const MarkupEllipse* markupEllipse );
 
+		};
+
+	}
 }
 
 
diff --git a/model/XmlTemplateParser.cpp b/model/XmlTemplateParser.cpp
index eb7d0e0..2c063a1 100644
--- a/model/XmlTemplateParser.cpp
+++ b/model/XmlTemplateParser.cpp
@@ -36,373 +36,377 @@
 #include <QtDebug>
 
 
-namespace glabels::model
+namespace glabels
 {
-
-	bool XmlTemplateParser::readFile( const QString &fileName )
+	namespace model
 	{
-		QFile file( fileName );
 
-		if ( !file.open( QFile::ReadOnly | QFile::Text) )
+		bool XmlTemplateParser::readFile( const QString &fileName )
 		{
-			qWarning() << "Error: Cannot read file " << fileName
-				   << ": " << file.errorString();
-			return false;
-		}
+			QFile file( fileName );
 
-
-		QDomDocument doc;
-		QString      errorString;
-		int          errorLine;
-		int          errorColumn;
-
-		if ( !doc.setContent( &file, false, &errorString, &errorLine, &errorColumn ) )
-		{
-			qWarning() << "Error: Parse error at line " << errorLine
-				   << "column " << errorColumn
-				   << ": " << errorString;
-			return false;
-		}
-
-		QDomElement root = doc.documentElement();
-		if ( root.tagName() != "Glabels-templates" )
-		{
-			qWarning() << "Error: Not a Glabels-templates file";
-			return false;
-		}
-
-		parseRootNode( root );
-		return true;
-	}
-
-
-	void XmlTemplateParser::parseRootNode( const QDomElement &node )
-	{
-		for ( QDomNode child = node.firstChild(); !child.isNull(); child = child.nextSibling() )
-		{
-			if ( child.toElement().tagName() == "Template" )
+			if ( !file.open( QFile::ReadOnly | QFile::Text) )
 			{
-				Template *tmplate = parseTemplateNode( child.toElement() );
-				if ( tmplate != nullptr )
+				qWarning() << "Error: Cannot read file " << fileName
+				           << ": " << file.errorString();
+				return false;
+			}
+
+
+			QDomDocument doc;
+			QString      errorString;
+			int          errorLine;
+			int          errorColumn;
+
+			if ( !doc.setContent( &file, false, &errorString, &errorLine, &errorColumn ) )
+			{
+				qWarning() << "Error: Parse error at line " << errorLine
+				           << "column " << errorColumn
+				           << ": " << errorString;
+				return false;
+			}
+
+			QDomElement root = doc.documentElement();
+			if ( root.tagName() != "Glabels-templates" )
+			{
+				qWarning() << "Error: Not a Glabels-templates file";
+				return false;
+			}
+
+			parseRootNode( root );
+			return true;
+		}
+
+
+		void XmlTemplateParser::parseRootNode( const QDomElement &node )
+		{
+			for ( QDomNode child = node.firstChild(); !child.isNull(); child = child.nextSibling() )
+			{
+				if ( child.toElement().tagName() == "Template" )
 				{
-					Db::registerTemplate( tmplate );
+					Template *tmplate = parseTemplateNode( child.toElement() );
+					if ( tmplate != nullptr )
+					{
+						Db::registerTemplate( tmplate );
+					}
+					else
+					{
+						qWarning() << "Warning: could not create template, Ignored.";
+					}
+				}
+				else if ( !child.isComment() )
+				{
+					qWarning() << "Warning: bad element: "
+					           << child.toElement().tagName()
+					           << ", Ignored.";
+				}
+			}
+		}
+
+
+		Template *XmlTemplateParser::parseTemplateNode( const QDomElement &node )
+		{
+			QString brand = XmlUtil::getStringAttr( node, "brand", "" );
+			QString part  = XmlUtil::getStringAttr( node, "part", "" );
+
+			if ( (brand == "") || (part == "") )
+			{
+				// Try the deprecated "name" attribute.
+				QString name = XmlUtil::getStringAttr( node, "name", "" );
+				if ( name != "" )
+				{
+					QStringList fields = name.split( " ", QString::SkipEmptyParts );
+					brand = fields[0];
+					part  = fields[1];
 				}
 				else
 				{
-					qWarning() << "Warning: could not create template, Ignored.";
-				}
-			}
-			else if ( !child.isComment() )
-			{
-				qWarning() << "Warning: bad element: "
-					   << child.toElement().tagName()
-					   << ", Ignored.";
-			}
-		}
-	}
-
-
-	Template *XmlTemplateParser::parseTemplateNode( const QDomElement &node )
-	{
-		QString brand = XmlUtil::getStringAttr( node, "brand", "" );
-		QString part  = XmlUtil::getStringAttr( node, "part", "" );
-
-		if ( (brand == "") || (part == "") )
-		{
-			// Try the deprecated "name" attribute.
-			QString name = XmlUtil::getStringAttr( node, "name", "" );
-			if ( name != "" )
-			{
-				QStringList fields = name.split( " ", QString::SkipEmptyParts );
-				brand = fields[0];
-				part  = fields[1];
-			}
-			else
-			{
-				qWarning() << "Error: missing name or brand/part attributes.";
-				return nullptr;
-			}
-		}
-
-
-		Template *tmplate = nullptr;
-
-		QString equivPart = XmlUtil::getStringAttr( node, "equiv", "" );
-		if ( equivPart != nullptr )
-		{
-			tmplate = Template::fromEquiv( brand, part, equivPart );
-
-			for ( QDomNode child = node.firstChild(); !child.isNull(); child = child.nextSibling() )
-			{
-				if ( child.toElement().tagName() == "Meta" )
-				{
-					parseMetaNode( child.toElement(), tmplate );
-				}
-				else if ( !child.isComment() )
-				{
-					qWarning() << "Warning: bad element: "
-						   << child.toElement().tagName()
-						   << ", Ignored.";
-				}
-			}
-		}
-		else
-		{
-			QString description = XmlUtil::getI18nAttr( node, "description", "" );
-			QString paperId     = XmlUtil::getStringAttr( node, "size", "" );
-
-			if ( !Db::isPaperIdOther( paperId ) )
-			{
-				const Paper *paper = Db::lookupPaperFromId( paperId );
-				if ( paper == nullptr )
-				{
-					qWarning() << "Error: unknown paper ID: " << paperId;
+					qWarning() << "Error: missing name or brand/part attributes.";
 					return nullptr;
 				}
+			}
 
-				tmplate = new Template( brand, part, description,
-							paper->id(), paper->width(), paper->height() );
+
+			Template *tmplate = nullptr;
+
+			QString equivPart = XmlUtil::getStringAttr( node, "equiv", "" );
+			if ( equivPart != nullptr )
+			{
+				tmplate = Template::fromEquiv( brand, part, equivPart );
+
+				for ( QDomNode child = node.firstChild(); !child.isNull(); child = child.nextSibling() )
+				{
+					if ( child.toElement().tagName() == "Meta" )
+					{
+						parseMetaNode( child.toElement(), tmplate );
+					}
+					else if ( !child.isComment() )
+					{
+						qWarning() << "Warning: bad element: "
+						           << child.toElement().tagName()
+						           << ", Ignored.";
+					}
+				}
 			}
 			else
 			{
-				Distance width  = XmlUtil::getLengthAttr( node, "width", Distance(0) );
-				Distance height = XmlUtil::getLengthAttr( node, "height", Distance(0) );
+				QString description = XmlUtil::getI18nAttr( node, "description", "" );
+				QString paperId     = XmlUtil::getStringAttr( node, "size", "" );
 
-				tmplate = new Template( brand, part, description, paperId, width, height );
+				if ( !Db::isPaperIdOther( paperId ) )
+				{
+					const Paper *paper = Db::lookupPaperFromId( paperId );
+					if ( paper == nullptr )
+					{
+						qWarning() << "Error: unknown paper ID: " << paperId;
+						return nullptr;
+					}
+
+					tmplate = new Template( brand, part, description,
+					                        paper->id(), paper->width(), paper->height() );
+				}
+				else
+				{
+					Distance width  = XmlUtil::getLengthAttr( node, "width", Distance(0) );
+					Distance height = XmlUtil::getLengthAttr( node, "height", Distance(0) );
+
+					tmplate = new Template( brand, part, description, paperId, width, height );
+				}
+
+				for ( QDomNode child = node.firstChild(); !child.isNull(); child = child.nextSibling() )
+				{
+					if ( child.toElement().tagName() == "Meta" )
+					{
+						parseMetaNode( child.toElement(), tmplate );
+					}
+					else if ( child.toElement().tagName() == "Label-rectangle" )
+					{
+						parseLabelRectangleNode( child.toElement(), tmplate );
+					}
+					else if ( child.toElement().tagName() == "Label-ellipse" )
+					{
+						parseLabelEllipseNode( child.toElement(), tmplate );
+					}
+					else if ( child.toElement().tagName() == "Label-round" )
+					{
+						parseLabelRoundNode( child.toElement(), tmplate );
+					}
+					else if ( child.toElement().tagName() == "Label-cd" )
+					{
+						parseLabelCdNode( child.toElement(), tmplate );
+					}
+					else if ( !child.isComment() )
+					{
+						qWarning() << "Warning: bad element: "
+						           << child.toElement().tagName()
+						           << ", Ignored.";
+					}
+				}
 			}
 
+			return tmplate;
+		}
+
+
+		void XmlTemplateParser::parseMetaNode( const QDomElement &node, Template *tmplate )
+		{
+			QString productUrl = XmlUtil::getStringAttr( node, "product_url", "" );
+			if ( productUrl != "" )
+			{
+				tmplate->setProductUrl( productUrl );
+			}
+		
+			QString categoryId = XmlUtil::getStringAttr( node, "category", "" );
+			if ( categoryId != "" )
+			{
+				tmplate->addCategory( categoryId );
+			}
+		}
+
+
+		void XmlTemplateParser::parseLabelRectangleNode( const QDomElement &node, Template *tmplate )
+		{
+			QString id = XmlUtil::getStringAttr( node, "id", "0" );
+
+			Distance w   = XmlUtil::getLengthAttr( node, "width", Distance(0) );
+			Distance h   = XmlUtil::getLengthAttr( node, "height", Distance(0) );
+			Distance r   = XmlUtil::getLengthAttr( node, "round", Distance(0) );
+
+			Distance xWaste, yWaste;
+
+			Distance waste = XmlUtil::getLengthAttr( node, "waste", Distance(-1) );
+			if ( waste >= Distance(0) )
+			{
+				xWaste = waste;
+				yWaste = waste;
+			}
+			else
+			{
+				xWaste = XmlUtil::getLengthAttr( node, "x_waste", Distance(0) );
+				yWaste = XmlUtil::getLengthAttr( node, "y_waste", Distance(0) );
+			}
+
+			Frame *frame = new FrameRect( w, h, r, xWaste, yWaste, id );
+
+			parseLabelNodeCommon( node, frame );
+
+			tmplate->addFrame( frame );
+		}
+
+
+		void XmlTemplateParser::parseLabelEllipseNode( const QDomElement &node, Template *tmplate )
+		{
+			QString id    = XmlUtil::getStringAttr( node, "id", "0" );
+
+			Distance w     = XmlUtil::getLengthAttr( node, "width", Distance(0) );
+			Distance h     = XmlUtil::getLengthAttr( node, "height", Distance(0) );
+			Distance waste = XmlUtil::getLengthAttr( node, "waste", Distance(0) );
+
+			Frame *frame = new FrameEllipse( w, h, waste, id );
+
+			parseLabelNodeCommon( node, frame );
+
+			tmplate->addFrame( frame );
+		}
+
+
+		void XmlTemplateParser::parseLabelRoundNode( const QDomElement &node, Template *tmplate )
+		{
+			QString id    = XmlUtil::getStringAttr( node, "id", "0" );
+
+			Distance r     = XmlUtil::getLengthAttr( node, "radius", Distance(0) );
+			Distance waste = XmlUtil::getLengthAttr( node, "waste", Distance(0) );
+
+			Frame *frame = new FrameRound( r, waste, id );
+
+			parseLabelNodeCommon( node, frame );
+
+			tmplate->addFrame( frame );
+		}
+
+
+		void XmlTemplateParser::parseLabelCdNode( const QDomElement &node, Template *tmplate )
+		{
+			QString id    = XmlUtil::getStringAttr( node, "id", "0" );
+
+			Distance r1    = XmlUtil::getLengthAttr( node, "radius", Distance(0) );
+			Distance r2    = XmlUtil::getLengthAttr( node, "hole", Distance(0) );
+			Distance w     = XmlUtil::getLengthAttr( node, "width", Distance(0) );
+			Distance h     = XmlUtil::getLengthAttr( node, "height", Distance(0) );
+			Distance waste = XmlUtil::getLengthAttr( node, "waste", Distance(0) );
+
+			Frame *frame = new FrameCd( r1, r2, w, h, waste, id );
+
+			parseLabelNodeCommon( node, frame );
+
+			tmplate->addFrame( frame );
+		}
+
+
+		void XmlTemplateParser::parseLabelNodeCommon( const QDomElement &node, Frame *frame )
+		{
 			for ( QDomNode child = node.firstChild(); !child.isNull(); child = child.nextSibling() )
 			{
-				if ( child.toElement().tagName() == "Meta" )
+				if ( child.toElement().tagName() == "Layout" )
 				{
-					parseMetaNode( child.toElement(), tmplate );
+					parseLayoutNode( child.toElement(), frame );
 				}
-				else if ( child.toElement().tagName() == "Label-rectangle" )
+				else if ( child.toElement().tagName() == "Markup-margin" )
 				{
-					parseLabelRectangleNode( child.toElement(), tmplate );
+					parseMarkupMarginNode( child.toElement(), frame );
 				}
-				else if ( child.toElement().tagName() == "Label-ellipse" )
+				else if ( child.toElement().tagName() == "Markup-line" )
 				{
-					parseLabelEllipseNode( child.toElement(), tmplate );
+					parseMarkupLineNode( child.toElement(), frame );
 				}
-				else if ( child.toElement().tagName() == "Label-round" )
+				else if ( child.toElement().tagName() == "Markup-circle" )
 				{
-					parseLabelRoundNode( child.toElement(), tmplate );
+					parseMarkupCircleNode( child.toElement(), frame );
 				}
-				else if ( child.toElement().tagName() == "Label-cd" )
+				else if ( child.toElement().tagName() == "Markup-rect" )
 				{
-					parseLabelCdNode( child.toElement(), tmplate );
+					parseMarkupRectNode( child.toElement(), frame );
+				}
+				else if ( child.toElement().tagName() == "Markup-ellipse" )
+				{
+					parseMarkupEllipseNode( child.toElement(), frame );
 				}
 				else if ( !child.isComment() )
 				{
 					qWarning() << "Warning: bad element: "
-						   << child.toElement().tagName()
-						   << ", Ignored.";
+					           << child.toElement().tagName()
+					           << ", Ignored.";
 				}
 			}
 		}
 
-		return tmplate;
-	}
 
-
-	void XmlTemplateParser::parseMetaNode( const QDomElement &node, Template *tmplate )
-	{
-		QString productUrl = XmlUtil::getStringAttr( node, "product_url", "" );
-		if ( productUrl != "" )
+		void XmlTemplateParser::parseLayoutNode( const QDomElement &node, Frame *frame )
 		{
-			tmplate->setProductUrl( productUrl );
-		}
-		
-		QString categoryId = XmlUtil::getStringAttr( node, "category", "" );
-		if ( categoryId != "" )
-		{
-			tmplate->addCategory( categoryId );
-		}
-	}
+			int      nX = XmlUtil::getIntAttr( node, "nx", 1 );
+			int      nY = XmlUtil::getIntAttr( node, "ny", 1 );
 
+			Distance x0 = XmlUtil::getLengthAttr( node, "x0", Distance(0) );
+			Distance y0 = XmlUtil::getLengthAttr( node, "y0", Distance(0) );
 
-	void XmlTemplateParser::parseLabelRectangleNode( const QDomElement &node, Template *tmplate )
-	{
-		QString id = XmlUtil::getStringAttr( node, "id", "0" );
+			Distance dX = XmlUtil::getLengthAttr( node, "dx", Distance(0) );
+			Distance dY = XmlUtil::getLengthAttr( node, "dy", Distance(0) );
 
-		Distance w   = XmlUtil::getLengthAttr( node, "width", Distance(0) );
-		Distance h   = XmlUtil::getLengthAttr( node, "height", Distance(0) );
-		Distance r   = XmlUtil::getLengthAttr( node, "round", Distance(0) );
-
-		Distance xWaste, yWaste;
-
-		Distance waste = XmlUtil::getLengthAttr( node, "waste", Distance(-1) );
-		if ( waste >= Distance(0) )
-		{
-			xWaste = waste;
-			yWaste = waste;
-		}
-		else
-		{
-			xWaste = XmlUtil::getLengthAttr( node, "x_waste", Distance(0) );
-			yWaste = XmlUtil::getLengthAttr( node, "y_waste", Distance(0) );
+			frame->addLayout( new Layout( nX, nY, x0, y0, dX, dY ) );
 		}
 
-		Frame *frame = new FrameRect( w, h, r, xWaste, yWaste, id );
 
-		parseLabelNodeCommon( node, frame );
-
-		tmplate->addFrame( frame );
-	}
-
-
-	void XmlTemplateParser::parseLabelEllipseNode( const QDomElement &node, Template *tmplate )
-	{
-		QString id    = XmlUtil::getStringAttr( node, "id", "0" );
-
-		Distance w     = XmlUtil::getLengthAttr( node, "width", Distance(0) );
-		Distance h     = XmlUtil::getLengthAttr( node, "height", Distance(0) );
-		Distance waste = XmlUtil::getLengthAttr( node, "waste", Distance(0) );
-
-		Frame *frame = new FrameEllipse( w, h, waste, id );
-
-		parseLabelNodeCommon( node, frame );
-
-		tmplate->addFrame( frame );
-	}
-
-
-	void XmlTemplateParser::parseLabelRoundNode( const QDomElement &node, Template *tmplate )
-	{
-		QString id    = XmlUtil::getStringAttr( node, "id", "0" );
-
-		Distance r     = XmlUtil::getLengthAttr( node, "radius", Distance(0) );
-		Distance waste = XmlUtil::getLengthAttr( node, "waste", Distance(0) );
-
-		Frame *frame = new FrameRound( r, waste, id );
-
-		parseLabelNodeCommon( node, frame );
-
-		tmplate->addFrame( frame );
-	}
-
-
-	void XmlTemplateParser::parseLabelCdNode( const QDomElement &node, Template *tmplate )
-	{
-		QString id    = XmlUtil::getStringAttr( node, "id", "0" );
-
-		Distance r1    = XmlUtil::getLengthAttr( node, "radius", Distance(0) );
-		Distance r2    = XmlUtil::getLengthAttr( node, "hole", Distance(0) );
-		Distance w     = XmlUtil::getLengthAttr( node, "width", Distance(0) );
-		Distance h     = XmlUtil::getLengthAttr( node, "height", Distance(0) );
-		Distance waste = XmlUtil::getLengthAttr( node, "waste", Distance(0) );
-
-		Frame *frame = new FrameCd( r1, r2, w, h, waste, id );
-
-		parseLabelNodeCommon( node, frame );
-
-		tmplate->addFrame( frame );
-	}
-
-
-	void XmlTemplateParser::parseLabelNodeCommon( const QDomElement &node, Frame *frame )
-	{
-		for ( QDomNode child = node.firstChild(); !child.isNull(); child = child.nextSibling() )
+		void XmlTemplateParser::parseMarkupMarginNode( const QDomElement &node, Frame *frame )
 		{
-			if ( child.toElement().tagName() == "Layout" )
-			{
-				parseLayoutNode( child.toElement(), frame );
-			}
-			else if ( child.toElement().tagName() == "Markup-margin" )
-			{
-				parseMarkupMarginNode( child.toElement(), frame );
-			}
-			else if ( child.toElement().tagName() == "Markup-line" )
-			{
-				parseMarkupLineNode( child.toElement(), frame );
-			}
-			else if ( child.toElement().tagName() == "Markup-circle" )
-			{
-				parseMarkupCircleNode( child.toElement(), frame );
-			}
-			else if ( child.toElement().tagName() == "Markup-rect" )
-			{
-				parseMarkupRectNode( child.toElement(), frame );
-			}
-			else if ( child.toElement().tagName() == "Markup-ellipse" )
-			{
-				parseMarkupEllipseNode( child.toElement(), frame );
-			}
-			else if ( !child.isComment() )
-			{
-				qWarning() << "Warning: bad element: "
-					   << child.toElement().tagName()
-					   << ", Ignored.";
-			}
+			Distance size = XmlUtil::getLengthAttr( node, "size", Distance(0) );
+
+			frame->addMarkup( new MarkupMargin( frame, size ) );
 		}
+
+
+		void XmlTemplateParser::parseMarkupLineNode( const QDomElement &node, Frame *frame )
+		{
+			Distance x1 = XmlUtil::getLengthAttr( node, "x1", Distance(0) );
+			Distance y1 = XmlUtil::getLengthAttr( node, "y1", Distance(0) );
+			Distance x2 = XmlUtil::getLengthAttr( node, "x2", Distance(0) );
+			Distance y2 = XmlUtil::getLengthAttr( node, "y2", Distance(0) );
+
+			frame->addMarkup( new MarkupLine( x1, y1, x2, y2 ) );
+		}
+
+
+		void XmlTemplateParser::parseMarkupCircleNode( const QDomElement &node, Frame *frame )
+		{
+			Distance x0 = XmlUtil::getLengthAttr( node, "x0", Distance(0) );
+			Distance y0 = XmlUtil::getLengthAttr( node, "y0", Distance(0) );
+			Distance r  = XmlUtil::getLengthAttr( node, "radius", Distance(0) );
+
+			frame->addMarkup( new MarkupCircle( x0, y0, r ) );
+		}
+
+
+		void XmlTemplateParser::parseMarkupRectNode( const QDomElement &node, Frame *frame )
+		{
+			Distance x1 = XmlUtil::getLengthAttr( node, "x1", Distance(0) );
+			Distance y1 = XmlUtil::getLengthAttr( node, "y1", Distance(0) );
+			Distance w  = XmlUtil::getLengthAttr( node, "w", Distance(0) );
+			Distance h  = XmlUtil::getLengthAttr( node, "h", Distance(0) );
+			Distance r  = XmlUtil::getLengthAttr( node, "r", Distance(0) );
+
+			frame->addMarkup( new MarkupRect( x1, y1, w, h, r ) );
+		}
+
+
+		void XmlTemplateParser::parseMarkupEllipseNode( const QDomElement &node, Frame *frame )
+		{
+			Distance x1 = XmlUtil::getLengthAttr( node, "x1", Distance(0) );
+			Distance y1 = XmlUtil::getLengthAttr( node, "y1", Distance(0) );
+			Distance w  = XmlUtil::getLengthAttr( node, "w", Distance(0) );
+			Distance h  = XmlUtil::getLengthAttr( node, "h", Distance(0) );
+
+			frame->addMarkup( new MarkupEllipse( x1, y1, w, h ) );
+		}
+
+
 	}
-
-
-	void XmlTemplateParser::parseLayoutNode( const QDomElement &node, Frame *frame )
-	{
-		int      nX = XmlUtil::getIntAttr( node, "nx", 1 );
-		int      nY = XmlUtil::getIntAttr( node, "ny", 1 );
-
-		Distance x0 = XmlUtil::getLengthAttr( node, "x0", Distance(0) );
-		Distance y0 = XmlUtil::getLengthAttr( node, "y0", Distance(0) );
-
-		Distance dX = XmlUtil::getLengthAttr( node, "dx", Distance(0) );
-		Distance dY = XmlUtil::getLengthAttr( node, "dy", Distance(0) );
-
-		frame->addLayout( new Layout( nX, nY, x0, y0, dX, dY ) );
-	}
-
-
-	void XmlTemplateParser::parseMarkupMarginNode( const QDomElement &node, Frame *frame )
-	{
-		Distance size = XmlUtil::getLengthAttr( node, "size", Distance(0) );
-
-		frame->addMarkup( new MarkupMargin( frame, size ) );
-	}
-
-
-	void XmlTemplateParser::parseMarkupLineNode( const QDomElement &node, Frame *frame )
-	{
-		Distance x1 = XmlUtil::getLengthAttr( node, "x1", Distance(0) );
-		Distance y1 = XmlUtil::getLengthAttr( node, "y1", Distance(0) );
-		Distance x2 = XmlUtil::getLengthAttr( node, "x2", Distance(0) );
-		Distance y2 = XmlUtil::getLengthAttr( node, "y2", Distance(0) );
-
-		frame->addMarkup( new MarkupLine( x1, y1, x2, y2 ) );
-	}
-
-
-	void XmlTemplateParser::parseMarkupCircleNode( const QDomElement &node, Frame *frame )
-	{
-		Distance x0 = XmlUtil::getLengthAttr( node, "x0", Distance(0) );
-		Distance y0 = XmlUtil::getLengthAttr( node, "y0", Distance(0) );
-		Distance r  = XmlUtil::getLengthAttr( node, "radius", Distance(0) );
-
-		frame->addMarkup( new MarkupCircle( x0, y0, r ) );
-	}
-
-
-	void XmlTemplateParser::parseMarkupRectNode( const QDomElement &node, Frame *frame )
-	{
-		Distance x1 = XmlUtil::getLengthAttr( node, "x1", Distance(0) );
-		Distance y1 = XmlUtil::getLengthAttr( node, "y1", Distance(0) );
-		Distance w  = XmlUtil::getLengthAttr( node, "w", Distance(0) );
-		Distance h  = XmlUtil::getLengthAttr( node, "h", Distance(0) );
-		Distance r  = XmlUtil::getLengthAttr( node, "r", Distance(0) );
-
-		frame->addMarkup( new MarkupRect( x1, y1, w, h, r ) );
-	}
-
-
-	void XmlTemplateParser::parseMarkupEllipseNode( const QDomElement &node, Frame *frame )
-	{
-		Distance x1 = XmlUtil::getLengthAttr( node, "x1", Distance(0) );
-		Distance y1 = XmlUtil::getLengthAttr( node, "y1", Distance(0) );
-		Distance w  = XmlUtil::getLengthAttr( node, "w", Distance(0) );
-		Distance h  = XmlUtil::getLengthAttr( node, "h", Distance(0) );
-
-		frame->addMarkup( new MarkupEllipse( x1, y1, w, h ) );
-	}
-
-} // namespace glabels::model
+}
diff --git a/model/XmlTemplateParser.h b/model/XmlTemplateParser.h
index 643b158..3762eb5 100644
--- a/model/XmlTemplateParser.h
+++ b/model/XmlTemplateParser.h
@@ -28,34 +28,37 @@
 #include <QString>
 
 
-namespace glabels::model
+namespace glabels
 {
-
-	class XmlTemplateParser
+	namespace model
 	{
-	public:
-		XmlTemplateParser() {}
 
-		bool readFile( const QString &fileName );
-		Template *parseTemplateNode( const QDomElement &node );
+		class XmlTemplateParser
+		{
+		public:
+			XmlTemplateParser() {}
 
-	private:
-		void parseRootNode( const QDomElement &node );
-		void parseMetaNode( const QDomElement &node, Template *tmplate );
-		void parseLabelRectangleNode( const QDomElement &node, Template *tmplate );
-		void parseLabelEllipseNode( const QDomElement &node, Template *tmplate );
-		void parseLabelRoundNode( const QDomElement &node, Template *tmplate );
-		void parseLabelCdNode( const QDomElement &node, Template *tmplate );
-		void parseLabelNodeCommon( const QDomElement &node, Frame *frame );
-		void parseLayoutNode( const QDomElement &node, Frame *frame );
-		void parseMarkupMarginNode( const QDomElement &node, Frame *frame );
-		void parseMarkupLineNode( const QDomElement &node, Frame *frame );
-		void parseMarkupCircleNode( const QDomElement &node, Frame *frame );
-		void parseMarkupRectNode( const QDomElement &node, Frame *frame );
-		void parseMarkupEllipseNode( const QDomElement &node, Frame *frame );
+			bool readFile( const QString &fileName );
+			Template *parseTemplateNode( const QDomElement &node );
 
-	};
+		private:
+			void parseRootNode( const QDomElement &node );
+			void parseMetaNode( const QDomElement &node, Template *tmplate );
+			void parseLabelRectangleNode( const QDomElement &node, Template *tmplate );
+			void parseLabelEllipseNode( const QDomElement &node, Template *tmplate );
+			void parseLabelRoundNode( const QDomElement &node, Template *tmplate );
+			void parseLabelCdNode( const QDomElement &node, Template *tmplate );
+			void parseLabelNodeCommon( const QDomElement &node, Frame *frame );
+			void parseLayoutNode( const QDomElement &node, Frame *frame );
+			void parseMarkupMarginNode( const QDomElement &node, Frame *frame );
+			void parseMarkupLineNode( const QDomElement &node, Frame *frame );
+			void parseMarkupCircleNode( const QDomElement &node, Frame *frame );
+			void parseMarkupRectNode( const QDomElement &node, Frame *frame );
+			void parseMarkupEllipseNode( const QDomElement &node, Frame *frame );
 
+		};
+
+	}
 }
 
 
diff --git a/model/XmlUtil.cpp b/model/XmlUtil.cpp
index 9cde9b8..2280530 100644
--- a/model/XmlUtil.cpp
+++ b/model/XmlUtil.cpp
@@ -25,383 +25,386 @@
 #include <QtDebug>
 
 
-namespace glabels::model
+namespace glabels
 {
-
-	//
-	// Static data
-	//
-	XmlUtil* XmlUtil::mInstance = nullptr;
-
-
-	XmlUtil::XmlUtil()
+	namespace model
 	{
-		mUnits = Units(Units::PT);
-	}
+
+		//
+		// Static data
+		//
+		XmlUtil* XmlUtil::mInstance = nullptr;
 
 
-	void XmlUtil::init()
-	{
-		if ( mInstance == nullptr )
+		XmlUtil::XmlUtil()
 		{
-			mInstance = new XmlUtil();
-		}
-	}
-
-
-	Units XmlUtil::units()
-	{
-		init();
-
-		return mInstance->mUnits;
-	}
-
-
-	void XmlUtil::setUnits( const Units& units )
-	{
-		init();
-
-		mInstance->mUnits = units;
-	}
-
-
-	QString XmlUtil::getStringAttr( const QDomElement& node,
-					const QString&     name,
-					const QString&     default_value )
-	{
-		init();
-
-		return node.attribute( name, default_value );
-	}
-
-
-	double XmlUtil::getDoubleAttr( const QDomElement& node,
-				       const QString&     name,
-				       double             default_value )
-	{
-		init();
-
-		QString valueString = node.attribute( name, "" );
-		if ( valueString != "" )
-		{
-			bool ok;
-			double value = valueString.toDouble(& ok );
-
-			if ( !ok )
-			{
-				qWarning() << "Error: bad double value in attribute "
-					   << node.tagName() << ":" << name << "=" << valueString;
-				return default_value;
-			}
-
-			return value;
+			mUnits = Units(Units::PT);
 		}
 
-		return default_value;
-	}
 
-
-	bool XmlUtil::getBoolAttr( const QDomElement& node,
-				   const QString&     name,
-				   bool               default_value )
-	{
-		init();
-
-		QString valueString = node.attribute( name, "" );
-		if ( valueString != "" )
+		void XmlUtil::init()
 		{
-			int intValue = valueString.toInt();
-
-			if ( (valueString == "True") ||
-			     (valueString == "TRUE") ||
-			     (valueString == "true") ||
-			     (intValue == 1) )
+			if ( mInstance == nullptr )
 			{
-				return true;
+				mInstance = new XmlUtil();
 			}
-
-			if ( (valueString == "False") ||
-			     (valueString == "FALSE") ||
-			     (valueString == "false") ||
-			     (intValue == 0) )
-			{
-				return false;
-			}
-
-			qWarning() << "Error: bad boolean value in attribute "
-				   << node.tagName() << ":" << name << "=" << valueString;
-			return default_value;
 		}
 
-		return default_value;
-	}
 
-
-	int XmlUtil::getIntAttr( const QDomElement& node,
-				 const QString&     name,
-				 int                default_value )
-	{
-		init();
-
-		QString valueString = node.attribute( name, "" );
-		if ( valueString != "" )
+		Units XmlUtil::units()
 		{
-			bool ok;
-			int value = valueString.toInt(& ok );
+			init();
 
-			if ( !ok )
-			{
-				qWarning() << "Error: bad integer value in attribute "
-					   << node.tagName() << ":" << name << "=" << valueString;
-				return default_value;
-			}
-
-			return value;
+			return mInstance->mUnits;
 		}
 
-		return default_value;
-	}
 
-
-	uint32_t XmlUtil::getUIntAttr( const QDomElement& node,
-				       const QString&     name,
-				       uint32_t           default_value )
-	{
-		init();
-
-		QString valueString = node.attribute( name, "" );
-		if ( valueString != "" )
+		void XmlUtil::setUnits( const Units& units )
 		{
-			bool ok;
-			uint32_t value = valueString.toUInt(& ok, 0 );
+			init();
 
-			if ( !ok )
-			{
-				qWarning() << "Error: bad unsigned integer value in attribute "
-					   << node.tagName() << ":" << name << "=" << valueString;
-				return default_value;
-			}
-
-			return value;
+			mInstance->mUnits = units;
 		}
 
-		return default_value;
-	}
 
-
-	QString  XmlUtil::getI18nAttr( const QDomElement& node,
-				       const QString&     name,
-				       const QString&     default_value )
-	{
-		init();
-
-		QString i18nString = node.attribute( QString("_").append(name), "" );
-
-		if ( i18nString == "" )
+		QString XmlUtil::getStringAttr( const QDomElement& node,
+		                                const QString&     name,
+		                                const QString&     default_value )
 		{
+			init();
+
 			return node.attribute( name, default_value );
 		}
 
-		return QCoreApplication::translate( "XmlStrings", i18nString.toUtf8().constData() );
-	}
 
-
-	Distance XmlUtil::getLengthAttr( const QDomElement& node,
-					 const QString&     name,
-					 const Distance&    default_value )
-	{
-		init();
-
-		QString valueString = node.attribute( name, "" );
-		if ( valueString != "" )
+		double XmlUtil::getDoubleAttr( const QDomElement& node,
+		                               const QString&     name,
+		                               double             default_value )
 		{
-			double value;
-			QString unitsString;
-			QTextStream valueStream( &valueString, QIODevice::ReadOnly );
+			init();
 
-			valueStream >> value >> unitsString;
-
-			if ( !unitsString.isEmpty() && !Units::isIdValid( unitsString ) )
+			QString valueString = node.attribute( name, "" );
+			if ( valueString != "" )
 			{
-				qWarning() << "Error: bad length value in attribute "
-					   << node.tagName() << ":" <<  name << "=" << valueString;
+				bool ok;
+				double value = valueString.toDouble(& ok );
+
+				if ( !ok )
+				{
+					qWarning() << "Error: bad double value in attribute "
+					           << node.tagName() << ":" << name << "=" << valueString;
+					return default_value;
+				}
+
+				return value;
 			}
 
-			return Distance( value, unitsString );
+			return default_value;
 		}
 
-		return default_value;
-	}
 
-
-	QFont::Weight XmlUtil::getWeightAttr( const QDomElement& node,
-	                                      const QString&     name,
-	                                      QFont::Weight      default_value )
-	{
-		init();
-
-		QString valueString = node.attribute( name, "" );
-		if ( valueString != "" )
+		bool XmlUtil::getBoolAttr( const QDomElement& node,
+		                           const QString&     name,
+		                           bool               default_value )
 		{
-			if ( valueString == "bold" )
+			init();
+
+			QString valueString = node.attribute( name, "" );
+			if ( valueString != "" )
 			{
-				return QFont::Bold;
+				int intValue = valueString.toInt();
+
+				if ( (valueString == "True") ||
+				     (valueString == "TRUE") ||
+				     (valueString == "true") ||
+				     (intValue == 1) )
+				{
+					return true;
+				}
+
+				if ( (valueString == "False") ||
+				     (valueString == "FALSE") ||
+				     (valueString == "false") ||
+				     (intValue == 0) )
+				{
+					return false;
+				}
+
+				qWarning() << "Error: bad boolean value in attribute "
+				           << node.tagName() << ":" << name << "=" << valueString;
+				return default_value;
 			}
-			else if ( valueString == "normal" )
+
+			return default_value;
+		}
+
+
+		int XmlUtil::getIntAttr( const QDomElement& node,
+		                         const QString&     name,
+		                         int                default_value )
+		{
+			init();
+
+			QString valueString = node.attribute( name, "" );
+			if ( valueString != "" )
 			{
-				return QFont::Normal;
+				bool ok;
+				int value = valueString.toInt(& ok );
+
+				if ( !ok )
+				{
+					qWarning() << "Error: bad integer value in attribute "
+					           << node.tagName() << ":" << name << "=" << valueString;
+					return default_value;
+				}
+
+				return value;
+			}
+
+			return default_value;
+		}
+
+
+		uint32_t XmlUtil::getUIntAttr( const QDomElement& node,
+		                               const QString&     name,
+		                               uint32_t           default_value )
+		{
+			init();
+
+			QString valueString = node.attribute( name, "" );
+			if ( valueString != "" )
+			{
+				bool ok;
+				uint32_t value = valueString.toUInt(& ok, 0 );
+
+				if ( !ok )
+				{
+					qWarning() << "Error: bad unsigned integer value in attribute "
+					           << node.tagName() << ":" << name << "=" << valueString;
+					return default_value;
+				}
+
+				return value;
+			}
+
+			return default_value;
+		}
+
+
+		QString  XmlUtil::getI18nAttr( const QDomElement& node,
+		                               const QString&     name,
+		                               const QString&     default_value )
+		{
+			init();
+
+			QString i18nString = node.attribute( QString("_").append(name), "" );
+
+			if ( i18nString == "" )
+			{
+				return node.attribute( name, default_value );
+			}
+
+			return QCoreApplication::translate( "XmlStrings", i18nString.toUtf8().constData() );
+		}
+
+
+		Distance XmlUtil::getLengthAttr( const QDomElement& node,
+		                                 const QString&     name,
+		                                 const Distance&    default_value )
+		{
+			init();
+
+			QString valueString = node.attribute( name, "" );
+			if ( valueString != "" )
+			{
+				double value;
+				QString unitsString;
+				QTextStream valueStream( &valueString, QIODevice::ReadOnly );
+
+				valueStream >> value >> unitsString;
+
+				if ( !unitsString.isEmpty() && !Units::isIdValid( unitsString ) )
+				{
+					qWarning() << "Error: bad length value in attribute "
+					           << node.tagName() << ":" <<  name << "=" << valueString;
+				}
+
+				return Distance( value, unitsString );
+			}
+
+			return default_value;
+		}
+
+
+		QFont::Weight XmlUtil::getWeightAttr( const QDomElement& node,
+		                                      const QString&     name,
+		                                      QFont::Weight      default_value )
+		{
+			init();
+
+			QString valueString = node.attribute( name, "" );
+			if ( valueString != "" )
+			{
+				if ( valueString == "bold" )
+				{
+					return QFont::Bold;
+				}
+				else if ( valueString == "normal" )
+				{
+					return QFont::Normal;
+				}
+			}
+
+			return default_value;
+		}
+
+
+		Qt::Alignment XmlUtil::getAlignmentAttr( const QDomElement& node,
+		                                         const QString&     name,
+		                                         Qt::Alignment      default_value )
+		{
+			init();
+
+			QString valueString = node.attribute( name, "" );
+			if ( valueString != "" )
+			{
+				if ( valueString == "right" )
+				{
+					return Qt::AlignRight;
+				}
+				else if ( valueString == "hcenter" )
+				{
+					return Qt::AlignHCenter;
+				}
+				else if ( valueString == "left" )
+				{
+					return Qt::AlignLeft;
+				}
+				else if ( valueString == "bottom" )
+				{
+					return Qt::AlignBottom;
+				}
+				else if ( valueString == "vcenter" )
+				{
+					return Qt::AlignVCenter;
+				}
+				else if ( valueString == "top" )
+				{
+					return Qt::AlignTop;
+				}
+			}
+
+			return default_value;
+		}
+
+
+		void XmlUtil::setStringAttr( QDomElement&   node,
+		                             const QString& name,
+		                             const QString& value )
+		{
+			init();
+
+			node.setAttribute( name, value );
+		}
+
+
+		void XmlUtil::setDoubleAttr( QDomElement&   node,
+		                             const QString& name,
+		                             double         value )
+		{
+			init();
+
+			node.setAttribute( name, QString::number(value) );
+		}
+
+
+		void XmlUtil::setBoolAttr( QDomElement&   node,
+		                           const QString& name,
+		                           bool           value )
+		{
+			init();
+
+			node.setAttribute( name, value ? "true" : "false" );
+		}
+
+
+		void XmlUtil::setIntAttr( QDomElement&   node,
+		                          const QString& name,
+		                          int            value )
+		{
+			init();
+
+			node.setAttribute( name, QString::number(value) );
+		}
+
+
+		void XmlUtil::setUIntAttr( QDomElement&   node,
+		                           const QString& name,
+		                           uint32_t       value )
+		{
+			init();
+
+			node.setAttribute( name, "0x" + QString::number(value, 16) );
+		}
+
+
+		void XmlUtil::setLengthAttr( QDomElement&    node,
+		                             const QString&  name,
+		                             const Distance& value )
+		{
+			init();
+
+			Units units = mInstance->mUnits;
+			node.setAttribute( name, QString::number(value.inUnits(units)) + units.toIdString() );
+		}
+
+
+		void XmlUtil::setWeightAttr( QDomElement&    node,
+		                             const QString&  name,
+		                             QFont::Weight   value )
+		{
+			switch (value)
+			{
+			case QFont::Bold:
+				node.setAttribute( name, "bold" );
+				break;
+			default:
+				node.setAttribute( name, "normal" );
+				break;
 			}
 		}
-
-		return default_value;
-	}
-
-
-	Qt::Alignment XmlUtil::getAlignmentAttr( const QDomElement& node,
-	                                         const QString&     name,
-	                                         Qt::Alignment      default_value )
-	{
-		init();
-
-		QString valueString = node.attribute( name, "" );
-		if ( valueString != "" )
-		{
-                        if ( valueString == "right" )
-                        {
-                                return Qt::AlignRight;
-                        }
-                        else if ( valueString == "hcenter" )
-                        {
-                                return Qt::AlignHCenter;
-                        }
-                        else if ( valueString == "left" )
-                        {
-                                return Qt::AlignLeft;
-                        }
-                        else if ( valueString == "bottom" )
-                        {
-                                return Qt::AlignBottom;
-                        }
-                        else if ( valueString == "vcenter" )
-                        {
-                                return Qt::AlignVCenter;
-                        }
-                        else if ( valueString == "top" )
-                        {
-                                return Qt::AlignTop;
-                        }
-		}
-
-		return default_value;
-	}
-
-
-	void XmlUtil::setStringAttr( QDomElement&   node,
-				     const QString& name,
-				     const QString& value )
-	{
-		init();
-
-		node.setAttribute( name, value );
-	}
-
-
-	void XmlUtil::setDoubleAttr( QDomElement&   node,
-				     const QString& name,
-				     double         value )
-	{
-		init();
-
-		node.setAttribute( name, QString::number(value) );
-	}
-
-
-	void XmlUtil::setBoolAttr( QDomElement&   node,
-				   const QString& name,
-				   bool           value )
-	{
-		init();
-
-		node.setAttribute( name, value ? "true" : "false" );
-	}
-
-
-	void XmlUtil::setIntAttr( QDomElement&   node,
-				  const QString& name,
-				  int            value )
-	{
-		init();
-
-		node.setAttribute( name, QString::number(value) );
-	}
-
-
-	void XmlUtil::setUIntAttr( QDomElement&   node,
-				   const QString& name,
-				   uint32_t       value )
-	{
-		init();
-
-		node.setAttribute( name, "0x" + QString::number(value, 16) );
-	}
-
-
-	void XmlUtil::setLengthAttr( QDomElement&    node,
-				     const QString&  name,
-				     const Distance& value )
-	{
-		init();
-
-		Units units = mInstance->mUnits;
-		node.setAttribute( name, QString::number(value.inUnits(units)) + units.toIdString() );
-	}
-
-
-	void XmlUtil::setWeightAttr( QDomElement&    node,
-	                             const QString&  name,
-	                             QFont::Weight   value )
-	{
-		switch (value)
-		{
-		case QFont::Bold:
-			node.setAttribute( name, "bold" );
-			break;
-		default:
-			node.setAttribute( name, "normal" );
-			break;
-		}
-	}
 	
 
-	void XmlUtil::setAlignmentAttr( QDomElement&    node,
-	                                const QString&  name,
-	                                Qt::Alignment   value )
-	{
-		switch (value)
+		void XmlUtil::setAlignmentAttr( QDomElement&    node,
+		                                const QString&  name,
+		                                Qt::Alignment   value )
 		{
-		case Qt::AlignRight:
-			node.setAttribute( name, "right" );
-			break;
-		case Qt::AlignHCenter:
-			node.setAttribute( name, "hcenter" );
-			break;
-		case Qt::AlignLeft:
-			node.setAttribute( name, "left" );
-			break;
-		case Qt::AlignBottom:
-			node.setAttribute( name, "bottom" );
-			break;
-		case Qt::AlignVCenter:
-			node.setAttribute( name, "vcenter" );
-			break;
-		case Qt::AlignTop:
-			node.setAttribute( name, "top" );
-			break;
-		default:
-			node.setAttribute( name, "left" );
-			break;
+			switch (value)
+			{
+			case Qt::AlignRight:
+				node.setAttribute( name, "right" );
+				break;
+			case Qt::AlignHCenter:
+				node.setAttribute( name, "hcenter" );
+				break;
+			case Qt::AlignLeft:
+				node.setAttribute( name, "left" );
+				break;
+			case Qt::AlignBottom:
+				node.setAttribute( name, "bottom" );
+				break;
+			case Qt::AlignVCenter:
+				node.setAttribute( name, "vcenter" );
+				break;
+			case Qt::AlignTop:
+				node.setAttribute( name, "top" );
+				break;
+			default:
+				node.setAttribute( name, "left" );
+				break;
+			}
 		}
-	}
 
 	
-} // namespace glabels::model
+	}
+}
diff --git a/model/XmlUtil.h b/model/XmlUtil.h
index 62c8c0c..df9e4c4 100644
--- a/model/XmlUtil.h
+++ b/model/XmlUtil.h
@@ -32,99 +32,102 @@
 #include <cstdint>
 
 
-namespace glabels::model
+namespace glabels
 {
-
-	class XmlUtil
+	namespace model
 	{
-	private:
-		XmlUtil();
+
+		class XmlUtil
+		{
+		private:
+			XmlUtil();
 
 		
-	public:
+		public:
 
-		static void init();
+			static void init();
 
-		static Units units();
-		static void setUnits( const Units& units );
+			static Units units();
+			static void setUnits( const Units& units );
 
-		static QString  getStringAttr( const QDomElement& node,
-		                               const QString&     name,
-		                               const QString&     default_value );
+			static QString  getStringAttr( const QDomElement& node,
+			                               const QString&     name,
+			                               const QString&     default_value );
 
-		static double   getDoubleAttr( const QDomElement& node,
-		                               const QString&     name,
-		                               double             default_value );
+			static double   getDoubleAttr( const QDomElement& node,
+			                               const QString&     name,
+			                               double             default_value );
 
-		static bool     getBoolAttr( const QDomElement& node,
-		                             const QString&     name,
-		                             bool               default_value );
+			static bool     getBoolAttr( const QDomElement& node,
+			                             const QString&     name,
+			                             bool               default_value );
 
-		static int      getIntAttr( const QDomElement& node,
-		                            const QString&     name,
-		                            int                default_value );
+			static int      getIntAttr( const QDomElement& node,
+			                            const QString&     name,
+			                            int                default_value );
 
-		static uint32_t getUIntAttr( const QDomElement& node,
-		                             const QString&     name,
-		                             uint32_t           default_value );
+			static uint32_t getUIntAttr( const QDomElement& node,
+			                             const QString&     name,
+			                             uint32_t           default_value );
 
-		static QString  getI18nAttr( const QDomElement& node,
-		                             const QString&     name,
-		                             const QString&     default_value );
+			static QString  getI18nAttr( const QDomElement& node,
+			                             const QString&     name,
+			                             const QString&     default_value );
 
-		static Distance getLengthAttr( const QDomElement& node,
-		                               const QString&     name,
-		                               const Distance&    default_value );
+			static Distance getLengthAttr( const QDomElement& node,
+			                               const QString&     name,
+			                               const Distance&    default_value );
 
-		static QFont::Weight getWeightAttr( const QDomElement& node,
-		                                    const QString&     name,
-		                                    QFont::Weight      default_value );
+			static QFont::Weight getWeightAttr( const QDomElement& node,
+			                                    const QString&     name,
+			                                    QFont::Weight      default_value );
 
-		static Qt::Alignment getAlignmentAttr( const QDomElement& node,
-		                                       const QString&     name,
-		                                       Qt::Alignment      default_value );
+			static Qt::Alignment getAlignmentAttr( const QDomElement& node,
+			                                       const QString&     name,
+			                                       Qt::Alignment      default_value );
 
 
-		static void     setStringAttr( QDomElement&   node,
-		                               const QString& name,
-		                               const QString& value );
+			static void     setStringAttr( QDomElement&   node,
+			                               const QString& name,
+			                               const QString& value );
 
-		static void     setDoubleAttr( QDomElement&   node,
-		                               const QString& name,
-		                               double         value );
+			static void     setDoubleAttr( QDomElement&   node,
+			                               const QString& name,
+			                               double         value );
 
-		static void     setBoolAttr( QDomElement&   node,
-		                             const QString& name,
-		                             bool           value );
+			static void     setBoolAttr( QDomElement&   node,
+			                             const QString& name,
+			                             bool           value );
 
-		static void     setIntAttr( QDomElement&   node,
-		                            const QString& name,
-		                            int            value );
+			static void     setIntAttr( QDomElement&   node,
+			                            const QString& name,
+			                            int            value );
 
-		static void     setUIntAttr( QDomElement&   node,
-		                             const QString& name,
-		                             uint32_t       value );
+			static void     setUIntAttr( QDomElement&   node,
+			                             const QString& name,
+			                             uint32_t       value );
 
-		static void     setLengthAttr( QDomElement&    node,
-		                               const QString&  name,
-		                               const Distance& value );
+			static void     setLengthAttr( QDomElement&    node,
+			                               const QString&  name,
+			                               const Distance& value );
 
-		static void     setWeightAttr( QDomElement&    node,
-		                               const QString&  name,
-		                               QFont::Weight   value );
+			static void     setWeightAttr( QDomElement&    node,
+			                               const QString&  name,
+			                               QFont::Weight   value );
 
-		static void     setAlignmentAttr( QDomElement&    node,
-		                                  const QString&  name,
-		                                  Qt::Alignment   value );
+			static void     setAlignmentAttr( QDomElement&    node,
+			                                  const QString&  name,
+			                                  Qt::Alignment   value );
 
 		
-	private:
-		Units mUnits;
+		private:
+			Units mUnits;
 
-		static XmlUtil* mInstance;
+			static XmlUtil* mInstance;
 
-	};
+		};
 
+	}
 }
 
 
diff --git a/model/XmlVendorParser.cpp b/model/XmlVendorParser.cpp
index 8463f38..b8745f6 100644
--- a/model/XmlVendorParser.cpp
+++ b/model/XmlVendorParser.cpp
@@ -30,74 +30,78 @@
 #include <QtDebug>
 
 
-namespace glabels::model
+namespace glabels
 {
-
-	bool XmlVendorParser::readFile( const QString &fileName )
+	namespace model
 	{
-		QFile file( fileName );
 
-		if ( !file.open( QFile::ReadOnly | QFile::Text) )
+		bool XmlVendorParser::readFile( const QString &fileName )
 		{
-			qWarning() << "Error: Cannot read file " << fileName
-				   << ": " << file.errorString();
-			return false;
-		}
+			QFile file( fileName );
 
-
-		QDomDocument doc;
-		QString      errorString;
-		int          errorLine;
-		int          errorColumn;
-
-		if ( !doc.setContent( &file, false, &errorString, &errorLine, &errorColumn ) )
-		{
-			qWarning() << "Error: Parse error at line " << errorLine
-				   << "column " << errorColumn
-				   << ": " << errorString;
-			return false;
-		}
-
-		QDomElement root = doc.documentElement();
-		if ( root.tagName() != "Glabels-vendors" )
-		{
-			qWarning() << "Error: Not a Glabels-vendors file.";
-			return false;
-		}
-
-		parseRootNode( root );
-		return true;
-	}
-
-
-	void XmlVendorParser::parseRootNode( const QDomElement &node )
-	{
-		for ( QDomNode child = node.firstChild(); !child.isNull(); child = child.nextSibling() )
-		{
-			if ( child.toElement().tagName() == "Vendor" )
+			if ( !file.open( QFile::ReadOnly | QFile::Text) )
 			{
-				parseVendorNode( child.toElement() );
+				qWarning() << "Error: Cannot read file " << fileName
+				           << ": " << file.errorString();
+				return false;
 			}
-			else if ( !child.isComment() )
+
+
+			QDomDocument doc;
+			QString      errorString;
+			int          errorLine;
+			int          errorColumn;
+
+			if ( !doc.setContent( &file, false, &errorString, &errorLine, &errorColumn ) )
 			{
-				qWarning() << "Warning: bad element: "
-					   << child.toElement().tagName()
-					   << ", Ignored.";
+				qWarning() << "Error: Parse error at line " << errorLine
+				           << "column " << errorColumn
+				           << ": " << errorString;
+				return false;
+			}
+
+			QDomElement root = doc.documentElement();
+			if ( root.tagName() != "Glabels-vendors" )
+			{
+				qWarning() << "Error: Not a Glabels-vendors file.";
+				return false;
+			}
+
+			parseRootNode( root );
+			return true;
+		}
+
+
+		void XmlVendorParser::parseRootNode( const QDomElement &node )
+		{
+			for ( QDomNode child = node.firstChild(); !child.isNull(); child = child.nextSibling() )
+			{
+				if ( child.toElement().tagName() == "Vendor" )
+				{
+					parseVendorNode( child.toElement() );
+				}
+				else if ( !child.isComment() )
+				{
+					qWarning() << "Warning: bad element: "
+					           << child.toElement().tagName()
+					           << ", Ignored.";
+				}
 			}
 		}
-	}
 
 
-	void XmlVendorParser::parseVendorNode( const QDomElement &node )
-	{
-		QString name = XmlUtil::getStringAttr( node, "name", "" );
-		QString url  = XmlUtil::getStringAttr( node, "url", "" );
-
-		Vendor *vendor = new Vendor( name, url );
-		if ( vendor != nullptr )
+		void XmlVendorParser::parseVendorNode( const QDomElement &node )
 		{
-			Db::registerVendor( vendor );
-		}
-	}
+			QString name = XmlUtil::getStringAttr( node, "name", "" );
+			QString url  = XmlUtil::getStringAttr( node, "url", "" );
 
-} // namespace glabels::model
+			Vendor *vendor = new Vendor( name, url );
+			if ( vendor != nullptr )
+			{
+				Db::registerVendor( vendor );
+			}
+		}
+
+
+	}
+}
diff --git a/model/XmlVendorParser.h b/model/XmlVendorParser.h
index 63afac1..3fd7c8a 100644
--- a/model/XmlVendorParser.h
+++ b/model/XmlVendorParser.h
@@ -26,21 +26,24 @@
 #include <QString>
 
 
-namespace glabels::model
+namespace glabels
 {
-
-	class XmlVendorParser
+	namespace model
 	{
-	public:
-		XmlVendorParser() {}
 
-		bool readFile( const QString &fileName );
+		class XmlVendorParser
+		{
+		public:
+			XmlVendorParser() {}
 
-	private:
-		void parseRootNode( const QDomElement &node );
-		void parseVendorNode( const QDomElement &node );
-	};
+			bool readFile( const QString &fileName );
 
+		private:
+			void parseRootNode( const QDomElement &node );
+			void parseVendorNode( const QDomElement &node );
+		};
+
+	}
 }