diff --git a/COPYING b/COPYING
new file mode 100644
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,504 @@
+		  GNU LESSER GENERAL PUBLIC LICENSE
+		       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+		  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+  
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+			    NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    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
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
+
+
diff --git a/Graphics/UI/Gtk/SourceView.hs b/Graphics/UI/Gtk/SourceView.hs
new file mode 100644
--- /dev/null
+++ b/Graphics/UI/Gtk/SourceView.hs
@@ -0,0 +1,19 @@
+module Graphics.UI.Gtk.SourceView (
+	module Graphics.UI.Gtk.SourceView.SourceBuffer,
+	module Graphics.UI.Gtk.SourceView.SourceIter,
+	module Graphics.UI.Gtk.SourceView.SourceLanguage,
+	module Graphics.UI.Gtk.SourceView.SourceLanguageManager,
+	module Graphics.UI.Gtk.SourceView.SourceStyle,
+	module Graphics.UI.Gtk.SourceView.SourceStyleScheme,
+	module Graphics.UI.Gtk.SourceView.SourceStyleSchemeManager,
+	module Graphics.UI.Gtk.SourceView.SourceView
+	) where
+
+import Graphics.UI.Gtk.SourceView.SourceBuffer
+import Graphics.UI.Gtk.SourceView.SourceIter
+import Graphics.UI.Gtk.SourceView.SourceLanguage
+import Graphics.UI.Gtk.SourceView.SourceLanguageManager
+import Graphics.UI.Gtk.SourceView.SourceStyle
+import Graphics.UI.Gtk.SourceView.SourceStyleScheme
+import Graphics.UI.Gtk.SourceView.SourceStyleSchemeManager
+import Graphics.UI.Gtk.SourceView.SourceView
diff --git a/Graphics/UI/Gtk/SourceView/Signals.chs b/Graphics/UI/Gtk/SourceView/Signals.chs
new file mode 100644
--- /dev/null
+++ b/Graphics/UI/Gtk/SourceView/Signals.chs
@@ -0,0 +1,91 @@
+{-# OPTIONS_HADDOCK hide #-}
+-- -*-haskell-*-
+-- -------------------- automatically generated file - do not edit ------------
+--  Callback installers for the GIMP Toolkit (GTK) Binding for Haskell
+--
+--  Author : Axel Simon
+--
+--  Created: 1 July 2000
+--
+--  Copyright (C) 2000-2005 Axel Simon
+--
+--  This library is free software; you can redistribute it and/or
+--  modify it under the terms of the GNU Lesser General Public
+--  License as published by the Free Software Foundation; either
+--  version 2.1 of the License, or (at your option) any later version.
+--
+--  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
+--  Lesser General Public License for more details.
+--
+-- #hide
+
+-- These functions are used to connect signals to widgets. They are auto-
+-- matically created through HookGenerator.hs which takes a list of possible
+-- function signatures that are included in the GTK sources (gtkmarshal.list).
+--
+-- The object system in the second version of GTK is based on GObject from
+-- GLIB. This base class is rather primitive in that it only implements
+-- ref and unref methods (and others that are not interesting to us). If
+-- the marshall list mentions OBJECT it refers to an instance of this 
+-- GObject which is automatically wrapped with a ref and unref call.
+-- Structures which are not derived from GObject have to be passed as
+-- BOXED which gives the signal connect function a possibility to do the
+-- conversion into a proper ForeignPtr type. In special cases the signal
+-- connect function use a PTR type which will then be mangled in the
+-- user function directly. The latter is needed if a signal delivers a
+-- pointer to a string and its length in a separate integer.
+--
+module Graphics.UI.Gtk.SourceView.Signals (
+  module System.Glib.Signals,
+
+  connect_NONE__NONE,
+  connect_BOXED_BOXED__NONE,
+  
+  ) where
+
+import Control.Monad	(liftM)
+
+import System.Glib.FFI
+import System.Glib.UTFString   (peekUTFString)
+import System.Glib.GError      (failOnGError)
+{#import System.Glib.Signals#}
+{#import System.Glib.GObject#} 
+
+
+{#context lib="gtk" prefix="gtk" #}
+
+
+-- Here are the generators that turn a Haskell function into
+-- a C function pointer. The fist Argument is always the widget,
+-- the last one is the user g_pointer. Both are ignored.
+
+
+connect_NONE__NONE :: 
+  GObjectClass obj => SignalName ->
+  ConnectAfter -> obj ->
+  (IO ()) ->
+  IO (ConnectId obj)
+connect_NONE__NONE signal after obj user =
+  connectGeneric signal after obj action
+  where action :: Ptr GObject -> IO ()
+        action _ =
+          failOnGError $
+          user
+
+connect_BOXED_BOXED__NONE :: 
+  GObjectClass obj => SignalName ->
+  (Ptr a' -> IO a) -> (Ptr b' -> IO b) -> 
+  ConnectAfter -> obj ->
+  (a -> b -> IO ()) ->
+  IO (ConnectId obj)
+connect_BOXED_BOXED__NONE signal boxedPre1 boxedPre2 after obj user =
+  connectGeneric signal after obj action
+  where action :: Ptr GObject -> Ptr () -> Ptr () -> IO ()
+        action _ box1 box2 =
+          failOnGError $
+          boxedPre2 (castPtr box2) >>= \box2' ->
+          boxedPre1 (castPtr box1) >>= \box1' ->
+          user box1' box2'
+
diff --git a/Graphics/UI/Gtk/SourceView/SourceBuffer.chs b/Graphics/UI/Gtk/SourceView/SourceBuffer.chs
new file mode 100644
--- /dev/null
+++ b/Graphics/UI/Gtk/SourceView/SourceBuffer.chs
@@ -0,0 +1,267 @@
+{-# LANGUAGE CPP #-}
+-- -*-haskell-*-
+--  GIMP Toolkit (GTK) SourceBuffer
+--
+--  Author : Peter Gavin
+--  derived from sourceview bindings by Axel Simon and Duncan Coutts
+--
+--  Created: 18 December 2008
+--
+--  Copyright (C) 2003-2008 Peter Gavin, Duncan Coutts, Axel Simon
+--
+--  This library is free software; you can redistribute it and/or
+--  modify it under the terms of the GNU Lesser General Public
+--  License as published by the Free Software Foundation; either
+--  version 2.1 of the License, or (at your option) any later version.
+--
+--  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
+--  Lesser General Public License for more details.
+--
+-- |
+-- Maintainer  : gtk2hs-users@lists.sourceforge.net
+-- Stability   : provisional
+-- Portability : portable (depends on GHC)
+--
+module Graphics.UI.Gtk.SourceView.SourceBuffer (
+  SourceBuffer,
+  SourceBufferClass,
+  castToSourceBuffer,
+  sourceBufferNew,
+  sourceBufferNewWithLanguage,
+  sourceBufferSetHighlightSyntax,
+  sourceBufferGetHighlightSyntax,
+  sourceBufferSetLanguage,
+  sourceBufferGetLanguage,
+  sourceBufferSetHighlightMatchingBrackets,
+  sourceBufferGetHighlightMatchingBrackets,
+  sourceBufferSetStyleScheme,
+  sourceBufferGetStyleScheme,
+  sourceBufferSetMaxUndoLevels,
+  sourceBufferGetMaxUndoLevels,
+  sourceBufferGetCanUndo,
+  sourceBufferGetCanRedo,
+  sourceBufferUndo,
+  sourceBufferRedo,
+  sourceBufferBeginNotUndoableAction,
+  sourceBufferEndNotUndoableAction,
+  sourceBufferCreateSourceMark,
+  sourceBufferEnsureHighlight,
+  sourceBufferCanRedo,
+  sourceBufferCanUndo,
+  sourceBufferHighlightMatchingBrackets,
+  sourceBufferHighlightSyntax,
+  sourceBufferLanguage,
+  sourceBufferSourceStyleScheme,
+  sourceBufferHighlightUpdated
+  ) where
+
+import Control.Monad	(liftM)
+import Data.Maybe    (fromMaybe)
+
+import System.Glib.FFI
+import System.Glib.GObject              (constructNewGObject,
+					 makeNewGObject)
+{#import System.Glib.Properties#}
+import System.Glib.Attributes
+import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)
+{#import Graphics.UI.Gtk.SourceView.Types#}
+{#import Graphics.UI.Gtk.SourceView.Signals#}
+{#import Graphics.UI.Gtk.Multiline.TextIter#}
+
+{#import Graphics.UI.Gtk.SourceView.SourceMark#}
+
+{# context lib="gtk" prefix="gtk" #}
+
+-- methods
+
+-- | Create a new 'SourceBuffer', possibly
+-- taking a 'TextTagTable'.
+--
+sourceBufferNew :: Maybe TextTagTable -> IO SourceBuffer
+sourceBufferNew tt = constructNewGObject mkSourceBuffer $
+  {#call unsafe source_buffer_new#} 
+  (fromMaybe (TextTagTable nullForeignPtr) tt)
+
+-- | Create a new 'SourceBuffer'
+-- with a 'SourceLanguage'.
+--
+sourceBufferNewWithLanguage :: SourceLanguage -> IO SourceBuffer
+sourceBufferNewWithLanguage lang = constructNewGObject mkSourceBuffer $
+  {#call unsafe source_buffer_new_with_language#} lang
+
+-- | 
+--
+sourceBufferSetHighlightSyntax :: SourceBuffer -> Bool -> IO ()
+sourceBufferSetHighlightSyntax sb newVal =
+  {#call unsafe source_buffer_set_highlight_syntax#} sb (fromBool newVal)
+  
+-- | 
+--
+sourceBufferGetHighlightSyntax :: SourceBuffer -> IO Bool 
+sourceBufferGetHighlightSyntax sb = liftM toBool $
+  {#call unsafe source_buffer_get_highlight_syntax#} sb
+
+-- | 
+--
+sourceBufferSetLanguage :: SourceBuffer -> SourceLanguage -> IO ()
+sourceBufferSetLanguage sb lang =
+  {#call unsafe source_buffer_set_language#} sb lang
+  
+-- | 
+--
+sourceBufferGetLanguage :: SourceBuffer -> IO SourceLanguage
+sourceBufferGetLanguage sb = makeNewGObject mkSourceLanguage $
+  {#call unsafe source_buffer_get_language#} sb
+
+-- | 
+--
+sourceBufferSetHighlightMatchingBrackets :: SourceBuffer -> Bool -> IO ()
+sourceBufferSetHighlightMatchingBrackets sb newVal =
+  {#call unsafe source_buffer_set_highlight_matching_brackets#} sb (fromBool newVal)
+  
+-- | 
+--
+sourceBufferGetHighlightMatchingBrackets :: SourceBuffer -> IO Bool 
+sourceBufferGetHighlightMatchingBrackets sb = liftM toBool $
+  {#call unsafe source_buffer_get_highlight_matching_brackets#} sb
+
+-- |
+-- 
+sourceBufferSetStyleScheme :: SourceBuffer -> SourceStyleScheme -> IO ()
+sourceBufferSetStyleScheme sb sss =
+    {#call unsafe source_buffer_set_style_scheme#} sb sss
+
+-- |
+-- 
+sourceBufferGetStyleScheme :: SourceBuffer -> IO SourceStyleScheme
+sourceBufferGetStyleScheme sb = makeNewGObject mkSourceStyleScheme $
+  {#call unsafe source_buffer_get_style_scheme#} sb
+
+-- | 
+--
+sourceBufferSetMaxUndoLevels :: SourceBuffer -> Int -> IO ()
+sourceBufferSetMaxUndoLevels sb newVal =
+  {#call unsafe source_buffer_set_max_undo_levels#} sb (fromIntegral newVal)
+  
+-- | 
+--
+sourceBufferGetMaxUndoLevels :: SourceBuffer -> IO Int
+sourceBufferGetMaxUndoLevels sb = liftM fromIntegral $
+  {#call unsafe source_buffer_get_max_undo_levels#} sb
+
+-- | 
+--
+sourceBufferGetCanUndo :: SourceBuffer -> IO Bool
+sourceBufferGetCanUndo sb = liftM toBool $
+  {#call unsafe source_buffer_can_undo#} sb
+  
+-- | 
+--
+sourceBufferGetCanRedo :: SourceBuffer -> IO Bool
+sourceBufferGetCanRedo sb = liftM toBool $
+  {#call unsafe source_buffer_can_redo#} sb
+
+-- | 
+--
+sourceBufferUndo :: SourceBuffer -> IO ()
+sourceBufferUndo sb =
+  {#call source_buffer_undo#} sb
+  
+-- | 
+--
+sourceBufferRedo :: SourceBuffer -> IO ()
+sourceBufferRedo sb =
+  {#call source_buffer_redo#} sb
+
+-- | 
+--
+sourceBufferBeginNotUndoableAction :: SourceBuffer -> IO ()
+sourceBufferBeginNotUndoableAction sb =
+  {#call source_buffer_begin_not_undoable_action#} sb
+  
+-- | 
+--
+sourceBufferEndNotUndoableAction :: SourceBuffer -> IO ()
+sourceBufferEndNotUndoableAction sb =
+  {#call source_buffer_end_not_undoable_action#} sb
+
+-- | Creates a marker in the buffer of the given type.
+--
+-- *  A marker is
+--    semantically very similar to a 'Graphics.UI.Gtk.Multiline.TextMark',
+--    except it has a type
+--    which is used by the 'SourceView' displaying the buffer to show a
+--    pixmap on the left margin, at the line the marker is in.  Because
+--    of this, a marker is generally associated to a line and not a
+--    character position.  Markers are also accessible through a position
+--    or range in the buffer.
+--
+-- *  Markers are implemented using 'Graphics.UI.Gtk.Multiline.TextMark',
+--    so all characteristics
+--    and restrictions to marks apply to markers too.  These includes
+--    life cycle issues and 'Graphics.UI.Gtk.Multiline.TextMark.onMarkSet'
+--    and 'Graphics.UI.Gtk.Multiline.TextMark.onMarkDeleted' signal
+--    emissions.
+--
+-- *  Like a 'Graphics.UI.Gtk.Multiline.TextMark', a 'SourceMarker'
+--    can be anonymous if the
+--    passed name is @Nothing@.  Also, the buffer owns the markers so you
+--    shouldn't unreference it.
+
+sourceBufferCreateSourceMark :: SourceBuffer -- the buffer
+                         -> Maybe String -- the name of the mark
+                         -> String -- the category of the mark
+                         -> TextIter -> IO SourceMark
+sourceBufferCreateSourceMark sb name category iter =
+  makeNewGObject mkSourceMark $
+  maybeWith withCString name       $ \strPtr1 ->
+  withCString category $ \strPtr2 ->
+  {#call source_buffer_create_source_mark#} sb strPtr1 strPtr2 iter
+
+-- |
+-- 
+sourceBufferEnsureHighlight :: SourceBuffer -> TextIter -> TextIter -> IO ()
+sourceBufferEnsureHighlight sb start end =
+    {#call source_buffer_ensure_highlight#} sb start end
+
+-- |
+-- 
+sourceBufferCanRedo :: ReadAttr SourceBuffer Bool
+sourceBufferCanRedo = readAttrFromBoolProperty "can-redo"
+
+-- |
+-- 
+sourceBufferCanUndo :: ReadAttr SourceBuffer Bool
+sourceBufferCanUndo = readAttrFromBoolProperty "can-undo"
+
+-- |
+--
+sourceBufferHighlightMatchingBrackets :: Attr SourceBuffer Bool
+sourceBufferHighlightMatchingBrackets = newAttrFromBoolProperty "highlight-matching-brackets"
+
+-- |
+--
+sourceBufferHighlightSyntax :: Attr SourceBuffer Bool
+sourceBufferHighlightSyntax = newAttrFromBoolProperty "highlight-matching-brackets"
+
+-- |
+-- 
+sourceBufferLanguage :: Attr SourceBuffer (Maybe SourceLanguage)
+sourceBufferLanguage = newAttrFromMaybeObjectProperty "language" gTypeSourceLanguage
+
+-- |
+--
+sourceBufferMaxUndoLevels :: Attr SourceBuffer Int
+sourceBufferMaxUndoLevels = newAttrFromIntProperty "max-undo-levels"
+
+-- |
+-- 
+sourceBufferSourceStyleScheme :: Attr SourceBuffer (Maybe SourceStyleScheme)
+sourceBufferSourceStyleScheme = newAttrFromMaybeObjectProperty "style-scheme" gTypeSourceStyleScheme
+
+-- |
+--
+sourceBufferHighlightUpdated :: Signal SourceBuffer (TextIter -> TextIter -> IO ())
+sourceBufferHighlightUpdated = Signal $ connect_BOXED_BOXED__NONE "highlight-updated" mkTextIterCopy mkTextIterCopy
diff --git a/Graphics/UI/Gtk/SourceView/SourceIter.chs b/Graphics/UI/Gtk/SourceView/SourceIter.chs
new file mode 100644
--- /dev/null
+++ b/Graphics/UI/Gtk/SourceView/SourceIter.chs
@@ -0,0 +1,82 @@
+{-# LANGUAGE CPP #-}
+-- -*-haskell-*-
+--  GIMP Toolkit (GTK) SourceIter
+--
+--  Author : Peter Gavin
+--  derived from sourceview bindings by Axel Simon and Duncan Coutts
+--
+--  Created: 18 December 2008
+--
+--  Copyright (C) 2004-2008 Peter Gavin, Duncan Coutts, Axel Simon
+--
+--  This library is free software; you can redistribute it and/or
+--  modify it under the terms of the GNU Lesser General Public
+--  License as published by the Free Software Foundation; either
+--  version 2.1 of the License, or (at your option) any later version.
+--
+--  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
+--  Lesser General Public License for more details.
+--
+-- |
+-- Maintainer  : gtk2hs-users@lists.sourceforge.net
+-- Stability   : provisional
+-- Portability : portable (depends on GHC)
+--
+-- Adds extra useful methods for "TextIter" for searching forwards and
+-- backwards within a region in the buffer and matching brackets.
+--
+-- * There is no SourceIter object, just extra methods for "TextIter"
+--
+module Graphics.UI.Gtk.SourceView.SourceIter (
+  SourceSearchFlags(..),
+  sourceIterForwardSearch,
+  sourceIterBackwardSearch,
+) where
+
+import Control.Monad	(liftM)
+import Data.Maybe    (fromMaybe)
+
+import System.Glib.FFI
+import System.Glib.Flags		(Flags, fromFlags)
+import System.Glib.UTFString
+import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)
+{#import Graphics.UI.Gtk.SourceView.Types#}
+{#import Graphics.UI.Gtk.Multiline.TextIter#}
+
+{# context lib="gtk" prefix="gtk" #}
+
+{# enum SourceSearchFlags {underscoreToCase} deriving(Eq,Bounded,Show,Read) #}
+
+instance Flags SourceSearchFlags
+
+-- methods
+
+-- | same as 'textIterForwardSearch' but allows
+-- case insensitive search and possibly in the future regular expressions.
+--
+sourceIterForwardSearch :: TextIter -> String -> [SourceSearchFlags] -> 
+                           Maybe TextIter -> IO (Maybe (TextIter, TextIter))
+sourceIterForwardSearch ti str flags limit = do
+   start  <- makeEmptyTextIter
+   end <- makeEmptyTextIter
+   found <- liftM toBool $ withUTFString str $ \cStr ->
+     {#call unsafe source_iter_forward_search#} ti cStr
+       ((fromIntegral.fromFlags) flags) start end
+       (fromMaybe (TextIter nullForeignPtr) limit)
+   return $ if found then Just (start,end) else Nothing
+
+-- | same as 'textIterForwardSearch' but allows
+-- case insensitive search and possibly in the future regular expressions.
+--
+sourceIterBackwardSearch :: TextIter -> String -> [SourceSearchFlags] -> 
+                           Maybe TextIter -> IO (Maybe (TextIter, TextIter))
+sourceIterBackwardSearch ti str flags limit = do
+   start  <- makeEmptyTextIter
+   end <- makeEmptyTextIter
+   found <- liftM toBool $ withUTFString str $ \cStr ->
+     {#call unsafe source_iter_backward_search#} ti cStr
+       ((fromIntegral.fromFlags) flags) start end
+       (fromMaybe (TextIter nullForeignPtr) limit)
+   return $ if found then Just (start,end) else Nothing
diff --git a/Graphics/UI/Gtk/SourceView/SourceLanguage.chs b/Graphics/UI/Gtk/SourceView/SourceLanguage.chs
new file mode 100644
--- /dev/null
+++ b/Graphics/UI/Gtk/SourceView/SourceLanguage.chs
@@ -0,0 +1,125 @@
+{-# LANGUAGE CPP #-}
+-- -*-haskell-*-
+--  GIMP Toolkit (GTK) Widget SourceView
+--
+--  Author : Peter Gavin
+--  derived from sourceview bindings by Axel Simon and Duncan Coutts
+--
+--  Created: 18 December 2008
+--
+--  Copyright (C) 2004-2008 Peter Gavin, Duncan Coutts, Axel Simon
+--
+--  This library is free software; you can redistribute it and/or
+--  modify it under the terms of the GNU Lesser General Public
+--  License as published by the Free Software Foundation; either
+--  version 2.1 of the License, or (at your option) any later version.
+--
+--  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
+--  Lesser General Public License for more details.
+--
+-- |
+-- Maintainer  : gtk2hs-users@lists.sourceforge.net
+-- Stability   : provisional
+-- Portability : portable (depends on GHC)
+--
+module Graphics.UI.Gtk.SourceView.SourceLanguage (
+  SourceLanguage,
+  SourceLanguageClass,
+  castToSourceLanguage,
+  sourceLanguageGetId,
+  sourceLanguageGetName,
+  sourceLanguageGetSection,
+  sourceLanguageGetHidden,
+  sourceLanguageGetMetadata,
+  sourceLanguageGetMimeTypes,
+  sourceLanguageGetGlobs,
+  sourceLanguageHidden,
+  sourceLanguageId,
+  sourceLanguageName,
+  sourceLanguageSection
+  ) where
+
+import Control.Monad	(liftM)
+import Data.Maybe (fromMaybe)
+
+import System.Glib.FFI
+import System.Glib.UTFString
+{#import System.Glib.Properties#}
+import System.Glib.Attributes
+{#import Graphics.UI.Gtk.SourceView.Types#}
+{#import Graphics.UI.Gtk.SourceView.SourceStyleScheme#}
+
+{# context lib="gtk" prefix="gtk" #}
+
+
+-- methods
+
+-- | 
+--
+sourceLanguageGetId :: SourceLanguage -> IO String
+sourceLanguageGetId sl =
+  {#call unsafe source_language_get_id#} sl >>= peekUTFString
+
+-- | 
+--
+sourceLanguageGetName :: SourceLanguage -> IO String
+sourceLanguageGetName sl =
+  {#call unsafe source_language_get_name#} sl >>= peekUTFString
+
+-- | 
+--
+sourceLanguageGetSection :: SourceLanguage -> IO String
+sourceLanguageGetSection sl =
+  {#call unsafe source_language_get_section#} sl >>= peekUTFString
+
+-- |
+--
+sourceLanguageGetHidden :: SourceLanguage -> IO Bool
+sourceLanguageGetHidden sl = liftM toBool $
+  {#call unsafe source_language_get_hidden#} sl
+
+-- |
+--
+sourceLanguageGetMetadata :: SourceLanguage -> String -> IO String
+sourceLanguageGetMetadata sl name = do
+  withUTFString name ({#call unsafe source_language_get_metadata#} sl) >>= peekUTFString
+
+-- |
+--
+sourceLanguageGetMimeTypes :: SourceLanguage -> IO [String]
+sourceLanguageGetMimeTypes sl = do
+  mimeTypesArray <- {#call unsafe source_language_get_mime_types#} sl
+  mimeTypes <- liftM (fromMaybe []) $ maybePeek peekUTFStringArray0 mimeTypesArray
+  {# call g_strfreev #} mimeTypesArray
+  return mimeTypes
+
+-- |
+--
+sourceLanguageGetGlobs :: SourceLanguage -> IO [String]
+sourceLanguageGetGlobs sl = do
+  globsArray <- {#call unsafe source_language_get_globs#} sl
+  globs <- liftM (fromMaybe []) $ maybePeek peekUTFStringArray0 globsArray
+  {# call g_strfreev #} globsArray
+  return globs
+
+-- |
+--
+sourceLanguageHidden :: ReadAttr SourceLanguage Bool
+sourceLanguageHidden = readAttrFromBoolProperty "hidden"
+
+-- |
+--
+sourceLanguageId :: ReadAttr SourceLanguage String
+sourceLanguageId = readAttrFromStringProperty "id"
+
+-- |
+--
+sourceLanguageName :: ReadAttr SourceLanguage String
+sourceLanguageName = readAttrFromStringProperty "name"
+
+-- |
+--
+sourceLanguageSection :: ReadAttr SourceLanguage String
+sourceLanguageSection = readAttrFromStringProperty "section"
diff --git a/Graphics/UI/Gtk/SourceView/SourceLanguageManager.chs b/Graphics/UI/Gtk/SourceView/SourceLanguageManager.chs
new file mode 100644
--- /dev/null
+++ b/Graphics/UI/Gtk/SourceView/SourceLanguageManager.chs
@@ -0,0 +1,122 @@
+{-# LANGUAGE CPP #-}
+-- -*-haskell-*-
+--  GIMP Toolkit (GTK) Widget SourceView
+--
+--  Author : Peter Gavin
+--  derived from sourceview bindings by Axel Simon and Duncan Coutts
+--
+--  Created: 18 December 2008
+--
+--  Copyright (C) 2004-2008 Peter Gavin, Duncan Coutts, Axel Simon
+--
+--  This library is free software; you can redistribute it and/or
+--  modify it under the terms of the GNU Lesser General Public
+--  License as published by the Free Software Foundation; either
+--  version 2.1 of the License, or (at your option) any later version.
+--
+--  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
+--  Lesser General Public License for more details.
+--
+-- |
+-- Maintainer  : gtk2hs-users@lists.sourceforge.net
+-- Stability   : provisional
+-- Portability : portable (depends on GHC)
+--
+module Graphics.UI.Gtk.SourceView.SourceLanguageManager (
+  SourceLanguageManager,
+  SourceLanguageManagerClass,
+  castToSourceLanguageManager,
+  sourceLanguageManagerNew,
+  sourceLanguageManagerGetDefault,
+  sourceLanguageManagerSetSearchPath,
+  sourceLanguageManagerGetSearchPath,
+  sourceLanguageManagerGetLanguageIds,
+  sourceLanguageManagerGetLanguage,
+  sourceLanguageManagerGuessLanguage
+  ) where
+
+import Control.Monad	(liftM)
+import Data.Maybe (fromMaybe)
+
+import System.Glib.FFI
+import System.Glib.GObject (constructNewGObject, makeNewGObject)
+import System.Glib.UTFString
+import System.Glib.Attributes
+import System.Glib.Properties
+{#import Graphics.UI.Gtk.SourceView.Types#}
+
+{# context lib="gtk" prefix="gtk" #}
+
+{# enum SourceSmartHomeEndType {underscoreToCase} deriving (Eq, Bounded, Show, Read) #}
+
+-- |
+--
+sourceLanguageManagerNew :: IO SourceLanguageManager
+sourceLanguageManagerNew = constructNewGObject mkSourceLanguageManager $ liftM castPtr
+  {#call unsafe source_language_manager_new#}
+
+-- |
+--
+sourceLanguageManagerGetDefault :: IO SourceLanguageManager
+sourceLanguageManagerGetDefault = makeNewGObject mkSourceLanguageManager $ liftM castPtr
+  {#call unsafe source_language_manager_new#}
+
+-- |
+--
+sourceLanguageManagerSetSearchPath :: SourceLanguageManager -> Maybe [String] -> IO ()
+sourceLanguageManagerSetSearchPath slm dirs =
+  maybeWith withUTFStringArray0 dirs $ \dirsPtr -> do
+    {#call unsafe source_language_manager_set_search_path#} slm dirsPtr
+
+-- |
+--
+sourceLanguageManagerGetSearchPath :: SourceLanguageManager -> IO [String]
+sourceLanguageManagerGetSearchPath slm = do
+  dirsPtr <- {#call unsafe source_language_manager_get_search_path#} slm
+  liftM (fromMaybe []) $ maybePeek peekUTFStringArray0 dirsPtr
+
+-- |
+--
+sourceLanguageManagerGetLanguageIds :: SourceLanguageManager -> IO [String]
+sourceLanguageManagerGetLanguageIds slm = do
+  idsPtr <- {#call unsafe source_language_manager_get_language_ids#} slm
+  liftM (fromMaybe []) $ maybePeek peekUTFStringArray0 idsPtr
+
+-- |
+--
+sourceLanguageManagerGetLanguage :: SourceLanguageManager -> String -> IO (Maybe SourceLanguage)
+sourceLanguageManagerGetLanguage slm id = do
+  slPtr <- liftM castPtr $
+    withUTFString id ({#call unsafe source_language_manager_get_language#} slm)
+  if slPtr /= nullPtr
+    then liftM Just $ makeNewGObject mkSourceLanguage $ return slPtr
+    else return Nothing
+
+-- |
+--
+sourceLanguageManagerGuessLanguage :: SourceLanguageManager -> Maybe String -> Maybe String -> IO (Maybe SourceLanguage)
+sourceLanguageManagerGuessLanguage slm filename contentType =
+  maybeWith withUTFString filename $ \cFilename ->
+  maybeWith withUTFString contentType $ \cContentType -> do
+    slPtr <- liftM castPtr $
+      {#call unsafe source_language_manager_guess_language#} slm cFilename cContentType
+    if slPtr /= nullPtr
+      then liftM Just $ makeNewGObject mkSourceLanguage $ return slPtr
+      else return Nothing
+
+-- |
+--
+sourceLanguageManagerLanguageIds :: ReadAttr SourceLanguageManager [String]
+sourceLanguageManagerLanguageIds =
+  readAttrFromBoxedOpaqueProperty (liftM (fromMaybe []) . maybePeek peekUTFStringArray0 . castPtr)
+                                  "language-ids" {#call pure g_strv_get_type#}
+
+-- |
+--
+sourceLanguageManagerSearchPath :: ReadWriteAttr SourceLanguageManager [String] (Maybe [String])
+sourceLanguageManagerSearchPath =
+  newAttr (objectGetPropertyBoxedOpaque (peekUTFStringArray0 . castPtr) gtype "search-path")
+          (objectSetPropertyBoxedOpaque (\dirs f -> maybeWith withUTFStringArray0 dirs (f . castPtr)) gtype "search-path")
+  where gtype = {#call pure g_strv_get_type#}
diff --git a/Graphics/UI/Gtk/SourceView/SourceMark.chs b/Graphics/UI/Gtk/SourceView/SourceMark.chs
new file mode 100644
--- /dev/null
+++ b/Graphics/UI/Gtk/SourceView/SourceMark.chs
@@ -0,0 +1,66 @@
+{-# LANGUAGE CPP #-}
+-- -*-haskell-*-
+--  GIMP Toolkit (GTK) SourceMark
+--
+--  Author : Duncan Coutts
+--  derived from GtkTextView bindings by Axel Simon
+--
+--  Created: 26 October 2003
+--
+--  Copyright (C) 2003-2005 Duncan Coutts, Axel Simon
+--
+--  This library is free software; you can redistribute it and/or
+--  modify it under the terms of the GNU Lesser General Public
+--  License as published by the Free Software Foundation; either
+--  version 2.1 of the License, or (at your option) any later version.
+--
+--  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
+--  Lesser General Public License for more details.
+--
+-- |
+-- Maintainer  : gtk2hs-users@lists.sourceforge.net
+-- Stability   : provisional
+-- Portability : portable (depends on GHC)
+--
+module Graphics.UI.Gtk.SourceView.SourceMark (
+  SourceMark,
+  castToSourceMark,
+  sourceMarkGetCategory,
+  sourceMarkNext,
+  sourceMarkPrev
+) where
+
+import Control.Monad	(liftM)
+
+import System.Glib.FFI
+import System.Glib.UTFString
+import System.Glib.GObject	(makeNewGObject)
+{#import Graphics.UI.Gtk.SourceView.Types#}
+
+{# context lib="gtk" prefix="gtk" #}
+
+-- methods
+
+-- | 
+-- 
+sourceMarkGetCategory :: SourceMark -> IO String
+sourceMarkGetCategory mark = do
+  strPtr <- {#call unsafe source_mark_get_category#} mark
+  markType <- peekUTFString strPtr
+  {#call unsafe g_free#} (castPtr strPtr)
+  return markType
+
+-- | 
+-- 
+sourceMarkNext :: SourceMark -> String -> IO SourceMark
+sourceMarkNext mark category = makeNewGObject mkSourceMark $
+  withUTFString category $ {#call unsafe source_mark_next#} mark
+
+-- | 
+-- 
+sourceMarkPrev :: SourceMark -> String -> IO SourceMark
+sourceMarkPrev mark category = makeNewGObject mkSourceMark $
+  withUTFString category $ {#call unsafe source_mark_prev#} mark
+
diff --git a/Graphics/UI/Gtk/SourceView/SourceStyle.hs b/Graphics/UI/Gtk/SourceView/SourceStyle.hs
new file mode 100644
--- /dev/null
+++ b/Graphics/UI/Gtk/SourceView/SourceStyle.hs
@@ -0,0 +1,40 @@
+{-# LANGUAGE CPP #-}
+-- -*-haskell-*-
+--  GIMP Toolkit (GTK) Widget SourceView
+--
+--  Author : Peter Gavin
+--  derived from sourceview bindings by Axel Simon and Duncan Coutts
+--
+--  Created: 18 December 2008
+--
+--  Copyright (C) 2004-2008 Peter Gavin, Duncan Coutts, Axel Simon
+--
+--  This library is free software; you can redistribute it and/or
+--  modify it under the terms of the GNU Lesser General Public
+--  License as published by the Free Software Foundation; either
+--  version 2.1 of the License, or (at your option) any later version.
+--
+--  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
+--  Lesser General Public License for more details.
+--
+-- |
+-- Maintainer  : gtk2hs-users@lists.sourceforge.net
+-- Stability   : provisional
+-- Portability : portable (depends on GHC)
+--
+module Graphics.UI.Gtk.SourceView.SourceStyle (
+  SourceStyle(..),
+  ) where
+
+data SourceStyle =
+  SourceStyle
+  { sourceStyleBackground     :: Maybe String
+  , sourceStyleBold           :: Maybe Bool
+  , sourceStyleForeground     :: Maybe String
+  , sourceStyleItalic         :: Maybe Bool
+  , sourceStyleLineBackground :: Maybe String
+  , sourceStyleStrikethrough  :: Maybe Bool
+  , sourceStyleUnderline      :: Maybe Bool
+  }
diff --git a/Graphics/UI/Gtk/SourceView/SourceStyle/Internal.chs b/Graphics/UI/Gtk/SourceView/SourceStyle/Internal.chs
new file mode 100644
--- /dev/null
+++ b/Graphics/UI/Gtk/SourceView/SourceStyle/Internal.chs
@@ -0,0 +1,111 @@
+{-# LANGUAGE CPP #-}
+{-# OPTIONS_HADDOCK hide #-}
+-- -*-haskell-*-
+--  GIMP Toolkit (GTK) Widget SourceView
+--
+--  Author : Peter Gavin
+--  derived from sourceview bindings by Axel Simon and Duncan Coutts
+--
+--  Created: 18 December 2008
+--
+--  Copyright (C) 2004-2008 Peter Gavin, Duncan Coutts, Axel Simon
+--
+--  This library is free software; you can redistribute it and/or
+--  modify it under the terms of the GNU Lesser General Public
+--  License as published by the Free Software Foundation; either
+--  version 2.1 of the License, or (at your option) any later version.
+--
+--  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
+--  Lesser General Public License for more details.
+--
+-- #hide
+
+-- |
+-- Maintainer  : gtk2hs-users@lists.sourceforge.net
+-- Stability   : provisional
+-- Portability : portable (depends on GHC)
+module Graphics.UI.Gtk.SourceView.SourceStyle.Internal (
+  sourceStyleFromObject,
+  sourceStyleToObject
+  ) where
+
+import Control.Monad (liftM, sequence)
+import Data.Maybe (catMaybes)
+
+import System.Glib.FFI
+{#import System.Glib.GObject#}              (objectNew, constructNewGObject)
+import System.Glib.GType (GType)
+import qualified System.Glib.GTypeConstants as GType
+import System.Glib.GValue (GValue, valueInit, allocaGValue)
+import System.Glib.GValueTypes (valueSetString, valueSetBool)
+{#import System.Glib.Properties#}
+{#import Graphics.UI.Gtk.SourceView.Types#}
+import Graphics.UI.Gtk.SourceView.SourceStyle
+
+{# context lib="gtk" prefix="gtk" #}
+
+sourceStyleFromObject :: SourceStyleObject -> IO SourceStyle
+sourceStyleFromObject obj = do
+  background        <- objectGetPropertyMaybeString "background"          obj
+  backgroundSet     <- objectGetPropertyBool        "background-set"      obj
+  bold              <- objectGetPropertyBool        "bold"                obj
+  boldSet           <- objectGetPropertyBool        "bold-set"            obj
+  foreground        <- objectGetPropertyMaybeString "foreground"          obj
+  foregroundSet     <- objectGetPropertyBool        "foreground-set"      obj
+  italic            <- objectGetPropertyBool        "italic"              obj
+  italicSet         <- objectGetPropertyBool        "italic-set"          obj
+  lineBackground    <- objectGetPropertyMaybeString "line-background"     obj
+  lineBackgroundSet <- objectGetPropertyBool        "line-background-set" obj
+  strikethrough     <- objectGetPropertyBool        "strikethrough"       obj
+  strikethroughSet  <- objectGetPropertyBool        "strikethrough-set"   obj
+  underline         <- objectGetPropertyBool        "underline"           obj
+  underlineSet      <- objectGetPropertyBool        "underline-set"       obj
+  return $ SourceStyle
+           { sourceStyleBackground     = if backgroundSet     then background         else Nothing
+           , sourceStyleBold           = if boldSet           then Just bold          else Nothing
+           , sourceStyleForeground     = if foregroundSet     then foreground         else Nothing
+           , sourceStyleItalic         = if italicSet         then Just italic        else Nothing
+           , sourceStyleLineBackground = if lineBackgroundSet then lineBackground     else Nothing
+           , sourceStyleStrikethrough  = if strikethroughSet  then Just strikethrough else Nothing
+           , sourceStyleUnderline      = if underlineSet      then Just underline     else Nothing
+           }
+
+sourceStyleToObject :: SourceStyle -> IO SourceStyleObject
+sourceStyleToObject ss =
+  allocaGValue $ \backgroundV ->
+  allocaGValue $ \backgroundSetV ->
+  allocaGValue $ \boldV ->
+  allocaGValue $ \boldSetV ->
+  allocaGValue $ \foregroundV ->
+  allocaGValue $ \foregroundSetV ->
+  allocaGValue $ \italicV ->
+  allocaGValue $ \italicSetV ->
+  allocaGValue $ \lineBackgroundV ->
+  allocaGValue $ \lineBackgroundSetV ->
+  allocaGValue $ \strikethroughV ->
+  allocaGValue $ \strikethroughSetV ->
+  allocaGValue $ \underlineV ->
+  allocaGValue $ \underlineSetV -> do
+    params <- liftM concat . sequence $
+              [ makeParam "background"      sourceStyleBackground     backgroundSetV     backgroundV     GType.string valueSetString
+              , makeParam "bold"            sourceStyleBold           boldSetV           boldV           GType.bool   valueSetBool
+              , makeParam "foreground"      sourceStyleForeground     foregroundSetV     foregroundV     GType.string valueSetString
+              , makeParam "italic"          sourceStyleItalic         italicSetV         italicV         GType.bool   valueSetBool
+              , makeParam "line-background" sourceStyleLineBackground lineBackgroundSetV lineBackgroundV GType.string valueSetString
+              , makeParam "strikethrough"   sourceStyleStrikethrough  strikethroughSetV  strikethroughV  GType.bool   valueSetBool
+              , makeParam "underline"       sourceStyleUnderline      underlineSetV      underlineV      GType.bool   valueSetBool
+              ]
+    constructNewGObject mkSourceStyleObject (liftM castPtr $ objectNew gTypeSourceStyleObject params)
+  where makeParam name field setV v gtype valueSet = do
+            valueInit setV GType.bool
+            case field ss of
+               Just field' -> do
+                  valueSetBool setV True
+                  valueInit v gtype
+                  valueSet v field'
+                  return [(name ++ "-set", setV), (name, v)]
+               Nothing -> do
+                  valueSetBool setV False
+                  return [(name ++ "-set", setV)]
diff --git a/Graphics/UI/Gtk/SourceView/SourceStyleScheme.chs b/Graphics/UI/Gtk/SourceView/SourceStyleScheme.chs
new file mode 100644
--- /dev/null
+++ b/Graphics/UI/Gtk/SourceView/SourceStyleScheme.chs
@@ -0,0 +1,113 @@
+{-# LANGUAGE CPP #-}
+-- -*-haskell-*-
+--  GIMP Toolkit (GTK) SourceStyleScheme
+--
+--  Author : Peter Gavin
+--  derived from sourceview bindings by Axel Simon and Duncan Coutts
+--
+--  Created: 18 December 2008
+--
+--  Copyright (C) 2004-2008 Peter Gavin, Duncan Coutts, Axel Simon
+--
+--  This library is free software; you can redistribute it and/or
+--  modify it under the terms of the GNU Lesser General Public
+--  License as published by the Free Software Foundation; either
+--  version 2.1 of the License, or (at your option) any later version.
+--
+--  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
+--  Lesser General Public License for more details.
+--
+-- |
+-- Maintainer  : gtk2hs-users@lists.sourceforge.net
+-- Stability   : provisional
+-- Portability : portable (depends on GHC)
+--
+module Graphics.UI.Gtk.SourceView.SourceStyleScheme (
+  SourceStyleScheme,
+  castToSourceStyleScheme,
+  sourceStyleSchemeGetId,
+  sourceStyleSchemeGetName,
+  sourceStyleSchemeGetDescription,
+  sourceStyleSchemeGetAuthors,
+  sourceStyleSchemeGetFilename,
+  sourceStyleSchemeGetStyle,
+  sourceStyleSchemeDescription,
+  sourceStyleSchemeFilename,
+  sourceStyleSchemeId,
+  sourceStyleSchemeName,
+  ) where
+
+import Control.Monad	(liftM)
+
+import System.Glib.FFI
+import System.Glib.UTFString
+import System.Glib.GObject	(constructNewGObject)
+import System.Glib.Attributes
+{#import System.Glib.Properties#}
+{#import Graphics.UI.Gtk.SourceView.Types#}
+import Graphics.UI.Gtk.SourceView.SourceStyle
+{#import Graphics.UI.Gtk.SourceView.SourceStyle.Internal#}
+
+{# context lib="gtk" prefix="gtk" #}
+
+-- methods
+
+-- | 
+-- 
+sourceStyleSchemeGetId :: SourceStyleScheme -> IO String
+sourceStyleSchemeGetId ss =
+  {#call source_style_scheme_get_id#} ss >>= peekUTFString
+
+-- | 
+-- 
+sourceStyleSchemeGetName :: SourceStyleScheme -> IO String
+sourceStyleSchemeGetName ss =
+  {#call source_style_scheme_get_name#} ss >>= peekUTFString
+
+-- | 
+-- 
+sourceStyleSchemeGetDescription :: SourceStyleScheme -> IO String
+sourceStyleSchemeGetDescription ss =
+  {#call source_style_scheme_get_description#} ss >>= peekUTFString
+
+-- |
+--
+sourceStyleSchemeGetAuthors :: SourceStyleScheme -> IO [String]
+sourceStyleSchemeGetAuthors ss =
+  {#call source_style_scheme_get_authors#} ss >>= peekUTFStringArray0
+
+-- | 
+-- 
+sourceStyleSchemeGetFilename :: SourceStyleScheme -> IO String
+sourceStyleSchemeGetFilename ss =
+  {#call source_style_scheme_get_filename#} ss >>= peekUTFString
+
+-- | 
+-- 
+sourceStyleSchemeGetStyle :: SourceStyleScheme -> String -> IO SourceStyle
+sourceStyleSchemeGetStyle ss id = do
+  styleObj <- makeNewGObject mkSourceStyleObject $
+              withUTFString id ({#call source_style_scheme_get_style#} ss)
+  sourceStyleFromObject styleObj
+
+-- |
+--
+sourceStyleSchemeDescription :: ReadAttr SourceStyleScheme String
+sourceStyleSchemeDescription = readAttrFromStringProperty "description"
+
+-- |
+--
+sourceStyleSchemeFilename :: ReadAttr SourceStyleScheme FilePath
+sourceStyleSchemeFilename = readAttrFromStringProperty "filename"
+
+-- |
+--
+sourceStyleSchemeId :: ReadAttr SourceStyleScheme String
+sourceStyleSchemeId = readAttrFromStringProperty "id"
+
+-- |
+--
+sourceStyleSchemeName :: ReadAttr SourceStyleScheme String
+sourceStyleSchemeName = readAttrFromStringProperty "name"
diff --git a/Graphics/UI/Gtk/SourceView/SourceStyleSchemeManager.chs b/Graphics/UI/Gtk/SourceView/SourceStyleSchemeManager.chs
new file mode 100644
--- /dev/null
+++ b/Graphics/UI/Gtk/SourceView/SourceStyleSchemeManager.chs
@@ -0,0 +1,126 @@
+{-# LANGUAGE CPP #-}
+-- -*-haskell-*-
+--  GIMP Toolkit (GTK) Widget SourceView
+--
+--  Author : Peter Gavin
+--  derived from sourceview bindings by Axel Simon and Duncan Coutts
+--
+--  Created: 18 December 2008
+--
+--  Copyright (C) 2004-2008 Peter Gavin, Duncan Coutts, Axel Simon
+--
+--  This library is free software; you can redistribute it and/or
+--  modify it under the terms of the GNU Lesser General Public
+--  License as published by the Free Software Foundation; either
+--  version 2.1 of the License, or (at your option) any later version.
+--
+--  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
+--  Lesser General Public License for more details.
+--
+-- |
+-- Maintainer  : gtk2hs-users@lists.sourceforge.net
+-- Stability   : provisional
+-- Portability : portable (depends on GHC)
+--
+module Graphics.UI.Gtk.SourceView.SourceStyleSchemeManager (
+  SourceStyleSchemeManager,
+  SourceStyleSchemeManagerClass,
+  sourceStyleSchemeManagerNew,
+  sourceStyleSchemeManagerGetDefault,
+  sourceStyleSchemeManagerSetSearchPath,
+  sourceStyleSchemeManagerAppendSearchPath,
+  sourceStyleSchemeManagerPrependSearchPath,
+  sourceStyleSchemeManagerGetSearchPath,
+  sourceStyleSchemeManagerGetSchemeIds,
+  sourceStyleSchemeManagerGetScheme,
+  sourceStyleSchemeManagerForceRescan,
+  sourceStyleSchemeManagerStyleIds,
+  sourceStyleSchemeManagerSearchPath
+  ) where
+
+{# context lib="gtk" prefix="gtk" #}
+
+import Control.Monad	(liftM)
+import Data.Maybe (fromMaybe)
+
+import System.Glib.FFI
+import System.Glib.GObject (constructNewGObject, makeNewGObject)
+import System.Glib.UTFString
+import System.Glib.Attributes
+{#import System.Glib.Properties#}
+{#import Graphics.UI.Gtk.SourceView.Types#}
+{#import Graphics.UI.Gtk.SourceView.SourceStyleScheme#}
+
+-- |
+--
+sourceStyleSchemeManagerNew :: IO SourceStyleSchemeManager
+sourceStyleSchemeManagerNew = constructNewGObject mkSourceStyleSchemeManager $ liftM castPtr
+  {#call unsafe source_style_scheme_manager_new#}
+
+-- |
+--
+sourceStyleSchemeManagerGetDefault :: IO SourceStyleSchemeManager
+sourceStyleSchemeManagerGetDefault = makeNewGObject mkSourceStyleSchemeManager $ liftM castPtr
+  {#call unsafe source_style_scheme_manager_get_default#}
+
+-- |
+--
+sourceStyleSchemeManagerSetSearchPath :: SourceStyleSchemeManager -> Maybe [String] -> IO ()
+sourceStyleSchemeManagerSetSearchPath ssm dirs =
+  maybeWith withUTFStringArray0 dirs $ \dirsPtr -> do
+    {#call unsafe source_style_scheme_manager_set_search_path#} ssm dirsPtr
+
+-- |
+--
+sourceStyleSchemeManagerAppendSearchPath :: SourceStyleSchemeManager -> String -> IO ()
+sourceStyleSchemeManagerAppendSearchPath ssm dir =
+  withUTFString dir $ {#call unsafe source_style_scheme_manager_append_search_path#} ssm
+
+-- |
+--
+sourceStyleSchemeManagerPrependSearchPath :: SourceStyleSchemeManager -> String -> IO ()
+sourceStyleSchemeManagerPrependSearchPath ssm dir =
+  withUTFString dir $ {#call unsafe source_style_scheme_manager_prepend_search_path#} ssm
+
+-- |
+--
+sourceStyleSchemeManagerGetSearchPath :: SourceStyleSchemeManager -> IO [String]
+sourceStyleSchemeManagerGetSearchPath ssm = do
+  dirsPtr <- {#call unsafe source_style_scheme_manager_get_search_path#} ssm
+  peekUTFStringArray0 dirsPtr
+
+-- |
+--
+sourceStyleSchemeManagerGetSchemeIds :: SourceStyleSchemeManager -> IO [String]
+sourceStyleSchemeManagerGetSchemeIds ssm = do
+  idsPtr <- {#call unsafe source_style_scheme_manager_get_scheme_ids#} ssm
+  liftM (fromMaybe []) $ maybePeek peekUTFStringArray0 idsPtr
+
+-- |
+--
+sourceStyleSchemeManagerGetScheme :: SourceStyleSchemeManager -> String -> IO SourceStyleScheme
+sourceStyleSchemeManagerGetScheme ssm id = makeNewGObject mkSourceStyleScheme $
+  withUTFString id $ {#call unsafe source_style_scheme_manager_get_scheme#} ssm
+
+-- |
+--
+sourceStyleSchemeManagerForceRescan :: SourceStyleSchemeManager -> IO ()
+sourceStyleSchemeManagerForceRescan =
+  {#call unsafe source_style_scheme_manager_force_rescan#}
+
+-- |
+--
+sourceStyleSchemeManagerStyleIds :: ReadAttr SourceStyleSchemeManager [String]
+sourceStyleSchemeManagerStyleIds =
+  readAttrFromBoxedOpaqueProperty (liftM (fromMaybe []) . maybePeek peekUTFStringArray0 . castPtr)
+                                  "style-ids" {#call pure g_strv_get_type#}
+
+-- |
+--
+sourceStyleSchemeManagerSearchPath :: ReadWriteAttr SourceStyleSchemeManager [String] (Maybe [String])
+sourceStyleSchemeManagerSearchPath =
+  newAttr (objectGetPropertyBoxedOpaque (peekUTFStringArray0 . castPtr) gtype "search-path")
+          (objectSetPropertyBoxedOpaque (\dirs f -> maybeWith withUTFStringArray0 dirs (f . castPtr)) gtype "search-path")
+  where gtype = {#call pure g_strv_get_type#}
diff --git a/Graphics/UI/Gtk/SourceView/SourceView.chs b/Graphics/UI/Gtk/SourceView/SourceView.chs
new file mode 100644
--- /dev/null
+++ b/Graphics/UI/Gtk/SourceView/SourceView.chs
@@ -0,0 +1,314 @@
+{-# LANGUAGE CPP #-}
+-- -*-haskell-*-
+--  GIMP Toolkit (GTK) Widget SourceView
+--
+--  Author : Peter Gavin
+--  derived from sourceview bindings by Axel Simon and Duncan Coutts
+--
+--  Created: 18 December 2008
+--
+--  Copyright (C) 2004-2008 Peter Gavin, Duncan Coutts, Axel Simon
+--
+--  This library is free software; you can redistribute it and/or
+--  modify it under the terms of the GNU Lesser General Public
+--  License as published by the Free Software Foundation; either
+--  version 2.1 of the License, or (at your option) any later version.
+--
+--  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
+--  Lesser General Public License for more details.
+--
+-- |
+-- Maintainer  : gtk2hs-users@lists.sourceforge.net
+-- Stability   : provisional
+-- Portability : portable (depends on GHC)
+--
+module Graphics.UI.Gtk.SourceView.SourceView (
+  SourceView,
+  SourceViewClass,
+  SourceSmartHomeEndType(..),
+  castToSourceView,
+  sourceViewNew,
+  sourceViewNewWithBuffer,
+  sourceViewSetAutoIndent,
+  sourceViewGetAutoIndent,
+  sourceViewSetIndentOnTab,
+  sourceViewGetIndentOnTab,
+  sourceViewSetIndentWidth,
+  sourceViewGetIndentWidth,
+  sourceViewSetInsertSpacesInsteadOfTabs,
+  sourceViewGetInsertSpacesInsteadOfTabs,
+  sourceViewSetSmartHomeEnd,
+  sourceViewGetSmartHomeEnd,
+  sourceViewSetHighlightCurrentLine,
+  sourceViewGetHighlightCurrentLine,
+  sourceViewSetShowLineMarks,
+  sourceViewGetShowLineMarks,
+  sourceViewSetShowLineNumbers,
+  sourceViewGetShowLineNumbers,
+  sourceViewSetShowRightMargin,
+  sourceViewGetShowRightMargin,
+  sourceViewSetRightMarginPosition,
+  sourceViewGetRightMarginPosition,
+  sourceViewSetTabWidth,
+  sourceViewGetTabWidth,
+  sourceViewSetMarkCategoryPixbuf,
+  sourceViewGetMarkCategoryPixbuf,
+  sourceViewAutoIndent,
+  sourceViewHighlightCurrentLine,
+  sourceViewIndentOnTab,
+  sourceViewIndentWidth,
+  sourceViewInsertSpacesInsteadOfTabs,
+  sourceViewRightMarginPosition,
+  sourceViewShowLineNumbers,
+  sourceViewShowRightMargin,
+  sourceViewSmartHomeEnd,
+  sourceViewTabWidth,
+  sourceViewUndo,
+  sourceViewRedo
+  ) where
+
+import Control.Monad	(liftM)
+
+import System.Glib.FFI
+{#import System.Glib.Properties#}
+import System.Glib.Attributes
+import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)
+{#import Graphics.UI.Gtk.SourceView.Types#}
+{#import Graphics.UI.Gtk.SourceView.Signals#}
+
+{# context lib="gtk" prefix="gtk" #}
+
+{# enum SourceSmartHomeEndType {underscoreToCase} deriving (Eq, Bounded, Show, Read) #}
+
+-- | Create a new 'SourceView' widget with a default 'SourceBuffer'.
+--
+sourceViewNew :: IO SourceView
+sourceViewNew = makeNewObject mkSourceView $ liftM castPtr
+  {#call unsafe source_view_new#}
+
+-- | Create a new 'SourceView'
+-- widget with the given 'SourceBuffer'.
+--
+sourceViewNewWithBuffer :: SourceBuffer -> IO SourceView
+sourceViewNewWithBuffer sb = makeNewObject mkSourceView $ liftM castPtr $
+  {#call source_view_new_with_buffer#} sb
+
+-- | 
+--
+sourceViewSetAutoIndent :: SourceViewClass sv => sv -> Bool -> IO ()
+sourceViewSetAutoIndent sv newVal =
+  {#call source_view_set_auto_indent#} (toSourceView sv) (fromBool newVal)
+  
+-- | 
+--
+sourceViewGetAutoIndent :: SourceViewClass sv => sv -> IO Bool 
+sourceViewGetAutoIndent sv = liftM toBool $
+  {#call unsafe source_view_get_auto_indent#} (toSourceView sv)
+
+-- | 
+--
+sourceViewSetIndentOnTab :: SourceViewClass sv => sv -> Bool -> IO ()
+sourceViewSetIndentOnTab sv newVal =
+  {#call source_view_set_indent_on_tab#} (toSourceView sv) (fromBool newVal)
+  
+-- | 
+--
+sourceViewGetIndentOnTab :: SourceViewClass sv => sv -> IO Bool 
+sourceViewGetIndentOnTab sv = liftM toBool $
+  {#call unsafe source_view_get_indent_on_tab#} (toSourceView sv)
+
+-- | 
+--
+sourceViewSetIndentWidth :: SourceViewClass sv => sv -> Int -> IO ()
+sourceViewSetIndentWidth sv newVal =
+  {#call source_view_set_indent_width#} (toSourceView sv) (fromIntegral newVal)
+
+-- | 
+--
+sourceViewGetIndentWidth :: SourceViewClass sv => sv -> IO Int
+sourceViewGetIndentWidth sv = liftM fromIntegral $
+  {#call unsafe source_view_get_indent_width#} (toSourceView sv)
+
+-- | 
+--
+sourceViewSetInsertSpacesInsteadOfTabs :: SourceViewClass sv => sv -> Bool -> IO ()
+sourceViewSetInsertSpacesInsteadOfTabs sv newVal =
+  {#call source_view_set_insert_spaces_instead_of_tabs#} (toSourceView sv) (fromBool newVal)
+  
+-- | 
+--
+sourceViewGetInsertSpacesInsteadOfTabs :: SourceViewClass sv => sv -> IO Bool 
+sourceViewGetInsertSpacesInsteadOfTabs sv = liftM toBool $
+  {#call unsafe source_view_get_insert_spaces_instead_of_tabs#} (toSourceView sv)
+
+-- | 
+--
+sourceViewSetSmartHomeEnd :: SourceViewClass sv => sv -> SourceSmartHomeEndType -> IO ()
+sourceViewSetSmartHomeEnd sv newVal =
+  {#call source_view_set_smart_home_end#} (toSourceView sv) (fromIntegral $ fromEnum newVal)
+  
+-- | 
+--
+sourceViewGetSmartHomeEnd :: SourceViewClass sv => sv -> IO SourceSmartHomeEndType
+sourceViewGetSmartHomeEnd sv = liftM (toEnum . fromIntegral) $
+  {#call unsafe source_view_get_smart_home_end#} (toSourceView sv)
+
+-- | 
+--
+sourceViewSetHighlightCurrentLine :: SourceViewClass sv => sv -> Bool -> IO ()
+sourceViewSetHighlightCurrentLine sv newVal =
+  {#call source_view_set_highlight_current_line#} (toSourceView sv) (fromBool newVal)
+  
+-- | 
+--
+sourceViewGetHighlightCurrentLine :: SourceViewClass sv => sv -> IO Bool 
+sourceViewGetHighlightCurrentLine sv = liftM toBool $
+  {#call unsafe source_view_get_highlight_current_line#} (toSourceView sv)
+
+-- | 
+--
+sourceViewSetShowLineMarks :: SourceViewClass sv => sv -> Bool -> IO ()
+sourceViewSetShowLineMarks sv newVal =
+  {#call source_view_set_show_line_marks#} (toSourceView sv) (fromBool newVal)
+  
+-- | 
+--
+sourceViewGetShowLineMarks :: SourceViewClass sv => sv -> IO Bool 
+sourceViewGetShowLineMarks sv = liftM toBool $
+  {#call unsafe source_view_get_show_line_marks#} (toSourceView sv)
+
+--- | 
+--
+sourceViewSetShowLineNumbers :: SourceViewClass sv => sv -> Bool -> IO ()
+sourceViewSetShowLineNumbers sv newVal =
+  {#call source_view_set_show_line_numbers#} (toSourceView sv) (fromBool newVal)
+  
+-- | 
+--
+sourceViewGetShowLineNumbers :: SourceViewClass sv => sv -> IO Bool 
+sourceViewGetShowLineNumbers sv = liftM toBool $
+  {#call unsafe source_view_get_show_line_numbers#} (toSourceView sv)
+
+-- | 
+--
+sourceViewSetShowRightMargin :: SourceViewClass sv => sv -> Bool -> IO ()
+sourceViewSetShowRightMargin sv newVal =
+  {#call source_view_set_show_right_margin#} (toSourceView sv) (fromBool newVal)
+  
+-- | 
+--
+sourceViewGetShowRightMargin :: SourceViewClass sv => sv -> IO Bool
+sourceViewGetShowRightMargin sv = liftM toBool $
+  {#call source_view_get_show_right_margin#} (toSourceView sv)
+  
+-- | 
+--
+sourceViewSetRightMarginPosition :: SourceViewClass sv => sv -> Word -> IO ()
+sourceViewSetRightMarginPosition sv margin =
+  {#call source_view_set_right_margin_position#} (toSourceView sv) (fromIntegral margin)
+  
+-- | 
+--
+sourceViewGetRightMarginPosition :: SourceViewClass sv => sv -> IO Int 
+sourceViewGetRightMarginPosition sv = liftM fromIntegral $
+  {#call unsafe source_view_get_right_margin_position#} (toSourceView sv)
+
+-- | 
+--
+sourceViewSetTabWidth :: SourceViewClass sv => sv -> Int -> IO ()
+sourceViewSetTabWidth sv width =
+  {#call source_view_set_tab_width#} (toSourceView sv) (fromIntegral width)
+  
+-- | 
+--
+sourceViewGetTabWidth :: SourceViewClass sv => sv -> IO Int 
+sourceViewGetTabWidth sv = liftM fromIntegral $
+  {#call unsafe source_view_get_tab_width#} (toSourceView sv)
+
+-- |
+--
+sourceViewSetMarkCategoryPriority :: SourceViewClass sv => sv -> String -> Int -> IO ()
+sourceViewSetMarkCategoryPriority sv markerType priority = withCString markerType $ \strPtr ->
+  {#call source_view_set_mark_category_priority#} (toSourceView sv) strPtr (fromIntegral priority)
+
+-- |
+--
+sourceViewGetMarkCategoryPriority :: SourceViewClass sv => sv -> String -> IO Int
+sourceViewGetMarkCategoryPriority sv markerType = withCString markerType $ \strPtr ->
+  liftM fromIntegral $
+  {#call unsafe source_view_get_mark_category_priority#} (toSourceView sv) strPtr
+
+--- |
+--
+sourceViewSetMarkCategoryPixbuf :: SourceViewClass sv => sv -> String -> Pixbuf -> IO ()
+sourceViewSetMarkCategoryPixbuf sv markerType marker = withCString markerType $ \strPtr ->
+  {#call source_view_set_mark_category_pixbuf#} (toSourceView sv) strPtr marker
+
+-- |
+--
+sourceViewGetMarkCategoryPixbuf :: SourceViewClass sv => sv -> String -> IO Pixbuf
+sourceViewGetMarkCategoryPixbuf sv markerType = withCString markerType $ \strPtr ->
+  constructNewGObject mkPixbuf $
+  {#call unsafe source_view_get_mark_category_pixbuf#} (toSourceView sv) strPtr
+
+-- |
+--
+sourceViewAutoIndent :: SourceViewClass sv => Attr sv Bool
+sourceViewAutoIndent = newAttrFromBoolProperty "auto-indent"
+
+-- |
+--
+sourceViewHighlightCurrentLine :: SourceViewClass sv => Attr sv Bool
+sourceViewHighlightCurrentLine = newAttrFromBoolProperty "highlight-current-line"
+
+-- |
+--
+sourceViewIndentOnTab :: SourceViewClass sv => Attr sv Bool
+sourceViewIndentOnTab = newAttrFromBoolProperty "indent-on-tab"
+
+-- |
+--
+sourceViewIndentWidth :: SourceViewClass sv => Attr sv Int
+sourceViewIndentWidth = newAttrFromIntProperty "indent-width"
+
+-- |
+--
+sourceViewInsertSpacesInsteadOfTabs :: SourceViewClass sv => Attr sv Bool
+sourceViewInsertSpacesInsteadOfTabs = newAttrFromBoolProperty "insert-spaces-instead-of-tabs"
+
+-- |
+--
+sourceViewRightMarginPosition :: SourceViewClass sv => Attr sv Int
+sourceViewRightMarginPosition = newAttrFromUIntProperty "right-margin-position"
+
+-- |
+--
+sourceViewShowLineNumbers :: SourceViewClass sv => Attr sv Bool
+sourceViewShowLineNumbers = newAttrFromBoolProperty "show-line-numbers"
+
+-- |
+--
+sourceViewShowRightMargin :: SourceViewClass sv => Attr sv Bool
+sourceViewShowRightMargin = newAttrFromBoolProperty "show-right-margin"
+
+-- |
+--
+sourceViewSmartHomeEnd :: SourceViewClass sv => Attr sv SourceSmartHomeEndType
+sourceViewSmartHomeEnd = newAttrFromEnumProperty "smart-home-end" {#call fun gtk_source_smart_home_end_type_get_type#}
+
+-- |
+--
+sourceViewTabWidth :: SourceViewClass sv => Attr sv Int
+sourceViewTabWidth = newAttrFromUIntProperty "tab-width"
+
+-- |
+--
+sourceViewUndo :: SourceViewClass sv => Signal sv (IO ())
+sourceViewUndo = Signal $ connect_NONE__NONE "undo"
+
+-- |
+--
+sourceViewRedo :: SourceViewClass sv => Signal sv (IO ())
+sourceViewRedo = Signal $ connect_NONE__NONE "redo"
diff --git a/Graphics/UI/Gtk/SourceView/Types.chs b/Graphics/UI/Gtk/SourceView/Types.chs
new file mode 100644
--- /dev/null
+++ b/Graphics/UI/Gtk/SourceView/Types.chs
@@ -0,0 +1,281 @@
+{-# OPTIONS_HADDOCK hide #-}
+-- -*-haskell-*-
+-- -------------------- automatically generated file - do not edit ----------
+--  Object hierarchy for the GIMP Toolkit (GTK) Binding for Haskell
+--
+--  Author : Axel Simon
+--
+--  Copyright (C) 2001-2005 Axel Simon
+--
+--  This library is free software; you can redistribute it and/or
+--  modify it under the terms of the GNU Lesser General Public
+--  License as published by the Free Software Foundation; either
+--  version 2.1 of the License, or (at your option) any later version.
+--
+--  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
+--  Lesser General Public License for more details.
+--
+-- #hide
+
+-- |
+-- Maintainer  : gtk2hs-users@lists.sourceforge.net
+-- Stability   : provisional
+-- Portability : portable (depends on GHC)
+--
+-- This file reflects the Gtk+ object hierarchy in terms of Haskell classes.
+--
+-- Note: the mk... functions were originally meant to simply be an alias
+-- for the constructor. However, in order to communicate the destructor
+-- of an object to objectNew, the mk... functions are now a tuple containing
+-- Haskell constructor and the destructor function pointer. This hack avoids
+-- changing all modules that simply pass mk... to objectNew.
+--
+module Graphics.UI.Gtk.SourceView.Types (
+
+  module Graphics.UI.GtkInternals,
+  SourceBuffer(SourceBuffer), SourceBufferClass,
+  toSourceBuffer, 
+  mkSourceBuffer, unSourceBuffer,
+  castToSourceBuffer, gTypeSourceBuffer,
+  SourceMark(SourceMark), SourceMarkClass,
+  toSourceMark, 
+  mkSourceMark, unSourceMark,
+  castToSourceMark, gTypeSourceMark,
+  SourceView(SourceView), SourceViewClass,
+  toSourceView, 
+  mkSourceView, unSourceView,
+  castToSourceView, gTypeSourceView,
+  SourceLanguage(SourceLanguage), SourceLanguageClass,
+  toSourceLanguage, 
+  mkSourceLanguage, unSourceLanguage,
+  castToSourceLanguage, gTypeSourceLanguage,
+  SourceLanguageManager(SourceLanguageManager), SourceLanguageManagerClass,
+  toSourceLanguageManager, 
+  mkSourceLanguageManager, unSourceLanguageManager,
+  castToSourceLanguageManager, gTypeSourceLanguageManager,
+  SourceStyleObject(SourceStyleObject), SourceStyleObjectClass,
+  toSourceStyleObject, 
+  mkSourceStyleObject, unSourceStyleObject,
+  castToSourceStyleObject, gTypeSourceStyleObject,
+  SourceStyleScheme(SourceStyleScheme), SourceStyleSchemeClass,
+  toSourceStyleScheme, 
+  mkSourceStyleScheme, unSourceStyleScheme,
+  castToSourceStyleScheme, gTypeSourceStyleScheme,
+  SourceStyleSchemeManager(SourceStyleSchemeManager), SourceStyleSchemeManagerClass,
+  toSourceStyleSchemeManager, 
+  mkSourceStyleSchemeManager, unSourceStyleSchemeManager,
+  castToSourceStyleSchemeManager, gTypeSourceStyleSchemeManager
+  ) where
+
+import Foreign.ForeignPtr (ForeignPtr, castForeignPtr, unsafeForeignPtrToPtr)
+import Foreign.C.Types    (CULong, CUInt)
+import System.Glib.GType	(GType, typeInstanceIsA)
+{#import Graphics.UI.GtkInternals#}
+
+{# context lib="gtk" prefix="gtk" #}
+
+-- The usage of foreignPtrToPtr should be safe as the evaluation will only be
+-- forced if the object is used afterwards
+--
+castTo :: (GObjectClass obj, GObjectClass obj') => GType -> String
+                                                -> (obj -> obj')
+castTo gtype objTypeName obj =
+  case toGObject obj of
+    gobj@(GObject objFPtr)
+      | typeInstanceIsA ((unsafeForeignPtrToPtr.castForeignPtr) objFPtr) gtype
+                  -> unsafeCastGObject gobj
+      | otherwise -> error $ "Cannot cast object to " ++ objTypeName
+
+
+-- *************************************************************** SourceBuffer
+
+{#pointer *SourceBuffer foreign newtype #} deriving (Eq,Ord)
+
+mkSourceBuffer = (SourceBuffer, objectUnrefFromMainloop)
+unSourceBuffer (SourceBuffer o) = o
+
+class TextBufferClass o => SourceBufferClass o
+toSourceBuffer :: SourceBufferClass o => o -> SourceBuffer
+toSourceBuffer = unsafeCastGObject . toGObject
+
+instance SourceBufferClass SourceBuffer
+instance TextBufferClass SourceBuffer
+instance GObjectClass SourceBuffer where
+  toGObject = GObject . castForeignPtr . unSourceBuffer
+  unsafeCastGObject = SourceBuffer . castForeignPtr . unGObject
+
+castToSourceBuffer :: GObjectClass obj => obj -> SourceBuffer
+castToSourceBuffer = castTo gTypeSourceBuffer "SourceBuffer"
+
+gTypeSourceBuffer :: GType
+gTypeSourceBuffer =
+  {# call fun unsafe gtk_source_buffer_get_type #}
+
+-- ***************************************************************** SourceMark
+
+{#pointer *SourceMark foreign newtype #} deriving (Eq,Ord)
+
+mkSourceMark = (SourceMark, objectUnrefFromMainloop)
+unSourceMark (SourceMark o) = o
+
+class TextMarkClass o => SourceMarkClass o
+toSourceMark :: SourceMarkClass o => o -> SourceMark
+toSourceMark = unsafeCastGObject . toGObject
+
+instance SourceMarkClass SourceMark
+instance TextMarkClass SourceMark
+instance GObjectClass SourceMark where
+  toGObject = GObject . castForeignPtr . unSourceMark
+  unsafeCastGObject = SourceMark . castForeignPtr . unGObject
+
+castToSourceMark :: GObjectClass obj => obj -> SourceMark
+castToSourceMark = castTo gTypeSourceMark "SourceMark"
+
+gTypeSourceMark :: GType
+gTypeSourceMark =
+  {# call fun unsafe gtk_source_mark_get_type #}
+
+-- ***************************************************************** SourceView
+
+{#pointer *SourceView foreign newtype #} deriving (Eq,Ord)
+
+mkSourceView = (SourceView, objectUnrefFromMainloop)
+unSourceView (SourceView o) = o
+
+class TextViewClass o => SourceViewClass o
+toSourceView :: SourceViewClass o => o -> SourceView
+toSourceView = unsafeCastGObject . toGObject
+
+instance SourceViewClass SourceView
+instance TextViewClass SourceView
+instance ContainerClass SourceView
+instance WidgetClass SourceView
+instance ObjectClass SourceView
+instance GObjectClass SourceView where
+  toGObject = GObject . castForeignPtr . unSourceView
+  unsafeCastGObject = SourceView . castForeignPtr . unGObject
+
+castToSourceView :: GObjectClass obj => obj -> SourceView
+castToSourceView = castTo gTypeSourceView "SourceView"
+
+gTypeSourceView :: GType
+gTypeSourceView =
+  {# call fun unsafe gtk_source_view_get_type #}
+
+-- ************************************************************* SourceLanguage
+
+{#pointer *SourceLanguage foreign newtype #} deriving (Eq,Ord)
+
+mkSourceLanguage = (SourceLanguage, objectUnrefFromMainloop)
+unSourceLanguage (SourceLanguage o) = o
+
+class GObjectClass o => SourceLanguageClass o
+toSourceLanguage :: SourceLanguageClass o => o -> SourceLanguage
+toSourceLanguage = unsafeCastGObject . toGObject
+
+instance SourceLanguageClass SourceLanguage
+instance GObjectClass SourceLanguage where
+  toGObject = GObject . castForeignPtr . unSourceLanguage
+  unsafeCastGObject = SourceLanguage . castForeignPtr . unGObject
+
+castToSourceLanguage :: GObjectClass obj => obj -> SourceLanguage
+castToSourceLanguage = castTo gTypeSourceLanguage "SourceLanguage"
+
+gTypeSourceLanguage :: GType
+gTypeSourceLanguage =
+  {# call fun unsafe gtk_source_language_get_type #}
+
+-- ****************************************************** SourceLanguageManager
+
+{#pointer *SourceLanguageManager foreign newtype #} deriving (Eq,Ord)
+
+mkSourceLanguageManager = (SourceLanguageManager, objectUnrefFromMainloop)
+unSourceLanguageManager (SourceLanguageManager o) = o
+
+class GObjectClass o => SourceLanguageManagerClass o
+toSourceLanguageManager :: SourceLanguageManagerClass o => o -> SourceLanguageManager
+toSourceLanguageManager = unsafeCastGObject . toGObject
+
+instance SourceLanguageManagerClass SourceLanguageManager
+instance GObjectClass SourceLanguageManager where
+  toGObject = GObject . castForeignPtr . unSourceLanguageManager
+  unsafeCastGObject = SourceLanguageManager . castForeignPtr . unGObject
+
+castToSourceLanguageManager :: GObjectClass obj => obj -> SourceLanguageManager
+castToSourceLanguageManager = castTo gTypeSourceLanguageManager "SourceLanguageManager"
+
+gTypeSourceLanguageManager :: GType
+gTypeSourceLanguageManager =
+  {# call fun unsafe gtk_source_language_manager_get_type #}
+
+-- ********************************************************** SourceStyleObject
+
+{#pointer *GtkSourceStyle as SourceStyleObject foreign newtype #} deriving (Eq,Ord)
+
+mkSourceStyleObject = (SourceStyleObject, objectUnrefFromMainloop)
+unSourceStyleObject (SourceStyleObject o) = o
+
+class GObjectClass o => SourceStyleObjectClass o
+toSourceStyleObject :: SourceStyleObjectClass o => o -> SourceStyleObject
+toSourceStyleObject = unsafeCastGObject . toGObject
+
+instance SourceStyleObjectClass SourceStyleObject
+instance GObjectClass SourceStyleObject where
+  toGObject = GObject . castForeignPtr . unSourceStyleObject
+  unsafeCastGObject = SourceStyleObject . castForeignPtr . unGObject
+
+castToSourceStyleObject :: GObjectClass obj => obj -> SourceStyleObject
+castToSourceStyleObject = castTo gTypeSourceStyleObject "SourceStyleObject"
+
+gTypeSourceStyleObject :: GType
+gTypeSourceStyleObject =
+  {# call fun unsafe gtk_source_style_get_type #}
+
+-- ********************************************************** SourceStyleScheme
+
+{#pointer *SourceStyleScheme foreign newtype #} deriving (Eq,Ord)
+
+mkSourceStyleScheme = (SourceStyleScheme, objectUnrefFromMainloop)
+unSourceStyleScheme (SourceStyleScheme o) = o
+
+class GObjectClass o => SourceStyleSchemeClass o
+toSourceStyleScheme :: SourceStyleSchemeClass o => o -> SourceStyleScheme
+toSourceStyleScheme = unsafeCastGObject . toGObject
+
+instance SourceStyleSchemeClass SourceStyleScheme
+instance GObjectClass SourceStyleScheme where
+  toGObject = GObject . castForeignPtr . unSourceStyleScheme
+  unsafeCastGObject = SourceStyleScheme . castForeignPtr . unGObject
+
+castToSourceStyleScheme :: GObjectClass obj => obj -> SourceStyleScheme
+castToSourceStyleScheme = castTo gTypeSourceStyleScheme "SourceStyleScheme"
+
+gTypeSourceStyleScheme :: GType
+gTypeSourceStyleScheme =
+  {# call fun unsafe gtk_source_style_scheme_get_type #}
+
+-- *************************************************** SourceStyleSchemeManager
+
+{#pointer *SourceStyleSchemeManager foreign newtype #} deriving (Eq,Ord)
+
+mkSourceStyleSchemeManager = (SourceStyleSchemeManager, objectUnrefFromMainloop)
+unSourceStyleSchemeManager (SourceStyleSchemeManager o) = o
+
+class GObjectClass o => SourceStyleSchemeManagerClass o
+toSourceStyleSchemeManager :: SourceStyleSchemeManagerClass o => o -> SourceStyleSchemeManager
+toSourceStyleSchemeManager = unsafeCastGObject . toGObject
+
+instance SourceStyleSchemeManagerClass SourceStyleSchemeManager
+instance GObjectClass SourceStyleSchemeManager where
+  toGObject = GObject . castForeignPtr . unSourceStyleSchemeManager
+  unsafeCastGObject = SourceStyleSchemeManager . castForeignPtr . unGObject
+
+castToSourceStyleSchemeManager :: GObjectClass obj => obj -> SourceStyleSchemeManager
+castToSourceStyleSchemeManager = castTo gTypeSourceStyleSchemeManager "SourceStyleSchemeManager"
+
+gTypeSourceStyleSchemeManager :: GType
+gTypeSourceStyleSchemeManager =
+  {# call fun unsafe gtk_source_style_scheme_manager_get_type #}
+
diff --git a/Gtk2HsSetup.hs b/Gtk2HsSetup.hs
new file mode 100644
--- /dev/null
+++ b/Gtk2HsSetup.hs
@@ -0,0 +1,486 @@
+{-# LANGUAGE CPP #-}
+
+#define CABAL_VERSION_ENCODE(major, minor, micro) (     \
+          ((major) * 10000)                             \
+        + ((minor) *   100)                             \
+        + ((micro) *     1))
+
+#define CABAL_VERSION_CHECK(major,minor,micro)    \
+        (CABAL_VERSION >= CABAL_VERSION_ENCODE(major,minor,micro))
+
+-- now, this is bad, but Cabal doesn't seem to actually pass any information about
+-- its version to CPP, so guess the version depending on the version of GHC
+#ifdef CABAL_VERSION_MINOR
+#ifndef CABAL_VERSION_MAJOR
+#define CABAL_VERSION_MAJOR 1
+#endif
+#ifndef CABAL_VERSION_MICRO
+#define CABAL_VERSION_MICRO 0
+#endif
+#define CABAL_VERSION CABAL_VERSION_ENCODE(     \
+        CABAL_VERSION_MAJOR,                    \
+        CABAL_VERSION_MINOR,                    \
+        CABAL_VERSION_MICRO)
+#else
+#warning Setup.hs is guessing the version of Cabal. If compilation of Setup.hs fails use -DCABAL_VERSION_MINOR=x for Cabal version 1.x.0 when building (prefixed by --ghc-option= when using the 'cabal' command)
+#if (__GLASGOW_HASKELL__ >= 612)
+#define CABAL_VERSION CABAL_VERSION_ENCODE(1,8,0)
+#else
+#define CABAL_VERSION CABAL_VERSION_ENCODE(1,6,0)
+#endif
+#endif
+
+-- | Build a Gtk2hs package.
+--
+module Gtk2HsSetup ( gtk2hsUserHooks, getPkgConfigPackages ) where
+
+import Distribution.Simple
+import Distribution.Simple.PreProcess
+import Distribution.InstalledPackageInfo ( importDirs,
+                                           showInstalledPackageInfo,
+                                           libraryDirs,
+                                           extraLibraries,
+                                           extraGHCiLibraries )
+import Distribution.Simple.PackageIndex (
+#if CABAL_VERSION_CHECK(1,8,0)
+  lookupInstalledPackageId
+#else
+  lookupPackageId
+#endif
+  )
+import Distribution.PackageDescription as PD ( PackageDescription(..),
+                                               updatePackageDescription,
+                                               BuildInfo(..),
+                                               emptyBuildInfo, allBuildInfo,
+                                               Library(..),
+                                               libModules, hasLibs)
+import Distribution.Simple.LocalBuildInfo (LocalBuildInfo(..),
+                                           InstallDirs(..),
+#if CABAL_VERSION_CHECK(1,8,0)
+                                           componentPackageDeps,
+#else
+                                           packageDeps,
+#endif
+                                           absoluteInstallDirs)
+import Distribution.Simple.Compiler  ( Compiler(..) )
+import Distribution.Simple.Program (
+  Program(..), ConfiguredProgram(..),
+  rawSystemProgramConf, rawSystemProgramStdoutConf,
+  c2hsProgram, pkgConfigProgram, requireProgram, ghcPkgProgram,
+  simpleProgram, lookupProgram, rawSystemProgramStdout, ProgArg)
+import Distribution.ModuleName ( ModuleName, components, toFilePath )
+import Distribution.Simple.Utils
+import Distribution.Simple.Setup (CopyFlags(..), InstallFlags(..), CopyDest(..),
+                                  defaultCopyFlags, ConfigFlags(configVerbosity),
+                                  fromFlag, toFlag, RegisterFlags(..), flagToMaybe,
+                                  fromFlagOrDefault, defaultRegisterFlags)
+import Distribution.Simple.BuildPaths ( autogenModulesDir )
+import Distribution.Simple.Install ( install )
+#if CABAL_VERSION_CHECK(1,8,0)
+import Distribution.Simple.Register ( generateRegistrationInfo, registerPackage )
+#else
+import qualified Distribution.Simple.Register as Register ( register )
+#endif
+import Distribution.Text ( simpleParse, display )
+import System.FilePath
+import System.Directory ( doesFileExist )
+import Distribution.Version (Version(..))
+import Distribution.Verbosity
+import Control.Monad (when, unless, filterM)
+import Data.Maybe ( isJust, isNothing, fromMaybe, maybeToList )
+import Data.List (isPrefixOf, isSuffixOf, nub)
+import Data.Char (isAlpha)
+import qualified Data.Map as M
+import qualified Data.Set as S
+
+import Control.Applicative ((<$>))
+import System.Directory (getDirectoryContents, doesDirectoryExist)
+
+-- the name of the c2hs pre-compiled header file
+precompFile = "precompchs.bin"
+
+gtk2hsUserHooks = simpleUserHooks {
+    hookedPrograms = [typeGenProgram, signalGenProgram, c2hsLocal],
+    hookedPreProcessors = [("chs", ourC2hs)],
+    confHook = \pd cf ->
+      confHook simpleUserHooks pd cf >>= return . adjustLocalBuildInfo,
+    postConf = \args cf pd lbi -> do
+      genSynthezisedFiles (fromFlag (configVerbosity cf)) pd lbi
+      postConf simpleUserHooks args cf pd lbi,
+    buildHook = \pd lbi uh bf -> fixDeps pd >>= \pd ->
+                                 (buildHook simpleUserHooks) pd lbi uh bf,
+    copyHook = \pd lbi uh flags -> (copyHook simpleUserHooks) pd lbi uh flags >>
+      installCHI pd lbi (fromFlag (copyVerbosity flags)) (fromFlag (copyDest flags)),
+    instHook = \pd lbi uh flags ->
+#if defined(mingw32_HOST_OS) || defined(__MINGW32__)
+      installHook pd lbi uh flags >>
+      installCHI pd lbi (fromFlag (installVerbosity flags)) NoCopyDest,
+    regHook = registerHook
+#else
+      instHook simpleUserHooks pd lbi uh flags >>
+      installCHI pd lbi (fromFlag (installVerbosity flags)) NoCopyDest
+#endif
+  }
+
+------------------------------------------------------------------------------
+-- Lots of stuff for windows ghci support
+------------------------------------------------------------------------------
+
+getDlls :: [FilePath] -> IO [FilePath]
+getDlls dirs = filter ((== ".dll") . takeExtension) . concat <$>
+    mapM getDirectoryContents dirs
+
+fixLibs :: [FilePath] -> [String] -> [String]
+fixLibs dlls = concatMap $ \ lib ->
+    case filter (("lib" ++ lib) `isPrefixOf`) dlls of
+                dll:_ -> [dropExtension dll]
+                _     -> if lib == "z" then [] else [lib]
+
+-- The following code is a big copy-and-paste job from the sources of
+-- Cabal 1.8 just to be able to fix a field in the package file. Yuck.
+
+#if CABAL_VERSION_CHECK(1,8,0)
+        
+installHook :: PackageDescription -> LocalBuildInfo
+                   -> UserHooks -> InstallFlags -> IO ()
+installHook pkg_descr localbuildinfo _ flags = do
+  let copyFlags = defaultCopyFlags {
+                      copyDistPref   = installDistPref flags,
+                      copyDest       = toFlag NoCopyDest,
+                      copyVerbosity  = installVerbosity flags
+                  }
+  install pkg_descr localbuildinfo copyFlags
+  let registerFlags = defaultRegisterFlags {
+                          regDistPref  = installDistPref flags,
+                          regInPlace   = installInPlace flags,
+                          regPackageDB = installPackageDB flags,
+                          regVerbosity = installVerbosity flags
+                      }
+  when (hasLibs pkg_descr) $ register pkg_descr localbuildinfo registerFlags
+
+registerHook :: PackageDescription -> LocalBuildInfo
+        -> UserHooks -> RegisterFlags -> IO ()
+registerHook pkg_descr localbuildinfo _ flags =
+    if hasLibs pkg_descr
+    then register pkg_descr localbuildinfo flags
+    else setupMessage verbosity
+           "Package contains no library to register:" (packageId pkg_descr)
+  where verbosity = fromFlag (regVerbosity flags)
+
+register :: PackageDescription -> LocalBuildInfo
+         -> RegisterFlags -- ^Install in the user's database?; verbose
+         -> IO ()
+register pkg@PackageDescription { library       = Just lib  }
+         lbi@LocalBuildInfo     { libraryConfig = Just clbi } regFlags
+  = do
+
+    installedPkgInfoRaw <- generateRegistrationInfo
+                           verbosity pkg lib lbi clbi inplace distPref
+
+    dllsInScope <- getSearchPath >>= (filterM doesDirectoryExist) >>= getDlls
+    let libs = fixLibs dllsInScope (extraLibraries installedPkgInfoRaw)
+        installedPkgInfo = installedPkgInfoRaw {
+                                extraGHCiLibraries = libs }
+
+     -- Three different modes:
+    case () of
+     _ | modeGenerateRegFile   -> die "Generate Reg File not supported"
+       | modeGenerateRegScript -> die "Generate Reg Script not supported"
+       | otherwise             -> registerPackage verbosity
+                                    installedPkgInfo pkg lbi inplace packageDb
+
+  where
+    modeGenerateRegFile = isJust (flagToMaybe (regGenPkgConf regFlags))
+    modeGenerateRegScript = fromFlag (regGenScript regFlags)
+    inplace   = fromFlag (regInPlace regFlags)
+    packageDb = case flagToMaybe (regPackageDB regFlags) of
+                    Just db -> db
+                    Nothing -> registrationPackageDB (withPackageDB lbi)
+    distPref  = fromFlag (regDistPref regFlags)
+    verbosity = fromFlag (regVerbosity regFlags)
+
+register _ _ regFlags = notice verbosity "No package to register"
+  where
+    verbosity = fromFlag (regVerbosity regFlags)
+
+#else
+installHook :: PackageDescription -> LocalBuildInfo
+                   -> UserHooks -> InstallFlags -> IO ()
+installHook pkg_descr localbuildinfo _ flags = do
+  let copyFlags = defaultCopyFlags {
+                      copyDistPref   = installDistPref flags,
+                      copyInPlace    = installInPlace flags,
+                      copyUseWrapper = installUseWrapper flags,
+                      copyDest       = toFlag NoCopyDest,
+                      copyVerbosity  = installVerbosity flags
+                  }
+  install pkg_descr localbuildinfo copyFlags
+  let registerFlags = defaultRegisterFlags {
+                          regDistPref  = installDistPref flags,
+                          regInPlace   = installInPlace flags,
+                          regPackageDB = installPackageDB flags,
+                          regVerbosity = installVerbosity flags
+                      }
+  when (hasLibs pkg_descr) $ register pkg_descr localbuildinfo registerFlags
+
+registerHook :: PackageDescription -> LocalBuildInfo
+        -> UserHooks -> RegisterFlags -> IO ()
+registerHook pkg_descr localbuildinfo _ flags =
+    if hasLibs pkg_descr
+    then register pkg_descr localbuildinfo flags
+    else setupMessage verbosity
+           "Package contains no library to register:" (packageId pkg_descr)
+  where verbosity = fromFlag (regVerbosity flags)
+
+register :: PackageDescription -> LocalBuildInfo
+         -> RegisterFlags -- ^Install in the user's database?; verbose
+         -> IO ()
+register pkg_descr lbi regFlags = do
+  let verbosity = fromFlag (regVerbosity regFlags)
+  warn verbosity "Cannot register ghci libraries with Cabal 1.6 (need 1.8)."
+  Register.register pkg_descr lbi regFlags
+  
+#endif
+
+------------------------------------------------------------------------------
+-- This is a hack for Cabal-1.8, It is not needed in Cabal-1.9.1 or later
+------------------------------------------------------------------------------
+
+adjustLocalBuildInfo :: LocalBuildInfo -> LocalBuildInfo
+adjustLocalBuildInfo lbi =
+  let extra = (Just libBi, [])
+      libBi = emptyBuildInfo { includeDirs = [ autogenModulesDir lbi
+                                             , buildDir lbi ] }
+   in lbi { localPkgDescr = updatePackageDescription extra (localPkgDescr lbi) }
+
+------------------------------------------------------------------------------
+-- Processing .chs files with our local c2hs.
+------------------------------------------------------------------------------
+
+ourC2hs :: BuildInfo -> LocalBuildInfo -> PreProcessor
+ourC2hs bi lbi = PreProcessor {
+  platformIndependent = False,
+  runPreProcessor = runC2HS bi lbi
+}
+
+runC2HS :: BuildInfo -> LocalBuildInfo ->
+           (FilePath, FilePath) -> (FilePath, FilePath) -> Verbosity -> IO ()
+runC2HS bi lbi (inDir, inFile)  (outDir, outFile) verbosity = do
+  -- have the header file name if we don't have the precompiled header yet
+  header <- case lookup "x-c2hs-header" (customFieldsBI bi) of
+    Just h -> return h
+    Nothing -> die ("Need x-c2hs-Header definition in the .cabal Library section "++
+                    "that sets the C header file to process .chs.pp files.")
+
+  -- c2hs will output files in out dir, removing any leading path of the input file.
+  -- Thus, append the dir of the input file to the output dir.
+  let (outFileDir, newOutFile) = splitFileName outFile
+  let newOutDir = outDir </> outFileDir
+  -- additional .chi files might be needed that other packages have installed;
+  -- we assume that these are installed in the same place as .hi files
+  let chiDirs = [ dir |
+#if CABAL_VERSION_CHECK(1,8,0)
+                  ipi <- maybe [] (map fst . componentPackageDeps) (libraryConfig lbi),
+                  dir <- maybe [] importDirs (lookupInstalledPackageId (installedPkgs lbi) ipi) ]
+#else
+                  ipi <- packageDeps lbi,
+                  dir <- maybe [] importDirs (lookupPackageId (installedPkgs lbi) ipi) ]
+#endif
+  rawSystemProgramConf verbosity c2hsLocal (withPrograms lbi) $
+       map ("--include=" ++) (outDir:chiDirs)
+    ++ ["--cppopts=" ++ opt | opt <- getCppOptions bi lbi]
+    ++ ["--output-dir=" ++ newOutDir,
+        "--output=" ++ newOutFile,
+        "--precomp=" ++ buildDir lbi </> precompFile,
+        header, inDir </> inFile]
+
+getCppOptions :: BuildInfo -> LocalBuildInfo -> [String]
+getCppOptions bi lbi
+    = nub $
+      ["-I" ++ dir | dir <- PD.includeDirs bi]
+   ++ [opt | opt@('-':c:_) <- (PD.cppOptions bi ++ PD.ccOptions bi), c `elem` "DIU"]
+
+installCHI :: PackageDescription -- ^information from the .cabal file
+        -> LocalBuildInfo -- ^information from the configure step
+        -> Verbosity -> CopyDest -- ^flags sent to copy or install
+        -> IO ()
+installCHI pkg@PD.PackageDescription { library = Just lib } lbi verbosity copydest = do
+  let InstallDirs { libdir = libPref } = absoluteInstallDirs pkg lbi copydest
+  -- cannot use the recommended 'findModuleFiles' since it fails if there exists
+  -- a modules that does not have a .chi file
+  mFiles <- mapM (findFileWithExtension' ["chi"] [buildDir lbi])
+                 (map toFilePath
+#if CABAL_VERSION_CHECK(1,8,0)
+                   (PD.libModules lib)
+#else
+                   (PD.libModules pkg)
+#endif
+                 )
+  let files = [ f | Just f <- mFiles ]
+#if CABAL_VERSION_CHECK(1,8,0)
+  installOrdinaryFiles verbosity libPref files
+#else
+  copyFiles verbosity libPref files
+#endif
+
+  
+installCHI _ _ _ _ = return ()
+
+------------------------------------------------------------------------------
+-- Generating the type hierarchy and signal callback .hs files.
+------------------------------------------------------------------------------
+
+typeGenProgram :: Program
+typeGenProgram = (simpleProgram "gtk2hsTypeGen")
+
+signalGenProgram :: Program
+signalGenProgram = (simpleProgram "gtk2hsHookGenerator")
+
+c2hsLocal :: Program
+c2hsLocal = (simpleProgram "gtk2hsC2hs")
+
+genSynthezisedFiles :: Verbosity -> PackageDescription -> LocalBuildInfo -> IO ()
+genSynthezisedFiles verb pd lbi = do
+
+  cPkgs <- getPkgConfigPackages verb lbi pd
+
+  let xList = maybe [] (customFieldsBI . libBuildInfo) (library pd)
+              ++customFieldsPD pd
+      typeOpts :: String -> [ProgArg]
+      typeOpts tag = concat [ map (\val -> '-':'-':drop (length tag) field++'=':val) (words content)
+                            | (field,content) <- xList,
+                              tag `isPrefixOf` field,
+                              field /= (tag++"file")]
+              ++ [ "--tag=" ++ tag
+                 | PackageIdentifier name (Version (major:minor:_) _) <- cPkgs
+                 , let name' = filter isAlpha (display name)
+                 , tag <- name'
+                        : [ name' ++ "-" ++ show major ++ "." ++ show digit
+                          | digit <- [0,2..minor] ]
+                 ]
+
+      signalsOpts :: [ProgArg]
+      signalsOpts = concat [ map (\val -> '-':'-':drop 10 field++'=':val) (words content)
+                        | (field,content) <- xList,
+                          "x-signals-" `isPrefixOf` field,
+                          field /= "x-signals-file"]
+
+      genFile :: Program -> [ProgArg] -> FilePath -> IO ()
+      genFile prog args outFile = do
+         res <- rawSystemProgramStdoutConf verb prog (withPrograms lbi) args
+         rewriteFile outFile res
+
+  (flip mapM_) (filter (\(tag,_) -> "x-types-" `isPrefixOf` tag && "file" `isSuffixOf` tag) xList) $
+    \(fileTag, f) -> do
+      let tag = reverse (drop 4 (reverse fileTag))
+      info verb ("Ensuring that class hierarchy in "++f++" is up-to-date.")
+      genFile typeGenProgram (typeOpts tag) f
+
+  case lookup "x-signals-file" xList of
+    Nothing -> return ()
+    Just f -> do
+      info verb ("Ensuring that callback hooks in "++f++" are up-to-date.")
+      genFile signalGenProgram signalsOpts f
+
+--FIXME: Cabal should tell us the selected pkg-config package versions in the
+--       LocalBuildInfo or equivalent.
+--       In the mean time, ask pkg-config again.
+
+getPkgConfigPackages :: Verbosity -> LocalBuildInfo -> PackageDescription -> IO [PackageId]
+getPkgConfigPackages verbosity lbi pkg =
+  sequence
+    [ do version <- pkgconfig ["--modversion", display pkgname]
+         case simpleParse version of
+           Nothing -> die $ "parsing output of pkg-config --modversion failed"
+           Just v  -> return (PackageIdentifier pkgname v)
+    | Dependency pkgname _ <- concatMap pkgconfigDepends (allBuildInfo pkg) ]
+  where
+    pkgconfig = rawSystemProgramStdoutConf verbosity
+                  pkgConfigProgram (withPrograms lbi)
+
+------------------------------------------------------------------------------
+-- Dependency calculation amongst .chs files.
+------------------------------------------------------------------------------
+
+-- Given all files of the package, find those that end in .chs and extract the
+-- .chs files they depend upon. Then return the PackageDescription with these
+-- files rearranged so that they are built in a sequence that files that are
+-- needed by other files are built first.
+fixDeps :: PackageDescription -> IO PackageDescription
+fixDeps pd@PD.PackageDescription {
+          PD.library = Just lib@PD.Library {
+            PD.exposedModules = expMods,
+            PD.libBuildInfo = bi@PD.BuildInfo {
+              PD.hsSourceDirs = srcDirs,
+              PD.otherModules = othMods
+            }}} = do
+  let findModule m = findFileWithExtension [".chs.pp",".chs"] srcDirs
+                       (joinPath (components m))
+  mExpFiles <- mapM findModule expMods
+  mOthFiles <- mapM findModule othMods
+
+  -- tag all exposed files with True so we throw an error if we need to build
+  -- an exposed module before an internal modules (we cannot express this)
+  let modDeps = zipWith (ModDep True []) expMods mExpFiles++
+                zipWith (ModDep False []) othMods mOthFiles
+  modDeps <- mapM extractDeps modDeps
+  let (expMods, othMods) = span mdExposed $ sortTopological modDeps
+      badOther = map (fromMaybe "<no file>" . mdLocation) $
+                 filter (not . mdExposed) expMods
+  unless (null badOther) $
+    die ("internal chs modules "++intercalate "," badOther++
+         " depend on exposed chs modules; cabal needs to build internal modules first")
+  return pd { PD.library = Just lib {
+    PD.exposedModules = map mdOriginal expMods,
+    PD.libBuildInfo = bi { PD.otherModules = map mdOriginal othMods }
+  }}
+
+data ModDep = ModDep {
+  mdExposed :: Bool,
+  mdRequires :: [ModuleName],
+  mdOriginal :: ModuleName,
+  mdLocation :: Maybe FilePath
+}
+
+instance Show ModDep where
+  show x = show (mdLocation x)
+
+instance Eq ModDep where
+  ModDep { mdOriginal = m1 } == ModDep { mdOriginal = m2 } = m1==m2
+instance Ord ModDep where
+  compare ModDep { mdOriginal = m1 } ModDep { mdOriginal = m2 } = compare m1 m2
+
+-- Extract the dependencies of this file. This is intentionally rather naive as it
+-- ignores CPP conditionals. We just require everything which means that the
+-- existance of a .chs module may not depend on some CPP condition.  
+extractDeps :: ModDep -> IO ModDep
+extractDeps md@ModDep { mdLocation = Nothing } = return md
+extractDeps md@ModDep { mdLocation = Just f } = withFileContents f $ \con -> do
+  let findImports acc (('{':'#':xs):xxs) = case (dropWhile ((==) ' ') xs) of
+        ('i':'m':'p':'o':'r':'t':' ':ys) ->
+          case simpleParse (takeWhile ((/=) '#') ys) of
+            Just m -> findImports (m:acc) xxs 
+            Nothing -> die ("cannot parse chs import in "++f++":\n"++
+                            "offending line is {#"++xs)
+         -- no more imports after the first non-import hook
+        _ -> return acc
+      findImports acc (_:xxs) = findImports acc xxs
+      findImports acc [] = return acc
+  mods <- findImports [] (lines con)
+  return md { mdRequires = mods }
+
+-- Find a total order of the set of modules that are partially sorted by their
+-- dependencies on each other. The function returns the sorted list of modules
+-- together with a list of modules that are required but not supplied by this
+-- in the input set of modules.
+sortTopological :: [ModDep] -> [ModDep]
+sortTopological ms = reverse $ fst $ foldl visit ([], S.empty) (map mdOriginal ms)
+  where
+  set = M.fromList (map (\m -> (mdOriginal m, m)) ms)
+  visit (out,visited) m
+    | m `S.member` visited = (out,visited)
+    | otherwise = case m `M.lookup` set of
+        Nothing -> (out, m `S.insert` visited)
+        Just md -> (md:out', visited')
+          where
+            (out',visited') = foldl visit (out, m `S.insert` visited) (mdRequires md)
diff --git a/Setup.hs b/Setup.hs
new file mode 100644
--- /dev/null
+++ b/Setup.hs
@@ -0,0 +1,7 @@
+-- Setup file for a Gtk2Hs module. Contains only adjustments specific to this module,
+-- all Gtk2Hs-specific boilerplate is stored in Gtk2HsSetup.hs which should be kept
+-- identical across all modules.
+import Gtk2HsSetup ( gtk2hsUserHooks )
+import Distribution.Simple ( defaultMainWithHooks )
+
+main = defaultMainWithHooks gtk2hsUserHooks
diff --git a/gtksourceview2.cabal b/gtksourceview2.cabal
new file mode 100644
--- /dev/null
+++ b/gtksourceview2.cabal
@@ -0,0 +1,65 @@
+Name:           gtksourceview2
+Version:        0.11.0
+License:        GPL
+License-file:   COPYING
+Copyright:      (c) 2001-2010 The Gtk2Hs Team
+Author:         Duncan Coutts, Peter Gavin, Axel Simon
+Maintainer:     gtk2hs-users@sourceforge.net
+Build-Type:     Custom
+Cabal-Version:  >= 1.6.0
+Stability:      provisional
+homepage:       http://www.haskell.org/gtk2hs/
+bug-reports:    http://hackage.haskell.org/trac/gtk2hs/
+Synopsis:       Binding to the GtkSourceView library.
+Description:    GtkSourceView is a text widget that extends the standard GTK+ 2.x text widget
+                GtkTextView. It improves GtkTextView by implementing syntax highlighting and
+                other features typical of a source editor.
+
+Category:       Graphics
+Tested-With:    GHC == 6.12.1
+Extra-Source-Files: gtksourceview2.h
+                    Gtk2HsSetup.hs
+                    marshal.list
+
+x-Types-File:       Graphics/UI/Gtk/SourceView/Types.chs
+x-Types-Tag:        gtksourceview2
+x-Types-ModName:    Graphics.UI.Gtk.SourceView.Types
+x-Types-Forward:    *Graphics.UI.GtkInternals
+x-Types-Destructor: objectUnrefFromMainloop
+
+Source-Repository head
+  type:         darcs
+  location:     http://code.haskell.org/gtk2hs/
+  subdir:       gtksourceview2
+
+Library
+        build-depends:  base >= 4 && < 5, array, containers, haskell98, mtl,
+                        glib  >= 0.11 && < 0.12, 
+                        gtk   >= 0.11 && < 0.12
+						
+        build-tools:    gtk2hsC2hs, gtk2hsHookGenerator, gtk2hsTypeGen
+						
+        exposed-modules:
+          Graphics.UI.Gtk.SourceView
+          Graphics.UI.Gtk.SourceView.SourceBuffer
+          Graphics.UI.Gtk.SourceView.SourceIter
+          Graphics.UI.Gtk.SourceView.SourceLanguage
+          Graphics.UI.Gtk.SourceView.SourceLanguageManager
+          Graphics.UI.Gtk.SourceView.SourceMark
+          Graphics.UI.Gtk.SourceView.SourceStyle
+          Graphics.UI.Gtk.SourceView.SourceStyleScheme
+          Graphics.UI.Gtk.SourceView.SourceStyleSchemeManager
+          Graphics.UI.Gtk.SourceView.SourceView
+        other-modules:
+          Graphics.UI.Gtk.SourceView.SourceStyle.Internal
+          Graphics.UI.Gtk.SourceView.Types		  
+          Graphics.UI.Gtk.SourceView.Signals
+		  
+        extensions:     ForeignFunctionInterface
+
+        x-Signals-File:  Graphics/UI/Gtk/SourceView/Signals.chs
+        x-Signals-Modname: Graphics.UI.Gtk.SourceView.Signals
+        x-Signals-Types: marshal.list
+		
+        x-c2hs-Header:  gtksourceview2.h
+        pkgconfig-depends: gtksourceview-2.0 >= 2.0.2
diff --git a/gtksourceview2.h b/gtksourceview2.h
new file mode 100644
--- /dev/null
+++ b/gtksourceview2.h
@@ -0,0 +1,9 @@
+#include <gtksourceview/gtksourcebuffer.h>
+#include <gtksourceview/gtksourceiter.h>
+#include <gtksourceview/gtksourcelanguage.h>
+#include <gtksourceview/gtksourcelanguagemanager.h>
+#include <gtksourceview/gtksourcestyle.h>
+#include <gtksourceview/gtksourcestylescheme.h>
+#include <gtksourceview/gtksourcestyleschememanager.h>
+#include <gtksourceview/gtksourceview.h>
+#include <gtksourceview/gtksourceview-typebuiltins.h>
diff --git a/marshal.list b/marshal.list
new file mode 100644
--- /dev/null
+++ b/marshal.list
@@ -0,0 +1,46 @@
+# see glib-genmarshal(1) for a detailed description of the file format,
+# possible parameter types are:
+#   VOID        indicates   no   return   type,  or  no  extra
+#               parameters. if VOID is used as  the  parameter
+#               list, no additional parameters may be present.
+#   BOOLEAN     for boolean types (gboolean)
+#   CHAR        for signed char types (gchar)
+#   UCHAR       for unsigned char types (guchar)
+#   INT         for signed integer types (gint)
+#   UINT        for unsigned integer types (guint)
+#   LONG        for signed long integer types (glong)
+#   ULONG       for unsigned long integer types (gulong)
+#   ENUM        for enumeration types (gint)
+#   FLAGS       for flag enumeration types (guint)
+#   FLOAT       for single-precision float types (gfloat)
+#   DOUBLE      for double-precision float types (gdouble)
+#   STRING      for string types (gchar*)
+#   BOXED       for boxed (anonymous but reference counted) types (GBoxed*)
+#   POINTER     for anonymous pointer types (gpointer)
+#   NONE        deprecated alias for VOID
+#   BOOL        deprecated alias for BOOLEAN
+
+#
+# One discrepancy from Gtk+ is that for signals that may pass NULL for an object
+# reference, the Haskell signal should be passed a 'Maybe GObject'.
+# We therefore have two variants that are marshalled as a maybe type:
+#
+#   OBJECT      for GObject or derived types (GObject*)
+#   MOBJECT      for GObject or derived types (GObject*) that may be NULL
+
+# Furthermore, some objects needs to be destroyed synchronously from the main loop of
+# Gtk rather than during GC. These objects need to be marshalled using TOBJECT (for thread-safe
+# object). It doesn't hurt to use TOBJECT for an object that doesn't need it, except for the
+# some performance. As a rule of thumb, use TOBJECT for all libraries that build on package
+# 'gtk' and use OBJECT for all packages that only need packages 'glib', 'pango', 'cairo',
+# 'gio'. Again both variants exist. Note that the same names will be generated for OBJECT and
+# TOBJECT, so you have to remove the OBJECT handler if you need both.
+#
+#   TOBJECT      for GObject or derived types (GObject*)
+#   MTOBJECT      for GObject or derived types (GObject*) that may be NULL
+
+# If you add a new signal type, please check that it actually works!
+# If it is a Boxed type check that the reference counting is right.
+
+NONE:NONE
+NONE:BOXED,BOXED
