1 files changed, 45 insertions, 35 deletions
diff --git a/doc/man/marco-theme-viewer.1 b/doc/man/marco-theme-viewer.1
index 6aafabda..702f36bf 100644
--- a/doc/man/marco-theme-viewer.1
+++ b/doc/man/marco-theme-viewer.1
@@ -1,43 +1,53 @@
-.\" In .TH, FOO should be all caps, SECTION should be 1-8, maybe w/ subsection
-.\" other parms are allowed: see man(7), man(1)
+.\" Man page for marco-message.
+.TH MARCO-THEME-VIEWER 1 "9 February 2014" "MATE Desktop Environment"
+.\" Please adjust this date whenever revising the manpage.
 .\"
-.\" Based on template provided by Tom Christiansen <[email protected]>.
-.\" 
-.TH MARCO-THEME-VIEWER 1 "1 June 2004" 
-.SH NAME
-marco-theme-viewer \- view marco themes
-.SH SYNOPSIS
-.B marco-theme-viewer
-[
-.I THEMENAME
-]
-.SH DESCRIPTION
-.\" Putting a newline after each sentence can generate better output.
-.B marco-theme-viewer
-allows you to preview any installed Marco theme.
+.SH "NAME"
+marco-theme-viewer \- Marco Theme Previewer
+.SH "SYNOPSIS"
+.B marco-theme-viewer [THEME]
+.SH "DESCRIPTION"
+\fBmarco-theme-viewer\fR allows you to preview any installed Marco theme.
 .PP
-When designing a new Marco theme, you can use
-.B marco-theme-viewer
-to measure the performance of a window frame option, and to preview
-the option.
-.SH OPTIONS
-.TP
-.I THEMENAME
-Name of the theme to be shown (\fIAtlanta\fR by default).
-It is case-sensitive.
-.SH FILES
+When designing a new Marco theme, you can use \fBmarco-theme-viewer\fR to benchmark the performance of a window frame, and to preview it around different types of windows in various mock scenarios.
+.SH "USAGE"
+Usage of \fBmarco-theme-viewer\fR is fairly simple. 
 .br
-.nf
+Just call \fBmarco-theme-viewer\fR followed by the Name of any valid Marco or Metacity theme installed in "~/.themes" or "/usr/share/themes".
+.br
+It is case-sensitive.
+.SH "EXAMPLE"
+\fBmarco-theme-viewer Crux\fR
+.RS 4
+Preview the Crux theme if it is installed.
+.SH "FILES"
+.TP 4
+~/.themes
+user themes directory
 .TP
-.I /usr/share/themes
+/usr/share/themes
 system themes directory
 .TP
-.I /usr/share/themes/*/marco-1/marco-theme-1.xml
-theme specification file
-.SH AUTHOR
-This manual page was written by Jose M. Moya <[email protected]>, for
-the Debian  GNU/Linux system (but may be used by others).
+/usr/share/themes/*/metacity-1/metacity-theme-1.xml
+.RS 2
+\fBOR\fR
+.RE
+.RS 0
+/usr/share/themes/*/marco-1/marco-theme-1.xml
+.RS 4
+theme specification files
+.SH "BUGS"
+.SS Should you encounter any bugs, they may be reported at: 
+http://github.com/mate-desktop/marco/issues
+.SH "AUTHORS"
+.SS This Man Page has been updated/re-written for the MATE Desktop Environment by:
+Adam Erdman <[email protected]> (2014)
+.SH "HISTORY"
+.SS Portions of this manpage were originally written for the Debian GNU/Linux system by: 
+Jose M. Moya <[email protected]> (2004)
 .SH "SEE ALSO"
-.\" Always quote multiple words for .SH
+.SS Further information may also be available at: http://wiki.mate-desktop.org/docs
+.P
 .BR marco (1),
-.BR marco-window-demo (1).
+.BR marco-message (1),
+.BR marco-window-demo (1)