diff --git a/contrib/rating/main.php b/contrib/rating/main.php
index f73882b5..e03cb2a4 100644
--- a/contrib/rating/main.php
+++ b/contrib/rating/main.php
@@ -8,8 +8,11 @@
  */
 
 class Ratings extends Extension {
-// event handler {{{
+	var $theme;
+
 	public function receive_event($event) {
+		if(is_null($this->theme)) $this->theme = get_theme_object("rating", "RatingsTheme");
+
 		if(is_a($event, 'InitExtEvent')) {
 			global $config;
 			if($config->get_int("ext_ratings_version") < 1) {
@@ -17,115 +20,35 @@ class Ratings extends Extension {
 			}
 		}
 
-/*
-		if(is_a($event, 'ImageDeletionEvent')) {
-			$this->delete_comments($event->image->id);
-		}
-		if(is_a($event, 'CommentDeletionEvent')) {
-			$this->delete_comment($event->comment_id);
+		if(is_a($event, 'PageRequestEvent') && $event->page_name == "rating" &&
+				$event->get_arg(0) == "set" && $event->user->is_admin() &&
+				isset($_POST['rating']) && isset($_POST['image_id'])) {
+			$this->set_rating($_POST['image_id'], $_POST['rating']);
+			$event->page->set_mode("redirect");
+			$event->page->set_redirect(make_link("post/view/".int_escape($_POST['image_id'])));
 		}
 
-		if(is_a($event, 'SetupBuildingEvent')) {
-			$sb = new SetupBlock("Comment Options");
-			$sb->add_label("Allow anonymous comments ");
-			$sb->add_bool_option("comment_anon");
-			$sb->add_label("<br>Limit to ");
-			$sb->add_int_option("comment_limit", 1, 60);
-			$sb->add_label(" comments per ");
-			$sb->add_int_option("comment_window", 1, 60);
-			$sb->add_label(" minutes");
-			$sb->add_label("<br>Show ");
-			$sb->add_int_option("comment_count", 0, 100);
-			$sb->add_label(" recent comments on the index");
-			$event->panel->add_block($sb);
+		if(is_a($event, 'DisplayingImageEvent')) {
+			global $user;
+			if($user->is_admin()) {
+				$this->theme->display_rater($event->page, $event->image->id);
+			}
 		}
-*/
 	}
 
-	private function can_comment() {
-		global $config, $user;
-		return $config->get_bool("rate_anon") || ($user->id != $config->get_int("anon_id"));
-	}
-// }}} 
-// installer {{{
-	protected function install() {
+	private function install() {
 		global $database;
 		global $config;
-		$database->Execute("CREATE TABLE `image_voters` (
-			`image_id` int(11) NOT NULL,
-			`user_id` int(11) NOT NULL,
-			`vote` tinyint(4) NOT NULL,
-			`voted` datetime NOT NULL,
-			PRIMARY KEY  (`image_id`,`user_id`)
+		$database->Execute("ALTER TABLE images
+			ADD COLUMN rating ENUM('s', 'q', 'e') NOT NULL DEFAULT 'q'
 		)");
 		$config->set_int("ext_ratings_version", 1);
 	}
-// }}}
-// page building {{{
 
-	private function build_image_rating($image_id) {
-		global $config;
-		$i_image_id = int_escape($image_id);
-		return $this->query_to_html("
-				SELECT
-				users.id as user_id, users.name as user_name,
-				comments.comment as comment, comments.id as comment_id,
-				comments.image_id as image_id, comments.owner_ip as poster_ip
-				FROM comments
-				LEFT JOIN users ON comments.owner_id=users.id
-				WHERE comments.image_id=?
-				ORDER BY comments.id ASC
-				LIMIT ?
-		", array($i_image_id, $config->get_int('recent_count')));
-	}
-
-	private function build_rater($image_id) {
-		if($this->can_comment()) {
-			$i_image_id = int_escape($image_id);
-			return "
-				<form action='".make_link("rating/vote_up")."' method='POST'>
-				<input type='hidden' name='image_id' value='$i_image_id' />
-				<input type='submit' value='Vote Up' />
-				</form>
-				<form action='".make_link("rating/vote_down")."' method='POST'>
-				<input type='hidden' name='image_id' value='$i_image_id' />
-				<input type='submit' value='Vote Down' />
-				</form>
-			";
-		}
-		else {
-			return "You need to create an account before you can rate";
-		}
-	}
-// }}}
-// add / remove / edit comments {{{
-	private function add_rating($image_id, $rating) {
-		global $user;
+	private function set_rating($image_id, $rating) {
 		global $database;
-		global $config;
-		global $page;
-
-		$page->set_title("Error");
-		$page->set_heading("Error");
-		if(!$config->get_bool('rating_anon') && $user->is_anonymous()) {
-			$page->add_main_block(new Block("Permission Denied", "Anonymous rating has been disabled"));
-		}
-		else {
-			$i_rating = int_escape($rating);
-			$database->Execute(
-					"INSERT INTO image_ratings(image_id, user_id, rating, rated) ".
-					"VALUES(?, ?, ?, now())",
-					array($image_id, $user->id, $i_rating));
-			$page->set_mode("redirect");
-			$page->set_redirect(make_link("post/view/".int_escape($image_id)));
-		}
+		$database->Execute("UPDATE images SET rating=? WHERE id=?", array($rating, $image_id));
 	}
-
-	private function delete_ratings($image_id) {
-		global $database;
-		$database->Execute("DELETE FROM image_voters WHERE image_id=?", array($image_id));
-	}
-// }}}
 }
 add_event_listener(new Ratings());
 ?>
diff --git a/contrib/rating/theme.php b/contrib/rating/theme.php
new file mode 100644
index 00000000..dc12c658
--- /dev/null
+++ b/contrib/rating/theme.php
@@ -0,0 +1,19 @@
+<?php
+
+class RatingsTheme extends Themelet {
+	public function display_rater($page, $image_id) {
+		$i_image_id = int_escape($image_id);
+		$html = "
+			<form action='".make_link("rating/set")."' method='POST'>
+				<input type='hidden' name='image_id' value='$i_image_id' />
+				<input type='radio' name='rating' value='s' id='s'><label for='s'>Safe</label>
+				<input type='radio' name='rating' value='q' id='q'><label for='q'>Questionable</label>
+				<input type='radio' name='rating' value='e' id='e'><label for='e'>Explicit</label>
+				<input type='submit' value='Set' />
+			</form>
+		";
+		$page->add_block(new Block(null, $html, "main", 45));
+	}
+}
+
+?>