diff --git a/setup/firstlogin/stepAction.php b/setup/firstlogin/stepAction.php
index e14da67..3f606fe 100644
--- a/setup/firstlogin/stepAction.php
+++ b/setup/firstlogin/stepAction.php
@@ -84,10 +84,8 @@ class stepAction extends stepActionBase {
 		$vars['left'] = $left; // Set left menu
 		$vars['fl_version'] = $this->properties['fl_version']; // Set version
 		$vars['fl_type'] = $this->properties['fl_type']; // Set type
-		if (KTPluginUtil::pluginIsActive('fs.FolderTemplatesPlugin.plugin')) { // Check if folder templates plugin is active
-	            $oRegistry =& KTPluginRegistry::getSingleton();
-	            $oPlugin =& $oRegistry->getPlugin('fs.FolderTemplatesPlugin.plugin'); // Get a handle on the plugin
-	            $ft_dir = $oPlugin->getDirs();
+		if (KTPluginUtil::pluginIsActive('folder.templates.plugin')) { // Check if folder templates plugin is active
+			$ft_dir = FolderTemplatesPlugin_RDIR . DIRECTORY_SEPARATOR . "KTFolderTemplates.php";
 		}
 		$vars['ft_handle'] = $ft_dir; // Set type
 		return $vars;
diff --git a/setup/firstlogin/steps/firstloginComplete.php b/setup/firstlogin/steps/firstloginComplete.php
index 86489ce..d61d100 100644
--- a/setup/firstlogin/steps/firstloginComplete.php
+++ b/setup/firstlogin/steps/firstloginComplete.php
@@ -77,10 +77,8 @@ class firstloginComplete extends Step {
     
     function doRun() {
     	$ft_dir = "";
-    	if (KTPluginUtil::pluginIsActive('fs.FolderTemplatesPlugin.plugin')) { // Check if folder templates plugin is active
-            $oRegistry =& KTPluginRegistry::getSingleton();
-            $oPlugin =& $oRegistry->getPlugin('fs.FolderTemplatesPlugin.plugin'); // Get a handle on the plugin
-            $ft_dir = $oPlugin->getDirs();
+    	if (KTPluginUtil::pluginIsActive('folder.templates.plugin')) { // Check if folder templates plugin is active
+			$ft_dir = FolderTemplatesPlugin_RDIR . DIRECTORY_SEPARATOR . "KTFolderTemplates.php";
 		}
 		$this->temp_variables['ft_dir'] = $ft_dir;
 
diff --git a/setup/firstlogin/steps/firstloginTemplates.php b/setup/firstlogin/steps/firstloginTemplates.php
index 28b23e6..0207ca3 100644
--- a/setup/firstlogin/steps/firstloginTemplates.php
+++ b/setup/firstlogin/steps/firstloginTemplates.php
@@ -87,10 +87,8 @@ class firstloginTemplates extends Step {
     
     function doRun() {
     	$ft_dir = "";
-    	if (KTPluginUtil::pluginIsActive('fs.FolderTemplatesPlugin.plugin')) { // Check if folder templates plugin is active
-            $oRegistry =& KTPluginRegistry::getSingleton();
-            $oPlugin =& $oRegistry->getPlugin('fs.FolderTemplatesPlugin.plugin'); // Get a handle on the plugin
-            $ft_dir = $oPlugin->getDirs();
+    	if (KTPluginUtil::pluginIsActive('folder.templates.plugin')) { // Check if folder templates plugin is active
+			$ft_dir = FolderTemplatesPlugin_RDIR . DIRECTORY_SEPARATOR . "KTFolderTemplates.php";
 		}
 		$this->temp_variables['aFolderTemplates'] = $this->getTemplates();
 		$this->temp_variables['ft_dir'] = $ft_dir;
@@ -103,28 +101,18 @@ class firstloginTemplates extends Step {
 			$templateId = KTUtil::arrayGet($_GET, "templateId", 0);// Could be ajax call
     	}
     	if($templateId > 0) {
-			if (KTPluginUtil::pluginIsActive('fs.FolderTemplatesPlugin.plugin')) { // Check if folder templates plugin is active
-	            $oRegistry =& KTPluginRegistry::getSingleton();
-	            $oPlugin =& $oRegistry->getPlugin('fs.FolderTemplatesPlugin.plugin'); // Get a handle on the plugin
-	            return $oPlugin->firstLoginAction(1, $templateId);
+			if (KTPluginUtil::pluginIsActive('folder.templates.plugin')) { // Check if folder templates plugin is active
+				require_once(FolderTemplatesPlugin_DIR . DIRECTORY_SEPARATOR . "FolderTemplate.inc.php");
+				return FolderTemplates::firstLoginAction(1, $templateId);
 			}
     	}
     	return false;
     }
     
     function getTemplates() {
-		if (KTPluginUtil::pluginIsActive('fs.FolderTemplatesPlugin.plugin')) { // Check if folder templates plugin is active
-            $oRegistry =& KTPluginRegistry::getSingleton();
-            $oPlugin =& $oRegistry->getPlugin('fs.FolderTemplatesPlugin.plugin'); // Get a handle on the plugin
-            return $oPlugin->getFirstLoginTemplates();
-		}
-    }
-    
-    function getTemplateNodes() {
-		if (KTPluginUtil::pluginIsActive('fs.FolderTemplatesPlugin.plugin')) { // Check if folder templates plugin is active
-            $oRegistry =& KTPluginRegistry::getSingleton();
-            $oPlugin =& $oRegistry->getPlugin('fs.FolderTemplatesPlugin.plugin'); // Get a handle on the plugin
-            return $oPlugin->getFirstLoginTemplates();
+		if (KTPluginUtil::pluginIsActive('folder.templates.plugin')) { // Check if folder templates plugin is active
+			require_once(FolderTemplatesPlugin_DIR . DIRECTORY_SEPARATOR . "FolderTemplate.inc.php");
+            return FolderTemplates::getList();
 		}
     }
     
diff --git a/setup/firstlogin/templates/templates.tpl b/setup/firstlogin/templates/templates.tpl
index 8c57881..f35293b 100644
--- a/setup/firstlogin/templates/templates.tpl
+++ b/setup/firstlogin/templates/templates.tpl
@@ -28,6 +28,9 @@
 					?>
 					<tr class="templates" style="display:none;" id="template_<?php echo $oFolderTemplate->getId(); ?>">
 						<td>
+							<div id="tconnector_template_<?php echo $oFolderTemplate->getId(); ?>" class="tree_icon connector-open-first open-first">&nbsp;</div>
+						</td>
+						<td>
 							<div class="tree_icon tree_folder closed">&nbsp;</div> 
 						</td>
 						<td>
diff --git a/setup/wizard/resources/css/firstlogin.css b/setup/wizard/resources/css/firstlogin.css
index 453de00..9c33050 100644
--- a/setup/wizard/resources/css/firstlogin.css
+++ b/setup/wizard/resources/css/firstlogin.css
@@ -27,7 +27,36 @@
 }
 
 .tree_folder {
-	background-image:url(../../../../thirdparty/icon-theme/16x16/mimetypes/x-directory-normal.png);
+	background-image:url(../../../../thirdpartyjs/extjs/resources/images/default/tree/folder.gif);
+}
+
+.open {
+	background-image:url(../../../../thirdpartyjs/extjs/resources/images/default/tree/folder-open.gif);
+}
+/* TODO: Check connectors again */
+
+.connector-closed {
+	background-image:url(../../../../thirdpartyjs/extjs/resources/images/default/tree/elbow-plus.gif);
+}
+
+.connector-closed-first {
+	background-image:url(../../../../thirdpartyjs/extjs/resources/images/default/tree/elbow-plus.gif);
+}
+
+.connector-closed-end {
+	background-image:url(../../../../thirdpartyjs/extjs/resources/images/default/tree/elbow-end-plus.gif);
+}
+
+.connector-open {
+	background-image:url(../../../../thirdpartyjs/extjs/resources/images/default/tree/elbow-minus.gif);
+}
+
+.connector-open-first {
+	background-image:url(../../../../thirdpartyjs/extjs/resources/images/default/tree/elbow-minus.gif);
+}
+
+.connector-open-end {
+	background-image:url(../../../../thirdpartyjs/extjs/resources/images/default/tree/elbow-end-minus.gif);
 }
 
 #tree_editable {
diff --git a/setup/wizard/resources/js/firstlogin.js b/setup/wizard/resources/js/firstlogin.js
index e566146..ba5dec6 100644
--- a/setup/wizard/resources/js/firstlogin.js
+++ b/setup/wizard/resources/js/firstlogin.js
@@ -27,6 +27,11 @@ firstlogin.prototype.openNode = function(node_id) {
 	this.nodeAction("nodes_" + node_id, "node_" + node_id, address);
 }
 
+firstlogin.prototype.getNodes = function(node_id) {
+	var address = this.ktfolderAccess + "getNodes&node_id="+node_id;
+	this.nodeAction("nodes_" + node_id, "node_" + node_id, address);
+};
+
 firstlogin.prototype.openTemplate = function(templateId) {
 	var address = this.ktfolderAccess + "getTemplateNodes&templateId="+templateId + "&firstlogin=1";
 	this.nodeAction("templates_" + templateId, "template_" + templateId, address);