-./inc/functions.php:1308: // @TODO Remove this if() block if all is working fine
-./inc/functions.php:222: // @TODO Remove this sanity-check if all is fine
-./inc/functions.php:225: // @TODO Try to rewrite all $DATA to $content
-./inc/functions.php:2328:// @TODO Try to move this to inc/libs/theme_functions.php
-./inc/functions.php:2499:// @TODO Please describe this function
-./inc/functions.php:2517: searchDirsRecursive($next_dir, $last_changed); // @TODO small change to API to $last_changed = searchDirsRecursive($next_dir, $time);
-./inc/functions.php:2613: // @TODO Add a little more infos here
-./inc/functions.php:2624: // @TODO This cannot be rewritten to app_die(), try to find a solution for this.
-./inc/functions.php:2706: // @TODO Rewrite this old lost code to a template
-./inc/functions.php:2825: // @TODO Are these convertions still required?
-./inc/functions.php:2843:// @TODO Rewrite this function to use readFromFile() and writeToFile()
-./inc/functions.php:546: // @TODO Extension 'msg' does not exist
-./inc/functions.php:615:// @TODO Rewrite this to an extension 'smtp'
+./inc/functions.php:1010:// @TODO $simple is deprecated
+./inc/functions.php:1045: // @TODO Do only use $content and deprecate $GLOBALS and $DATA in templates
+./inc/functions.php:2345:// @TODO Try to move this to inc/libs/theme_functions.php
+./inc/functions.php:241: // @TODO Remove this sanity-check if all is fine
+./inc/functions.php:244: // @TODO Try to rewrite all $DATA to $content
+./inc/functions.php:2516:// @TODO Please describe this function
+./inc/functions.php:2534: searchDirsRecursive($next_dir, $last_changed); // @TODO small change to API to $last_changed = searchDirsRecursive($next_dir, $time);
+./inc/functions.php:2630: // @TODO Add a little more infos here
+./inc/functions.php:2641: // @TODO This cannot be rewritten to app_die(), try to find a solution for this.
+./inc/functions.php:2724: // @TODO Rewrite this old lost code to a template
+./inc/functions.php:2813: // @TODO Are these convertions still required?
+./inc/functions.php:2831:// @TODO Rewrite this function to use readFromFile() and writeToFile()
+./inc/functions.php:467: // @TODO Do only use $contentn, not $DATA or raw variables
+./inc/functions.php:537: // @TODO Extension 'msg' does not exist
+./inc/functions.php:606:// @TODO Rewrite this to an extension 'smtp'