diff --git a/TODO b/TODO
index 403bc95..fc82bc1 100644
--- a/TODO
+++ b/TODO
@@ -1,8 +1,43 @@
-* Merge pull requests #43, #69, #71
-* Fix issues #65, #57, #52, #44, #39
+GUI
+===
+* Create new button widget (groups, auto width, General tab)
+* Add more statistics (Average download speed)
+* Auto video format detection
+* GUI command line builder like zenmap
+
+Structure
+=========
+* Create devscripts/ directory and move all the utility scripts there
+* Create guides/ directory and move all the guides there
+* Remove twodict from utils and use it directly from the library
+* Give icons the same name and keep them on different directories
+    (see: https://github.com/deluge-torrent/deluge/tree/develop/deluge/ui/data/icons/hicolor)
+
+Localization
+============
 * Update translation files
-* Add support for right to left languages
-* Create new website for http://mrs0m30n3.github.io/youtube-dl-gui/
-* Add some test on the code ???
-* Use youtube-dl directly from python instead of using the subprocess module
+* Add support for right to left languages (hebrew, arabic)
+* Fix paths on R2L layouts
+* Compile *.po files at build time
+* Script to automatically check translations (use google-translate library)
+* Write bot to automatically check the translations and merge them?
 
+Options
+=======
+* Option to disable-enable the 'download finished' pop up message
+* Option to close the program after download process
+* Add 'native hls option' see issue #49
+* Add Swedish on available subtitles
+* Add Hebrew on available subtitles
+
+Other
+=====
+* README.md add slackbuild
+* README.md add new images
+
+* Add tests
+* Add support for Python 3.*
+* Logging system using the Python 'logging' module
+* Use youtube-dl directly from python instead of using the subprocess module
+* Upload new website for http://mrs0m30n3.github.io/youtube-dl-gui
+* Script to automatically update file contents like version from .github/ISSUE_TEMPLATE.md file, AUTHORS file, etc..