diff --git a/moo.mprj b/moo.mprj
index 997cf410..d3b3354e 100644
--- a/moo.mprj
+++ b/moo.mprj
@@ -34,7 +34,7 @@
    </configure>
   </optimized>
  </configurations>
- <file_selector_dir>/home/muntyan/projects/moo/moo/mooedit/gtksourceview/upstream/</file_selector_dir>
+ <file_selector_dir>/home/muntyan/projects/moo/</file_selector_dir>
  <run>
   <args>--new-app /tmp/file.rst</args>
   <exe>medit/medit</exe>
diff --git a/moo/mooedit/language-specs/css.lang b/moo/mooedit/language-specs/css.lang
index 67ae1eb1..4ca1f46e 100644
--- a/moo/mooedit/language-specs/css.lang
+++ b/moo/mooedit/language-specs/css.lang
@@ -4,19 +4,20 @@
  Author: Scott Martin <scott@coffeeblack.org>
  Copyright (C) 2004 Scott Martin <scott@coffeeblack.org>
 
- This library is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
 
- This program is distributed in the hope that it will be useful,
+ This library is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Library General Public License for more details.
 
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ You should have received a copy of the GNU Library General Public
+ License along with this library; if not, write to the
+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
 
 -->
 <!--
diff --git a/moo/mooedit/language-specs/javascript.lang b/moo/mooedit/language-specs/javascript.lang
index 802b80c2..8ae8193b 100644
--- a/moo/mooedit/language-specs/javascript.lang
+++ b/moo/mooedit/language-specs/javascript.lang
@@ -7,19 +7,20 @@
  Copyright (C) 2005-2007 Marco Barisione <barisione@gmail.com>
  Copyright (C) 2005-2007 Emanuele Aina
 
- This library is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
 
- This program is distributed in the hope that it will be useful,
+ This library is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Library General Public License for more details.
 
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ You should have received a copy of the GNU Library General Public
+ License along with this library; if not, write to the
+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
 
 -->
 <!--
diff --git a/moo/mooedit/language-specs/language.dtd b/moo/mooedit/language-specs/language.dtd
deleted file mode 100644
index 7144f8e3..00000000
--- a/moo/mooedit/language-specs/language.dtd
+++ /dev/null
@@ -1,51 +0,0 @@
-<!-- FIXME: the "name" attribute can be "_name" to be marked for translation -->
-<!ENTITY % itemattrs
- "name  CDATA #REQUIRED
-  style CDATA #REQUIRED">
-
-<!ELEMENT language (escape-char?,(line-comment|block-comment|string|syntax-item|pattern-item|keyword-list)+)>
-<!-- FIXME: the "name" and "section" attributes can be prefixed with
-     "_" to be marked for translation -->
-<!ATTLIST language
-  name                CDATA #REQUIRED
-  version             CDATA #REQUIRED
-  section             CDATA #REQUIRED
-  translation-domain  CDATA #IMPLIED
-  mimetypes           CDATA #REQUIRED>
-
-<!ELEMENT escape-char (#PCDATA)>
-
-<!ELEMENT line-comment (start-regex)>
-<!ATTLIST line-comment
-  %itemattrs;>
-
-<!ELEMENT block-comment (start-regex,end-regex)>
-<!ATTLIST block-comment
-  %itemattrs;>
-
-<!ELEMENT string (start-regex,end-regex)>
-<!ATTLIST string
-  %itemattrs;
-  end-at-line-end (true|false) "true">
-
-<!ELEMENT syntax-item (start-regex,end-regex)>
-<!ATTLIST syntax-item
-  %itemattrs;>
-
-<!ELEMENT pattern-item (regex)>
-<!ATTLIST pattern-item
-  %itemattrs;>
-
-<!ELEMENT keyword-list (keyword+)>
-<!ATTLIST keyword-list
-  %itemattrs;
-  case-sensitive                  (true|false) "true"
-  match-empty-string-at-beginning (true|false) "false"
-  match-empty-string-at-end       (true|false) "false"
-  beginning-regex                 CDATA        #IMPLIED
-  end-regex                       CDATA        #IMPLIED>
-
-<!ELEMENT start-regex (#PCDATA)>
-<!ELEMENT end-regex (#PCDATA)>
-<!ELEMENT regex (#PCDATA)>
-<!ELEMENT keyword (#PCDATA)>
diff --git a/moo/mooedit/language-specs/makefile.lang b/moo/mooedit/language-specs/makefile.lang
index a1587a10..1db645ac 100644
--- a/moo/mooedit/language-specs/makefile.lang
+++ b/moo/mooedit/language-specs/makefile.lang
@@ -5,19 +5,20 @@
  Copyright (C) 2005 Paolo Borelli <pborelli@katamail.com>
  Copyright (C) 2005 Ricardo Lenz
 
- This library is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
 
- This program is distributed in the hope that it will be useful,
+ This library is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Library General Public License for more details.
 
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ You should have received a copy of the GNU Library General Public
+ License along with this library; if not, write to the
+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
 
 -->
 <language id="makefile" _name="Makefile" version="2.0" _section="Sources">