diff --git a/templates/themes/rss/info.php b/templates/themes/rss/info.php
index 14b39eb9..4da43bf0 100755
--- a/templates/themes/rss/info.php
+++ b/templates/themes/rss/info.php
@@ -48,6 +48,20 @@
 		'comment' => '(eg. "http://test.com")'
 	);
 	
+	$theme['config'][] = Array(
+		'title' => 'Show Threads Only',
+		'name' => 'show_threads_only',
+		'type' => 'text',
+		'default' => 'false',
+	);
+	
+	$theme['config'][] = Array(
+		'title' => 'Enable Per Board',
+		'name' => 'enable_per_board',
+		'type' => 'text',
+		'default' => 'false',
+	);
+
 	// Unique function name for building everything
 	$theme['build_function'] = 'rss_recentposts_build';
 	$theme['install_callback'] = 'rss_recentposts_install';
diff --git a/templates/themes/rss/rss.xml b/templates/themes/rss/rss.xml
index 30fdb473..6bf34113 100644
--- a/templates/themes/rss/rss.xml
+++ b/templates/themes/rss/rss.xml
@@ -11,7 +11,7 @@
     <link>{{ settings.base_url }}{{ config.root }}{{ settings.html }}</link>
     {% for post in recent_posts %}
     <item>
-      <title>{{ post.board_name }}</title>
+      <title><![CDATA[ {{ post.board_name }} ]]></title>
       <description>
 	<![CDATA[
 		 <a href="{{ settings.base_url }}{{ post.link }}">
diff --git a/templates/themes/rss/theme.php b/templates/themes/rss/theme.php
index 33c1b210..d0a80f51 100755
--- a/templates/themes/rss/theme.php
+++ b/templates/themes/rss/theme.php
@@ -16,52 +16,91 @@
 	// Wrap functions in a class so they don't interfere with normal Tinyboard operations
 	class RSSRecentPosts {
 		public function build($action, $settings) {
-			global $config, $_theme;
+			global $config, $_theme,$board;
 			
-			/*if ($action == 'all') {
-				copy('templates/themes/recent/' . $settings['basecss'], $config['dir']['home'] . $settings['css']);
-			}*/
 			
 			$this->excluded = explode(' ', $settings['exclude']);
-			
-			if ($action == 'all' || $action == 'post' || $action == 'post-thread' || $action == 'post-delete')
-				file_write($config['dir']['home'] . $settings['xml'], $this->homepage($settings));
+			if ($settings['show_threads_only'] == 'true'){
+				if ($action == 'all' || $action == 'post-thread' || $action == 'post-delete')
+					file_write($config['dir']['home'] . $settings['xml'], $this->site_rsspage($settings));
+			}
+			else {	
+				if ($action == 'all' || $action == 'post' || $action == 'post-thread' || $action == 'post-delete')
+					file_write($config['dir']['home'] . $settings['xml'], $this->site_rsspage($settings));
+			}
+
+			if ($settings['enable_per_board'] == 'true'){
+				$boards = listBoards();
+				foreach ($boards as &$_board) {
+					if (in_array($_board['uri'], $this->excluded))
+						continue;
+
+					openBoard($_board['uri']);
+					if ($settings['show_threads_only'] == 'true'){
+						if ($action == 'all' || $action == 'post-thread' || $action == 'post-delete')
+							file_write($config['dir']['home']  . 'debug.xml', $board['dir']);
+							file_write($config['dir']['home']  . $board['dir'] . $settings['xml'], $this->board_rsspage($settings,$_board));
+					}
+					else {	
+						if ($action == 'all' || $action == 'post' || $action == 'post-thread' || $action == 'post-delete')
+							file_write($config['dir']['home']  . $board['dir'] . $settings['xml'], $this->board_rsspage($settings,$_board));
+					}
+				}
+
+			}
 		}
 		
 		// Build news page
-		public function homepage($settings) {
+		public function site_rsspage($settings) {
 			global $config, $board;
 			
-			//$recent_images = Array();
 			$recent_posts = Array();
-			//$stats = Array();
 			
 			$boards = listBoards();
 			
-			/*$query = '';
-			foreach ($boards as &$_board) {
-				if (in_array($_board['uri'], $this->excluded))
-					continue;
-				$query .= sprintf("SELECT *, '%s' AS `board` FROM ``posts_%s`` WHERE `file` IS NOT NULL AND `file` != 'deleted' AND `thumb` != 'spoiler' UNION ALL ", $_board['uri'], $_board['uri']);
-			}
-			$query = preg_replace('/UNION ALL $/', 'ORDER BY `time` DESC LIMIT ' . (int)$settings['limit_images'], $query);
-			$query = query($query) or error(db_error());
-			
-			while ($post = $query->fetch(PDO::FETCH_ASSOC)) {
-				openBoard($post['board']);
-				
-				// board settings won't be available in the template file, so generate links now
-				$post['link'] = $config['root'] . $board['dir'] . $config['dir']['res'] . sprintf($config['file_page'], ($post['thread'] ? $post['thread'] : $post['id'])) . '#' . $post['id'];
-				$post['src'] = $config['uri_thumb'] . $post['thumb'];
-				
-				//$recent_images[] = $post;
-			}*/
-			
-			
 			$query = '';
 			foreach ($boards as &$_board) {
 				if (in_array($_board['uri'], $this->excluded))
 					continue;
+				if ($settings['show_threads_only'] == 'true'){
+					$query .= sprintf("SELECT *, '%s' AS `board` FROM ``posts_%s`` WHERE `thread` is null UNION ALL ", $_board['uri'], $_board['uri']);
+				}
+				else {
+					$query .= sprintf("SELECT *, '%s' AS `board` FROM ``posts_%s`` UNION ALL ", $_board['uri'], $_board['uri']);
+				}
+			}
+			$query = preg_replace('/UNION ALL $/', 'ORDER BY `time` DESC LIMIT ' . (int)$settings['limit_posts'], $query);
+			$query = query($query) or error(db_error());
+			
+			while ($post = $query->fetch(PDO::FETCH_ASSOC)) {
+				openBoard($post['board']);
+				
+				$post['link'] = $config['root'] . $board['dir'] . $config['dir']['res'] . sprintf($config['file_page'], ($post['thread'] ? $post['thread'] : $post['id'])) . '#' . $post['id'];
+				$post['snippet'] = pm_snippet($post['body'], 30);
+				$post['board_name'] = $board['name'];
+				
+				$recent_posts[] = $post;
+			}
+			
+			
+			return Element('themes/rss/rss.xml', Array(
+				'settings' => $settings,
+				'config' => $config,
+				'recent_posts' => $recent_posts,
+			));
+		}
+		
+		// Build news page
+		public function board_rsspage($settings,$_board) {
+			global $config, $board;
+			
+			$recent_posts = Array();
+			
+			$query = '';
+			if ($settings['show_threads_only'] == 'true'){
+				$query .= sprintf("SELECT *, '%s' AS `board` FROM ``posts_%s`` WHERE `thread` is null UNION ALL ", $_board['uri'], $_board['uri']);
+			}
+			else {
 				$query .= sprintf("SELECT *, '%s' AS `board` FROM ``posts_%s`` UNION ALL ", $_board['uri'], $_board['uri']);
 			}
 			$query = preg_replace('/UNION ALL $/', 'ORDER BY `time` DESC LIMIT ' . (int)$settings['limit_posts'], $query);
@@ -77,46 +116,11 @@
 				$recent_posts[] = $post;
 			}
 			
-			// Total posts
-			/*$query = 'SELECT SUM(`top`) FROM (';
-			foreach ($boards as &$_board) {
-				if (in_array($_board['uri'], $this->excluded))
-					continue;
-				$query .= sprintf("SELECT MAX(`id`) AS `top` FROM ``posts_%s`` UNION ALL ", $_board['uri']);
-			}
-			$query = preg_replace('/UNION ALL $/', ') AS `posts_all`', $query);
-			$query = query($query) or error(db_error());*/
-			//$stats['total_posts'] = number_format($query->fetchColumn());
-			
-			// Unique IPs
-			/*$query = 'SELECT COUNT(DISTINCT(`ip`)) FROM (';
-			foreach ($boards as &$_board) {
-				if (in_array($_board['uri'], $this->excluded))
-					continue;
-				$query .= sprintf("SELECT `ip` FROM ``posts_%s`` UNION ALL ", $_board['uri']);
-			}
-			$query = preg_replace('/UNION ALL $/', ') AS `posts_all`', $query);
-			$query = query($query) or error(db_error());
-			//$stats['unique_posters'] = number_format($query->fetchColumn());*/
-			
-			// Active content
-			/*$query = 'SELECT SUM(`filesize`) FROM (';
-			foreach ($boards as &$_board) {
-				if (in_array($_board['uri'], $this->excluded))
-					continue;
-				$query .= sprintf("SELECT `filesize` FROM ``posts_%s`` UNION ALL ", $_board['uri']);
-			}
-			$query = preg_replace('/UNION ALL $/', ') AS `posts_all`', $query);
-			$query = query($query) or error(db_error());
-			//$stats['active_content'] = $query->fetchColumn();*/
 			
 			return Element('themes/rss/rss.xml', Array(
 				'settings' => $settings,
 				'config' => $config,
-				//'boardlist' => createBoardlist(),
-				//'recent_images' => $recent_images,
 				'recent_posts' => $recent_posts,
-				//'stats' => $stats
 			));
 		}
 	};