diff --git a/README b/README
index feb8d03..6a94323 100644
--- a/README
+++ b/README
@@ -22,7 +22,22 @@ Available Characters
 * Big McIntosh
 * Princess Cadance
 
-Scripts and stuff
+System Pony
+-----------
+
+systempony is a script which shows a pony and system information.
+It can be installed system-wide with make install (PREFIX selects the directory).
+Global config is found in $PREFIX/share/ascii-pony/systempony.conf, 
+(or ./systempony.conf if not installed), user config is in ~/.systempony.
+
+Config Variables:
+* PONY   : pony identifier or "random", 
+           see "./systempony --list" for a list of identifiers
+* INFO   : array of system info to display, "./systempony -h" for a list
+* FSTYPE : file system type used to calculate disk usage (Uses df),
+           if empty it will show the total.
+
+Generating Images
 -----------------
 
 Each final character is divided into separate file, one for each color.
@@ -37,7 +52,7 @@ It produces the following kinds of output:
 Being a PHP script it requires PHP in order to run it.
 
 The makefile will compile all of the above, the plaintext in the same directory 
-as the parent of the directory containing the various part files, everythin else
+as the parent of the directory containing the various part files, everything else
 in /rendered.
 It will also call Inkscape to generate PNG images from the SVG.
 
diff --git a/systempony b/systempony
index 8c60fe3..3e6fe7c 100755
--- a/systempony
+++ b/systempony
@@ -132,7 +132,10 @@ function help()
 	echo -e "\t\tShow the given info (default: ${INFO[@]})."
 	echo -e "\t\tThis option supports multiples IDs separated by commas, spaces or colons."
 	echo -e "\t\tAvailable IDs:"
-	declare -F | grep ponyget_ | sed "s/declare -f ponyget_/\t\t * /"	
+	declare -F | grep ponyget_ | sed "s/declare -f ponyget_/\t\t * /"
+	echo
+	echo -e "\t$(bold --list), $(bold --list-ponies)"
+	echo -e "\t\tShows a list of possible values for $(bold --pony)."
 	
 	title CONFIGURATION
 	echo -e "\tYou can override $(bold PONY) and $(bold INFO) in the config files."
@@ -143,6 +146,14 @@ function help()
 	echo
 }
 
+
+function list_ponies()
+{
+	ponydir=$(get_data_file "rendered/ansi/")
+	echo random
+	find "$ponydir" -name '*.colored.txt' -exec basename {} .colored.txt \; | sort
+}
+
 function select_info()
 {
 	INFO=($(echo "${*}" | column -t -s:,))
@@ -182,6 +193,10 @@ do
 			help
 			exit 0
 			;;
+		--list|--list-ponies)
+			list_ponies
+			exit 0
+			;;
 		--pony)
 			shift
 			PONY=$1