diff --git a/atom-to-html.xsl b/atom-to-html.xsl
index 1b827bb8f..f32d59983 100644
--- a/atom-to-html.xsl
+++ b/atom-to-html.xsl
@@ -9,11 +9,11 @@
 <html>
 	<head>
 		<title><xsl:value-of select="atom:title"/></title>
-		<link rel="stylesheet" type="text/css" href="css/utility.css"/>
+		<link rel="stylesheet" type="text/css" href="css/default.css"/>
 		<script language="javascript" src="lib/xsl_mop-up.js"></script>
 	</head>
 
-	<body onload="go_decoding()">
+	<body onload="go_decoding()" class="ttrss_utility">
 
 		<div id="cometestme" style="display:none;">
 			<xsl:text disable-output-escaping="yes">&amp;amp;</xsl:text>
diff --git a/classes/feeds.php b/classes/feeds.php
index 70e8ade93..30d26f361 100755
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -1201,10 +1201,10 @@ class Feeds extends Handler_Protected {
 		?>
 		<html>
 		<head>
-			<link rel="stylesheet" type="text/css" href="css/utility.css">
+			<?php echo stylesheet_tag("css/default.css") ?>
 			<title>Feed Debugger</title>
 		</head>
-		<body class="small_margins">
+		<body class="small_margins ttrss_utility claro">
 		<h1>Feed Debugger: <?php echo "$feed_id: " . $this->getFeedTitle($feed_id) ?></h1>
 		<form method="GET" action="">
 			<input type="hidden" name="op" value="feeds">
diff --git a/classes/handler/public.php b/classes/handler/public.php
index 9fccf884b..bd938cdbb 100644
--- a/classes/handler/public.php
+++ b/classes/handler/public.php
@@ -353,12 +353,11 @@ class Handler_Public extends Handler {
 		<link rel=\"shortcut icon\" type=\"image/png\" href=\"images/favicon.png\">
 		<link rel=\"icon\" type=\"image/png\" sizes=\"72x72\" href=\"images/favicon-72px.png\">";
 
-		echo stylesheet_tag("css/utility.css");
 		echo stylesheet_tag("css/default.css");
 		echo javascript_tag("lib/prototype.js");
 		echo javascript_tag("lib/scriptaculous/scriptaculous.js?load=effects,controls");
 		print "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"/>
-			</head><body id='sharepopup'>";
+			</head><body id='sharepopup' class='ttrss_utility'>";
 
 		$action = $_REQUEST["action"];
 
@@ -647,11 +646,12 @@ class Handler_Public extends Handler {
 		<link rel=\"shortcut icon\" type=\"image/png\" href=\"images/favicon.png\">
 		<link rel=\"icon\" type=\"image/png\" sizes=\"72x72\" href=\"images/favicon-72px.png\">";
 
-		echo stylesheet_tag("css/utility.css");
+		echo stylesheet_tag("lib/dijit/themes/claro/claro.css");
+		echo stylesheet_tag("css/default.css");
 		echo javascript_tag("lib/prototype.js");
 
 		print "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"/>
-			</head><body id='forgotpass'>";
+			</head><body class='claro ttrss_utility'>";
 
 		print '<div class="floatingLogo"><img src="images/logo_small.png"></div>';
 		print "<h1>".__("Password recovery")."</h1>";
@@ -707,17 +707,17 @@ class Handler_Public extends Handler {
 
 			print "<fieldset>";
 			print "<label>".__("Login:")."</label>";
-			print "<input type='text' name='login' value='' required>";
+			print "<input class='input input-text' type='text' name='login' value='' required>";
 			print "</fieldset>";
 
 			print "<fieldset>";
 			print "<label>".__("Email:")."</label>";
-			print "<input type='email' name='email' value='' required>";
+			print "<input class='input input-text' type='email' name='email' value='' required>";
 			print "</fieldset>";
 
 			print "<fieldset>";
 			print "<label>".__("How much is two plus two:")."</label>";
-			print "<input type='text' name='test' value='' required>";
+			print "<input class='input input-text' type='text' name='test' value='' required>";
 			print "</fieldset>";
 
 			print "<p/>";
@@ -831,7 +831,7 @@ class Handler_Public extends Handler {
 			<head>
 			<title>Database Updater</title>
 			<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-			<link rel="stylesheet" type="text/css" href="css/utility.css"/>
+			<link rel="stylesheet" type="text/css" href="css/default.css"/>
 			<link rel=\"shortcut icon\" type=\"image/png\" href=\"images/favicon.png\">
 			<link rel=\"icon\" type=\"image/png\" sizes=\"72x72\" href=\"images/favicon-72px.png\">
 			</head>
@@ -839,7 +839,7 @@ class Handler_Public extends Handler {
 				span.ok { color : #009000; font-weight : bold; }
 				span.err { color : #ff0000; font-weight : bold; }
 			</style>
-		<body>
+		<body class="claro ttrss_utility">
 			<script type='text/javascript'>
 			function confirmOP() {
 				return confirm("Update the database?");
diff --git a/classes/opml.php b/classes/opml.php
index 98ea21a5c..b09653ca9 100644
--- a/classes/opml.php
+++ b/classes/opml.php
@@ -27,11 +27,11 @@ class Opml extends Handler_Protected {
 
 		print "<html>
 			<head>
-				<link rel=\"stylesheet\" href=\"css/utility.css\" type=\"text/css\">
+				".stylesheet_tag("css/default.css")."
 				<title>".__("OPML Utility")."</title>
 				<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"/>
 			</head>
-			<body>
+			<body class='claro ttrss_utility'>
 			<div class=\"floatingLogo\"><img src=\"images/logo_small.png\"></div>
 			<h1>".__('OPML Utility')."</h1><div class='content'>";
 
diff --git a/css/utility.less b/css/utility.less
index fd6d4fbc1..a74b00780 100644
--- a/css/utility.less
+++ b/css/utility.less
@@ -177,35 +177,6 @@ body.ttrss_utility {
 		border-color : #e0e0e0;
 	}
 
-	body#sharepopup {
-		background-color : white;
-		background-image : url("../images/toolbar.png");
-		background-repeat : repeat-x;
-		background-position : bottom;
-		margin : 10px;
-		padding : 0px;
-	}
-
-	body#sharepopup h1 {
-		font-size : 14px;
-		margin : 0px;
-		color : rgb(82, 168, 236);
-	}
-
-	body#sharepopup table {
-		background : white;
-		border : 1px solid rgb(82, 168, 236);
-		padding : 5px;
-	}
-
-	body#sharepopup form {
-		height : 100%;
-	}
-
-	body#sharepopup input {
-		width : 100%;
-	}
-
 	div.autocomplete {
 		position : absolute;
 		width : 250px;
@@ -288,3 +259,30 @@ body.small_margins {
 	margin : 1em;
 	max-width : none;
 }
+
+body#sharepopup {
+	background: white url("../images/toolbar.png") repeat-x bottom;
+	margin : 10px;
+	padding : 0px;
+
+	h1 {
+		font-size : 14px;
+		margin : 0px;
+		color : rgb(82, 168, 236);
+	}
+
+	table {
+		background : white;
+		border : 1px solid rgb(82, 168, 236);
+		padding : 5px;
+	}
+
+	form {
+		height : 100%;
+	}
+
+	input {
+		width : 100%;
+	}
+
+}
diff --git a/include/login_form.php b/include/login_form.php
index 09f9f04b8..3cc89f41f 100644
--- a/include/login_form.php
+++ b/include/login_form.php
@@ -24,7 +24,7 @@
 		});
 	</script>
 	<style type="text/css">
-	body#ttrssLogin {
+	body.ttrss_login {
 		padding : 2em;
 		font-size : 14px;
 	}
@@ -37,14 +37,6 @@
 		border-width : 0px;
 	}
 
-	/*input.input {
-		font-family : sans-serif;
-		font-size : medium;
-		border-spacing : 2px;
-		border : 1px solid #b5bcc7;
-		padding : 2px;
-	}*/
-
 	label {
 		width : 120px;
 		margin-right : 20px;
@@ -54,20 +46,18 @@
 	}
 
 	div.header {
-		border-width : 0px 0px 1px 0px;
-		border-style : solid;
-		border-color : #0088cc;
-		margin-bottom : 1em;
+        border: 0px solid #0088cc;
+        border-bottom-width: 1px;
+        margin-bottom : 1em;
 		padding-bottom : 5px;
 	}
 
 	div.footer {
 		margin-top : 1em;
 		padding-top : 5px;
-		border-width : 1px 0px 0px 0px;
-		border-style : solid;
-		border-color : #0088cc;
-		text-align : center;
+        border: 0px solid #0088cc;
+        border-top-width: 1px;
+        text-align : center;
 		color : gray;
 		font-size : 12px;
 	}
@@ -78,10 +68,6 @@
 		display : inline-block;
 	}
 
-	a {
-		color : #0088cc;
-	}
-
 	a {
 		color: #0088cc;
 		text-decoration: none;
@@ -114,7 +100,7 @@
 	</style>
 </head>
 
-<body id="ttrssLogin" class="claro">
+<body class="claro ttrss_main ttrss_login">
 
 <script type="text/javascript">
 function init() {
diff --git a/include/sanity_check.php b/include/sanity_check.php
index 713777585..9c089bda2 100755
--- a/include/sanity_check.php
+++ b/include/sanity_check.php
@@ -188,9 +188,9 @@
 			<head>
 			<title>Startup failed</title>
 				<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-				<link rel="stylesheet" type="text/css" href="css/utility.css">
+				<link rel="stylesheet" type="text/css" href="css/default.css">
 			</head>
-		<body class='sanity_failed'>
+		<body class='sanity_failed claro ttrss_utility'>
 		<div class="floatingLogo"><img src="images/logo_small.png"></div>
 			<div class="content">
 
diff --git a/install/index.php b/install/index.php
index 9f817db17..46a0fdecd 100755
--- a/install/index.php
+++ b/install/index.php
@@ -2,13 +2,12 @@
 <head>
 	<title>Tiny Tiny RSS - Installer</title>
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-	<link rel="stylesheet" type="text/css" href="../css/utility.css">
 	<link rel="stylesheet" type="text/css" href="../css/default.css">
 	<style type="text/css">
 	textarea { font-size : 12px; }
 	</style>
 </head>
-<body class="claro">
+<body class="claro ttrss_utility">
 
 <?php
 
diff --git a/plugins/auth_internal/init.php b/plugins/auth_internal/init.php
index 5253ae67b..ee4758530 100644
--- a/plugins/auth_internal/init.php
+++ b/plugins/auth_internal/init.php
@@ -54,8 +54,8 @@ class Auth_Internal extends Plugin implements IAuthModule {
 							$return = urlencode($_REQUEST["return"]);
 							?><html>
 								<head><title>Tiny Tiny RSS</title></head>
-								<?php echo stylesheet_tag("css/utility.css") ?>
-							<body class="otp"><div class="content">
+								<?php echo stylesheet_tag("css/default.css") ?>
+							<body class="ttrss_utility otp"><div class="content">
 							<form action="public.php?return=<?php echo $return ?>"
 									method="POST" class="otpform">
 								<input type="hidden" name="op" value="login">
diff --git a/register.php b/register.php
index 11f5d9284..d03218fc1 100644
--- a/register.php
+++ b/register.php
@@ -95,7 +95,6 @@
 <head>
 <title>Create new account</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<?php echo stylesheet_tag("css/utility.css") ?>
 <?php echo stylesheet_tag("css/default.css") ?>
 <?php echo javascript_tag("js/functions.js") ?>
 <?php echo javascript_tag("lib/prototype.js") ?>
@@ -180,7 +179,7 @@
 
 </script>
 
-<body>
+<body class="claro ttrss_utility">
 
 <div class="floatingLogo"><img src="images/logo_small.png"></div>
 
diff --git a/update.php b/update.php
index 3116ab781..99f4a59dc 100755
--- a/update.php
+++ b/update.php
@@ -60,7 +60,6 @@
 		<head>
 		<title>Tiny Tiny RSS data update script.</title>
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-		<link rel="stylesheet" type="text/css" href="css/utility.css">
 		</head>
 
 		<body>
