diff --git a/FieldtypePageTableExtended.module b/FieldtypePageTableExtended.module
old mode 100644
new mode 100755
index 0ba8a26..200a1b7
--- a/FieldtypePageTableExtended.module
+++ b/FieldtypePageTableExtended.module
@@ -1,4 +1,5 @@
-<?php
+<?php namespace ProcessWire;
+
 class FieldtypePageTableExtended extends FieldtypePageTable {
 
         public static function getModuleInfo() {
diff --git a/InputfieldPageTableExtended.css b/InputfieldPageTableExtended.css
old mode 100644
new mode 100755
diff --git a/InputfieldPageTableExtended.js b/InputfieldPageTableExtended.js
old mode 100644
new mode 100755
diff --git a/InputfieldPageTableExtended.module b/InputfieldPageTableExtended.module
old mode 100644
new mode 100755
index 04d80e5..b481bc2
--- a/InputfieldPageTableExtended.module
+++ b/InputfieldPageTableExtended.module
@@ -1,4 +1,4 @@
-<?php
+<?php namespace ProcessWire;
 
 class InputfieldPageTableExtended extends InputfieldPageTable {
 
@@ -40,13 +40,13 @@ class InputfieldPageTableExtended extends InputfieldPageTable {
 	public function ___renderTable(array $columns) {
 		// exit($this->pathToTemplates);
 		if($this->renderLayout) {
+            $files = $this->wire('files');
 			$pagesToRender = $this->attr('value'); // pages
 			$layout = "";
 			//get the right language label
-			$lang = wire('user')->language;
 			$label = 'label';
-			if (wire('user')->language->title != 'default'){
-				$label = "label{$lang}";
+			if ($this->wire('modules')->isInstalled('LanguageSupport') && $this->wire('user')->language->name != 'default'){
+				$label = "label{$this->wire('user')->language}";
 			}
 			// $this->wire("config")->paths->templates .= "views/bocks/";
 			// echo $this->wire("config")->paths->templates;
@@ -54,12 +54,13 @@ class InputfieldPageTableExtended extends InputfieldPageTable {
 				$layoutTitle = $p->template->$label ? $p->template->$label : $p->template->name;
 				$ext = "." . $this->config->templateExtension;
 				$template_name = $p->template->altFilename ? basename($p->template->altFilename, $ext) : $p->template->name;
-				$templateFilename = $this->config->paths->templates . $this->pathToTemplates  . $template_name . $ext;
+				if(is_dir($this->pathToTemplates)) $templateFilename = $this->config->paths->templates . $this->pathToTemplates  . $template_name . $ext;
+				else $templateFilename = $this->pathToTemplates;
+                if(preg_match('/\{(.*?)\}/', $templateFilename, $_match) && $this->config->paths->{$_match[1]}) {
+                    $templateFilename = $this->config->paths->{$_match[1]} . str_replace($_match[0], '', $this->pathToTemplates);
+                }
+                $parsedTemplate = $files->render($templateFilename, array('page' => $p, 'isAdmin' => 1, 'pageTableExtended' => true));
 
-				$parsedTemplate = new TemplateFile($templateFilename);
-				$parsedTemplate->set("page", $p);
-				$parsedTemplate->set("isAdmin", 1);
-				$parsedTemplate->options = array('pageTableExtended' => true);
 				$p->of(true);
 
 				$iconClass = "fa-angle-down";
@@ -82,7 +83,7 @@ class InputfieldPageTableExtended extends InputfieldPageTable {
 	        							<i class="toggle-icon fa '.$iconClass.'"></i>
 	        						</a>
 	        						<span class="renderedLayoutTitle '.$activeClass.'">'.$layoutTitle.'</span>
-	        						<div class="renderedLayout '.$activeClass.$statusClass.'">'.$parsedTemplate->render().'</div>
+	        						<div class="renderedLayout '.$activeClass.$statusClass.'">' . $parsedTemplate . '</div>
 	        					</td>
 	        					<td width="5%">
 	        						<a class="InputfieldPageTableEdit" data-url="./?id='.$p->id.'&amp;modal=1" href="#">
diff --git a/README.md b/README.md
old mode 100644
new mode 100755
diff --git a/resetAdminCSS.css b/resetAdminCSS.css
old mode 100644
new mode 100755