diff --git a/admin/themes/admin/login.htm b/admin/themes/admin/login.htm
new file mode 100644
index 0000000..46082cc
--- /dev/null
+++ b/admin/themes/admin/login.htm
@@ -0,0 +1,89 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+	<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<title>gelato :: {__("login screen")}</title>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+		<meta name="generator" content="gelato cms {version}" />
+		<link rel="shortcut icon" href="{conf.urlGelato}/images/favicon.ico" />
+		<script language="javascript" type="text/javascript" src="{conf.urlGelato}/admin/scripts/jquery.js"></script>
+		<script language="javascript" type="text/javascript" src="{conf.urlGelato}/admin/scripts/jquery.validate.min.js"></script>
+
+		<script type="text/javascript">
+		$(document).ready(function(){
+	
+			$("#valida").validate({
+				rules: {
+					login: "required",
+					pass: "required"
+				},
+				errorElement: "span",
+				errorClass: "validate_span", 
+				errorPlacement: function(label, element) { 
+					label.prependTo(element.prev())
+				} 
+			});
+
+		});
+		</script>
+		<style type="text/css" media="screen">	
+			@import "{conf.urlGelato}/admin/css/style.css";
+		</style>
+	</head>
+	
+	<body>
+		<div id="div-process" style="display:none;">{__("Processing request&hellip;")}</div>
+		<div id="cont">
+			<div id="head">
+				<h1><a href="{conf.urlGelato}/" title="gelato :: {__("home")}">gelato cms</a></h1>
+				<ul id="nav">
+					<li><a href="{conf.urlGelato}/" title="{__("Take me to the tumblelog")}">{__("Back to the Tumblelog")}</a></li>
+			  	</ul>
+			</div>
+			<div id="main">				
+				
+				<div class="box">
+					<ul class="menu manage">
+					<h3>{__("Start session")}</h3>
+					<li class="selected"><a>{__("Login")}</a></li>
+					</ul>
+				
+					<div class="tabla">
+
+								<form action="login.php" method="post" id="valida" autocomplete="off" class="newpost">
+									{if $redirect_url}
+									<input type="hidden" name="url_redirect" value="{redirect_url}" />
+									<input type="hidden" name="sel" value="{sel}" />
+									{/if}
+									<fieldset>
+									<ul>
+										<li><label for="login">{__("User:")}</label>
+											<input id="login" name="login" type="text" class="txt" /></li>
+										<li><label for="pass">{__("Password:")}</label>
+											<input id="pass" name="pass" type="password" class="txt" /></li>
+										<li><label for="save_pass">{__("Remember me:")}</label>
+											<input id="save_pass" name="save_pass" type="checkbox" /></li>
+										<li><input name="btnLogin" type="submit" value="Login" /></li>
+									</ul>
+									</fieldset>
+								</form>
+
+								{if $error==1}
+								<div class="error">
+									{__("&nbsp;You must be registered to use gelato.")}
+								</div>
+								{elseif $error==2}
+								<div class="error">
+									{__("&nbsp;You must be logged on the system.")}
+								</div>
+								{/if}
+					</div>
+
+					<div class="footer-box">&nbsp;</div>
+				</div>
+			</div>
+			<div id="foot">
+				<a href="http://www.gelatocms.com/" title="gelato CMS">gelato CMS</a> :: PHP/MySQL Tumblelog Content Management System.
+			</div>
+		</div>
+	</body>
+	</html>
diff --git a/login.php b/login.php
index 4c39a39..ccb64e7 100644
--- a/login.php
+++ b/login.php
@@ -33,103 +33,16 @@ if ($user->isAuthenticated()) {
 			header("Location: ".$conf->urlGelato."/login.php?error=1");
 			exit();
 		}
-	} else {
-?>
-	<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-	<html xmlns="http://www.w3.org/1999/xhtml">
-	<head>
-		<title>gelato :: <?php echo __("login screen")?></title>
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-		<meta name="generator" content="gelato cms <?php echo util::version();?>" />
-		<link rel="shortcut icon" href="<?php echo $conf->urlGelato;?>/images/favicon.ico" />
-		<script language="javascript" type="text/javascript" src="<?php echo $conf->urlGelato;?>/admin/scripts/jquery.js"></script>
-		<script language="javascript" type="text/javascript" src="<?php echo $conf->urlGelato;?>/admin/scripts/jquery.validate.min.js"></script>
-
-		<script type="text/javascript">
-		$(document).ready(function(){
-	
-			$("#valida").validate({
-				rules: {
-					login: "required",
-					pass: "required"
-				},
-				errorElement: "span",
-				errorClass: "validate_span", 
-				errorPlacement: function(label, element) { 
-					label.prependTo(element.prev())
-				} 
-			});
-
-		});
-		</script>
-		<style type="text/css" media="screen">	
-			@import "<?php echo $conf->urlGelato;?>/admin/css/style.css";
-		</style>
-	</head>
-	
-	<body>
-		<div id="div-process" style="display:none;"><?php echo __("Processing request&hellip;")?></div>
-		<div id="cont">
-			<div id="head">
-				<h1><a href="<?php echo $conf->urlGelato;?>/" title="gelato :: <?php echo __("home")?>">gelato cms</a></h1>
-				<ul id="nav">
-					<li><a href="<?php echo $conf->urlGelato;?>/" title="<?php echo __("Take me to the tumblelog")?>"><?php echo __("Back to the Tumblelog")?></a></li>
-			  	</ul>
-			</div>
-			<div id="main">				
-				
-				<div class="box">
-					<ul class="menu manage">
-					<h3><?php echo __("Start session")?></h3>
-					<li class="selected"><a><?php echo __("Login")?></a></li>
-					</ul>
-				
-					<div class="tabla">
-
-								<form action="login.php" method="post" id="valida" autocomplete="off" class="newpost">
-									<?php echo (isset($_GET['redirect_url']))? "<input type=\"hidden\" name=\"url_redirect\" value=\"".$_GET['redirect_url']."\" /><input type=\"hidden\" name=\"sel\" value=\"".$_GET['sel']."\" />" : ""; ?>
-									<fieldset>
-									<ul>
-										<li><label for="login"><?php echo __("User:")?></label>
-											<input id="login" name="login" type="text" class="txt" /></li>
-										<li><label for="pass"><?php echo __("Password:")?></label>
-											<input id="pass" name="pass" type="password" class="txt" /></li>
-										<li><label for="save_pass"><?php echo __("Remember me:")?></label>
-											<input id="save_pass" name="save_pass" type="checkbox" /></li>
-										<li><input name="btnLogin" type="submit" value="Login" /></li>
-									</ul>
-									</fieldset>
-								</form>
-<?php				
-								if (isset($_GET["error"])) {
-									if ($_GET["error"]==1) {
-?>
-								<div class="error">
-									<?php echo __("&nbsp;You must be registered to use gelato.")?>
-								</div>
-<?php
-									}
-									elseif ($_GET["error"]==2) {
-?>
-								<div class="error">
-									<?php echo __("&nbsp;You must be logged on the system.")?>
-								</div>
-<?php
-									}									
-								}
-?>
-					</div>
-
-					<div class="footer-box">&nbsp;</div>
-				</div>
-			</div>
-			<div id="foot">
-				<a href="http://www.gelatocms.com/" title="gelato CMS">gelato CMS</a> :: PHP/MySQL Tumblelog Content Management System.
-			</div>
-		</div>
-	</body>
-	</html>
-<?php
+	} else {
+		$theme = new themes;
+		$theme->set('version',util::version());
+		$theme->set('redirect_url',(isset($_GET['redirect_url'])?$_GET['redirect_url']:''));
+		$theme->set('sel',(isset($_GET['sel'])?$_GET['sel']:''));
+		$theme->set('error',(isset($_GET['error'])?$_GET['error']:''));
+		$theme->set('conf',array(
+			"urlGelato"=>$conf->urlGelato
+		));
+		$theme->display(Absolute_Path.'admin/themes/admin/login.htm');
 	}
 }
-?>
\ No newline at end of file
+?>