diff --git a/TODO b/TODO
index 9dc0bf3..9514fb1 100644
--- a/TODO
+++ b/TODO
@@ -1,67 +1,154 @@
 $Id$
 
-Low level stuff
+libcucul
+========
 
-   o  Write a Linux console output for the drawing library
+  API-dependent stuff
+  -------------------
 
-   o  Better keyboard driver in an X terminal, see
-      http://groups.yahoo.com/group/zepp/message/381
+   o brightness, contrast support for bitmaps
 
-   o  DONE 13 Jan 2004: Write a window resize handler.
-   o  DONE 12 Nov 2003: Port to conio.h
+   o allow to select the characters that will be used for bitmap
+     rendering, for instance halftoning (░ ▒ ▓ █) and quarter
+     blocks (▀ ▄ ▌ ▐ █ ▖ ▗ ▘ ▝ ▚ ▞ ▙ ▛ ▜ ▟).
 
+   o all the sprite stuff (loading, saving, blitting, transparency
+     support, background colour support, thinking of a storage format,
+     etc.)
 
-High level stuff
+   o support for Unicode characters in the primitives (circle, lines,
+     boxes, etc.)
 
-   o  Sprite library. Maybe use ANSI as the format, perhaps with UTF-8
-      extensions (though they'll probably collide with CP437).
+   o bitmap output support (will require one or several custom fonts),
+     maybe should be in libcaca.
 
-   o  256 colour sprites instead of 16
+   o support for more than 16 colours, maybe truecolor, maybe less
 
-   o  Alpha layer for sprites
+   o support for transparency (CUCUL_COLOR_TRANSPARENT)
 
-   o  Fix the thin ellipse rendering (currently it's only |s and -s, we
-      could make them smoother by using ' ` , etc.
+   o ASCII/ANSI art loading functions (maybe load them as sprites)
 
-   o  DONE 26 Nov 2003: Support more colour depths, more bitmask orderings
-   o  DONE 15 Nov 2003: Clip all graphics primitives
+   o old school ASCII-art handling functions, for instance mirroring
+     routines that are able to change "\_o< !" into "! >o_/" or even
+     into "/▔o< ¡" with Unicode support added.
 
 
-Unicode features
+  API-independent stuff
+  ---------------------
 
-   o Unicode support for X11
+   o Fix the thin ellipse rendering (currently it's only |s and -s, we
+     could make them smoother by using ' ` , etc.
 
-   o Unicode support for ncurses
+   o support for double width glyphs (also needs some libcaca changes)
 
-   o DONE 15 Mar 2006: Translation functions for output drivers that don't
-     support it (for instance, use CP437 in DOS)
+   o better mask support in cucul_blit()
 
-   o DONE 15 Mar 2006: Use &#xxx; for the HTML output
 
-   o Unicode support in bitmap.c: add support for halftoning (░ ▒ ▓ █)
-     and quarter blocks (▀ ▄ ▌ ▐ █ ▖ ▗ ▘ ▝ ▚ ▞ ▙ ▛ ▜ ▟).
+libcaca
+=======
 
-   o Support double width glyphs (mostly for kana and cyrillic art)
+  API-dependent stuff
+  -------------------
 
+   o text edit widget with cursor support (I'm unsure about this, it
+     seems pretty difficult)
 
-Misc
+   o replace the event return value with a structure so that we can put
+     more information into it, such as mouse coordinates or Unicode
+     characters.
 
-   o  Draw a nicer logo sprite
 
-   o  Text edit widget
+  API-independent stuff
+  ---------------------
+
+   o Write a Linux console output
+
+   o Better keyboard driver in an X terminal, see
+     http://groups.yahoo.com/group/zepp/message/381
+
+   o Unicode support for X11 (maybe through Xft)
+
+   o fix Unicode support for ncurses
+
+   o Unicode support for GL
+
+   o and Jylam wants a framebuffer output
+
+
+Language bindings
+=================
+
+  Needed
+  ------
+
+   o Fix Python
+
+   o Fix Perl
+
+   o C++ (given how object-oriented we now are, it will be a walk in the
+     park)
+
+   o C# (it's the next big thing, believe me)
+
+   o PHP (together with the HTML output it would allow for nice web
+     applications)
+
+   o maybe Ruby, maybe Java
+
+
+  Not that important
+  ------------------
+
+   o Ruby
+
+   o Java
+
+
+Kernel mode
+===========
+
+   o keyboard support
+
+   o printf/fprintf are missing
+
+   o Improve malloc/free so that we can reuse freed memory
 
 
 Documentation
+=============
+
+   o Write a tutorial.
+
+   o Draw a nicer logo
+
+
+Applications
+============
+
+  cacaview
+  --------
+
+   o File browser
+
+   o open ANSI files
+
+   o save in different formats
+
+
+  cacadraw
+  --------
 
-   o  Most functions are documented. Maybe write a tutorial.
+   o Does not exist yet, but I want it. A modern ANSI editor that can also
+     do Unicode.
 
 
-cacaview
+  CUCUlet
+  -------
 
-   o  DONE 21 Jan 2004: Aspect ratio
+   o Does not exist yet, but I want it. A replacement for FIGlet that can
+     also do Unicode
 
-   o  File browser
+   o Colour support, of course: outputs to IRC, ANSI, HTML...
 
-   o  DONE 11 Dec 2003: Handle GIF and PNG transparency with checkered
-      background
+   o Open FIGlet fonts