diff --git a/config.php.template b/config.php.template
index 35b779957..25f26f321 100644
--- a/config.php.template
+++ b/config.php.template
@@ -1,28 +1,50 @@
 <?php 
+/**
+ * Pico Configuration
+ *
+ * This is the configuration file for Pico. It comes loaded with the 
+ *  default values, which can be found in the get_config() method of
+ *  the Pico class (lib/pico.php).
+ *
+ * @author Gilbert Pellegrom
+ * @link http://picocms.org
+ * @license http://opensource.org/licenses/MIT
+ * @version 0.9
+ *
+ * Override any of the default settings below:
+ */
 
 /*
-// Override any of the default settings below:
+ * BASIC
+ */
+// $config['site_title'] = 'Pico';			    // Site title
+// $config['base_url'] = ''; 				    // Override base URL (e.g. http://example.com)
 
-$config['site_title'] = 'Pico';			    // Site title
-$config['base_url'] = ''; 				    // Override base URL (e.g. http://example.com)
-$config['theme'] = 'default'; 			    // Set the theme (defaults to "default")
-$config['date_format'] = 'jS M Y';		    // Set the PHP date format
-$config['twig_config'] = array(			    // Twig settings
-	'cache' => false,					    // To enable Twig caching change this to CACHE_DIR
-	'autoescape' => false,				    // Autoescape Twig vars
-	'debug' => false					    // Enable Twig debug
-);
-$config['pages_order_by'] = 'alpha';	    // Order pages by "alpha" or "date"
-$config['pages_order'] = 'asc';			    // Order pages "asc" or "desc"
-$config['excerpt_length'] = 50;			    // The pages excerpt length (in words)
-$config['content_dir'] = 'content-sample/'; // Content directory.
-
-// Specify timezone if required
-
-date_default_timezone_set('UTC');
+/*
+ * THEME
+ */
+// $config['theme'] = 'default'; 			    // Set the theme (defaults to "default")
+// $config['twig_config'] = array(			    // Twig settings
+//	'cache' => false,					    // To enable Twig caching change this to CACHE_DIR
+//	'autoescape' => false,				    // Autoescape Twig vars
+//	'debug' => false					    // Enable Twig debug
+// );
 
-// To add a custom config setting:
+/*
+ * CONTENT
+ */
+// $config['date_format'] = 'jS M Y';		    // Set the PHP date format
+// $config['pages_order_by'] = 'alpha';	    	    // Order pages by "alpha" or "date"
+// $config['pages_order'] = 'asc';			    // Order pages "asc" or "desc"
+// $config['excerpt_length'] = 50;			    // The pages excerpt length (in words)
+// $config['content_dir'] = 'content-sample/';   // Content directory.
 
-$config['custom_setting'] = 'Hello'; 	// Can be accessed by {{ config.custom_setting }} in a theme
+/*
+ * TIMEZONE
+ */
+// date_default_timezone_set('UTC');
 
-*/
+/*
+ * CUSTOM
+ */
+// $config['custom_setting'] = 'Hello'; 	// Can be accessed by {{ config.custom_setting }} in a theme