diff --git a/README.txt b/README.txt
index b0bb1be95..412c23262 100755
--- a/README.txt
+++ b/README.txt
@@ -325,7 +325,7 @@ For example, if installed on the local machine at port 8080, then use:
  http://localhost:8080 
    
 The web browser should be redirected to the address:
- http://IP-ADDRESS/sys/en/green/login
+ http://IP-ADDRESS/sys/en/classic/login
 
 2. The installation configuration page should appear to setup ProcessMaker. 
 (If the default Apache page appears, then disable it and restart Apache.)
diff --git a/gulliver/bin/tasks/templates/index.html.tpl b/gulliver/bin/tasks/templates/index.html.tpl
index 667bbbc82..120d501e6 100755
--- a/gulliver/bin/tasks/templates/index.html.tpl
+++ b/gulliver/bin/tasks/templates/index.html.tpl
@@ -3,6 +3,6 @@
 <title>Redirector</title>
 <meta http-equiv="PRAGMA" content="NO-CACHE" />
 <meta http-equiv="CACHE-CONTROL" content="NO-STORE" />
-<meta http-equiv="REFRESH" content="0;URL=/sys{projectName}/en/green/login/login.html" />
+<meta http-equiv="REFRESH" content="0;URL=/sys{projectName}/en/classic/login/login.html" />
 </head>
 </html>
diff --git a/gulliver/bin/tasks/templates/sysGeneric.php.tpl b/gulliver/bin/tasks/templates/sysGeneric.php.tpl
index 2b96a46c6..47b34d2a8 100755
--- a/gulliver/bin/tasks/templates/sysGeneric.php.tpl
+++ b/gulliver/bin/tasks/templates/sysGeneric.php.tpl
@@ -123,7 +123,7 @@ $docuroot = explode ( PATH_SEP , $_SERVER['DOCUMENT_ROOT'] );
       require_once('sysUnnamed.php'); die;
     	break;
     case 'sysNamed' :
-      header('location : ' . $_SERVER['REQUEST_URI'] . 'en/green/login/login' );
+      header('location : ' . $_SERVER['REQUEST_URI'] . 'en/classic/login/login' );
       die;
 	    break;
     case 'jsMethod' :
diff --git a/workflow/engine/classes/model/CaseScheduler.php b/workflow/engine/classes/model/CaseScheduler.php
index 984d30203..63739842d 100755
--- a/workflow/engine/classes/model/CaseScheduler.php
+++ b/workflow/engine/classes/model/CaseScheduler.php
@@ -363,7 +363,7 @@ class CaseScheduler extends BaseCaseScheduler {
       if ($sActualDataHour < $dActualSysHour) {
         $_PORT = (SERVER_PORT != '80') ? ':' . SERVER_PORT : '';
 
-        $defaultEndpoint = 'http://' . SERVER_NAME . $_PORT . '/sys' . SYS_SYS . '/en/green/services/wsdl2';
+        $defaultEndpoint = 'http://' . SERVER_NAME . $_PORT . '/sys' . SYS_SYS . '/'.SYS_LANG.'/classic/services/wsdl2';
         println(" - Connecting webservice: $defaultEndpoint");
 
         $user = $aRow ["SCH_DEL_USER_NAME"];
@@ -532,8 +532,8 @@ class CaseScheduler extends BaseCaseScheduler {
 
         $_PORT = (isset($_SERVER ['SERVER_PORT']) && $_SERVER ['SERVER_PORT'] != '80') ? ':' . $_SERVER ['SERVER_PORT'] : '';
 
-        //$defaultEndpoint = 'http://' . $_SERVER ['SERVER_NAME'] . ':' . $_PORT . '/sys' . SYS_SYS . '/en/green/services/wsdl2';
-        $defaultEndpoint = 'http://' . SERVER_NAME . $_PORT . '/sys' . SYS_SYS . '/en/green/services/wsdl2';
+        //$defaultEndpoint = 'http://' . $_SERVER ['SERVER_NAME'] . ':' . $_PORT . '/sys' . SYS_SYS .'/'.SYS_LANG.'/classic/green/services/wsdl2';
+        $defaultEndpoint = 'http://' . SERVER_NAME . $_PORT . '/sys' . SYS_SYS . '/'.SYS_LANG.'/classic/services/wsdl2';
         println(" - Connecting webservice: $defaultEndpoint");
         $user = $aRow ["SCH_DEL_USER_NAME"];
         $pass = $aRow ["SCH_DEL_USER_PASS"];
diff --git a/workflow/engine/methods/install/install.js b/workflow/engine/methods/install/install.js
index f8b1287c6..06bc22167 100755
--- a/workflow/engine/methods/install/install.js
+++ b/workflow/engine/methods/install/install.js
@@ -572,7 +572,7 @@ var installer=function()
 	this.installation=function(rpc)
 	{
 /*		var r = new leimnud.module.rpc.xmlhttp({
-			url	:"/sysworkflow/en/green/tools/updateTranslation",
+			url	:"/sysworkflow/en/classic/tools/updateTranslation",
 			method	:"GET"
 		});
 		r.callback=function(rpc)
@@ -608,7 +608,7 @@ var installer=function()
 			this.options.buttong.value="Finish Installation";
 			this.options.buttong.onmouseup=function()
 			{
-				window.location = "/sysworkflow/en/green/login/login";
+				window.location = "/sysworkflow/en/classic/login/login";
 			}.extend(this);
 			tdS.appendChild(this.options.buttong);
 			this.buttonFun(this.options.buttong);
diff --git a/workflow/engine/methods/install/install.php b/workflow/engine/methods/install/install.php
index 3ebb4d712..d13be542d 100755
--- a/workflow/engine/methods/install/install.php
+++ b/workflow/engine/methods/install/install.php
@@ -43,7 +43,7 @@ echo '<?xml version="1.0" encoding="UTF-8" ?>';
    <script type='text/javascript' src='/js/maborak/core/maborak.js'></script>
    <link rel="stylesheet" type="text/css" href="/js/maborak/samples/style.css" />
 
-   <script type='text/javascript' src='/sys/en/green/install/install.js'></script>
+   <script type='text/javascript' src='/sys/en/classic/install/install.js'></script>
    <script type='text/javascript'>
    var ifr;
    var forceCssLoad = true;
diff --git a/workflow/engine/methods/install/installServer.php b/workflow/engine/methods/install/installServer.php
index 15949d25b..db2c6c538 100755
--- a/workflow/engine/methods/install/installServer.php
+++ b/workflow/engine/methods/install/installServer.php
@@ -191,7 +191,7 @@ else if($action==="install")
 	*
 	*	4.2 Update translation from this url (background)
 	*
-	*		http://ProcessmakerHostname/sysworkflow/en/green/tools/updateTranslation
+	*		http://ProcessmakerHostname/sysworkflow/en/classic/tools/updateTranslation
 	*
  	*
  	*
@@ -325,22 +325,22 @@ else if($action==="install")
 	fclose( $fp );
 
 	/* Update languages */
-	$update = file_get_contents("http://".$_SERVER['SERVER_NAME'].":".$_SERVER['SERVER_PORT']."/sysworkflow/en/green/tools/updateTranslation");
+	$update = file_get_contents("http://".$_SERVER['SERVER_NAME'].":".$_SERVER['SERVER_PORT']."/sysworkflow/en/classic/tools/updateTranslation");
 	$logger->log("Update language      => ".((!$update)?$update:"OK"));
 	
 	/* Heartbeat Enable/Disable */
 	if(!isset($dataClient->heartbeatEnabled)) $dataClient->heartbeatEnabled=true;
-	$update = file_get_contents("http://".$_SERVER['SERVER_NAME'].":".$_SERVER['SERVER_PORT']."/sysworkflow/en/green/install/heartbeatStatus?status=".$dataClient->heartbeatEnabled);
+	$update = file_get_contents("http://".$_SERVER['SERVER_NAME'].":".$_SERVER['SERVER_PORT']."/sysworkflow/en/classic/install/heartbeatStatus?status=".$dataClient->heartbeatEnabled);
 	$logger->log("Heartbeat Status     => ".str_replace("<br>","\n",$update));
 	
 	/* Autoinstall Process */
-	$update = file_get_contents("http://".$_SERVER['SERVER_NAME'].":".$_SERVER['SERVER_PORT']."/sysworkflow/en/green/install/autoinstallProcesses");
+	$update = file_get_contents("http://".$_SERVER['SERVER_NAME'].":".$_SERVER['SERVER_PORT']."/sysworkflow/en/classic/install/autoinstallProcesses");
 	if (trim(str_replace("<br>","",$update)) == "")
 		$update = "Nothing to do.";
 	$logger->log("Process AutoInstall  => ".str_replace("<br>","\n",$update));
 	
 	/* Autoinstall Plugins */
-	$update = file_get_contents("http://".$_SERVER['SERVER_NAME'].":".$_SERVER['SERVER_PORT']."/sysworkflow/en/green/install/autoinstallPlugins");
+	$update = file_get_contents("http://".$_SERVER['SERVER_NAME'].":".$_SERVER['SERVER_PORT']."/sysworkflow/en/classic/install/autoinstallPlugins");
 	if (trim(str_replace("<br>","",$update)) == "")
 		$update = "Nothing to do.";
 	$logger->log("Plugin AutoInstall   => ".str_replace("<br>","\n",$update));
diff --git a/workflow/engine/methods/services/wsdl.php b/workflow/engine/methods/services/wsdl.php
index 07d4aa70c..8db71024f 100755
--- a/workflow/engine/methods/services/wsdl.php
+++ b/workflow/engine/methods/services/wsdl.php
@@ -4,7 +4,7 @@
   $lang = defined ('SYS_LANG') ? SYS_LANG : 'en';
   
   $endpoint = 'http://' .$_SERVER['SERVER_NAME'] . ':' .$_SERVER['SERVER_PORT'] . 
-              '/sys' .SYS_SYS.'/' .$lang . '/green/services/soap';
+              '/sys' .SYS_SYS.'/' .$lang . '/classic/services/soap';
   //print $endpoint; die;
   $content = str_replace ( "___SOAP_ADDRESS___", $endpoint, $content );
   
diff --git a/workflow/engine/methods/services/wsdl2.php b/workflow/engine/methods/services/wsdl2.php
index 163cb3c66..d4f9770cc 100755
--- a/workflow/engine/methods/services/wsdl2.php
+++ b/workflow/engine/methods/services/wsdl2.php
@@ -5,7 +5,7 @@
   
   $http = ( isset($_SERVER['HTTPS']) &&  $_SERVER['HTTPS'] == 'on' ) ? 'https' : 'http';
   $endpoint = $http . '://' .$_SERVER['SERVER_NAME'] . ':' .$_SERVER['SERVER_PORT'] .
-              '/sys' .SYS_SYS.'/' .$lang . '/green/services/soap2';   
+              '/sys' .SYS_SYS.'/' .$lang . '/classic/services/soap2';
 
   $content = str_replace ( "___SOAP_ADDRESS___", $endpoint, $content );
   
diff --git a/workflow/engine/methods/setup/jasper.php b/workflow/engine/methods/setup/jasper.php
index c05d5108f..1e82f732f 100755
--- a/workflow/engine/methods/setup/jasper.php
+++ b/workflow/engine/methods/setup/jasper.php
@@ -62,7 +62,7 @@
   if ( $formatReport == RUN_OUTPUT_FORMAT_HTML) {
     //$pageReport = isset ( $_GET['page'] ) ? $_GET['page'] : 1;
     //$output_params[RUN_OUTPUT_PAGE] = $pageReport;
-    //$output_params[RUN_OUTPUT_IMAGES_URI] = '/sysos/en/green/';
+    //$output_params[RUN_OUTPUT_IMAGES_URI] = '/sysos/'. SYS_LANG. '/classic';
   }
  
   $result = $oJasper->ws_runReport($currentUri, $report_params,  $output_params, $attachments);
diff --git a/workflow/engine/methods/setup/webServicesAjax.php b/workflow/engine/methods/setup/webServicesAjax.php
index 3f1c2bfac..c1b10fdba 100755
--- a/workflow/engine/methods/setup/webServicesAjax.php
+++ b/workflow/engine/methods/setup/webServicesAjax.php
@@ -87,7 +87,7 @@ switch ($_POST ['action']) {
 		$_SESSION ['_DBArray'] = $_DBArray;
 		
 		if (! isset ( $_SESSION ['END_POINT'] )) {
-			//$wsdl = 'http://'.$_SERVER['HTTP_HOST'].'/sys'.SYS_SYS.'/en/green/services/wsdl';
+			//$wsdl = 'http://'.$_SERVER['HTTP_HOST'].'/sys'.SYS_SYS. '/'. SYS_LANG .'/classic/services/wsdl';
 			$wsdl = 'http://' . $_SERVER ['HTTP_HOST'];
 			$workspace = SYS_SYS;
 		} else {
@@ -95,7 +95,7 @@ switch ($_POST ['action']) {
 			$workspace = $_SESSION ['WS_WORKSPACE'];
 		}
 		
-		$defaultEndpoint = 'http://' . $_SERVER ['SERVER_NAME'] . ':' . $_SERVER ['SERVER_PORT'] . '/sys' . SYS_SYS . '/en/green/services/wsdl2';
+		$defaultEndpoint = 'http://' . $_SERVER ['SERVER_NAME'] . ':' . $_SERVER ['SERVER_PORT'] . '/sys' . SYS_SYS . '/'. SYS_LANG .'/classic/services/wsdl2';
 		
 		$wsdl = isset ( $_SESSION ['END_POINT'] ) ? $_SESSION ['END_POINT'] : $defaultEndpoint;
 		
@@ -137,7 +137,7 @@ switch ($_POST ['action']) {
 		if (isset ( $_POST ["epr"] )) {
 			$_SESSION ['END_POINT'] = $_POST ["epr"];
 		}
-		$defaultEndpoint = 'http://' . $_SERVER ['SERVER_NAME'] . ':' . $_SERVER ['SERVER_PORT'] . '/sys' . SYS_SYS . '/en/green/services/wsdl2';
+		$defaultEndpoint = 'http://' . $_SERVER ['SERVER_NAME'] . ':' . $_SERVER ['SERVER_PORT'] . '/sys' . SYS_SYS . '/'. SYS_LANG .'/classic/services/wsdl2';
 		
 		$endpoint = isset ( $_SESSION ['END_POINT'] ) ? $_SESSION ['END_POINT'] : $defaultEndpoint;
 		
@@ -1269,7 +1269,7 @@ case "removeUserFromGroup" :
                                 $del_index = 1;
 
                                 function sendFile($FILENAME, $USR_UID, $APP_UID, $DEL_INDEX = 1, $DOC_UID = NULL, $title = NULL, $comment = NULL) {
-                                    $defaultEndpoint = 'http://' . $_SERVER ['SERVER_NAME'] . ':' . $_SERVER ['SERVER_PORT'] . '/sys' . SYS_SYS . '/en/green/services/upload';
+                                    $defaultEndpoint = 'http://' . $_SERVER ['SERVER_NAME'] . ':' . $_SERVER ['SERVER_PORT'] . '/sys' . SYS_SYS . '/'. SYS_LANG .'/classic/services/upload';
                                     $upload = isset ( $_SESSION ['END_POINT'] ) ? $_SESSION ['END_POINT'] : $defaultEndpoint;
 
                                     $DOC_UID = ($DOC_UID != NULL) ? $DOC_UID : - 1;
diff --git a/workflow/engine/methods/setup/webServicesSetupSave.php b/workflow/engine/methods/setup/webServicesSetupSave.php
index ba01da015..7e0cbf0c7 100755
--- a/workflow/engine/methods/setup/webServicesSetupSave.php
+++ b/workflow/engine/methods/setup/webServicesSetupSave.php
@@ -5,11 +5,11 @@ if($_POST['form']['WS_PROTOCOL']!='' && $_POST['form']['WS_WORKSPACE']!='')
   {
   	if($_POST['form']['WS_PORT']!='')
   	{
-  			$_SESSION['END_POINT']=$_POST['form']['WS_PROTOCOL'].'://' .$_POST['form']['WS_HOST'] . ':' .$_POST['form']['WS_PORT'] .'/sys' .$_POST['form']['WS_WORKSPACE'].'/en/green/services/wsdl2';
+  			$_SESSION['END_POINT']=$_POST['form']['WS_PROTOCOL'].'://' .$_POST['form']['WS_HOST'] . ':' .$_POST['form']['WS_PORT'] .'/sys' .$_POST['form']['WS_WORKSPACE'].'/en/classic/services/wsdl2';
   			G::header('location: webServices?x=1');
   	}
   	else
-  	{		$_SESSION['END_POINT']=$_POST['form']['WS_PROTOCOL'].'://' .$_POST['form']['WS_HOST'] .'/sys' .$_POST['form']['WS_WORKSPACE'].'/en/green/services/wsdl2';
+  	{		$_SESSION['END_POINT']=$_POST['form']['WS_PROTOCOL'].'://' .$_POST['form']['WS_HOST'] .'/sys' .$_POST['form']['WS_WORKSPACE'].'/en/classic/services/wsdl2';
   			G::header('location: webServices?x=1');
   	}
   	$_SESSION['WS_WORKSPACE']=$_POST['form']['WS_WORKSPACE'];
diff --git a/workflow/engine/templates/setup/webServicesTree.php b/workflow/engine/templates/setup/webServicesTree.php
index ed250bc14..29bc8ab01 100755
--- a/workflow/engine/templates/setup/webServicesTree.php
+++ b/workflow/engine/templates/setup/webServicesTree.php
@@ -40,19 +40,18 @@ if (isset ( $_GET ['x'] )) {
         $wsdl = '<font color="red">' . G::LoadTranslation ( 'ID_WSDL' ) . '</font>';
         $workspace = '';
     }
-} else {
-    if (! isset ( $_SESSION ['END_POINT'] )) {
-        //$wsdl = 'http://'.$_SERVER['HTTP_HOST'].'/sys'.SYS_SYS.'/en/green/services/wsdl';
-        $wsdl = 'http://' . $_SERVER ['HTTP_HOST'];
-        $workspace = SYS_SYS;
-    } else {
-        $wsdl = $_SESSION ['END_POINT'];
-        $workspace = $_SESSION ['WS_WORKSPACE'];
-    }
+} else {
+	if (! isset ( $_SESSION ['END_POINT'] )) {
+		//$wsdl = 'http://'.$_SERVER['HTTP_HOST'].'/sys'.SYS_SYS.'/en/classic/services/wsdl';
+		$wsdl = 'http://' . $_SERVER ['HTTP_HOST'];
+		$workspace = SYS_SYS;
+	} else {
+		$wsdl = $_SESSION ['END_POINT'];
+		$workspace = $_SESSION ['WS_WORKSPACE'];
+	}
 }
 
-$defaultEndpoint =  'http://' . $_SERVER ['SERVER_NAME'] . ':' . $_SERVER ['SERVER_PORT'] . '/sys' . SYS_SYS .
-                    '/en/green/services/wsdl2';
+$defaultEndpoint = 'http://' . $_SERVER ['SERVER_NAME'] . ':' . $_SERVER ['SERVER_PORT'] . '/sys' . SYS_SYS . '/en/classic/services/wsdl2';
 
 $wsdl = isset ( $_SESSION ['END_POINT'] ) ? $_SESSION ['END_POINT'] : $defaultEndpoint;
 
@@ -72,14 +71,14 @@ $tree->value = '
     </table>
     </div>
     <div class="boxBottomBlue"><div class="a"></div><div class="b"></div><div class="c"></div></div>
-    
+
       <div class="userGroupLink">
           <a href="#" onclick="showDetails();return false;">' . G::LoadTranslation ( 'ID_DETAILS_WEBSERVICES' ) .
           '</a> &nbsp;
           <a href="#" onclick="webServicesSetup();return false;">' . G::LoadTranslation ( 'ID_SETUP_WEBSERVICES' ) .
           '</a>
       </div>
-      
+
     ';
 
 $tree->showSign = false;
diff --git a/workflow/engine/xmlform/login/newSite.xml b/workflow/engine/xmlform/login/newSite.xml
index d4e88b6d3..8f10c19b3 100755
--- a/workflow/engine/xmlform/login/newSite.xml
+++ b/workflow/engine/xmlform/login/newSite.xml
@@ -64,7 +64,7 @@
 	
 	/*data.goto = data.submit.parentNode.appendChild(new button('Open workspace',function()
 	{
-		window.location="/sys"+data.name.value+"/en/green/login/login";
+		window.location="/sys"+data.name.value+"/en/classic/login/login";
 		return false;
 	},{fontWeight:'bold'},{type:'reset'})).disable();
 	*/
@@ -100,7 +100,7 @@
 	
   });
   	function redirectLogin(){
-		location.href="/sys"+data.name.value+"/en/green/login/login";
+		location.href="/sys"+data.name.value+"/en/classic/login/login";
 	}
 
   	var status_in_progress=function(form)
@@ -147,11 +147,11 @@
 		  		label: G_STRINGS.NEW_SITE_SUCCESS +" "+ data.name.value +"<br/>"+ G_STRINGS.NEW_SITE_SUCCESS_CONFIRM+"<br/>"+ G_STRINGS.NEW_SITE_SUCCESS_CONFIRMNOTE,
 		    	action: function(){
 
-		    	parent.parent.window.location="/sys"+data.name.value+"/en/green/login/login";
+		    	parent.parent.window.location="/sys"+data.name.value+"/en/classic/login/login";
 
 		 /*  	   if (typeof(window.parent.admToolsContent) != 'undefined'){
 
-					 parent.parent.window.location="/sys"+data.name.value+"/en/green/login/login";
+					 parent.parent.window.location="/sys"+data.name.value+"/en/classic/login/login";
 					} else {
 					    setTimeout('redirectLogin()', 1000);
 					}*/
diff --git a/workflow/engine/xmlform/login/newSiteAdd.xml b/workflow/engine/xmlform/login/newSiteAdd.xml
index 3e2c35862..fcb933bfa 100755
--- a/workflow/engine/xmlform/login/newSiteAdd.xml
+++ b/workflow/engine/xmlform/login/newSiteAdd.xml
@@ -82,7 +82,7 @@
 	
 	/*data.goto = data.submit.parentNode.appendChild(new button('Open workspace',function()
 	{
-		window.location="/sys"+data.name.value+"/en/green/login/login";
+		window.location="/sys"+data.name.value+"/en/classic/login/login";
 		return false;
 	},{fontWeight:'bold'},{type:'reset'})).disable();
 	*/
@@ -147,7 +147,7 @@
 		    	action: function(){
 		    	    if (typeof(window.parent.admToolsContent) != 'undefined'){
 		    	  
-					    parent.window.location="/sys"+data.name.value+"/en/green/login/login";
+					    parent.window.location="/sys"+data.name.value+"/en/classic/login/login";
 					} else {
 						
 					    setTimeout('redirectLogin()', 1000);
@@ -179,7 +179,7 @@
 	//data.name.passed();
 	
 	function redirectLogin(){
-		location.href="/sys"+data.name.value+"/en/green/login/login";
+		location.href="/sys"+data.name.value+"/en/classic/login/login";
 	}
 ]]></JS>
 </dynaForm>  
diff --git a/workflow/public_html/sysGeneric.php b/workflow/public_html/sysGeneric.php
index 1b022d6aa..55cf6cff1 100755
--- a/workflow/public_html/sysGeneric.php
+++ b/workflow/public_html/sysGeneric.php
@@ -233,7 +233,7 @@
         die;
         break;
       case 'sysNamed' :
-        header('location : ' . $_SERVER['REQUEST_URI'] . 'en/green/login/login' ); 
+        header('location : ' . $_SERVER['REQUEST_URI'] . '/' .SYS_LANG. '/classic/login/login' ); 
         die;
         break;
       case 'jsMethod' :