diff --git a/application/controllers/AdminController.php b/application/controllers/AdminController.php
index 9680a2d98e9..e252e57432e 100644
--- a/application/controllers/AdminController.php
+++ b/application/controllers/AdminController.php
@@ -302,7 +302,7 @@ public function _getAdminHeader($meta = false, $return = false)
         $data['baseurl'] = Yii::app()->baseUrl . '/';
         $data['datepickerlang']="";
         if (Yii::app()->session["adminlang"] != 'en')
-            $data['datepickerlang'] = "<script type=\"text/javascript\" src=\"".$data['baseurl']."scripts/jquery/locale/jquery.ui.datepicker-".Yii::app()->session["adminlang"].".js\"></script>\n";
+            $data['datepickerlang'] = "<script type=\"text/javascript\" src=\"".Yii::app()->getConfig('generalscripts')."jquery/locale/jquery.ui.datepicker-".Yii::app()->session["adminlang"].".js\"></script>\n";
 
         $data['sitename'] = Yii::app()->getConfig("sitename");
         $data['admintheme'] = Yii::app()->getConfig("admintheme");
diff --git a/application/controllers/admin/globalsettings.php b/application/controllers/admin/globalsettings.php
index 618ba26d35f..fa9b3d5e90b 100644
--- a/application/controllers/admin/globalsettings.php
+++ b/application/controllers/admin/globalsettings.php
@@ -242,8 +242,8 @@ private function _checkSettings()
     */
     protected function _renderWrappedTemplate($sAction = '', $aViewUrls = array(), $aData = array())
     {
-        $this->getController()->_js_admin_includes(Yii::app()->baseUrl . "/scripts/jquery/jquery.selectboxes.min.js");
-        $this->getController()->_js_admin_includes(Yii::app()->baseUrl . "/scripts/admin/globalsettings.js");
+        $this->getController()->_js_admin_includes(Yii::app()->getConfig('generalscripts') . "jquery/jquery.selectboxes.min.js");
+        $this->getController()->_js_admin_includes(Yii::app()->getConfig('adminscripts') . "globalsettings.js");
 
         parent::_renderWrappedTemplate($sAction, $aViewUrls, $aData);
     }
diff --git a/application/controllers/admin/labels.php b/application/controllers/admin/labels.php
index b4030e5aad8..66dc260dfb0 100644
--- a/application/controllers/admin/labels.php
+++ b/application/controllers/admin/labels.php
@@ -235,8 +235,8 @@ public function view($lid = 0)
         $aData = array();
 
         // Includes some javascript files
-        $this->getController()->_js_admin_includes(Yii::app()->baseUrl . '/scripts/admin/labels.js');
-        $this->getController()->_js_admin_includes(Yii::app()->baseUrl . '/scripts/admin/updateset.js');
+        $this->getController()->_js_admin_includes(Yii::app()->getConfig('adminscripts') . 'labels.js');
+        $this->getController()->_js_admin_includes(Yii::app()->getConfig('adminscripts') . 'updateset.js');
 
         // Checks if user have the sufficient rights to manage the labels
         if (Yii::app()->session['USER_RIGHT_SUPERADMIN'] == 1 || Yii::app()->session['USER_RIGHT_MANAGE_LABEL'] == 1)
@@ -361,7 +361,7 @@ public function process()
      */
     public function exportmulti()
     {
-        $this->getController()->_js_admin_includes(Yii::app()->baseUrl . '/scripts/admin/labels.js');
+        $this->getController()->_js_admin_includes(Yii::app()->getConfig('adminscripts') . 'labels.js');
         $this->_renderWrappedTemplate('labels', 'exportmulti_view');
     }
 
diff --git a/application/controllers/admin/question.php b/application/controllers/admin/question.php
index da09d63fb42..ca7f48be2f6 100644
--- a/application/controllers/admin/question.php
+++ b/application/controllers/admin/question.php
@@ -256,11 +256,11 @@ public function answeroptions($surveyid, $gid, $qid)
         $surveyid = sanitize_int($surveyid);
         $qid = sanitize_int($qid);
         $gid = sanitize_int($gid);
-        $this->getController()->_js_admin_includes(Yii::app()->baseUrl .'/scripts/jquery/jquery.dd.js');
-        $this->getController()->_js_admin_includes(Yii::app()->baseUrl .'/scripts/admin/answers.js');
-        $this->getController()->_js_admin_includes(Yii::app()->baseUrl .'/scripts/jquery/jquery.blockUI.js');
-        $this->getController()->_js_admin_includes(Yii::app()->baseUrl .'/scripts/jquery/jquery.selectboxes.min.js');
-        $this->getController()->_css_admin_includes(Yii::app()->baseUrl . '/scripts/jquery/dd.css');
+        $this->getController()->_js_admin_includes(Yii::app()->getConfig('generalscripts') . 'jquery/jquery.dd.js');
+        $this->getController()->_js_admin_includes(Yii::app()->getConfig('adminscripts') . 'answers.js');
+        $this->getController()->_js_admin_includes(Yii::app()->getConfig('generalscripts') . 'jquery/jquery.blockUI.js');
+        $this->getController()->_js_admin_includes(Yii::app()->getConfig('generalscripts') . 'jquery/jquery.selectboxes.min.js');
+        $this->getController()->_css_admin_includes(Yii::app()->getConfig('generalscripts') . 'jquery/dd.css');
 
         $aData['display']['menu_bars']['surveysummary'] = 'viewgroup';
         $aData['display']['menu_bars']['gid_action'] = 'addquestion';
@@ -1249,8 +1249,8 @@ function checkconditions(value, name, type, evt_type)
      */
     protected function _renderWrappedTemplate($sAction = 'survey/Question', $aViewUrls = array(), $aData = array())
     {
-        $this->getController()->_js_admin_includes(Yii::app()->baseUrl . '/scripts/jquery/jquery.dd.js');
-        $this->getController()->_css_admin_includes(Yii::app()->baseUrl . '/scripts/jquery/dd.css');
+        $this->getController()->_js_admin_includes(Yii::app()->getConfig('generalscripts') . 'jquery/jquery.dd.js');
+        $this->getController()->_css_admin_includes(Yii::app()->getConfig('generalscripts') . 'jquery/dd.css');
         $this->getController()->_css_admin_includes(Yii::app()->getConfig('adminstyleurl')."superfish.css");
         parent::_renderWrappedTemplate($sAction, $aViewUrls, $aData);
     }
diff --git a/application/controllers/admin/saved.php b/application/controllers/admin/saved.php
index 7ad6e802517..0ce79a67a77 100644
--- a/application/controllers/admin/saved.php
+++ b/application/controllers/admin/saved.php
@@ -35,8 +35,8 @@ public function view($iSurveyId)
             die();
         }
 
-        $this->getController()->_js_admin_includes(Yii::app()->baseUrl . 'scripts/jquery/jquery.tablesorter.min.js');
-        $this->getController()->_js_admin_includes(Yii::app()->baseUrl . 'scripts/admin/saved.js');
+        $this->getController()->_js_admin_includes(Yii::app()->getConfig('generalscripts') . 'jquery/jquery.tablesorter.min.js');
+        $this->getController()->_js_admin_includes(Yii::app()->getConfig('adminscripts') . 'saved.js');
 
         $aThisSurvey = getSurveyInfo($iSurveyId);
         $aData['sSurveyName'] = $aThisSurvey['name'];
diff --git a/application/controllers/admin/surveyadmin.php b/application/controllers/admin/surveyadmin.php
index 82ea386e2c5..c77d02a3e99 100644
--- a/application/controllers/admin/surveyadmin.php
+++ b/application/controllers/admin/surveyadmin.php
@@ -51,7 +51,7 @@ public function index()
         $this->getController()->_js_admin_includes(Yii::app()->getConfig('generalscripts') . "jquery/jqGrid/js/i18n/grid.locale-en.js");
         $this->getController()->_js_admin_includes(Yii::app()->getConfig('generalscripts') . "jquery/jqGrid/js/jquery.jqGrid.min.js");
         $this->getController()->_js_admin_includes(Yii::app()->getConfig('generalscripts') . "jquery/jquery.coookie.js");
-        $this->getController()->_js_admin_includes(Yii::app()->baseUrl . "/scripts/admin/listsurvey.js");
+        $this->getController()->_js_admin_includes(Yii::app()->getConfig('adminscripts') . "listsurvey.js");
         $this->getController()->_css_admin_includes(Yii::app()->getConfig('publicstyleurl') . 'jquery.multiselect.css');
         $this->getController()->_css_admin_includes(Yii::app()->getConfig('publicstyleurl') . 'jquery.multiselect.filter.css');
         $this->getController()->_css_admin_includes(Yii::app()->getConfig('adminstyleurl') .  "displayParticipants.css");
@@ -757,7 +757,7 @@ public function editlocalsettings($iSurveyID)
         $aData['surveyid'] = $iSurveyID = sanitize_int($iSurveyID);
         $aViewUrls = array();
 
-        $this->getController()->_js_admin_includes(Yii::app()->getConfig('generalscripts').'admin/surveysettings.js');
+        $this->getController()->_js_admin_includes(Yii::app()->getConfig('adminscripts').'surveysettings.js');
 
         if (hasSurveyPermission($iSurveyID, 'surveylocale', 'read'))
         {
@@ -1028,7 +1028,7 @@ private function _showReorderForm($iSurveyID)
         $aData['surveyid'] = $iSurveyID;
 
         $this->getController()->_js_admin_includes(Yii::app()->getConfig('generalscripts') . 'jquery/jquery.ui.nestedSortable.js');
-        $this->getController()->_js_admin_includes(Yii::app()->getConfig('generalscripts') . 'admin/organize.js');
+        $this->getController()->_js_admin_includes(Yii::app()->getConfig('adminscripts') . 'organize.js');
 
         $this->_renderWrappedTemplate('survey', 'organizeGroupsAndQuestions_view', $aData);
     }
@@ -1428,10 +1428,11 @@ private function _registerScriptFiles($files = array())
         if (empty($files))
         {
             $generalscripts_path = Yii::app()->getConfig('generalscripts');
+	    $adminscripts_path = Yii::app()->getConfig('adminscripts');
             $styleurl = Yii::app()->getConfig('styleurl');
 
             $js_files = array(
-            $generalscripts_path . 'admin/surveysettings.js',
+            $adminscripts_path . 'surveysettings.js',
             $generalscripts_path . 'jquery/jqGrid/js/i18n/grid.locale-en.js',
             $generalscripts_path . 'jquery/jqGrid/js/jquery.jqGrid.min.js',
             $generalscripts_path . 'jquery/jquery.json.min.js',
diff --git a/application/controllers/admin/surveypermission.php b/application/controllers/admin/surveypermission.php
index d980255f2b7..676818791de 100644
--- a/application/controllers/admin/surveypermission.php
+++ b/application/controllers/admin/surveypermission.php
@@ -38,8 +38,8 @@ function index($surveyid)
         {
             $aBaseSurveyPermissions=Survey_permissions::model()->getBasePermissions();
 
-            $this->getController()->_js_admin_includes(Yii::app()->baseUrl.'/scripts/jquery/jquery.tablesorter.min.js');
-            $this->getController()->_js_admin_includes(Yii::app()->baseUrl.'/scripts/admin/surveysecurity.js');
+            $this->getController()->_js_admin_includes(Yii::app()->getConfig('generalscripts') . 'jquery/jquery.tablesorter.min.js');
+            $this->getController()->_js_admin_includes(Yii::app()->getConfig('adminscripts') . 'surveysecurity.js');
 
             $result2 = Survey_permissions::model()->getUserDetails($surveyid);
 
@@ -374,8 +374,8 @@ function set($surveyid)
             {
                 //$js_admin_includes[]='../scripts/jquery/jquery.tablesorter.min.js';
                 //$js_admin_includes[]='scripts/surveysecurity.js';
-                $this->getController()->_js_admin_includes(Yii::app()->baseUrl.'/scripts/jquery/jquery.tablesorter.min.js');
-                $this->getController()->_js_admin_includes(Yii::app()->baseUrl.'/scripts/admin/surveysecurity.js');
+                $this->getController()->_js_admin_includes(Yii::app()->getConfig('generalscripts') .'jquery/jquery.tablesorter.min.js');
+                $this->getController()->_js_admin_includes(Yii::app()->getConfig('adminscripts') . 'surveysecurity.js');
                 if ($action == "setsurveysecurity")
                 {
                     $query = "select users_name from {{users}} where uid=:uid";
diff --git a/application/controllers/admin/templates.php b/application/controllers/admin/templates.php
index c18f0014e51..6d674de5dd2 100644
--- a/application/controllers/admin/templates.php
+++ b/application/controllers/admin/templates.php
@@ -71,7 +71,7 @@ public function upload()
     {
         $clang = $this->getController()->lang;
 
-//        $this->getController()->_js_admin_includes(Yii::app()->baseUrl . '/scripts/admin/templates.js');
+//        $this->getController()->_js_admin_includes(Yii::app()->getConfig('adminscripts') . 'templates.js');
 
         $aViewUrls = $this->_initialise('default', 'welcome', 'startpage.pstpl', FALSE);
         $lid = returnGlobal('lid');
diff --git a/application/controllers/admin/tokens.php b/application/controllers/admin/tokens.php
index 94ebd76230c..0d53112acb4 100644
--- a/application/controllers/admin/tokens.php
+++ b/application/controllers/admin/tokens.php
@@ -263,8 +263,8 @@ function browse($iSurveyId, $limit = 50, $start = 0, $order = false, $searchstri
             self::_newtokentable($iSurveyId);
         }
         // Javascript
-        $this->getController()->_js_admin_includes(Yii::app()->getConfig('generalscripts') . "admin/tokens.js");
-        $this->getController()->_js_admin_includes(Yii::app()->getConfig('generalscripts') . "admin/tokentocpdb.js");
+        $this->getController()->_js_admin_includes(Yii::app()->getConfig('adminscripts') . "tokens.js");
+        $this->getController()->_js_admin_includes(Yii::app()->getConfig('adminscripts') . "tokentocpdb.js");
         $this->getController()->_js_admin_includes(Yii::app()->getConfig('generalscripts') . "jquery/jquery.multiselect.min.js");
         $this->getController()->_js_admin_includes(Yii::app()->getConfig('generalscripts') . "jquery/jqGrid/js/i18n/grid.locale-en.js");
         $this->getController()->_js_admin_includes(Yii::app()->getConfig('generalscripts') . "jquery/jqGrid/js/jquery.jqGrid.min.js");
@@ -1798,7 +1798,7 @@ function import($iSurveyId)
             die('access denied');
         }
 
-        $this->getController()->_js_admin_includes('scripts/tokens.js');
+        $this->getController()->_js_admin_includes(Yii::app()->getConfig('adminscripts') . 'tokens.js');
 
         $aEncodings = array(
         "armscii8" => $clang->gT("ARMSCII-8 Armenian")
diff --git a/application/controllers/admin/useraction.php b/application/controllers/admin/useraction.php
index eb25741ba71..53886718459 100644
--- a/application/controllers/admin/useraction.php
+++ b/application/controllers/admin/useraction.php
@@ -37,8 +37,8 @@ function __construct($controller, $id)
     */
     public function index()
     {
-        $this->getController()->_js_admin_includes(Yii::app()->baseUrl . '/scripts/jquery/jquery.tablesorter.min.js');
-        $this->getController()->_js_admin_includes(Yii::app()->baseUrl . '/scripts/admin/users.js');
+        $this->getController()->_js_admin_includes(Yii::app()->getConfig('generalscripts') . 'jquery/jquery.tablesorter.min.js');
+        $this->getController()->_js_admin_includes(Yii::app()->getConfig('adminscripts').'users.js');
 
         $userlist = getUserList();
         $usrhimself = $userlist[0];
@@ -393,8 +393,8 @@ function moduser()
 
     function setUserRights()
     {
-        $this->getController()->_js_admin_includes(Yii::app()->baseUrl . '/scripts/jquery/jquery.tablesorter.min.js');
-        $this->getController()->_js_admin_includes(Yii::app()->baseUrl . '/scripts/admin/users.js');
+        $this->getController()->_js_admin_includes(Yii::app()->getConfig('generalscripts') . 'jquery/jquery.tablesorter.min.js');
+        $this->getController()->_js_admin_includes(Yii::app()->getConfig('adminscripts') . 'users.js');
         $postuser = Yii::app()->request->getPost('user');
         $postemail = Yii::app()->request->getPost('email');
         $postuserid = Yii::app()->request->getPost('uid');
@@ -510,8 +510,8 @@ function userrights()
 
     function setusertemplates()
     {
-        $this->getController()->_js_admin_includes(Yii::app()->baseUrl . '/scripts/jquery/jquery.tablesorter.min.js');
-        $this->getController()->_js_admin_includes(Yii::app()->baseUrl . '/scripts/admin/users.js');
+        $this->getController()->_js_admin_includes(Yii::app()->getConfig('generalscripts') . 'jquery/jquery.tablesorter.min.js');
+        $this->getController()->_js_admin_includes(Yii::app()->getConfig('adminscripts') . 'users.js');
         $aData['postuser']  = Yii::app()->request->getPost("user");
         $aData['postemail'] = Yii::app()->request->getPost("email");
         $postuserid = Yii::app()->request->getPost("uid");
diff --git a/application/controllers/admin/usergroups.php b/application/controllers/admin/usergroups.php
index 9d5bd33e7d0..59bd2e3a685 100644
--- a/application/controllers/admin/usergroups.php
+++ b/application/controllers/admin/usergroups.php
@@ -420,7 +420,7 @@ function user($ugid, $action = 'add')
     protected function _renderWrappedTemplate($sAction = 'usergroup', $aViewUrls = array(), $aData = array())
     {
         $this->getController()->_css_admin_includes(Yii::app()->getConfig('adminstyleurl')."superfish.css");
-        $this->getController()->_js_admin_includes(Yii::app()->baseUrl . 'scripts/admin/users.js');
+        $this->getController()->_js_admin_includes(Yii::app()->getConfig('adminscripts').'users.js');
 
         $aData['display']['menu_bars']['user_group'] = true;
 
diff --git a/application/helpers/common_helper.php b/application/helpers/common_helper.php
index aa2dfcf8bd0..2e3b6afe3fb 100644
--- a/application/helpers/common_helper.php
+++ b/application/helpers/common_helper.php
@@ -7325,8 +7325,8 @@ function getPrintableHeader()
     global $rooturl,$homeurl;
     $headelements = '
     <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-    <script type="text/javascript" src="'.$rooturl.'/scripts/jquery/jquery.js"></script>
-    <script type="text/javascript" src="'.$homeurl.'/scripts/printablesurvey.js"></script>
+    <script type="text/javascript" src="'.Yii::app()->getConfig('generalscripts').'jquery/jquery.js"></script>
+    <script type="text/javascript" src="'.Yii::app()->getConfig('adminscripts').'printablesurvey.js"></script>
     ';
     return $headelements;
 }
diff --git a/application/views/admin/templates/templatesummary_view.php b/application/views/admin/templates/templatesummary_view.php
index 2d62c595ed2..ade058a13a9 100644
--- a/application/views/admin/templates/templatesummary_view.php
+++ b/application/views/admin/templates/templatesummary_view.php
@@ -1,15 +1,15 @@
 <?php if (is_template_editable($templatename)==true)
     { ?>
-    <script type="text/javascript" src="<?php echo Yii::app()->baseUrl; ?>/scripts/admin/codemirror_ui/lib/CodeMirror-2.0/lib/codemirror.js" ></script>
+    <script type="text/javascript" src="<?php echo Yii::app()->getConfig('adminscripts'); ?>codemirror_ui/lib/CodeMirror-2.0/lib/codemirror.js" ></script>
     <?php if ($sEditorFileType=='htmlmixed')
         {?>
-        <script type="text/javascript" src="<?php echo Yii::app()->baseUrl; ?>/scripts/admin/codemirror_ui/lib/CodeMirror-2.0/mode/xml/xml.js" ></script>
-        <script type="text/javascript" src="<?php echo Yii::app()->baseUrl; ?>/scripts/admin/codemirror_ui/lib/CodeMirror-2.0/mode/javascript/javascript.js" ></script>
-        <script type="text/javascript" src="<?php echo Yii::app()->baseUrl; ?>/scripts/admin/codemirror_ui/lib/CodeMirror-2.0/mode/css/css.js" ></script>
+        <script type="text/javascript" src="<?php echo Yii::app()->getConfig('adminscripts'); ?>codemirror_ui/lib/CodeMirror-2.0/mode/xml/xml.js" ></script>
+        <script type="text/javascript" src="<?php echo Yii::app()->getConfig('adminscripts'); ?>codemirror_ui/lib/CodeMirror-2.0/mode/javascript/javascript.js" ></script>
+        <script type="text/javascript" src="<?php echo Yii::app()->getConfig('adminscripts'); ?>codemirror_ui/lib/CodeMirror-2.0/mode/css/css.js" ></script>
         <?php }
     ?>
-    <script type="text/javascript" src="<?php echo Yii::app()->baseUrl; ?>/scripts/admin/codemirror_ui/lib/CodeMirror-2.0/mode/<?php echo $sEditorFileType; ?>/<?php echo $sEditorFileType; ?>.js" ></script>
-    <script type="text/javascript" src="<?php echo Yii::app()->baseUrl; ?>/scripts/admin/codemirror_ui/js/codemirror-ui.js" ></script>
+    <script type="text/javascript" src="<?php echo Yii::app()->getConfig('adminscripts'); ?>codemirror_ui/lib/CodeMirror-2.0/mode/<?php echo $sEditorFileType; ?>/<?php echo $sEditorFileType; ?>.js" ></script>
+    <script type="text/javascript" src="<?php echo Yii::app()->getConfig('adminscripts'); ?>codemirror_ui/js/codemirror-ui.js" ></script>
     <script type="text/javascript">
         var editorfiletype='<?php echo $sEditorFileType; ?>';
     </script>
@@ -44,7 +44,7 @@
                 } ?>
             </textarea>
             <script type="text/javascript">
-                var codemirropath = '<?php echo Yii::app()->baseUrl; ?>/scripts/admin/codemirror_ui/js/';
+                var codemirropath = '<?php echo Yii::app()->getConfig('adminscripts'); ?>codemirror_ui/js/';
             </script>
             <p>
                 <?php if (is_writable($templates[$templatename])) { ?>