diff --git a/plugins/ktcore/KTWidgets.php b/plugins/ktcore/KTWidgets.php
index 35d8dab..5ba2dd4 100755
--- a/plugins/ktcore/KTWidgets.php
+++ b/plugins/ktcore/KTWidgets.php
@@ -1165,6 +1165,8 @@ class KTCoreImageSelectWidget extends KTWidget {
         $oTemplate = $oTemplating->loadTemplate('ktcore/forms/widgets/base');
         
       	$this->aJavascript[] = 'thirdpartyjs/jquery/jquery-1.3.2.js';
+      	$this->aJavascript[] = 'thirdpartyjs/jquery/plugins/selectimage/jquery.selectimage.js';
+      	$this->aJavascript[] = 'resources/js/kt_selectimage.js';
 	
         if (!empty($this->aJavascript)) {
             // grab our inner page.
@@ -1172,14 +1174,15 @@ class KTCoreImageSelectWidget extends KTWidget {
             $oPage->requireJSResources($this->aJavascript);
         }
 
-    	$this->aCSS[] = 'resources/css/kt_imageselect.css';
+    	//$this->aCSS[] = 'resources/css/kt_imageselect.css';
+	$this->aCSS[] = 'thirdpartyjs/jquery/plugins/selectimage/css/selectimage.css';
         
         if (!empty($this->aCSS)) {
             // grab our inner page.
             $oPage =& $GLOBALS['main'];            
             $oPage->requireCSSResources($this->aCSS);
         }
-		
+	
         $widget_content = $this->getWidget();
 
         $aTemplateData = array(
diff --git a/resources/js/kt_selectimage.js b/resources/js/kt_selectimage.js
new file mode 100755
index 0000000..d33b257
--- /dev/null
+++ b/resources/js/kt_selectimage.js
@@ -0,0 +1,3 @@
+jQuery(document).ready(function() {
+  jQuery('#kt_image_select_container').selectImage();
+});
diff --git a/setup/wizard/templates/complete.tpl b/setup/wizard/templates/complete.tpl
index 2a944fb..7f88183 100644
--- a/setup/wizard/templates/complete.tpl
+++ b/setup/wizard/templates/complete.tpl
@@ -34,17 +34,22 @@
 					<br/>
 					[START MENU] => [Programs] => [KnowledgeTree 3.7.x] => [services]
 					<br/>
-					Right-Click and run [Install Services] as administrator
+					Right-Click and run [Install Services] as administrator, if applicable, or
+					<br/>
+					Click [Install Services]
 					<br/>
 					[START MENU] => [Programs] => [KnowledgeTree 3.7.x] => [services]
 					<br/>
-					Right-Click and run [Start Services] as administrator
+					Right-Click and run [Start Services] as administrator, if applicable, or
+					<br/>
+					Click [Start Services]
 					<br/>
 					<br/>
 					<b>Alternatively:</b>
 					<br/>
 					Open a command prompt and enter the following:
 					<br/>
+					<br/>
 					cd <?php echo "\"".SYSTEM_DIR."\""; ?> <br/>
 					dmsctl.bat install<br/>
 					dmsctl.bat start
diff --git a/templates/ktcore/forms/widgets/imageselect.smarty b/templates/ktcore/forms/widgets/imageselect.smarty
index c5b281a..7173055 100755
--- a/templates/ktcore/forms/widgets/imageselect.smarty
+++ b/templates/ktcore/forms/widgets/imageselect.smarty
@@ -2,32 +2,17 @@
     <field>
         <div id="kt_image_select_container">
 
-        {foreach key=id item=src from=$value}
+	  <input type="hidden" id="selectimage_src" name="selectimage_src" value="">
+	  <input type="hidden" id="selectimage_alt" name="selectimage_alt" value="">
+	  <input type="hidden" id="selectimage_title" name="selectimage_title" value="">
+	  <input type="hidden" id="selectimage_name" name="selectimage_name" value="">
+	  <input type="hidden" id="selectimage_id" name="selectimage_id" value="">
 
-        <div class="jq_select_image">
-	    <img class="kt_image_select" id="kt_image_select_{$id}" src="{$src}" border="0"/>
-        </div>
-        <script type="text/javascript">
-            var toggle_{$id} = 1;
-            var selected = '';
-            
-            var multiselect = false;
-            
-            var hover = '#f9f9f9';
-            var click = '#f2943a'; //Orange
-            var background_color = 'white'; //also set in css
-            
-            jQuery('#kt_image_select_{$id}').click(function(){ldelim}
-                jQuery('#kt_image_select').val('{$src}');
-                
-                //Resetting background:
-                jQuery("img[id*='kt_image_select_']").css('border', '10px solid ' + background_color);
-                jQuery('#kt_image_select_{$id}').css('border', '10px solid ' + click);
-                
-            {rdelim})
-        </script>
-
-        {/foreach}
+	  {foreach key=id item=src from=$value}
+	    <div class="jq_select_image">
+	      <img class="kt_image_select" id="kt_image_select_{$id}" src="{$src}" border="0"/>
+	    </div>
+	  {/foreach}
         
         </div>
         
diff --git a/thirdpartyjs/jquery/plugins/selectimage/css/selectimage.css b/thirdpartyjs/jquery/plugins/selectimage/css/selectimage.css
new file mode 100644
index 0000000..b9b18fd
--- /dev/null
+++ b/thirdpartyjs/jquery/plugins/selectimage/css/selectimage.css
@@ -0,0 +1,31 @@
+#selectimage_container img {
+    cursor: pointer;
+    text-decoration: none;
+    border: 10px solid white;
+}
+
+#selectimage_container img:hover {
+    text-decoration: none;
+    border: 10px solid white;
+}
+
+.jq_select_image {
+    float: left;
+    border: 1px solid #cccccc;
+    margin-right: 5px;
+    padding: 0px;
+    display:inline;
+    height:70px;
+}
+
+.selectimage_border_background {
+  border: 10px solid white;
+}
+
+.selectimage_border_hover {
+  border: 10px solid #9c9c9c;
+}
+
+.selectimage_border_click {
+  border: 10px solid #f2943a;
+}
\ No newline at end of file
diff --git a/thirdpartyjs/jquery/plugins/selectimage/jquery.selectimage.js b/thirdpartyjs/jquery/plugins/selectimage/jquery.selectimage.js
new file mode 100755
index 0000000..88f7c0e
--- /dev/null
+++ b/thirdpartyjs/jquery/plugins/selectimage/jquery.selectimage.js
@@ -0,0 +1,100 @@
+/**
+ * jQuery Select Image Plugin
+ *
+ * @author Charl Mert <charl@knowledgetree.com>
+ *
+ * KnowledgeTree Community Edition
+ * Document Management Made Simple
+ * Copyright (C) 2009, 2010 KnowledgeTree Inc.
+ * 
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License version 3 as published by the
+ * Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ * You can contact KnowledgeTree Inc., PO Box 7775 #87847, San Francisco, 
+ * California 94120-7775, or email info@knowledgetree.com.
+ * 
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ * 
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "Powered by
+ * KnowledgeTree" logo and retain the original copyright notice. If the display of the 
+ * logo is not reasonably feasible for technical reasons, the Appropriate Legal Notices
+ * must display the words "Powered by KnowledgeTree" and retain the original 
+ * copyright notice.
+ * Contributor( s): ______________________________________
+ */
+
+jQuery.fn.selectImage = function() {
+  return this.each(function(){
+
+    var opt = jQuery.extend({
+      passBackNamespace : 'selectimage', //TODO: Let plugin detect parent form and produce the hidden inputs. For now the user has to place the predefined hidden inputs onto the form manually.
+      multiselect : false,
+      hover : '#e2e2e2',
+      click : '#f2943a', //Orange
+      background : 'white',
+      selected : ''
+    }, opt);
+
+    var containerId = this.id;
+    var custId = 0;
+
+    //Setting up border
+    jQuery('#' + containerId + ' img'   ).css('border', '10px solid ' + opt.background);
+
+    jQuery('#' + containerId + ' img').each(function(){
+      //Assigning custom id's to attach event handlers to
+      if (this.id == '') {
+        this.id = 'select_image_img_' + custId;
+        custId++;
+      }
+
+      var toggle = 1;
+
+      //Click to select
+      jQuery('#' + this.id).click(function(){
+          opt.selected = this.id;
+          jQuery('#' + opt.passBackNamespace + '_src').val(this.src);
+          jQuery('#' + opt.passBackNamespace + '_alt').val(this.alt);
+          jQuery('#' + opt.passBackNamespace + '_title').val(this.title);
+
+          //Resetting background:
+          jQuery('#' + containerId + ' img'   ).css('border', '10px solid ' + opt.background);
+          jQuery('#' + this.id).css('border', '10px solid ' + opt.click);
+      })
+
+        //Hover Effect
+        jQuery('#' + this.id).mouseenter(function(){
+          if (this.id != opt.selected) {
+            jQuery('#' + this.id).css('border', '10px solid ' + opt.hover).show("slow");
+          }
+        })
+
+        jQuery('#' + this.id).mouseleave(function(){
+          if (this.id != opt.selected) {
+            jQuery('#' + this.id).css('border', '10px solid ' + opt.background).show("slow");
+          }
+        })
+
+    });
+  });
+};
+
+jQuery.log = function(message) {
+  if(window.console) {
+     console.debug(message);
+  } else {
+     alert(message);
+  }
+};
\ No newline at end of file