From 5d54f0c9f060b5f12a487147f2999b16ebd1023c Mon Sep 17 00:00:00 2001
From: Marzo Sette Torres Junior <marzojr@gmail.com>
Date: Sat, 27 Apr 2024 13:08:15 +0200
Subject: [PATCH] Fixes to UCC highlighting in Seven Towers

Also, adding a dark theme for it.
---
 seventowers/code.inc                          |   4 +-
 seventowers/content/usecode.dat               |   2 +-
 seventowers/default.css                       | 967 +++++++++++++-----
 seventowers/downloads.php                     |  13 +-
 seventowers/geshi.php                         |   2 +-
 seventowers/geshi/ucc.php                     |   7 +-
 .../usecode/reference/intrinsic_params.dat    |   2 +-
 seventowers/usecode/ucc_scripting.dat         |   2 +
 8 files changed, 708 insertions(+), 291 deletions(-)

diff --git a/seventowers/code.inc b/seventowers/code.inc
index e084c7a8..e5d4f55d 100644
--- a/seventowers/code.inc
+++ b/seventowers/code.inc
@@ -45,7 +45,7 @@
 	function parse_code($source, $lines = false)
 	{
 		$geshi = new GeSHi($source, 'ucc');
-		$geshi->enable_classes();
+		$geshi->enable_classes(true);
 		if ($lines)
 		{
 			$geshi->enable_line_numbers(GESHI_FANCY_LINE_NUMBERS);
@@ -133,7 +133,7 @@
 		}
 		else
 			$code = $source;
-		return $code;
+		return '<span class="ucc">' . $code . '</span>';
 	}
 
 	function code_file($file, $block = true, $lines = false, $offset = 0, $out = true)
diff --git a/seventowers/content/usecode.dat b/seventowers/content/usecode.dat
index c89178c0..82eba01f 100644
--- a/seventowers/content/usecode.dat
+++ b/seventowers/content/usecode.dat
@@ -158,7 +158,7 @@ If you wisely don't use Windows, you will have to compile your own binary."
 								"NAME"			=>	$filename,
 								"EXT"			=>	$ext,
 								"TITLE"			=>	$finfo["TITLE"],
-								"BLURBNFO"		=>	$finfo["README"],
+								"BLURBNFO"		=>	"",//$finfo["README"],
 								"DIR"			=>	$dir
 							);
 					}
diff --git a/seventowers/default.css b/seventowers/default.css
index 309ed2d4..6170761b 100644
--- a/seventowers/default.css
+++ b/seventowers/default.css
@@ -1,255 +1,257 @@
-a	{
-	background-color:	#DFDFDF;
-	color:				#005533;
-	padding:			0.1em;
-	text-decoration:	none;
+a {
+	padding: 0.1em;
+	text-decoration: none;
 }
 
-a:link, a:visited	{
-	border-right:		0.5em	solid	#00AA33;
-	background-color:	#DFDFDF;
-	color:				#005533;
+a:link,
+a:visited {
+	border-right-width: 0.5em;
+	border-right-style: solid;
 }
 
-a:link.offsite, a:visited.offsite	{
-	border-right:		0.5em	solid	#00AAFF;
-	background-color:	#DFDFDF;
-	color:				#003388;
+a:link.offsite,
+a:visited.offsite {
+	border-right-width: 0.5em;
+	border-right-style: solid;
 }
 
-a:hover, a:hover.offsite	{
-	border-right:		0.5em	solid	#AA0000;
-	background-color:	#FFFF80;
-	color:				#AA0000;
+a:hover,
+a:hover.offsite {
+	border-right-width: 0.5em;
+	border-right-style: solid;
+	font-weight: bolder;
 }
 
-ul.box a:hover, ul.box a:hover.offsite	{
-	border-right:		0.5em	solid	#D8AC20;
-	background-color:	#3F3F3F;
-	color:				#D8AC20;
+ul.box a:hover,
+ul.box a:hover.offsite {
+	border-right-width: 0.5em;
+	border-right-style: solid;
+	font-weight: bolder;
 }
 
-a.offsite img+img	{
-	padding:			0.25em;
+a.offsite img+img {
+	padding: 0.25em;
 }
 
-a.target, a:link.target, a:visited.target, a:hover.target	{
-	border:				inherit;
-	background-color:	inherit;
-	color:				inherit;
+a.target,
+a:link.target,
+a:visited.target,
+a:hover.target {
+	border: inherit;
+	background-color: inherit;
+	color: inherit;
 }
 
-
-body	{
-	background-color:	#FFFFFF;
-	color:				#000000;
-	font-family:		helvetica, sans-serif;
-	font-size:			medium;
-	padding-left:		15em;
-	text-align:			justify;
-	line-height:		1.4em;
+body {
+	font-family: helvetica, sans-serif;
+	font-size: medium;
+	padding-left: 15em;
+	text-align: justify;
+	line-height: 1.4em;
 }
 
-h1	{
-	background-color:	#000000;
-	color:				#FFFFFF;
-	display:			block;
-	font-family:		times, serif;
-	font-size:			x-small;
-	font-weight:		bold;
-	padding:			0.1em;
-	text-align:			justify;
+h1 {
+	display: block;
+	font-family: times, serif;
+	font-size: x-small;
+	font-weight: bold;
+	padding: 0.1em;
+	text-align: justify;
 }
 
-h2	{
-	background-color:	#000000;
-	color:				#D8AC20;
-	display:			block;
-	font-size:			xx-large;
-	padding-left:		0.25em;
-	line-height:		1.6em;
+h2 {
+	display: block;
+	font-size: xx-large;
+	padding-left: 0.25em;
+	line-height: 1.6em;
 }
 
-h3	{
-	background-color:	#000000;
-	color:				#D8AC20;
-	display:			block;
-	font-size:			x-large;
-	padding-left:		0.25em;
-	line-height:		1.4em;
+h3 {
+	display: block;
+	font-size: x-large;
+	padding-left: 0.25em;
+	line-height: 1.4em;
 }
 
-img	{
-	border-width:		0;
-	vertical-align:		middle;
+img {
+	border-width: 0;
+	vertical-align: middle;
 }
 
-p.box	{
-	margin:				1em;
-	padding-left:		0.25em;
-	padding-right:		0.25em;
-	background-color:	#FFFF80;
-	color:				#000000;
+p.box {
+	margin: 1em;
+	padding-left: 0.25em;
+	padding-right: 0.25em;
 }
 
-p.boxtitle	{
-	background-color:	#000000;
-	color:				#D8AC20;
-	font-size:			x-large;
-	margin:				0;
-	padding:			0.25em;
+p.boxtitle {
+	font-size: x-large;
+	margin: 0;
+	padding: 0.25em;
 }
 
-div.download	{
-	display:			block;
+div.download {
+	display: block;
 }
 
-span.logoimg	{
-	vertical-align:		middle;
-	display:			inline-block;
+span.logoimg {
+	vertical-align: middle;
+	display: inline-block;
 }
 
-span.logoimg img+img	{
+span.logoimg img+img {
 	padding-left: 0.25em;
-	display:			inline-block;
+	display: inline-block;
+}
+
+span.logoimg a {
+	vertical-align: middle;
+	display: inline-block;
 }
 
-span.logoimg	a	{
-	vertical-align:		middle;
-	display:			inline-block;
+div.info {
+	vertical-align: middle;
+	padding-left: 0.6em;
+	display: inline-block;
+	max-width: 70%
 }
 
-div.info	{
-	vertical-align:		middle;
-	padding-left:		0.6em;
-	display:			inline-block;
-	max-width:			70%
+p.info {
+	vertical-align: top;
+	padding-top: 0.0em;
+	padding-bottom: 0.0em;
+	overflow: auto;
 }
 
-p.info	{
-	vertical-align:		top;
-	padding-top:		0.0em;
-	padding-bottom:		0.0em;
-	overflow:			auto;
+p.subsections {
+	text-align: center;
 }
 
-p.subsections	{
-	text-align:			center;
+p.subsections a {
+	padding-right: 0.3em;
+	vertical-align: middle;
+	display: table-cell;
 }
 
-p.subsections	a	{
-	padding-right:		0.3em;
-	vertical-align:		middle;
-	display:			table-cell;
+span.subsections {
+	border-right-width: 0.5em;
+	border-right-style: solid;
+	padding: 0.1em 0.3em 0.1em 0.1em;
+	vertical-align: middle;
+	display: table-cell;
+	font-weight: bolder;
 }
 
-span.subsections	{
-	background-color:	#3F3F3F;
-	border-right:		0.5em	solid	#D8AC20;
-	color:				#D8AC20;
-	padding:			0.1em	0.3em	0.1em	0.1em;
-	vertical-align:		middle;
-	display:			table-cell;
+p.subsections a+a,
+p.subsections span.subsections+a,
+p.subsections a+span.subsections {
+	border-left-width: 0.5em;
+	border-left-style: solid;
 }
 
-p.subsections a+a, p.subsections span.subsections+a, p.subsections a+span.subsections	{
-	border-left:		0.5em	solid	#FFFFFF;
+span.quicktip {
+	cursor: help;
 }
 
-span.quicktip	{
-	background-color:	#FFFF80;
-	color:				#AA0000;
-	cursor:				help;
+ul.box span.quicktip {
+	cursor: help;
 }
 
-ul.box span.quicktip	{
-	color:				#D8AC20;
-	background-color:	#3F3F3F;
-	cursor:				help;
+ul.box {
+	border-width: 0.25em;
+	border-style: solid;
+	display: block;
+	list-style-type: none;
+	margin: 0;
+	padding: 0;
 }
 
-ul.box	{
-	background-color:	#FFFF80;
-	color:				#000000;
-	border:				0.25em	solid	#000000;
-	display:			block;
-	list-style-type:	none;
-	margin:				0;
-	padding:			0;
+ul.itemlist {
+	list-style-image: url("images/dot.png");
+	vertical-align: middle;
 }
 
-ul.itemlist	{
-	list-style-image:	url("images/dot.png");
-	vertical-align:		middle;
+ul.itemlist li {
+	padding-bottom: 0.5em;
+	padding-left: 0.5em;
 }
 
-ul.itemlist	li	{
-	padding-bottom:		0.5em;
-	padding-left:		0.5em;
+ul.navbar {
+	color: inherit;
+	list-style-type: none;
+	margin: 0;
+	padding: 0;
+	position: fixed;
+	left: 1em;
+	top: 1em;
+	width: 14em;
 }
 
-ul.navbar	{
-	background-color:	#ffffff;
-	color:				inherit;
-	list-style-type:	none;
-	margin:				0;
-	padding:			0;
-	position:			fixed;
-	left:				1em;
-	top:				1em;
-	width:				14em;
+ul.navbar a {
+	display: block;
+	padding: 0.1em;
+	width: 13em;
 }
 
-ul.navbar	a	{
-	display:			block;
-	padding:			0.1em;
-	width:				13em;
+ul.navbar li {
+	margin: 0.5em 0;
+	width: 14em;
 }
 
-ul.navbar	li	{
-	margin:				0.5em	0;
-	width:				13em;
+span.navbar {
+	border-right-width: 0.5em;
+	border-right-style: solid;
+	vertical-align: middle;
+	display: table-cell;
+	font-weight: bolder;
+	width: 13.2em;
 }
 
-.codeblock	{
-	width:				92%;
-	max-height:			30em;
-	overflow:			auto;
+.codeblock {
+	width: 92%;
+	max-height: 30em;
+	overflow: auto;
 }
 
-.bigcodeblock	{
-	width:				92%;
-	overflow:			auto;
+.bigcodeblock {
+	width: 92%;
+	overflow: auto;
 }
 
-table, td, tr	{
-	font-family:		helvetica, sans-serif;
-	font-size:			medium;
+table,
+td,
+tr {
+	font-family: helvetica, sans-serif;
+	font-size: medium;
 }
 
-code	{
-	font-family:		'DejaVu Sans Mono', 'Bitstream Vera Sans Mono', 'Courier New', Courier, monospace;
-	font-size:			1em;
+code {
+	font-family: 'Fira Code Nerd Font', 'DejaVu Sans Mono', 'Bitstream Vera Sans Mono', 'Courier New', Courier, monospace;
+	font-size: 1em;
 }
 
-.right	{
-	float:				right;
+.right {
+	float: right;
 }
 
-.codeblock a, .bigcodeblock a	{
-	background-color:	inherit;
-	color:				inherit;
-	padding:			inherit;
-	text-decoration:	inherit;
-	border-right:		inherit;
+.codeblock a,
+.bigcodeblock a {
+	background-color: inherit;
+	color: inherit;
+	padding: inherit;
+	text-decoration: inherit;
+	border-right: inherit;
 }
 
-code a, code a:link, code a:visited, code a:hover	{
-	background-color:	inherit;
-	color:				inherit;
-	padding:			inherit;
-	text-decoration:	inherit;
-	border-right:		inherit;
+code a,
+code a:link,
+code a:visited,
+code a:hover {
+	background-color: inherit;
+	color: inherit;
+	padding: inherit;
+	text-decoration: inherit;
+	border-right: inherit;
 }
 
 @font-face {
@@ -278,110 +280,513 @@ code a, code a:link, code a:visited, code a:hover	{
 	src: url('https://github.com/ryanoasis/nerd-fonts/raw/master/patched-fonts/FiraCode/Bold/complete/Fura%20Code%20Bold%20Nerd%20Font%20Complete.ttf') format('truetype');
 }
 
-/*
- *
- *	GeSHi	Dynamically	Generated	Stylesheet
- *	--------------------------------------
- *	Dynamically	generated	stylesheet	for	ucc
- *	CSS	class:	ucc,	CSS	id:
- *	GeSHi	(c)	Nigel	McNie	2004	(http://qbnz.com/highlighter)
- */
-.ucc	.de1,	.ucc	.de2	{
-	font-family:		'Fira Code Nerd Font', 'DejaVu Sans Mono', 'Bitstream Vera Sans Mono', 'Courier New', Courier, monospace;
-	font-weight:		normal;
-	background-color:	#ffffff;
-	color:				inherit;
-	overflow:			visible;
-}
-.ucc	{
-	font-family:		'Fira Code Nerd Font', 'DejaVu Sans Mono', 'Bitstream Vera Sans Mono', 'Courier New', Courier, monospace;
-	font-size:	1em;
-}
-.ucc	.imp	{
-	font-family:		'Fira Code Nerd Font', 'DejaVu Sans Mono', 'Bitstream Vera Sans Mono', 'Courier New', Courier, monospace;
-	font-weight:		bold;
-	background-color:	inherit;
-	color:				red;
-}
-.ucc	.ln-xtra	{
-	font-family:		'Fira Code Nerd Font', 'DejaVu Sans Mono', 'Bitstream Vera Sans Mono', 'Courier New', Courier, monospace;
-	color:	#cc0;
-	background-color:	#ffc;
-}
-.ucc	li	{
-	font-family:		'Fira Code Nerd Font', 'DejaVu Sans Mono', 'Bitstream Vera Sans Mono', 'Courier New', Courier, monospace;
-	background-color:	inherit;
-	color:				black;
-	font-weight:		normal;
-	font-style:			normal;
-	margin-left:		1.5em;
-	border-left:		2px	solid	#000000;
-	padding-left:		1em;
-}
-.ucc	li.li2	{
-	font-family:		'Fira Code Nerd Font', 'DejaVu Sans Mono', 'Bitstream Vera Sans Mono', 'Courier New', Courier, monospace;
-	font-weight:	bold;
-}
-.ucc	.kw1	{
-	background-color:	inherit;
-	color:				#0000ff;
-	font-weight:	bold;
-}
-.ucc	.kw2	{
-	background-color:	inherit;
-	color:	#00C000;
-	font-weight:	bold;
-}
-.ucc	.kw3	{
-	background-color:	inherit;
-	color:	#008080;
-}
-.ucc	.kw4	{
-	background-color:	inherit;
-	color:	#800080;
-	font-style:	italic;
-}
-.ucc	.kw5	{
-	background-color:	inherit;
-	color:	#C000C0;
-	font-weight:	bold;
-}
-.ucc	.co1	{
-	background-color:	inherit;
-	color:	#808080;
-	font-style:	italic;
-}
-.ucc	.co2	{
-	background-color:	inherit;
-	color:	#0000ff;
-}
-.ucc	.coMULTI	{
-	background-color:	inherit;
-	color:	#808080;
-	font-style:	italic;
-}
-.ucc	.es0	{
-	background-color:	inherit;
-	color:	#800000;
-	font-weight:	bold;
-}
-.ucc	.br0	{
-	background-color:	inherit;
-	color:	#808080;
-}
-.ucc	.st0	{
-	background-color:	inherit;
-	color:	#808000;
-}
-.ucc	.nu0	{
-	background-color:	inherit;
-	color:	#ff0000;
-}
-.ucc	.me1	{
-	background-color:	inherit;
-	color:	#808080;
-}
-.ucc	.me2	{
-	background-color:	inherit;
-	color:	#808080;
+/* UCC syntax highlighting */
+
+.ucc .de1,
+.ucc .de2 {
+	font-family: 'Fira Code Nerd Font', 'DejaVu Sans Mono', 'Bitstream Vera Sans Mono', 'Courier New', Courier, monospace;
+	font-weight: normal;
+	color: inherit;
+	overflow: visible;
+}
+
+.ucc {
+	font-family: 'Fira Code Nerd Font', 'DejaVu Sans Mono', 'Bitstream Vera Sans Mono', 'Courier New', Courier, monospace;
+	font-size: 1em;
+}
+
+.ucc .imp {
+	font-family: 'Fira Code Nerd Font', 'DejaVu Sans Mono', 'Bitstream Vera Sans Mono', 'Courier New', Courier, monospace;
+	font-weight: bold;
+	background-color: inherit;
+}
+
+.ucc .ln-xtra {
+	font-family: 'Fira Code Nerd Font', 'DejaVu Sans Mono', 'Bitstream Vera Sans Mono', 'Courier New', Courier, monospace;
+}
+
+.ucc li {
+	font-family: 'Fira Code Nerd Font', 'DejaVu Sans Mono', 'Bitstream Vera Sans Mono', 'Courier New', Courier, monospace;
+	background-color: inherit;
+	font-weight: normal;
+	font-style: normal;
+	margin-left: 1.5em;
+	border-left-width: 2px;
+	border-left-style: solid;
+	padding-left: 1em;
+}
+
+.ucc li.li2 {
+	font-family: 'Fira Code Nerd Font', 'DejaVu Sans Mono', 'Bitstream Vera Sans Mono', 'Courier New', Courier, monospace;
+	font-weight: bold;
+}
+
+.ucc .kw1 {
+	background-color: inherit;
+	font-weight: bold;
+}
+
+.ucc .kw2 {
+	background-color: inherit;
+	font-weight: bold;
+}
+
+.ucc .kw3 {
+	background-color: inherit;
+}
+
+.ucc .kw4 {
+	background-color: inherit;
+	font-style: italic;
+}
+
+.ucc .kw5 {
+	background-color: inherit;
+	font-weight: bold;
+}
+
+.ucc .kw6 {
+	background-color: inherit;
+	font-weight: bold;
+}
+
+.ucc .co1 {
+	background-color: inherit;
+	font-style: italic;
+}
+
+.ucc .co2 {
+	background-color: inherit;
+}
+
+.ucc .coMULTI {
+	background-color: inherit;
+	font-style: italic;
+}
+
+.ucc .es0 {
+	background-color: inherit;
+	font-weight: bold;
+}
+
+.ucc .br0 {
+	background-color: inherit;
+}
+
+.ucc .sy0 {
+	background-color: inherit;
+}
+
+.ucc .st0 {
+	background-color: inherit;
+}
+
+.ucc .nu0 {
+	background-color: inherit;
+}
+
+.ucc .nu12 {
+	background-color: inherit;
+}
+
+.ucc .me1 {
+	background-color: inherit;
+}
+
+.ucc .me2 {
+	background-color: inherit;
+}
+
+.ucc .me3 {
+	background-color: inherit;
+}
+
+/* Primary (light) color theme */
+
+a {
+	background-color: #DFDFDF;
+	color: #005533;
+}
+
+a:link,
+a:visited {
+	border-right-color: #00AA33;
+	background-color: #DFDFDF;
+	color: #005533;
+}
+
+a:link.offsite,
+a:visited.offsite {
+	border-right-color: #00AAFF;
+	background-color: #DFDFDF;
+	color: #003388;
+}
+
+a:hover,
+a:hover.offsite {
+	border-right-color: #AA0000;
+	background-color: #FFFF80;
+	color: #AA0000;
+}
+
+ul.box a:hover,
+ul.box a:hover.offsite,
+span.navbar {
+	border-right-color: #D8AC20;
+	background-color: #3F3F3F;
+	color: #D8AC20;
+}
+
+body {
+	background-color: #FFFFFF;
+	color: #000000;
+}
+
+h1 {
+	background-color: #000000;
+	color: #D8AC20;
+}
+
+h2 {
+	background-color: #000000;
+	color: #D8AC20;
+}
+
+h3 {
+	background-color: #000000;
+	color: #D8AC20;
+}
+
+p.box {
+	background-color: #FFFF80;
+	color: #000000;
+}
+
+p.boxtitle {
+	background-color: #000000;
+	color: #D8AC20;
+}
+
+span.subsections {
+	background-color: #3F3F3F;
+	border-right-color: #D8AC20;
+	color: #D8AC20;
+}
+
+p.subsections a+a,
+p.subsections span.subsections+a,
+p.subsections a+span.subsections {
+	border-left-color: #FFFFFF;
+}
+
+span.quicktip {
+	background-color: #FFFF80;
+	color: #AA0000;
+}
+
+ul.box span.quicktip {
+	color: #D8AC20;
+	background-color: #3F3F3F;
+}
+
+ul.box {
+	background-color: #FFFF80;
+	color: #000000;
+	border-color: #000000;
+}
+
+ul.navbar {
+	background-color: #ffffff;
+}
+
+/* UCC syntax highlighting */
+
+.ucc .de1,
+.ucc .de2 {
+	background-color: #ffffff;
+}
+
+.ucc .imp {
+	color: red;
+}
+
+.ucc .ln-xtra {
+	color: #cc0;
+	background-color: #ffc;
+}
+
+.ucc li {
+	color: black;
+	border-left-color: #000000;
+}
+
+.ucc .kw1 {
+	color: #0000ff;
+}
+
+.ucc .kw2 {
+	color: #00C000;
+}
+
+.ucc .kw3 {
+	color: #008080;
+}
+
+.ucc .kw4 {
+	color: #800080;
+}
+
+.ucc .kw5 {
+	color: #C000C0;
+}
+
+.ucc .kw6 {
+	color: #0000ff;
+}
+
+.ucc .co1 {
+	color: #808080;
+}
+
+.ucc .co2 {
+	color: #808080;
+}
+
+.ucc .coMULTI {
+	color: #808080;
+}
+
+.ucc .es0 {
+	color: #800000;
+}
+
+.ucc .br0 {
+	color: #808080;
+}
+
+.ucc .sy0 {
+	color: #808080;
+}
+
+.ucc .st0 {
+	color: #808000;
+}
+
+.ucc .nu0 {
+	color: #ff0000;
+}
+
+.ucc .nu12 {
+	color: #ff0000;
+}
+
+.ucc .me1 {
+	color: #808080;
+}
+
+.ucc .me2 {
+	color: #808080;
+}
+
+.ucc .me3 {
+	color: #808080;
+}
+
+/* Dark theme */
+/* --link-color: rgb(100, 172, 232) !important;
+--link-color-hover: rgb(126, 187, 236) !important;
+--link-color-active: rgb(100, 172, 232) !important;
+--visited-color: rgb(148, 100, 232) !important;
+--visited-color-hover: rgb(166, 126, 236) !important;
+--visited-color-active: rgb(148, 100, 232) !important;
+border-color: rgb(20, 184, 118) rgb(20, 184, 69) rgb(20, 184, 118) rgb(20, 184, 118) !important; */
+@media screen and (prefers-color-scheme: dark) {
+	a {
+		background-color: rgb(54, 56, 57);
+		color: rgb(100, 172, 232);
+	}
+
+	a:link,
+	a:visited {
+		border-right-color: rgb(20, 184, 69);
+		background-color: rgb(54, 56, 57);
+		color: rgb(20, 184, 69);
+	}
+
+	a:link.offsite,
+	a:visited.offsite {
+		border-right-color: rgb(100, 172, 232);
+		background-color: rgb(54, 56, 57);
+		color: rgb(100, 172, 232);
+	}
+
+	a:hover,
+	a:hover.offsite {
+		border-right-color: #AA4444;
+		background-color: #D8AC20;
+		color: #AA4444;
+	}
+
+	ul.box a:hover,
+	ul.box a:hover.offsite,
+	span.navbar {
+		border-right-color: #D8AC20;
+		background-color: #3F3F3F;
+		color: #D8AC20;
+	}
+
+	body {
+		background-color: rgb(24, 26, 27);
+		color: rgb(209, 203, 199);
+	}
+
+	h1 {
+		background-color: #000000;
+		color: #D8AC20;
+	}
+
+	h2 {
+		background-color: #000000;
+		color: #D8AC20;
+	}
+
+	h3 {
+		background-color: #000000;
+		color: #D8AC20;
+	}
+
+	p.box {
+		background-color: rgb(24, 26, 27);
+		color: #EECC40;
+	}
+
+	p.boxtitle {
+		background-color: #000000;
+		color: #D8AC20;
+	}
+
+	span.subsections {
+		background-color: #3F3F3F;
+		border-right-color: #D8AC20;
+		color: #D8AC20;
+	}
+
+	p.subsections a+a,
+	p.subsections span.subsections+a,
+	p.subsections a+span.subsections {
+		border-left-color: rgb(24, 26, 27);
+	}
+
+	span.quicktip {
+		background-color: #EECC40;
+		color: #AA0000;
+	}
+
+	ul.box span.quicktip {
+		color: #D8AC20;
+		background-color: #3F3F3F;
+	}
+
+	ul.box {
+		background-color: rgb(24, 26, 27);
+		color: #EECC40;
+		border-color: #EECC40;
+	}
+
+	ul.navbar {
+		background-color: rgb(24, 26, 27);
+	}
+
+	/* UCC syntax highlighting */
+
+	.ucc .de1,
+	.ucc .de2 {
+		background-color: #1E1E1E;
+	}
+
+	.ucc .imp {
+		color: #546E7A;
+	}
+
+	.ucc .ln-xtra {
+		color: #cc0;
+		background-color: #ffc;
+	}
+
+	.ucc li {
+		color: #D4D4D4;
+		border-left-color: #D4D4D4;
+	}
+
+	.ucc .kw1 {
+		color: #4EC9B0;
+	}
+
+	.ucc .kw2 {
+		color: #FF5370;
+	}
+
+	.ucc .kw3 {
+		color: #C792EA;
+	}
+
+	.ucc .kw4 {
+		color: #FFCB6B;
+	}
+
+	.ucc .kw5 {
+		color: #82AAFF;
+	}
+
+	.ucc .kw6 {
+		color: #4EC9B0;
+	}
+
+	.ucc .co1 {
+		color: #546E7A;
+	}
+
+	.ucc .co2 {
+		color: #4EC9B0;
+	}
+
+	.ucc .coMULTI {
+		color: #546E7A;
+	}
+
+	.ucc .es0 {
+		color: #4EC9B0;
+	}
+
+	.ucc .br0 {
+		color: #89DDFF;
+	}
+
+	.ucc .sy0 {
+		color: #89DDFF;
+	}
+
+	.ucc .st0 {
+		color: #C3E88D;
+	}
+
+	.ucc .nu0 {
+		color: #F78C6C;
+	}
+
+	.ucc .nu12 {
+		color: #F78C6C;
+	}
+
+	.ucc .me1 {
+		color: #82AAFF;
+	}
+
+	.ucc .me2 {
+		color: #82AAFF;
+	}
+
+	.ucc .me3 {
+		color: #82AAFF;
+	}
 }
\ No newline at end of file
diff --git a/seventowers/downloads.php b/seventowers/downloads.php
index 52ab3cdf..109285bb 100644
--- a/seventowers/downloads.php
+++ b/seventowers/downloads.php
@@ -29,17 +29,26 @@
 		),
 	);
 
+	if (is_array($argv))
+		parse_str(implode('&', array_slice($argv, 1)), $PARAMETERS);
+
+	if (!isset($PARAMETERS["section"]))
+		$PARAMETERS["section"] = 0;
+
+	if (!isset($PARAMETERS["page"]))
+		$PARAMETERS["page"] = 0;
+
 	// Silently correct errors.
 	if( isset($_REQUEST["section"]) && is_numeric($_REQUEST["section"]) )
 		$section = intval($_REQUEST["section"]);
 	else
-		$section = 0;
+		$section = intval($PARAMETERS["section"]);
 
 	// Silently correct errors.
 	if( isset($_REQUEST["page"]) && is_numeric($_REQUEST["page"]) )
 		$page = intval($_REQUEST["page"]);
 	else
-		$page = 0;
+		$page = intval($PARAMETERS["page"]);
 
 	$FILEINFO = $PAGES[$section];
 
diff --git a/seventowers/geshi.php b/seventowers/geshi.php
index 47a490e6..459f5d54 100644
--- a/seventowers/geshi.php
+++ b/seventowers/geshi.php
@@ -277,7 +277,7 @@ class GeSHi {
      * Whether to use CSS classes in output
      * @var boolean
      */
-    protected $use_classes = false;
+    protected $use_classes = true;
 
     /**
      * The type of header to use. Can be one of the following
diff --git a/seventowers/geshi/ucc.php b/seventowers/geshi/ucc.php
index 729bc8ba..9f609a85 100644
--- a/seventowers/geshi/ucc.php
+++ b/seventowers/geshi/ucc.php
@@ -48,7 +48,7 @@
 		//Multiline-continued single-line comments
 		1 => '/\/\/(?:\\\\\\\\|\\\\\\n|.)*$/m',
 		//Multiline-continued preprocessor define
-		2 => '/#(?:\\\\\\\\|\\\\\\n|.)*$/m',
+		2 => '/#\\s*(line|include|game|autonumber|strictbraces)(?:\\\\\\\\|\\\\\\n|.)*$/m',
 		//C++ 11 string literal extensions
 		3 => '/(?:L|u8?|U)(?=")/',
 		//C++ 11 string literal extensions (raw)
@@ -517,7 +517,8 @@
 			),
 		),
 	'SYMBOLS' => array(
-		'(', ')', '{', '}', '[', ']', '=', '+', '-', '*', '/', '!', '&', ':', '&lt;', '&gt;', '&lt;&lt;'
+		'(', ')', '{', '}', '[', ']', '=', '+', '-', '*', '/', '!', '&', ':',
+		'<', '>', '<<', '.', '->', '::',
 		),
 	'CASE_SENSITIVE' => array(
 		GESHI_COMMENTS => false,
@@ -578,7 +579,7 @@
 	'OOLANG' => true,
 	'OBJECT_SPLITTERS' => array(
 		1 => '.',
-		2 => '-&gt;',
+		2 => '->',
 		3 => '::',
 		),
 	'REGEXPS' => array(
diff --git a/seventowers/usecode/reference/intrinsic_params.dat b/seventowers/usecode/reference/intrinsic_params.dat
index e3241558..89221919 100644
--- a/seventowers/usecode/reference/intrinsic_params.dat
+++ b/seventowers/usecode/reference/intrinsic_params.dat
@@ -7,7 +7,7 @@
 				inline_code("object"), "Any object or NPC. It can be an object reference, '" . inline_code("item") . "' or a number (that " . bold("must") . " be negative, which Exult will convert to an NPC if it is in the correct range).",
 				inline_code("actor"), "Any NPC. It is evaluated the same way as '" . inline_code("object") . "' is, but Exult will reject anything that can't be converted to an NPC. Monsters are also accepted.",
 				inline_code("bool"), "A '$true'/'$false' parameter. Can be a number (nonzero/zero), an array (non-empty/empty) or a comparison expression (e.g., '" . inline_code("a == b") . "'.",
-				inline_code("string"), "A string (text). Strings in usecode are any set of characters surrounded by double-quotes; for example, \"This is a string.\". If you need a double-quote inside a string you can 'escape' it by prefixing them with a backslash: \"\\\"\"; alternatively, Exult converts '@' into a double-quote.",
+				inline_code("string"), "A string (text). Strings in usecode are any set of characters surrounded by double-quotes; for example, " . inline_code("\"This is a string.\"") . ". If you need a double-quote inside a string you can 'escape' it by prefixing them with a backslash: " . inline_code("\"\\\"\"") . "; alternatively, Exult converts '" . inline_code("@") . "' into a double-quote.",
 				inline_code("function"), "A usecode function, which " . bold("must") . " be declared with either, the " . inline_code("shape#") . " " . italic("or") . " the " . inline_code("object#") . " specifiers. In $ucc, this can be the function name or its usecode number. For example: '" . inline_code("extern Bolt shape#(0x2D3) ();") . "' can be passed as '" . inline_code("Bolt") . "' (the function name), '" . inline_code("0x2D3") . "' (its function number since '" . inline_code("shape#(shnum) == shnum") . "' if " . inline_code("shnum < 0x400") . ") or as '" . inline_code("&Bolt") . "' (using the 'address of' operator '" . inline_code("&") . "' to get the function number).",
 			), 4
 		);
diff --git a/seventowers/usecode/ucc_scripting.dat b/seventowers/usecode/ucc_scripting.dat
index c239a6dd..e6eea595 100644
--- a/seventowers/usecode/ucc_scripting.dat
+++ b/seventowers/usecode/ucc_scripting.dat
@@ -1,4 +1,6 @@
 <?php
+	if (!isset($htmlmode))
+		$htmlmode = true;
 	$eua = inline_code("execute_usecode_array");
 	$deua = inline_code("delayed_execute_usecode_array");
 	$ucc = "Usecode C";