Only in geshismf_2-0/: geshismf_2-0.zip
diff -ur geshismf_orig/install.xml geshismf_2-0/install.xml
--- geshismf_orig/install.xml	2006-12-17 05:07:58.000000000 +1100
+++ geshismf_2-0/install.xml	2007-11-23 15:13:15.000000000 +1100
@@ -9,7 +9,7 @@
 			array(
 				'tag' => 'code',
 				'type' => 'unparsed_content',
-				'content' => '<div class="codeheader">' . $txt['smf238'] . ':</div><div class="code">' . ($context['browser']['is_gecko'] ? '<pre style="margin-top: 0; display: inline;">$1</pre>' : '$1') . '</div>',
+				'content' => '<div class="codeheader">' . $txt['code'] . ':</div><div class="code">' . ($context['browser']['is_gecko'] ? '<pre style="margin-top: 0; display: inline;">$1</pre>' : '$1') . '</div>',
 				// !!! Maybe this can be simplified?
 				'validate' => isset($disabled['code']) ? null : create_function('&$tag, &$data, $disabled', '
 					global $context;
@@ -47,7 +47,7 @@
 			array(
 				'tag' => 'code',
 				'type' => 'unparsed_equals_content',
-				'content' => '<div class="codeheader">' . $txt['smf238'] . ': ($2)</div><div class="code">' . ($context['browser']['is_gecko'] ? '<pre style="margin-top: 0; display: inline;">$1</pre>' : '$1') . '</div>',
+				'content' => '<div class="codeheader">' . $txt['code'] . ': ($2)</div><div class="code">' . ($context['browser']['is_gecko'] ? '<pre style="margin-top: 0; display: inline;">$1</pre>' : '$1') . '</div>',
 				// !!! Maybe this can be simplified?
 				'validate' => isset($disabled['code']) ? null : create_function('&$tag, &$data, $disabled', '
 					global $context;
@@ -87,7 +87,7 @@
 			array(
 				'tag' => 'code',
 				'type' => 'unparsed_content',
-				'content' => '<div class="codeheader">' . $txt['smf238'] . ':</div><div class="code">' . ($context['browser']['is_gecko'] ? '<pre style="margin-top: 0; display: inline;">$1</pre>' : '$1') . '</div>',
+				'content' => '<div class="codeheader">' . $txt['code'] . ':</div><div class="code">' . ($context['browser']['is_gecko'] ? '<pre style="margin-top: 0; display: inline;">$1</pre>' : '$1') . '</div>',
 				// !!! Maybe this can be simplified?
 				'validate' => isset($disabled['code']) ? null : create_function('&$tag, &$data, $disabled', '
 					global $context;
@@ -105,10 +105,11 @@
 			array(
 				'tag' => 'code',
 				'type' => 'unparsed_equals_content',
-				'content' => '<div class="codeheader">' . $txt['smf238'] . '</div>$1',
+				'content' => '<div class="codeheader">' . $txt['code'] . '</div>$1',
 				'block_level' => true,
 				'validate' => isset($disabled['code']) ? null : create_function('&$tag, &$data, $disabled', '
-
+					global $settings;
+					
 					// Show headers and footers from the settings, default to true.
                     $enable_header = isset($settings[\'geshi_enable_header\']) ? $settings[\'geshi_enable_header\'] : true;
                     $enable_footer = isset($settings[\'geshi_enable_footer\']) ? $settings[\'geshi_enable_footer\'] : true;
@@ -122,7 +123,7 @@
 					);
 					$data[0] = un_htmlspecialchars($data[0]);
 					
-					include_once(\'geshi/geshi.php\');
+					require_once(\'geshi/geshi.php\');
                     global $sourcedir, $settings;
 
 					$data[1] = explode(\',\', $data[1]);
@@ -137,7 +138,7 @@
 
                     $geshi->set_overall_class(\'geshi\');
 
-                    $numbering = $settings[\'geshi_numbering\'] ? GESHI_FANCY_LINE_NUMBERS : GESHI_NO_LINE_NUMBERS;
+                    $numbering = !empty($settings[\'geshi_numbering\']) ? GESHI_FANCY_LINE_NUMBERS : GESHI_NO_LINE_NUMBERS;
                     $geshi->enable_line_numbers($settings[\'geshi_numbering\']);
 
                     if($enable_header){
@@ -155,7 +156,7 @@
 ]]></add>
 		</operation>
 		</file>
-	<file name="$boarddir/Themes/default/style.css">
+	<file name="$themedir/style.css">
 		<operation>
 			<search position="after"><![CDATA[
 /* The main post box - this makes it as wide as possible. */
@@ -177,33 +178,11 @@
 ]]></add>
 		</operation>
 	</file>
-
-	<file name="$boarddir/Themes/classic/style.css">
-		<operation>
-			<search position="after"><![CDATA[
-/* The main post box - this makes it as wide as possible. */
-]]></search>
-			<add><![CDATA[
-.geshi {
-	color: #000000;
-	background-color: #cccccc;
-	font-family: monospace;
-	font-size: 1.3em;
-	border: 1px solid #000000;
-	margin: 1px auto 1px auto;
-	padding: 1px;
-	width: 99%;
-	overflow: auto;
-	white-space: pre;
-	max-height: 24em;
-}
-]]></add>
-		</operation>
-	</file>
 	
-	<file name="$boarddir/Themes/default/Post.template.php">
+	<file name="$themedir/Post.template.php">
 		<operation>
 			<search position="before" whitespace="loose"><![CDATA[
+		// Here loop through the array, printing the images/rows/separators!
 		foreach ($context['bbc_tags'][0] as $image => $tag)
 		{
 			// Is there a "before" part for this bbc button? If not, it can't be a button!!
@@ -215,15 +194,8 @@
 
 				$found_button = true;
 
-				// If there's no after, we're just replacing the entire selection in the post box.
-				if (!isset($tag['after']))
-					echo '<a href="javascript:void(0);" onclick="replaceText(\'', $tag['before'], '\', document.forms.', $context['post_form'], '.', $context['post_box_name'], '); return false;">';
-				// On the other hand, if there is one we are surrounding the selection ;).
-				else
-					echo '<a href="javascript:void(0);" onclick="surroundText(\'', $tag['before'], '\', \'', $tag['after'], '\', document.forms.', $context['post_form'], '.', $context['post_box_name'], '); return false;">';
-
 				// Okay... we have the link. Now for the image and the closing </a>!
-				echo '<img onmouseover="bbc_highlight(this, true);" onmouseout="if (window.bbc_highlight) bbc_highlight(this, false);" src="', $settings['images_url'], '/bbc/', $image, '.gif" align="bottom" width="23" height="22" alt="', $tag['description'], '" title="', $tag['description'], '" style="background-image: url(', $settings['images_url'], '/bbc/bbc_bg.gif); margin: 1px 2px 1px 1px;" /></a>';
+				echo '<a href="javascript:void(0);" onclick="return false;"><img id="cmd_', $tag['code'], '" src="', $settings['images_url'], '/bbc/', $image, '.gif" align="bottom" width="23" height="22" alt="', $tag['description'], '" title="', $tag['description'], '" style="background-image: url(', $settings['images_url'], '/bbc/bbc_bg.gif); margin: 1px 2px 1px 1px;" /></a>';
 			}
 			// I guess it's a divider...
 			elseif ($found_button)
@@ -296,94 +268,8 @@
 ]]></add>
 		</operation>
 	</file>
-	<file name="$boarddir/Themes/classic/Post.template.php">
-		<operation>
-			<search position="after"><![CDATA[
-		echo '
-					<select onchange="surroundText(\'[color=\' + this.options[this.selectedIndex].value.toLowerCase() + \']\',\'[/color]\', document.forms.' . $context['post_form'] . '.' . $context['post_box_name'] . '); this.selectedIndex = 0;">
-						<option value="" selected="selected">', $txt['change_color'], '</option>
-						<option value="Black">' . $txt[262] . '</option>
-						<option value="Red">' . $txt[263] . '</option>
-						<option value="Yellow">' . $txt[264] . '</option>
-						<option value="Pink">' . $txt[265] . '</option>
-						<option value="Green">' . $txt[266] . '</option>
-						<option value="Orange">' . $txt[267] . '</option>
-						<option value="Purple">' . $txt[268] . '</option>
-						<option value="Blue">' . $txt[269] . '</option>
-						<option value="Beige">' . $txt[270] . '</option>
-						<option value="Brown">' . $txt[271] . '</option>
-						<option value="Teal">' . $txt[272] . '</option>
-						<option value="Navy">' . $txt[273] . '</option>
-						<option value="Maroon">' . $txt[274] . '</option>
-						<option value="LimeGreen">' . $txt[275] . '</option>
-					</select>
-				</td>
-			</tr>';
-]]></search>
-			<add><![CDATA[
-		// Print a drop down list for all the GeSHi-languages we "allow"!
-		if (!isset($context['disabled_tags']['color']))
-			echo ' <select onchange="surroundText(\'[code=\' + this.options[this.selectedIndex].value.toLowerCase() + \']\', \'[/code]\', document.forms.', $context['post_form'], '.', $context['post_box_name'], '); this.selectedIndex = 0; document.forms.', $context['post_form'], '.', $context['post_box_name'], '.focus(document.forms.', $context['post_form'], '.', $context['post_box_name'], '.caretPos);" style="margin-bottom: 1ex;">
-							<option value="" selected="selected">GeSHi</option>
-							<option value="actionscript-french"> Actionscript-French </option>
-							<option value="actionscript"> Actionscript </option>
-							<option value="ada"> Ada </option>
-							<option value="apache"> Apache Log </option>
-							<option value="applescript"> AppleScript </option>
-							<option value="asm"> ASM </option>
-							<option value="asp"> ASP </option>
-							<option value="bash"> Bash </option>
-							<option value="caddcl"> CAD DCL </option>
-							<option value="cadlisp"> CADLisp </option>
-							<option value="c_mac"> C for Macs </option>
-							<option value="c"> C </option>
-							<option value="cpp"> C++ </option>
-							<option value="csharp"> C# </option>
-							<option value="css"> CSS </option>
-							<option value="delphi"> Delphi </option>
-							<option value="diff"> Diff </option>
-							<option value="div"> DIV </option>
-							<option value="dos"> DOS </option>
-							<option value="d"> D </option>
-							<option value="eiffel"> Eiffel </option>
-							<option value="freebasic"> FreeBasic </option>
-							<option value="gml"> GML </option>
-							<option value="html4strict"> HTML4 Strict </option>
-							<option value="ini"> INI </option>
-							<option value="inno"> Inno </option>
-							<option value="java"> Java </option>
-							<option value="javascript"> Javascript </option>
-							<option value="lisp"> Lisp </option>
-							<option value="lua"> Lua </option>
-							<option value="matlab"> Matlab </option>
-							<option value="mpasm"> Microprocessor ASM </option>
-							<option value="nsis"> MSIS </option>
-							<option value="objc"> Objective C </option>
-							<option value="ocaml-brief"> OCaml-Brief </option>
-							<option value="ocaml"> OCaml </option>
-							<option value="oobas"> OpenOffice Basic </option>
-							<option value="oracle8"> Oracle 8 SQL </option>
-							<option value="pascal"> Pascal </option>
-							<option value="perl"> Perl </option>
-							<option value="php-brief"> PHP-Brief </option>
-							<option value="php"> PHP </option>
-							<option value="python"> Python </option>
-							<option value="qbasic"> Q(uick)BASIC </option>
-							<option value="ruby"> Ruby </option>
-							<option value="scheme"> Scheme </option>
-							<option value="sdlbasic"> SDLBasic </option>
-							<option value="smarty"> Smarty </option>
-							<option value="sql"> SQL </option>
-							<option value="vbnet"> Visual BASIC .NET </option>
-							<option value="vb"> Visual BASIC </option>
-							<option value="vhdl"> VHDL </option>
-							<option value="visualfoxpro"> Visual Fox Pro </option>
-							<option value="xml"> XML </option>
-						</select>';
-]]></add>
-		</operation>
-	</file>
-    <file name="$boarddir/Themes/default/Settings.template.php">
+
+    <file name="$themedir/Settings.template.php">
 		<operation>
 			<search position="before"><![CDATA[
 		array(
@@ -412,7 +298,7 @@
 		</operation>
 	</file>
 
-	<file name="$boarddir/Themes/default/languages/Themes.english.php">
+	<file name="$languagedir/Themes.english.php">
 		<operation>
 			<search position="before"><![CDATA[
 $txt['themeadmin_edit_preview'] = 'Preview';
diff -ur geshismf_orig/package-info.xml geshismf_2-0/package-info.xml
--- geshismf_orig/package-info.xml	2007-07-19 03:12:47.000000000 +1000
+++ geshismf_2-0/package-info.xml	2007-11-23 14:07:40.000000000 +1100
@@ -6,12 +6,12 @@
 	<name>GeSHiSmf</name>
 	<version>0.1.4</version>
 	<type>modification</type>
-	<install for="1.1,1.1.1,1.1.2,1.1.3">
+	<install for="2.0 Beta 1-2.0 Beta 1.99">
 		<readme>README</readme>
 		<modification>install.xml</modification>
 		<require-dir name="geshi" destination="$sourcedir" />
 	</install>
-	<uninstall for="1.1,1.1.1,1.1.2,1.1.3">
+	<uninstall for="2.0 Beta 1-2.0 Beta 1.99">
 		<modification reverse="true">install.xml</modification>
         <!-- 
             The uninstallfix fixes a bug in the package manager, that will remove instances of $x, for example $1, $2 etc...
