diff --git a/contrib/et/main.php b/contrib/et/main.php
index 4336fc84..17fc526e 100644
--- a/contrib/et/main.php
+++ b/contrib/et/main.php
@@ -39,13 +39,14 @@ class ET implements Extension {
 		$info = array();
 		$info['site_title'] = $config->get_string("title");
 		$info['site_theme'] = $config->get_string("theme");
-		$info['site_genre'] = "[please write something here]";
-		$info['site_url']   = isset($_SERVER['SCRIPT_URI']) ? dirname($_SERVER['SCRIPT_URI']) : "???";
+		$info['site_url']   = "http://" . $_SERVER["HTTP_HOST"] . get_base_href();
 
 		$info['sys_shimmie'] = VERSION;
 		$info['sys_schema']  = $config->get_string("db_version");
 		$info['sys_php']     = phpversion();
 		$info['sys_os']      = php_uname();
+		$info['sys_disk']    = to_shorthand_int(disk_total_space("./") - disk_free_space("./")) . " / " .
+		                       to_shorthand_int(disk_total_space("./"));
 		$info['sys_server']  = $_SERVER["SERVER_SOFTWARE"];
 		include "config.php"; // more magical hax
 		$proto = preg_replace("#(.*)://.*#", "$1", $database_dsn);
diff --git a/contrib/et/theme.php b/contrib/et/theme.php
index 9c0541e0..88c14a14 100644
--- a/contrib/et/theme.php
+++ b/contrib/et/theme.php
@@ -16,10 +16,9 @@ class ETTheme extends Themelet {
 	protected function build_data_form($info) {
 		$data = <<<EOD
 Optional:
-Add this site to the public shimmie users list: No
 Site title: {$info['site_title']}
 Theme: {$info['site_theme']}
-Genre: {$info['site_genre']}
+Genre: [describe your site here]
 URL: {$info['site_url']}
 
 System stats:
@@ -29,7 +28,7 @@ PHP: {$info['sys_php']}
 OS: {$info['sys_os']}
 Server: {$info['sys_server']}
 Database: {$info['sys_db']}
-Extensions: {$info['sys_extensions']}
+Disk use: {$info['sys_disk']}
 
 Shimmie stats:
 Images: {$info['stat_images']}
@@ -37,6 +36,7 @@ Comments: {$info['stat_comments']}
 Users: {$info['stat_users']}
 Tags: {$info['stat_tags']}
 Applications: {$info['stat_image_tags']}
+Extensions: {$info['sys_extensions']}
 EOD;
 		$html = <<<EOD
 <form action='http://shimmie.shishnet.org/register.php' method='POST'>