diff --git a/application/settings/config/settings.development.ini b/application/settings/config/settings.development.ini
index df41e24..5c3b036 100644
--- a/application/settings/config/settings.development.ini
+++ b/application/settings/config/settings.development.ini
@@ -2,10 +2,10 @@
 ;;name                  =   "Dwoo"
 name                  =   "Smarty"
 ;;name                  =   "Twig"
-cache                 =   "application/view/cache/"
-templates             =   "application/view/templates/"
-templates_c           =   "application/view/templates_c/"
-config_dir            =   "application/view/configs/"
+cache                 =   "/../../application/view/cache/"
+templates             =   "/../../application/view/templates/"
+templates_c           =   "/../../application/view/templates_c/"
+config_dir            =   "/../../application/view/configs/"
 class_file            =   "core/l/Smarty/Smarty.class.php"
 debugbar              =   false
 
diff --git a/core/c/config.php b/core/c/config.php
index b09e281..47cd54a 100644
--- a/core/c/config.php
+++ b/core/c/config.php
@@ -38,7 +38,7 @@ class Config extends Settings
 	 */
 	private static function setEnv( )
 	{
-		if(getenv("APPLICATION_ENV"))
+		if( getenv("APPLICATION_ENV") )
 		{
 			self::$_env = getenv("APPLICATION_ENV");
 		}
diff --git a/core/c/controller.php b/core/c/controller.php
index d882b37..150f9e5 100644
--- a/core/c/controller.php
+++ b/core/c/controller.php
@@ -18,6 +18,7 @@ class Controller
 	protected $_post        = array();
 	private $_current       = array();
 	private $_next          = array();
+	private $_controller	= "index";
 
 	protected function __construct()
 	{
@@ -50,6 +51,22 @@ class Controller
 		$this->_config = $config;
 	}
 
+	/**
+	 * @return string
+	 */
+	public function getController()
+	{
+		return $this->_controller;
+	}
+
+	/**
+	 * @param string $controller
+	 */
+	protected function setController( $controller )
+	{
+		$this->_controller = $controller;
+	}
+	
 	/**
 	 * @param $template
 	 * @param $page
diff --git a/core/c/dispatcher.php b/core/c/dispatcher.php
index d702a29..ccd6f7e 100644
--- a/core/c/dispatcher.php
+++ b/core/c/dispatcher.php
@@ -30,7 +30,7 @@ final class Dispatcher
         Router::getInstance();
         Router::getInstance()->route();
         require_once __DIR__ . '/../../application/controller/' . Router::getInstance()->tplName() . 'Controller.php';
-        $class = "Sunrise\\".\Sunrise\Router::getInstance()->tplName()."Controller";
+        $class = "Nibiru\\".\Nibiru\Router::getInstance()->tplName()."Controller";
         $controller = new $class();
 
         if(array_key_exists('_action', $_REQUEST))
diff --git a/core/framework.php b/core/framework.php
index d707ab5..1556304 100644
--- a/core/framework.php
+++ b/core/framework.php
@@ -10,8 +10,6 @@
 session_start();
 /**
  * @desc Nibiru framework functionality
- * TODO: write a javascript controller handler
- * in order to be full scale compatible with limbas
  */
 require_once __DIR__ . '/t/messages.php';
 require_once __DIR__ . '/c/settings.php';
diff --git a/core/i/controller.php b/core/i/controller.php
index ebd938a..5b5ef8f 100644
--- a/core/i/controller.php
+++ b/core/i/controller.php
@@ -10,7 +10,8 @@ namespace Nibiru;
  */
 interface IController
 {
-
+	const START_CONTROLLER_NAME = "index";
+	
 	/**
 	 * This should be part of any extended controller
 	 * class in order to implement a page structure
diff --git a/public/js/v3/jquery-ui.js b/public/js/v3/jquery-ui.js
index 0213552..3063a3a 100644
--- a/public/js/v3/jquery-ui.js
+++ b/public/js/v3/jquery-ui.js
@@ -9025,7 +9025,7 @@ $.extend( Datepicker.prototype, {
 			if ( secondary || !changeYear ) {
 				html += "<span class='ui-datepicker-year'>" + drawYear + "</span>";
 			} else {
-
+				
 				// determine range of years to display
 				years = this._get( inst, "yearRange" ).split( ":" );
 				thisYear = new Date().getFullYear();