diff --git a/COMPOSITE_TODO b/COMPOSITE_TODO
index 18a1090ecb..2f0ec9e333 100644
--- a/COMPOSITE_TODO
+++ b/COMPOSITE_TODO
@@ -20,6 +20,57 @@ TODO
 % = should be probably done later, during cleanups and preparations for being stable
 
 
+KDE 4.0 TODO
+=================================
+
+- configure dialog
+    - dump kompmgr settings
+?   - some simple basic settings in the Translucency config tab
+
+- shortcut configuration
+    - configurable per effect (in the options dialog)
+
+- handle selecting mode
+    - opengl vs xrender option
+    - tfp vs shm should not be needed
+
+- different handling of differeng gfx cards
+    - check that nvidia/ati/intel work and add specific hacks if needed
+    - the same about driver versions
+
+- default effects and their settings
+
+- effects (to do)
+    - add configuration options (dialogs)
+    - split effects to groups (eyecandy, accessibility, whatever)
+    - explosion
+?       - use for forcible killing (add support to windowClosed())
+    - diminactive
+*       - needs grouping for unmanaged windows
+*   - inactive window notification (when it stops responding)
+    - shadow
+        - xrender mode
+        - needs to follow the window shape
+        - textured shadow
+    - make transparent
+        - make windows that are moved/resized by the user slightly transparent
+    - hide all testing, demo etc. effects in final builds
+    - presentwindows
+        - should show window icon, title (like boxswitch)
+    - boxswitch
+?       - better frame graphics
+        - should share some features (next/previous, etc.) with presentwindows
+?           - duplicate code or try to share it?
+    - presentwindows
+        - should preserve aspect ratio (as an option?)
+    - taskbar thumbnail
+        - define protocol (with _KDE prefix for now?)
+        - add support to taskbar
+    - inversion effect
+
+- fix inclusion of config-X11.h in installed headers
+
+
 General TODO
 =================================
 
@@ -252,6 +303,14 @@ Effects TODO
         and zooms out of the old one and into the new one
     - or whatever
 
+/ present windows
++    - option to show windows with relative sizes to each other
+
+/ scalein
++    - should scale in from e.g. 80%, not 0%, to just "pop up"
+
 + effect for drawing attention to windows demanding attention
 
 * DimInactive flickers when switching between windows (temporarily no window becomes active)
+
++ generic class for shader effects