diff --git a/themes/futaba/themelet.class.php b/themes/futaba/themelet.class.php
index 151f952b..27f35ceb 100644
--- a/themes/futaba/themelet.class.php
+++ b/themes/futaba/themelet.class.php
@@ -30,11 +30,11 @@ class Themelet extends BaseThemelet {
 		$at_start = ($current_page <= 1 || $total_pages <= 1);
 		$at_end = ($current_page >= $total_pages);
 
-		//$first_html  = $at_start ? "First" : $this->gen_page_link($base_url, $query, 1,            "First");
-		$prev_html   = $at_start ? "Prev"  : $this->gen_page_link($base_url, $query, $prev,        "Prev");
-		//$random_html =                       $this->gen_page_link($base_url, $query, $rand,        "Random");
-		$next_html   = $at_end   ? "Next"  : $this->gen_page_link($base_url, $query, $next,        "Next");
-		//$last_html   = $at_end   ? "Last"  : $this->gen_page_link($base_url, $query, $total_pages, "Last");
+		//$first_html   = $at_start ? "First" : $this->litetheme_gen_page_link($base_url, $query, 1,            "First");
+		$prev_html      = $at_start ? "Prev"  : $this->gen_page_link($base_url, $query, $prev,        "Prev");
+		//$random_html  =                       $this->litetheme_gen_page_link($base_url, $query, $rand,        "Random");
+		$next_html      = $at_end   ? "Next"  : $this->gen_page_link($base_url, $query, $next,        "Next");
+		//$last_html    = $at_end   ? "Last"  : $this->litetheme_gen_page_link($base_url, $query, $total_pages, "Last");
 
 		$start = $current_page-5 > 1 ? $current_page-5 : 1;
 		$end = $start+10 < $total_pages ? $start+10 : $total_pages;
diff --git a/themes/lite/themelet.class.php b/themes/lite/themelet.class.php
index 939c0a6b..631ef171 100644
--- a/themes/lite/themelet.class.php
+++ b/themes/lite/themelet.class.php
@@ -16,25 +16,25 @@ class Themelet extends BaseThemelet {
 	 */
 	public function display_paginator(Page $page, $base, $query, $page_number, $total_pages) {
 		if($total_pages == 0) $total_pages = 1;
-		$body = $this->build_paginator($page_number, $total_pages, $base, $query);
+		$body = $this->litetheme_build_paginator($page_number, $total_pages, $base, $query);
 		$page->add_block(new Block(null, $body, "main", 90));
 	}
 
-	private function gen_page_link($base_url, $query, $page, $name, $link_class=null) {
+	private function litetheme_gen_page_link($base_url, $query, $page, $name, $link_class=null) {
 		$link = make_link("$base_url/$page", $query);
-	    return "<a class='$link_class' href='$link'>$name</a>";
+		return "<a class='$link_class' href='$link'>$name</a>";
 	}
 	
-	private function gen_page_link_block($base_url, $query, $page, $current_page, $name) {
+	private function litetheme_gen_page_link_block($base_url, $query, $page, $current_page, $name) {
 		$paginator = "";
-	    
-	    if($page == $current_page) {$link_class = "tab-selected";} else {$link_class = "";}
-	    $paginator .= $this->gen_page_link($base_url, $query, $page, $name, $link_class);
-	    
-	    return $paginator;
+
+		if($page == $current_page) {$link_class = "tab-selected";} else {$link_class = "";}
+		$paginator .= $this->litetheme_gen_page_link($base_url, $query, $page, $name, $link_class);
+
+		return $paginator;
 	}
 					
-	private function build_paginator($current_page, $total_pages, $base_url, $query) {
+	private function litetheme_build_paginator($current_page, $total_pages, $base_url, $query) {
 		$next = $current_page + 1;
 		$prev = $current_page - 1;
 		$rand = mt_rand(1, $total_pages);
@@ -42,18 +42,18 @@ class Themelet extends BaseThemelet {
 		$at_start = ($current_page <= 1 || $total_pages <= 1);
 		$at_end = ($current_page >= $total_pages);
 
-		$first_html  = $at_start ? "<span class='tab'>First</span>" : $this->gen_page_link($base_url, $query, 1,            "First");
-		$prev_html   = $at_start ? "<span class='tab'>Prev</span>"  : $this->gen_page_link($base_url, $query, $prev,        "Prev");
-		$random_html =                       			      $this->gen_page_link($base_url, $query, $rand,        "Random");
-		$next_html   = $at_end   ? "<span class='tab'>Next</span>"  : $this->gen_page_link($base_url, $query, $next,        "Next");
-		$last_html   = $at_end   ? "<span class='tab'>Last</span>"  : $this->gen_page_link($base_url, $query, $total_pages, "Last");
+		$first_html  = $at_start ? "<span class='tab'>First</span>" : $this->litetheme_gen_page_link($base_url, $query, 1,            "First");
+		$prev_html   = $at_start ? "<span class='tab'>Prev</span>"  : $this->litetheme_gen_page_link($base_url, $query, $prev,        "Prev");
+		$random_html =                                                $this->litetheme_gen_page_link($base_url, $query, $rand,        "Random");
+		$next_html   = $at_end   ? "<span class='tab'>Next</span>"  : $this->litetheme_gen_page_link($base_url, $query, $next,        "Next");
+		$last_html   = $at_end   ? "<span class='tab'>Last</span>"  : $this->litetheme_gen_page_link($base_url, $query, $total_pages, "Last");
 
 		$start = $current_page-5 > 1 ? $current_page-5 : 1;
 		$end = $start+10 < $total_pages ? $start+10 : $total_pages;
 
 		$pages = array();
 		foreach(range($start, $end) as $i) {
-			$pages[] = $this->gen_page_link_block($base_url, $query, $i, $current_page, $i);
+			$pages[] = $this->litetheme_gen_page_link_block($base_url, $query, $i, $current_page, $i);
 		}
 		$pages_html = implode(" ", $pages);