diff --git a/TODO.md b/TODO.md
deleted file mode 100644
index 8f0bf1b..0000000
--- a/TODO.md
+++ /dev/null
@@ -1,46 +0,0 @@
-#TODO list for Astrognome
-
-The code is currently tested only on Fedora. If you can install the required
-libraries on your system, please test it and provide feedback (even positive)!
-
-We are looking for people to package Astrognome for other systems, like
-Debian/Ubuntu, Arch or Gentoo.
-
-## Priority features to implement
-
-The features below will be implemented in the first release of Astrognome.
-
-* Database should contain a small preview image of the chart. The selection
-  screen should show a small box with the name and the preview image. Upon
-  mouseover it should blur/darken the image, and write some chart data over
-  it, like birth date and place
-* Chart cleanup and manipulation
-* Generate, load and save synastries
-* Calculate transits and progressions
-* Stepping through time without modifying the chart data
-* Application settings
-  * Default display properties (can be overridden per window)
-    * Traditional view (personal planets and Ptolemaic aspects only)
-    * Display major (Ptolemaic) aspects
-    * Display minor aspects
-    * Display antiscia/contra-antiscia
-    * Display personal planets
-    * Display outer planets
-    * Display dwarf planets and asteroids
-    * Display fixed stars
-    * Display hidden ascendent
-    * Display Vertex/anti-Vertex
-  * Symbol of Uranus and Pluto to use in charts
-* Regiomontanus import
-
-## Later features
-
-The features below will become part of Astrognome in later versions.
-
-* Custom location database
-* Synastries (Composite charts)
-* Transits
-* Progression
-* Chart export as different types of images
-* Chart printing
-
diff --git a/TODO.org b/TODO.org
new file mode 100644
index 0000000..d214c46
--- /dev/null
+++ b/TODO.org
@@ -0,0 +1,67 @@
+
+* Port to other Linux distros
+
+* Package for other distros
+
+- Debian
+- Ubuntu
+- Arch
+- Gentoo
+
+* Preview images
+
+The database (or a cache directory) should contain a preview image of
+each chart. The chart list screen should show a small box with the
+name and the preview image. Upon mouseover the image should
+blur/darken and some chart data (maybe customizable?) may get drawn
+over it.
+
+* Chart cleanup
+
+* Chart manipulation
+
+* Synastries
+
+* Transits
+
+* Progressions
+
+* Stepping through time without actually modifying the chart data
+
+* Application settings
+
+** Default display properties
+
+*** Traditional view
+
+Personal (inner) planets, Ptolemaic aspects only, nothing else
+
+*** Show/hide major aspects
+
+*** Show/hide minor aspects
+
+*** Show/hide astiscia/contrantiscia
+
+*** Show/hide personal planets
+
+*** Show/hide outer planets
+
+*** Show/hide dwarf planets and asteroids
+
+*** Show/hide fixed stars
+
+*** Show/hide hidden ascendant
+
+*** Show/hide vertex/anti-vertex
+
+** Symbol of Uranus and Pluto
+
+* Regiomontanus import
+
+* Custom location database
+
+* Chart export as different image types
+
+* Chart printing
+
+* Port to Windows