diff --git a/winixd/html/fun_account.html b/winixd/html/fun_account.html
index fffd056..bb1b221 100644
--- a/winixd/html/fun_account.html
+++ b/winixd/html/fun_account.html
@@ -12,7 +12,7 @@
 				<td></td>
 			</tr>
 
-			[if user_super_user]
+			[if user.is_super_user]
 			<tr>
 				<td>{account_admin}</td>
 				<td>{account_admin_yes}</td>
diff --git a/winixd/html/fun_adduser.html b/winixd/html/fun_adduser.html
index c6e81f3..7c9f7d0 100644
--- a/winixd/html/fun_adduser.html
+++ b/winixd/html/fun_adduser.html
@@ -40,7 +40,7 @@
 		</div>
 	</div>
 
-	[if user_super_user]
+	[if user.is_super_user]
 	<div class="uk-margin">
 		<div class="uk-form-controls">
 			<label><input class="uk-checkbox uk-margin-small-right" type="checkbox" name="autoactivate" id="autoactivate">{adduser_auto_activate}</label>
diff --git a/winixd/html/fun_env.html b/winixd/html/fun_env.html
index d95cd22..c487ffe 100644
--- a/winixd/html/fun_env.html
+++ b/winixd/html/fun_env.html
@@ -3,7 +3,7 @@
 <h1>{env_header}</h1>
 
 
-[if user_super_user]
+[if user.is_super_user]
 
 	<form class="uk-form-stacked uk-width-1-2@s" method="post" action="[doc_base_url][dir][if request.is_item][item.url]/[end]env[if winix_function_param_is "a"]/a[end]">
 
@@ -18,8 +18,8 @@
 
 			<div class="uk-form-controls">
 				<select class="uk-select" id="winix_env_user_select" name="userid">
-					[for env_user_tab]
-						<option value="[env_user_tab_id]" [if env_user_tab_is_current]selected="selected"[end]>[env_user_tab_name]</option>
+					[for users.users]
+						<option value="[users.users.id]" [if env_user.user.id_is users.users.id]selected="selected"[end]>[users.users.login]</option>
 					[end]
 				</select>
 			</div>
@@ -46,11 +46,11 @@
 
 	<div class="uk-margin">
 		<div class="uk-form-controls">
-			<textarea class="uk-textarea" rows="20" name="envvar">[if winix_function_param_is "a"][env_user_admin_env_str][else][env_user_env_str][end]</textarea>
+			<textarea class="uk-textarea" rows="20" name="envvar" id="winix_content_id">[if winix_function_param_is "a"][if env_user.user.is_admin_env_object][env_user.user.admin_env "dump_to_space" "pretty"][end][else][if env_user.user.is_env_object][env_user.user.env "dump_to_space" "pretty"][end][end]</textarea>
 		</div>
 	</div>
 	
-	<input type="hidden" name="userid" value="[env_user_id]">
+	<input type="hidden" name="userid" value="[env_user.user.id]">
 
 	<div class="uk-margin">
 		<input class="uk-button uk-button-primary" type="submit" value="{change}">
diff --git a/winixd/html/fun_meta.html b/winixd/html/fun_meta.html
index 9ac3d50..98dd37f 100644
--- a/winixd/html/fun_meta.html
+++ b/winixd/html/fun_meta.html
@@ -33,7 +33,7 @@
 		</label>
 
 		<div class="uk-form-controls">
-			<textarea class="uk-textarea" id="winix_meta_textarea" rows="20" name="itemmeta">[if winix_function_param_is "a"][if request.is_item][item_admin_meta_str][else][dir_last_admin_meta_str][end][else][if request.is_item][item_meta_str][else][dir_last_meta_str][end][end]</textarea>
+			<textarea class="uk-textarea" id="winix_meta_textarea" rows="20" name="itemmeta">[if winix_function_param_is "a"][if request.is_item][item.content.admin_meta "dump"][else][dir_last_admin_meta_str][end][else][if request.is_item][item.content.meta "dump"][else][dir_last_meta_str][end][end]</textarea>
 		</div>
 	</div>
 
diff --git a/winixd/html/fun_passwd.html b/winixd/html/fun_passwd.html
index 621022d..f4fbd9e 100644
--- a/winixd/html/fun_passwd.html
+++ b/winixd/html/fun_passwd.html
@@ -44,7 +44,7 @@
 
 	<form class="uk-form-stacked" method="post" action="[doc_base_url][dir]passwd">
 
-		[if user_super_user]
+		[if user.is_super_user]
 			<div class="uk-margin">
 				<label class="uk-form-label" for="winix_user_login">{passwd_login}</label>
 
diff --git a/winixd/html/fun_rmuser.html b/winixd/html/fun_rmuser.html
index 9651c7f..314cd37 100644
--- a/winixd/html/fun_rmuser.html
+++ b/winixd/html/fun_rmuser.html
@@ -6,7 +6,7 @@
 
 	<form class="uk-form-stacked" method="post" action="[doc_base_url][dir][if request.is_item][item.url]/[end]rmuser">
 
-		[if user_super_user]
+		[if user.is_super_user]
 
 			<div class="uk-margin">
 				<label class="uk-form-label" for="winix_select_user_id">{rmuser_selectuser}</label>
diff --git a/winixd/html/fun_seo.html b/winixd/html/fun_seo.html
index 4fa9934..5c71563 100644
--- a/winixd/html/fun_seo.html
+++ b/winixd/html/fun_seo.html
@@ -15,14 +15,14 @@
 	<div class="uk-margin">
 		<label class="uk-form-label" for="winix_description_id">{seo_description}</label>
 		<div class="uk-form-controls">
-			<input class="uk-input" id="winix_description_id" type="text" name="description" value="[item_meta "seo" "description"]">
+			<input class="uk-input" id="winix_description_id" type="text" name="description" value="[item.content.meta.seo.description]">
 		</div>
 	</div>
 
 	<div class="uk-margin">
 		<label class="uk-form-label" for="winix_keywords_id">{seo_keywords}</label>
 		<div class="uk-form-controls">
-			<input class="uk-input" id="winix_keywords_id" type="text" name="keywords" value="[item_meta "seo" "keywords"]">
+			<input class="uk-input" id="winix_keywords_id" type="text" name="keywords" value="[item.content.meta.seo.keywords]">
 		</div>
 	</div>
 
diff --git a/winixd/html/index_head_adder.html b/winixd/html/index_head_adder.html
index 388df94..561742d 100644
--- a/winixd/html/index_head_adder.html
+++ b/winixd/html/index_head_adder.html
@@ -60,7 +60,7 @@
 [end]
 
 
-[if winix_function_is "emacs"]
+[if or winix_function_is "emacs" winix_function_is "env"]
 	<script type="text/javascript" src="[doc_base_url_common]/codemirror/5.59.2/lib/codemirror.js"></script>
 	<link rel="stylesheet" href="[doc_base_url_common]/codemirror/5.59.2/lib/codemirror.css" type="text/css">