Updated a few files that have been out of date for a while. This doesn't

fix make dist yet, but at least these files aren't out of date any more.

4 files changed, 338 insertions, 795 deletions

diff --git a/debian/aethyra-data.install b/debian/aethyra-data.install
index 007bcf7b..c652dff3 100644
--- a/debian/aethyra-data.install
+++ b/debian/aethyra-data.install
@@ -1,4 +1,5 @@
 data/graphics/gui/*.png usr/share/games/aethyra/data/graphics/gui
+data/graphics/gui/*.xml usr/share/games/aethyra/data/graphics/gui
 data/graphics/images/*.png usr/share/games/aethyra/data/graphics/images
 data/graphics/images/ambient/*.png usr/share/games/aethyra/data/graphics/images/ambient
 data/graphics/tiles/*.png usr/share/games/aethyra/data/graphics/tiles
diff --git a/debian/aethyra.menu b/debian/aethyra.menu
index 4af5ad0a..42035107 100644
--- a/debian/aethyra.menu
+++ b/debian/aethyra.menu
@@ -1,4 +1,4 @@
-?package(tmw):needs="X11" section="Games/Adventure"\
- title="The Mana World"\
- description="The Mana World is an Online Fantasy adventure game."\
- command="/usr/games/tmw" icon="/usr/share/pixmaps/tmw.xpm"
+?package(aethyra):needs="X11" section="Games/Adventure"\
+ title="Aethyra"\
+ description="Aethyra is a 2D MMORPG using eAthena."\
+ command="/usr/games/aethyra" icon="/usr/share/pixmaps/aethyra.xpm"
diff --git a/debian/aethyra.xpm b/debian/aethyra.xpm
index a3ab9513..515be72e 100644
--- a/debian/aethyra.xpm
+++ b/debian/aethyra.xpm
@@ -1,776 +1,312 @@
-/* XPM */
-static char * aethyra_xpm[] = {
-"32 32 741 2",
-"	c None",
-".	c #E8ED72",
-"+	c #E7ED6A",
-"@	c #E1EB62",
-"#	c #D4E758",
-"$	c #D2E750",
-"%	c #CDE748",
-"&	c #F5F4A1",
-"*	c #F3F294",
-"=	c #EBEE81",
-"-	c #EAEE77",
-";	c #E6ED6F",
-">	c #E1EB68",
-",	c #D9E859",
-"'	c #D3E851",
-")	c #CCE549",
-"!	c #C7E643",
-"~	c #BEE239",
-"{	c #B3DF32",
-"]	c #F8F8C4",
-"^	c #F9F7B3",
-"/	c #F4F3A2",
-"(	c #F4F397",
-"_	c #F5F39A",
-":	c #F2F399",
-"<	c #E2EA6D",
-"[	c #DFEA66",
-"}	c #DAE95C",
-"|	c #D3E753",
-"1	c #CAE54B",
-"2	c #C7E545",
-"3	c #BFE23C",
-"4	c #B7E034",
-"5	c #B1E130",
-"6	c #A5DC28",
-"7	c #F9F9DA",
-"8	c #F9F8CA",
-"9	c #F8F7C9",
-"0	c #F8F7CD",
-"a	c #F9F7C7",
-"b	c #F9F7B8",
-"c	c #F7F5A8",
-"d	c #E6EC73",
-"e	c #E0EA68",
-"f	c #DBE95D",
-"g	c #D8E956",
-"h	c #D2E850",
-"i	c #C4E343",
-"j	c #BEE23D",
-"k	c #B2E036",
-"l	c #A9DE2E",
-"m	c #A0DC29",
-"n	c #91D823",
-"o	c #F9F9F5",
-"p	c #F9F9EA",
-"q	c #F9F9E2",
-"r	c #F9F8E9",
-"s	c #F9F8E1",
-"t	c #F9F7D3",
-"u	c #F9F7BC",
-"v	c #F9F7AF",
-"w	c #E8EE80",
-"x	c #E2EC6F",
-"y	c #DBEA61",
-"z	c #D3E755",
-"A	c #CAE44C",
-"B	c #C6E446",
-"C	c #BDE441",
-"D	c #B8E337",
-"E	c #AADE30",
-"F	c #9DDA2A",
-"G	c #91D722",
-"H	c #87D61F",
-"I	c #7FD61B",
-"J	c #F9F9F8",
-"K	c #F9F9F7",
-"L	c #F9F9F0",
-"M	c #F9F8EC",
-"N	c #F9F7E1",
-"O	c #F9F7D7",
-"P	c #F9F7C9",
-"Q	c #F9F7B4",
-"R	c #EBF092",
-"S	c #E1EB69",
-"T	c #DBE95F",
-"U	c #D3E654",
-"V	c #CCE44A",
-"W	c #C9E647",
-"X	c #BDE13D",
-"Y	c #B1DE35",
-"Z	c #A8DD30",
-"`	c #9BDA29",
-" .	c #94D823",
-"..	c #8CD921",
-"+.	c #82D71C",
-"@.	c #7CD716",
-"#.	c #F9F9F9",
-"$.	c #F9F8F5",
-"%.	c #F9F7EE",
-"&.	c #F9F7E4",
-"*.	c #F9F7D5",
-"=.	c #F9F7CB",
-"-.	c #F9F7BF",
-";.	c #F4F39E",
-">.	c #E1EA76",
-",.	c #E0EA69",
-"'.	c #D9E85D",
-").	c #D7E859",
-"!.	c #CCE64E",
-"~.	c #C1E343",
-"{.	c #BBE23C",
-"].	c #B0DF34",
-"^.	c #A9DD2F",
-"/.	c #9AD928",
-"(.	c #90D822",
-"_.	c #8AD81F",
-":.	c #81D81B",
-"<.	c #76D517",
-"[.	c #F9F7F6",
-"}.	c #F9F7F4",
-"|.	c #F9F5D3",
-"1.	c #F9F6C7",
-"2.	c #F9F6B9",
-"3.	c #E6EC86",
-"4.	c #E6ED72",
-"5.	c #E3ED6C",
-"6.	c #D6E75E",
-"7.	c #D1E655",
-"8.	c #C7E34A",
-"9.	c #C1E141",
-"0.	c #B2DD39",
-"a.	c #B3E135",
-"b.	c #A6DE30",
-"c.	c #9BDB29",
-"d.	c #97DA24",
-"e.	c #87D71E",
-"f.	c #82D71B",
-"g.	c #87DA1F",
-"h.	c #63CF12",
-"i.	c #F8F8F8",
-"j.	c #F9F7F5",
-"k.	c #F9F5E3",
-"l.	c #F9F5D4",
-"m.	c #F9F6B8",
-"n.	c #EDF198",
-"o.	c #E1EB6F",
-"p.	c #E1EC68",
-"q.	c #D8E95C",
-"r.	c #D3E752",
-"s.	c #C9E44A",
-"t.	c #C7E746",
-"u.	c #BEE43D",
-"v.	c #B0E138",
-"w.	c #A8E02D",
-"x.	c #A3DF29",
-"y.	c #B4E226",
-"z.	c #CDEB2C",
-"A.	c #B9E925",
-"B.	c #6DD213",
-"C.	c #56C90F",
-"D.	c #F9F8F4",
-"E.	c #F9F7EB",
-"F.	c #F9F7F2",
-"G.	c #F9F5EA",
-"H.	c #F9F3DE",
-"I.	c #F9F4CF",
-"J.	c #F9F5C5",
-"K.	c #F9F5B8",
-"L.	c #F8F7B2",
-"M.	c #F1F495",
-"N.	c #E3EC6B",
-"O.	c #D8E859",
-"P.	c #CEE650",
-"Q.	c #C8E449",
-"R.	c #C2E441",
-"S.	c #BAE139",
-"T.	c #E7F24F",
-"U.	c #E3F347",
-"V.	c #DCF13E",
-"W.	c #D9F137",
-"X.	c #CDEE30",
-"Y.	c #C3EB27",
-"Z.	c #85D919",
-"`.	c #4FC90E",
-" +	c #F7F7F2",
-".+	c #F9F9F2",
-"++	c #F9F8ED",
-"@+	c #F9F5EE",
-"#+	c #F9F4E4",
-"$+	c #F9F5DC",
-"%+	c #F9F6D1",
-"&+	c #F9F6C2",
-"*+	c #F9F6B7",
-"=+	c #F9F6A6",
-"-+	c #F8F599",
-";+	c #F7F591",
-">+	c #F4F584",
-",+	c #D7EB61",
-"'+	c #C5E447",
-")+	c #BAE13E",
-"!+	c #B8E23A",
-"~+	c #B8E132",
-"{+	c #E6F349",
-"]+	c #E1F343",
-"^+	c #DAF13B",
-"/+	c #D2EF33",
-"(+	c #CBEE2E",
-"_+	c #C1EA25",
-":+	c #A9E61F",
-"<+	c #55CE10",
-"[+	c #4FC60D",
-"}+	c #F8F8E9",
-"|+	c #F9F9E8",
-"1+	c #F9F9E7",
-"2+	c #F9F8E4",
-"3+	c #F9F7F0",
-"4+	c #F9F6EF",
-"5+	c #F9F5E7",
-"6+	c #F9F3DB",
-"7+	c #F9F5D6",
-"8+	c #F9F7CE",
-"9+	c #F9F7BE",
-"0+	c #F9F7B7",
-"a+	c #F9F7A5",
-"b+	c #F7F691",
-"c+	c #F6F588",
-"d+	c #F5F580",
-"e+	c #DBEE6B",
-"f+	c #BAE13D",
-"g+	c #B5E137",
-"h+	c #A5DB2E",
-"i+	c #E0F041",
-"j+	c #DBF140",
-"k+	c #DAF138",
-"l+	c #D1EE32",
-"m+	c #C6EB2B",
-"n+	c #C0EC27",
-"o+	c #BAEB22",
-"p+	c #65D517",
-"q+	c #4FCC0B",
-"r+	c #F9F9D7",
-"s+	c #F9F9D6",
-"t+	c #F9F8EA",
-"u+	c #F9F7E8",
-"v+	c #F9F5E5",
-"w+	c #F9F5DD",
-"x+	c #F9F2D2",
-"y+	c #F9F3CA",
-"z+	c #F9F6C3",
-"A+	c #F9F7BA",
-"B+	c #F9F8B2",
-"C+	c #F8F89E",
-"D+	c #F8F58E",
-"E+	c #F5F583",
-"F+	c #EFF479",
-"G+	c #C5E557",
-"H+	c #C5E543",
-"I+	c #B9E13B",
-"J+	c #9FDA2A",
-"K+	c #CEEC3B",
-"L+	c #D9EF38",
-"M+	c #D4EE32",
-"N+	c #D1EF30",
-"O+	c #C8ED2A",
-"P+	c #C2EB26",
-"Q+	c #B5E81E",
-"R+	c #80DC1C",
-"S+	c #46C80B",
-"T+	c #F0F1C0",
-"U+	c #F9F8C7",
-"V+	c #F9F9C6",
-"W+	c #F9F8D5",
-"X+	c #F9F7DF",
-"Y+	c #F9F6D6",
-"Z+	c #F9F5D0",
-"`+	c #F9F3C4",
-" @	c #F9F3BC",
-".@	c #F9F5B5",
-"+@	c #F9F7B0",
-"@@	c #F9F8A4",
-"#@	c #F7F796",
-"$@	c #EFF386",
-"%@	c #D3E865",
-"&@	c #C7E450",
-"*@	c #C0E242",
-"=@	c #BEE33F",
-"-@	c #B5E036",
-";@	c #A7DB2F",
-">@	c #A0DC2B",
-",@	c #C4E32F",
-"'@	c #DCF139",
-")@	c #D2ED2E",
-"!@	c #CAEC2A",
-"~@	c #CBEF2B",
-"{@	c #BEEA22",
-"]@	c #B2E81E",
-"^@	c #8FDD17",
-"/@	c #3DC209",
-"(@	c #33BC07",
-"_@	c #F5F5B4",
-":@	c #F6F6AE",
-"<@	c #F6F6B1",
-"[@	c #F7F7B3",
-"}@	c #F2F3AB",
-"|@	c #F3F198",
-"1@	c #F8F5BA",
-"2@	c #F9F4B6",
-"3@	c #F9F3AF",
-"4@	c #F9F4A4",
-"5@	c #F8F7A2",
-"6@	c #F7F799",
-"7@	c #F6F68A",
-"8@	c #DDEC69",
-"9@	c #CEE74F",
-"0@	c #C0E03C",
-"a@	c #D5EA4C",
-"b@	c #BEE23A",
-"c@	c #A9DF2F",
-"d@	c #9EDD2A",
-"e@	c #BEE22A",
-"f@	c #DCF23A",
-"g@	c #D4F033",
-"h@	c #CBED2A",
-"i@	c #C5ED29",
-"j@	c #BDEB22",
-"k@	c #B4E81E",
-"l@	c #A5E618",
-"m@	c #41C209",
-"n@	c #3ABF07",
-"o@	c #DCDC8A",
-"p@	c #F3F49B",
-"q@	c #F3F49D",
-"r@	c #F2F49D",
-"s@	c #F4F59F",
-"t@	c #F4F59D",
-"u@	c #F1F498",
-"v@	c #F8F7BF",
-"w@	c #F9F6AF",
-"x@	c #F8F39A",
-"y@	c #F8F594",
-"z@	c #F5F57D",
-"A@	c #DDEC66",
-"B@	c #C2E144",
-"C@	c #BDE13F",
-"D@	c #BFD82E",
-"E@	c #E6EF4E",
-"F@	c #E1F04A",
-"G@	c #C2E433",
-"H@	c #CDEA34",
-"I@	c #DDF03F",
-"J@	c #D4EF36",
-"K@	c #CFEF30",
-"L@	c #CBEE2A",
-"M@	c #C2EC26",
-"N@	c #B7E91F",
-"O@	c #ADE71C",
-"P@	c #A0E517",
-"Q@	c #3FC008",
-"R@	c #33BD06",
-"S@	c #DDD97B",
-"T@	c #F2F392",
-"U@	c #F0F28F",
-"V@	c #F1F38C",
-"W@	c #F6F7BE",
-"X@	c #F5F6B7",
-"Y@	c #F5F5B2",
-"Z@	c #F9F6A7",
-"`@	c #F9F6A3",
-" #	c #F8F59C",
-".#	c #F8F38D",
-"+#	c #F7F58C",
-"@#	c #F5F687",
-"##	c #F3F576",
-"$#	c #F0F575",
-"%#	c #DDEC57",
-"&#	c #D8EA49",
-"*#	c #DDE946",
-"=#	c #E8F14F",
-"-#	c #E3F148",
-";#	c #E2F346",
-">#	c #E1F345",
-",#	c #D8F039",
-"'#	c #D1EF31",
-")#	c #CAED2C",
-"!#	c #C4EC27",
-"~#	c #C1ED24",
-"{#	c #B6EA1F",
-"]#	c #AFEA1C",
-"^#	c #A4E717",
-"/#	c #3EBF08",
-"(#	c #37C206",
-"_#	c #E8EB6C",
-":#	c #E6ED76",
-"<#	c #E4EC73",
-"[#	c #ECEF86",
-"}#	c #F8F7A7",
-"|#	c #F9F7A7",
-"1#	c #F8F7A3",
-"2#	c #F8F69D",
-"3#	c #F8F69A",
-"4#	c #F7F48A",
-"5#	c #F6F27B",
-"6#	c #F6F482",
-"7#	c #F3F57B",
-"8#	c #F1F574",
-"9#	c #F0F46C",
-"0#	c #EBF25E",
-"a#	c #EBF259",
-"b#	c #E7F152",
-"c#	c #E1EF44",
-"d#	c #DFEF40",
-"e#	c #D7EE3B",
-"f#	c #DAF039",
-"g#	c #D7F137",
-"h#	c #D1F032",
-"i#	c #CCEF2C",
-"j#	c #C6EE26",
-"k#	c #B7EA1F",
-"l#	c #AAE81A",
-"m#	c #97E415",
-"n#	c #37BE07",
-"o#	c #2CAF05",
-"p#	c #D5DC5B",
-"q#	c #E4ED6F",
-"r#	c #E9F082",
-"s#	c #F8F7A1",
-"t#	c #F8F79D",
-"u#	c #F7F696",
-"v#	c #F6F68B",
-"w#	c #F5F37B",
-"x#	c #F5F378",
-"y#	c #F3F372",
-"z#	c #F1F36C",
-"A#	c #EEF468",
-"B#	c #ECF35D",
-"C#	c #EAF256",
-"D#	c #E7F151",
-"E#	c #E4F148",
-"F#	c #E0F043",
-"G#	c #E1F143",
-"H#	c #D9EF39",
-"I#	c #D2ED31",
-"J#	c #CEF030",
-"K#	c #C9EF2A",
-"L#	c #C0ED25",
-"M#	c #ADE61C",
-"N#	c #A7E619",
-"O#	c #A5E818",
-"P#	c #80D913",
-"Q#	c #34BE06",
-"R#	c #35BF05",
-"S#	c #E0EC61",
-"T#	c #E4ED72",
-"U#	c #F7F792",
-"V#	c #F7F791",
-"W#	c #F8F78F",
-"X#	c #F6F687",
-"Y#	c #F6F688",
-"Z#	c #F3F377",
-"`#	c #F4F474",
-" $	c #F1F472",
-".$	c #EEF46D",
-"+$	c #DEEB59",
-"@$	c #E7F059",
-"#$	c #E9F356",
-"$$	c #E9F255",
-"%$	c #E7F24D",
-"&$	c #E6F245",
-"*$	c #E4F243",
-"=$	c #DFF240",
-"-$	c #D7EF36",
-";$	c #CCEB2B",
-">$	c #CDEE2C",
-",$	c #C5ED2A",
-"'$	c #BDEB25",
-")$	c #ADE71E",
-"!$	c #A6E51A",
-"~$	c #9AE316",
-"{$	c #93E214",
-"]$	c #5CC30B",
-"^$	c #34BD05",
-"/$	c #DDEC59",
-"($	c #D6E858",
-"_$	c #F5F57C",
-":$	c #F5F680",
-"<$	c #F5F67E",
-"[$	c #F5F67C",
-"}$	c #F4F574",
-"|$	c #F1F26A",
-"1$	c #F2F46F",
-"2$	c #EFF468",
-"3$	c #BCE24A",
-"4$	c #BBDF38",
-"5$	c #B9DB30",
-"6$	c #C3DF33",
-"7$	c #DDED42",
-"8$	c #E5F249",
-"9$	c #DEF03D",
-"0$	c #D5EF35",
-"a$	c #CEEE2E",
-"b$	c #C1E925",
-"c$	c #B9E923",
-"d$	c #B1E71E",
-"e$	c #ABE619",
-"f$	c #A8E517",
-"g$	c #94E113",
-"h$	c #83DE11",
-"i$	c #35AD06",
-"j$	c #2FBB04",
-"k$	c #CEE249",
-"l$	c #CFE54B",
-"m$	c #E8F16F",
-"n$	c #F5F578",
-"o$	c #F4F674",
-"p$	c #F1F46D",
-"q$	c #F2F268",
-"r$	c #F1F366",
-"s$	c #EFF462",
-"t$	c #DEEF5B",
-"u$	c #B3E039",
-"v$	c #B4E037",
-"w$	c #AEDE31",
-"x$	c #A6DB2B",
-"y$	c #BBE331",
-"z$	c #E3F243",
-"A$	c #DFF141",
-"B$	c #D9F038",
-"C$	c #D9F136",
-"D$	c #CDEF2E",
-"E$	c #C7EE2A",
-"F$	c #BDEB24",
-"G$	c #B7EA1D",
-"H$	c #A0E316",
-"I$	c #96E214",
-"J$	c #93E212",
-"K$	c #6DD10D",
-"L$	c #2CAD04",
-"M$	c #2AB303",
-"N$	c #CDE746",
-"O$	c #CDE74B",
-"P$	c #F0F56D",
-"Q$	c #F2F46A",
-"R$	c #F0F264",
-"S$	c #ECF15A",
-"T$	c #EFF361",
-"U$	c #EDF45A",
-"V$	c #EBF45C",
-"W$	c #B9E239",
-"X$	c #B6E335",
-"Y$	c #ADE02E",
-"Z$	c #A9E02B",
-"`$	c #A4DE28",
-" %	c #DFF243",
-".%	c #D7EF35",
-"+%	c #D5EF31",
-"@%	c #D4F031",
-"#%	c #CDEF2C",
-"$%	c #C7ED28",
-"%%	c #C6EE27",
-"&%	c #C1EE23",
-"*%	c #B6EC1F",
-"=%	c #A7E818",
-"-%	c #67CC0E",
-";%	c #47C208",
-">%	c #34B906",
-",%	c #2DBD04",
-"'%	c #C1E23C",
-")%	c #C3E53E",
-"!%	c #D7EB4F",
-"~%	c #EEF257",
-"{%	c #ECF057",
-"]%	c #EAF051",
-"^%	c #EBF255",
-"/%	c #EBF452",
-"(%	c #E9F450",
-"_%	c #B8E137",
-":%	c #A3DB2A",
-"<%	c #A5DF2B",
-"[%	c #98DA26",
-"}%	c #8CD621",
-"|%	c #90D41D",
-"1%	c #BFE326",
-"2%	c #D0EE2D",
-"3%	c #CEEF2E",
-"4%	c #C8EE28",
-"5%	c #C1ED26",
-"6%	c #BCEC22",
-"7%	c #B9ED20",
-"8%	c #9FE419",
-"9%	c #70CD0F",
-"0%	c #35B906",
-"a%	c #34C005",
-"b%	c #30C005",
-"c%	c #26B503",
-"d%	c #B7E036",
-"e%	c #B7E239",
-"f%	c #E2EF4B",
-"g%	c #EBF451",
-"h%	c #E5F14B",
-"i%	c #E4F04B",
-"j%	c #E7F451",
-"k%	c #E6F44B",
-"l%	c #B6DD2C",
-"m%	c #ABDC25",
-"n%	c #B4DF23",
-"o%	c #A3D61D",
-"p%	c #96D91D",
-"q%	c #86D218",
-"r%	c #B3DE21",
-"s%	c #CAED2B",
-"t%	c #C6EC25",
-"u%	c #BEEB22",
-"v%	c #BDEC20",
-"w%	c #B3EA1D",
-"x%	c #9AE017",
-"y%	c #46BC07",
-"z%	c #40C107",
-"A%	c #35C206",
-"B%	c #2EBE05",
-"C%	c #2BBD04",
-"D%	c #B2E130",
-"E%	c #B5E334",
-"F%	c #DFF042",
-"G%	c #E4F147",
-"H%	c #E5F348",
-"I%	c #E2F246",
-"J%	c #E4F445",
-"K%	c #DFF33F",
-"L%	c #E0F33D",
-"M%	c #DCF238",
-"N%	c #D8F034",
-"O%	c #D2EF2E",
-"P%	c #CBEB29",
-"Q%	c #D1EF2D",
-"R%	c #C7ED26",
-"S%	c #C5EE26",
-"T%	c #B7EA20",
-"U%	c #B5EA1D",
-"V%	c #AEEA1B",
-"W%	c #85D813",
-"X%	c #3FC208",
-"Y%	c #3AC507",
-"Z%	c #33C005",
-"`%	c #2BBB04",
-" &	c #26A903",
-".&	c #A9E029",
-"+&	c #A5DF29",
-"@&	c #A5DE29",
-"#&	c #D8EE3D",
-"$&	c #E4F341",
-"%&	c #E2F340",
-"&&	c #E0F33C",
-"*&	c #DDF239",
-"=&	c #D9F236",
-"-&	c #D6F133",
-";&	c #D3F131",
-">&	c #CEEE2A",
-",&	c #CEEF28",
-"'&	c #CBEF29",
-")&	c #BFEB22",
-"!&	c #B2EB23",
-"~&	c #81DD1D",
-"{&	c #6DCF11",
-"]&	c #68D10F",
-"^&	c #4CCB0E",
-"/&	c #39C407",
-"(&	c #33C106",
-"_&	c #2ABB04",
-":&	c #27B803",
-"<&	c #97DA23",
-"[&	c #98DC24",
-"}&	c #95DC23",
-"|&	c #93DB25",
-"1&	c #99DF2A",
-"2&	c #C6EC31",
-"3&	c #C6EB2E",
-"4&	c #ADE026",
-"5&	c #C1E928",
-"6&	c #CCEE29",
-"7&	c #C9ED26",
-"8&	c #B9EA21",
-"9&	c #8FD718",
-"0&	c #4FC30C",
-"a&	c #4DCB0B",
-"b&	c #49CB0A",
-"c&	c #3DC508",
-"d&	c #3DC808",
-"e&	c #34C306",
-"f&	c #2DBC04",
-"g&	c #2CBF04",
-"h&	c #88D81D",
-"i&	c #87D81A",
-"j&	c #86D81A",
-"k&	c #7ED518",
-"l&	c #75D015",
-"m&	c #71D113",
-"n&	c #84DB1A",
-"o&	c #9DE524",
-"p&	c #7CD316",
-"q&	c #62CA0E",
-"r&	c #5AC80B",
-"s&	c #55C90B",
-"t&	c #46CA0A",
-"u&	c #41C708",
-"v&	c #3DC907",
-"w&	c #36C406",
-"x&	c #30C205",
-"y&	c #27AA04",
-"z&	c #75D016",
-"A&	c #79D516",
-"B&	c #73D515",
-"C&	c #6AD113",
-"D&	c #6CD413",
-"E&	c #65D211",
-"F&	c #5BCD0F",
-"G&	c #56CD0E",
-"H&	c #58D10E",
-"I&	c #50CC0C",
-"J&	c #48C809",
-"K&	c #40C708",
-"L&	c #3FC607",
-"M&	c #40C907",
-"N&	c #38C706",
-"O&	c #32C105",
-"P&	c #57BE0F",
-"Q&	c #61D111",
-"R&	c #66D411",
-"S&	c #62D20F",
-"T&	c #57CD0D",
-"U&	c #57D00C",
-"V&	c #4DCC0C",
-"W&	c #4BCD0A",
-"X&	c #40C608",
-"Y&	c #3DC807",
-"Z&	c #30B505",
-"`&	c #4BBC0B",
-" *	c #4CC20A",
-".*	c #48BF0A",
-"+*	c #45C109",
-"@*	c #38B507",
-"#*	c #31B506",
-"                          . + @ # $ %                           ",
-"                    & * = - ; > , ' ) ! ~ {                     ",
-"                ] ^ / ( _ : < [ } | 1 2 3 4 5 6                 ",
-"              7 8 9 0 a b c d e f g h i j k l m n               ",
-"          o p q r s t a u v w x y z A B C D E F G H I           ",
-"        J K L o M N O P u Q R S T U V W X Y Z `  ...+.@.        ",
-"        #.K J $.%.&.*.=.-.;.>.,.'.).!.~.{.].^./.(._.:.<.        ",
-"      #.#.J [.}.%.&.|.1.2.3.4.5.6.7.8.9.0.a.b.c.d.e.f.g.h.      ",
-"    i.#.K [.j.}.%.k.l.1.m.n.o.p.q.r.s.t.u.v.E w.x.y.z.A.B.C.    ",
-"    #.K D.E.}.F.G.H.I.J.K.L.M.N.O.P.Q.R.S.D T.U.V.W.X.Y.Z.`.    ",
-"   +.+.+++&.F.@+#+$+%+&+*+=+-+;+>+,+'+)+!+~+{+]+^+/+(+_+:+<+[+  ",
-"  }+|+1+2+3+4+5+6+7+8+9+0+a+b+c+d+e+9.f+g+h+i+j+k+l+m+n+o+p+q+  ",
-"  r+r+s+t+u+v+w+x+y+z+A+B+C+D+E+F+G+H+I+].J+K+L+M+N+O+P+Q+R+S+  ",
-"T+U+V+V+W+X+Y+Z+`+ @.@+@@@#@$@%@&@*@=@-@;@>@,@'@)@!@~@{@]@^@/@(@",
-"_@:@<@[@[@}@|@1@2@3@4@5@6@7@8@9@W 0@a@b@c@d@e@f@g@h@i@j@k@l@m@n@",
-"o@p@q@r@s@t@u@v@w@4@x@y@b+z@A@B@C@D@E@F@G@H@I@J@K@L@M@N@O@P@Q@R@",
-"S@T@U@V@W@X@Y@Z@`@ #.#+#@###$#%#&#*#=#-#;#>#,#'#)#!#~#{#]#^#/#(#",
-"_#:#<#[#}#|#1#2#3#4#5#6#7#8#9#0#a#b#c#d#e#f#g#h#i#j#k#O@l#m#n#o#",
-"p#q#r#5@s#t#u#b+v#w#x#y#z#A#B#C#D#E#F#G#H#I#'#J#K#L#M#N#O#P#Q#R#",
-"  S#T#U#V#W#X#Y#Z#`# $.$+$@$#$$$%$&$*$=$-$;$>$,$'$)$!$~${$]$^$  ",
-"  /$($_$:$<$[$}$|$1$2$3$4$5$6$7$8$G#9$k+0$a$b$c$d$e$f$g$h$i$j$  ",
-"  k$l$m$n$o$p$q$r$s$t$u$v$w$x$y$z$A$B$C$'#D$E$F$G$H$I$J$K$L$M$  ",
-"    N$O$P$Q$R$S$T$U$V$W$X$Y$Z$`$ %.%+%@%#%$%%%&%*%=%-%;%>%,%    ",
-"    '%)%!%~%{%]%^%/%(%_%:%<%[%}%|%1%2%3%4%5%6%7%8%9%0%a%b%c%    ",
-"      d%e%f%g%h%i%j%k%l%m%n%o%p%q%r%s%t%u%v%w%x%y%z%A%B%C%      ",
-"        D%E%F%G%H%I%J%K%L%M%N%O%P%Q%R%S%T%U%V%W%X%Y%Z%`% &      ",
-"        .&+&@&#&$&%&&&*&=&-&;&>&,&'&)&!&~&{&]&^&/&(&_&:&        ",
-"          <&[&}&|&1&2&3&4&5&6&7&{@8&9&0&a&b&c&d&e&f&g&          ",
-"              h&i&j&k&l&m&n&o&p&q&r&s&a&t&u&v&w&x&y&            ",
-"                z&A&B&C&D&E&F&G&H&I&J&K&L&M&N&O&                ",
-"                    P&Q&R&S&T&U&V&W&X&Y&v&Z&                    ",
-"                          `& *.*+*@*#*                          "};
+/* XPM */

+static char * Aethyra_xpm[] = {

+"32 32 277 2",

+"  	c None",

+". 	c #840000",

+"+ 	c #7E0000",

+"@ 	c #4F0000",

+"# 	c #810000",

+"$ 	c #830000",

+"% 	c #7B0000",

+"& 	c #460000",

+"* 	c #4C0000",

+"= 	c #4B0000",

+"- 	c #750000",

+"; 	c #860000",

+"> 	c #850000",

+", 	c #5D0000",

+"' 	c #490000",

+") 	c #450000",

+"! 	c #4A0000",

+"~ 	c #440000",

+"{ 	c #6A0000",

+"] 	c #7A0000",

+"^ 	c #8B0000",

+"/ 	c #990000",

+"( 	c #960000",

+"_ 	c #720000",

+": 	c #6E0000",

+"< 	c #740000",

+"[ 	c #6B0202",

+"} 	c #550505",

+"| 	c #420404",

+"1 	c #440101",

+"2 	c #4D0000",

+"3 	c #4E0000",

+"4 	c #480000",

+"5 	c #9D0000",

+"6 	c #9B0000",

+"7 	c #6F0000",

+"8 	c #710000",

+"9 	c #760000",

+"0 	c #680404",

+"a 	c #4B0C0C",

+"b 	c #3C0909",

+"c 	c #470202",

+"d 	c #450101",

+"e 	c #500000",

+"f 	c #510000",

+"g 	c #790000",

+"h 	c #890000",

+"i 	c #920000",

+"j 	c #710706",

+"k 	c #7D381F",

+"l 	c #934A1A",

+"m 	c #7B1A09",

+"n 	c #6B1609",

+"o 	c #521E13",

+"p 	c #4F2517",

+"q 	c #5D230F",

+"r 	c #4D0F04",

+"s 	c #350A0A",

+"t 	c #360909",

+"u 	c #470303",

+"v 	c #930000",

+"w 	c #840202",

+"x 	c #712C1C",

+"y 	c #A58248",

+"z 	c #866621",

+"A 	c #835819",

+"B 	c #98681F",

+"C 	c #845C1D",

+"D 	c #BB964A",

+"E 	c #856225",

+"F 	c #3D1B0B",

+"G 	c #241818",

+"H 	c #251717",

+"I 	c #360A0A",

+"J 	c #430000",

+"K 	c #6C0000",

+"L 	c #800000",

+"M 	c #730404",

+"N 	c #6A431E",

+"O 	c #473C1C",

+"P 	c #534420",

+"Q 	c #806125",

+"R 	c #53290B",

+"S 	c #461C09",

+"T 	c #BB9432",

+"U 	c #65490F",

+"V 	c #1F1110",

+"W 	c #1A2323",

+"X 	c #1A2222",

+"Y 	c #261212",

+"Z 	c #440202",

+"` 	c #7F0000",

+" .	c #870000",

+"..	c #6D0505",

+"+.	c #422522",

+"@.	c #454434",

+"#.	c #A18744",

+"$.	c #8F7237",

+"%.	c #A37F48",

+"&.	c #AD8847",

+"*.	c #C6A657",

+"=.	c #644C14",

+"-.	c #211615",

+";.	c #1C2626",

+">.	c #1B2323",

+",.	c #231313",

+"'.	c #420202",

+").	c #6C0404",

+"!.	c #532D23",

+"~.	c #A8915B",

+"{.	c #967C37",

+"].	c #6E5926",

+"^.	c #453512",

+"/.	c #473713",

+"(.	c #A4832A",

+"_.	c #594310",

+":.	c #241F1E",

+"<.	c #232828",

+"[.	c #1C2020",

+"}.	c #241111",

+"|.	c #430202",

+"1.	c #7C5030",

+"2.	c #967C3D",

+"3.	c #3E3318",

+"4.	c #3D3930",

+"5.	c #454442",

+"6.	c #524D44",

+"7.	c #C09E45",

+"8.	c #654F17",

+"9.	c #262524",

+"0.	c #252929",

+"a.	c #410202",

+"b.	c #6B0302",

+"c.	c #A78041",

+"d.	c #6A5621",

+"e.	c #414543",

+"f.	c #696B6B",

+"g.	c #747676",

+"h.	c #7B7566",

+"i.	c #C9A84F",

+"j.	c #665017",

+"k.	c #282725",

+"l.	c #252A2A",

+"m.	c #1B2222",

+"n.	c #3D0202",

+"o.	c #750802",

+"p.	c #B48E41",

+"q.	c #564418",

+"r.	c #4A4B4B",

+"s.	c #6D6F6F",

+"t.	c #797A7A",

+"u.	c #867C62",

+"v.	c #AE9040",

+"w.	c #664F12",

+"x.	c #2D2A25",

+"y.	c #242828",

+"z.	c #1E1E1E",

+"A.	c #291010",

+"B.	c #400202",

+"C.	c #860B02",

+"D.	c #B78C32",

+"E.	c #594013",

+"F.	c #433E3E",

+"G.	c #606464",

+"H.	c #74736C",

+"I.	c #7C6D44",

+"J.	c #433719",

+"K.	c #413311",

+"L.	c #322F1E",

+"M.	c #1C2121",

+"N.	c #271212",

+"O.	c #3C0606",

+"P.	c #8C0200",

+"Q.	c #B5771D",

+"R.	c #765513",

+"S.	c #3F3636",

+"T.	c #555B5B",

+"U.	c #686969",

+"V.	c #5A5957",

+"W.	c #3C3832",

+"X.	c #403826",

+"Y.	c #2F3023",

+"Z.	c #1C1F1D",

+"`.	c #2E0A0A",

+" +	c #460101",

+".+	c #8F0101",

+"++	c #A03F0C",

+"@+	c #AC7E19",

+"#+	c #4B3625",

+"$+	c #474747",

+"%+	c #5B5C5A",

+"&+	c #83775A",

+"*+	c #8C7539",

+"=+	c #67541F",

+"-+	c #6B551C",

+";+	c #8C6D24",

+">+	c #4E1C09",

+",+	c #4A0101",

+"'+	c #8A0606",

+")+	c #8D1203",

+"!+	c #A76713",

+"~+	c #87611B",

+"{+	c #453A32",

+"]+	c #52554E",

+"^+	c #A38A45",

+"/+	c #715818",

+"(+	c #7A6424",

+"_+	c #443212",

+":+	c #947026",

+"<+	c #7D4E11",

+"[+	c #490400",

+"}+	c #420000",

+"|+	c #7F0808",

+"1+	c #8B0101",

+"2+	c #800F01",

+"3+	c #915E11",

+"4+	c #504F40",

+"5+	c #4E4834",

+"6+	c #5A4715",

+"7+	c #5B4814",

+"8+	c #382813",

+"9+	c #917035",

+"0+	c #533209",

+"a+	c #3F0400",

+"b+	c #8E0101",

+"c+	c #8A0000",

+"d+	c #671104",

+"e+	c #663D12",

+"f+	c #786023",

+"g+	c #74612B",

+"h+	c #665320",

+"i+	c #675321",

+"j+	c #785C24",

+"k+	c #684718",

+"l+	c #380B00",

+"m+	c #400000",

+"n+	c #8C0303",

+"o+	c #8D0000",

+"p+	c #780101",

+"q+	c #510808",

+"r+	c #291A16",

+"s+	c #26291C",

+"t+	c #2D2B18",

+"u+	c #321F0E",

+"v+	c #370A02",

+"w+	c #3E0100",

+"x+	c #850202",

+"y+	c #600202",

+"z+	c #331313",

+"A+	c #1E2121",

+"B+	c #1A1E1E",

+"C+	c #270D0D",

+"D+	c #470000",

+"E+	c #7B0404",

+"F+	c #720101",

+"G+	c #4B0D0D",

+"H+	c #2D1717",

+"I+	c #261414",

+"J+	c #380808",

+"K+	c #7E0202",

+"L+	c #5D0606",

+"M+	c #3B0E0E",

+"N+	c #300C0C",

+"O+	c #430303",

+"P+	c #7A0505",

+"Q+	c #7C0000",

+"R+	c #640404",

+"S+	c #430D0D",

+"T+	c #460202",

+"U+	c #610505",

+"V+	c #440E0E",

+"W+	c #390B0B",

+"X+	c #560202",

+"Y+	c #480707",

+"Z+	c #410505",

+"`+	c #4B0101",

+" @	c #480101",

+"                                                                ",

+"                                                                ",

+"                                                                ",

+"          . +                                     @             ",

+"          # $ %                               & * @ =           ",

+"          - # ; > $           , '           ) ! @ * ~           ",

+"          { ] ^ / ( $ _ : < [ } | 1 ) ~ ' 2 2 3 3 4             ",

+"            ] ^ 5 6 . 7 8 9 0 a b c * d 4 e f @ 3 4             ",

+"            g h / i j k l m n o p q r s t u e 3 2 4             ",

+"            8 > v w x y z A B C D E F G H I = @ ' J             ",

+"            K L ^ M N O P Q R S T U V W X Y Z e )               ",

+"              `  ...+.@.#.$.%.&.*.=.-.;.>.,.'.e &               ",

+"              ` . ).!.~.{.].^./.(._.:.<.[.}.|.@ 4               ",

+"                # [ 1.2.3.4.5.6.7.8.9.0.[.}.a.=                 ",

+"                ` b.c.d.e.f.g.h.i.j.k.l.m.,.n.)                 ",

+"                L o.p.q.r.s.t.u.v.w.x.y.z.A.B.~                 ",

+"                ; C.D.E.F.G.H.I.J.K.L.M.N.O.4                   ",

+"                  P.Q.R.S.T.U.V.W.X.Y.Z.`. +2                   ",

+"                  .+++@+#+$+%+&+*+=+-+;+>+,+=                   ",

+"                  '+)+!+~+{+]+^+/+(+_+:+<+[+}+                  ",

+"                  |+1+2+3+z 4+5+6+7+8+9+0+a+                    ",

+"                    b+c+d+e+f+g+h+i+j+k+l+m+                    ",

+"                    n+o+p+q+r+s+t+u+v+w+) )                     ",

+"                      x+` y+z+A+B+C+1 e D+                      ",

+"                      E+# F+G+H+I+J+3 @ ~                       ",

+"                        K+% L+M+N+O+e '                         ",

+"                        P+Q+R+S+I T+@ )                         ",

+"                          9 U+V+W+u 2                           ",

+"                            X+Y+Z+ +                            ",

+"                            * `+ @                              ",

+"                                                                ",

+"                                                                "};

diff --git a/debian/control b/debian/control
index 4ada3be5..b845ba94 100644
--- a/debian/control
+++ b/debian/control
@@ -1,8 +1,8 @@
 Source: aethyra
 Section: games
 Priority: optional
-Homepage: http://www.aethyra.com/
-Maintainer: Patrick Matthäi <patrick.matthaei@web.de> (Patrick is TMW maintainer need to change this)
+Homepage: http://www.aethyra.org/
+Maintainer: Aethyra Project <www.aethyra.org>
 Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.13.19), dpatch, autotools-dev, libcurl4-gnutls-dev, libgl1-mesa-dev, libguichan2-dev (>= 0.7.1), libsdl1.2-dev, libsdl-image1.2-dev, libsdl-net1.2-dev, libsdl-mixer1.2-dev, libphysfs-dev, libpng12-dev, libxml2-dev, zlib1g-dev
 Standards-Version: 3.7.3
 
@@ -10,28 +10,34 @@ Package: aethyra
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, aethyra-data (= ${source:Version})
 Recommends: aethyra-music
-Description: Aethyra is a great Online Rolegame
- based upon The Mana World 0.0 codebase. It has its own universe, and its own
- character management system, which will give you the opportunity to play in a
- 2D heroic-fantasy world forever.
+Description:  Aethyra is a community driven experiment that utilizes eAthena at its core with the end goal of 
+ getting its players as involved in the process as much as possible. It's originally forked from 
+ The Mana World when its developers came up with the idea of "Why should we have to wait for an 
+ MMORPG game in development when we've already got a great server setup here that does everything 
+ we've been promised and more?" As such, we are trying to implement as many functions of eAthena 
+ as possible while creating our own in the process based on what our players want to see.
 
 Package: aethyra-dbg
 Architecture: any
 Priority: extra
 Depends: aethyra (= ${binary:Version})
-Description: Aethyra is a great Online Rolegame (debugging symbols)
- based upon the The Mana World 0.0 codebase. It has its own universe, and its own
- character management system, which will give you the opportunity to play in a
- 2D heroic-fantasy world forever.
+Description:  Aethyra is a community driven experiment that utilizes eAthena at its core with the end goal of 
+ getting its players as involved in the process as much as possible. It's originally forked from 
+ The Mana World when its developers came up with the idea of "Why should we have to wait for an 
+ MMORPG game in development when we've already got a great server setup here that does everything 
+ we've been promised and more?" As such, we are trying to implement as many functions of eAthena 
+ as possible while creating our own in the process based on what our players want to see.
  .
- This package provides debugging symbols for the tmw package.
+ This package provides debugging symbols for the aethyra package.
 
 Package: aethyra-data
 Architecture: all
 Recommends: aethyra, aethyra-music
-Description: Aethyra is a great Online Rolegame (data files)
- based upon The Mana World 0.0 codebase. It has its own universe, and its own
- character management system, which will give you the opportunity to play in a
- 2D heroic-fantasy world forever.
+Description:  Aethyra is a community driven experiment that utilizes eAthena at its core with the end goal of 
+ getting its players as involved in the process as much as possible. It's originally forked from 
+ The Mana World when its developers came up with the idea of "Why should we have to wait for an 
+ MMORPG game in development when we've already got a great server setup here that does everything 
+ we've been promised and more?" As such, we are trying to implement as many functions of eAthena 
+ as possible while creating our own in the process based on what our players want to see.
  .
  This package contains the data files.