diff --git a/firefox/yubnub/chrome/content/yubnub/about.xul b/firefox/yubnub/chrome/content/yubnub/about.xul
index 38049fc..384348c 100644
--- a/firefox/yubnub/chrome/content/yubnub/about.xul
+++ b/firefox/yubnub/chrome/content/yubnub/about.xul
@@ -12,7 +12,7 @@
 <groupbox align="center" orient="horizontal">
 <vbox>
   <text value="YubNub LocationBar" style="font-weight: bold; font-size: x-large;"/>
-  <text value="ver. 0.18"/>
+  <text value="ver. 0.19"/>
   <separator class="thin"/>
   <text value="Created By:" style="font-weight: bold;"/>
   <text value="Stephen Paul Weber" class="url"
diff --git a/firefox/yubnub/chrome/content/yubnub/about.xul~ b/firefox/yubnub/chrome/content/yubnub/about.xul~
deleted file mode 100644
index 59878e9..0000000
--- a/firefox/yubnub/chrome/content/yubnub/about.xul~
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<window class="dialog"
-	title="YubNub LocationBar - About"
-	orient="vertical"
-	autostretch="always"
-	onload="sizeToContent()"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-<!-- Original template by Jed Brown -->
-
-<groupbox align="center" orient="horizontal">
-<vbox>
-  <text value="YubNub LocationBar" style="font-weight: bold; font-size: x-large;"/>
-  <text value="ver. 0.16"/>
-  <separator class="thin"/>
-  <text value="Created By:" style="font-weight: bold;"/>
-  <text value="Stephen Paul Weber" class="url"
-        onclick="window.open('http://singpolyma-tech.blogspot.com/'); window.close();"/>
-  <separator class="thin"/>
-    <text value="Home Page:" style="font-weight: bold;"/>
-    <text value="http://singpolyma-tech.blogspot.com/2006/04/yubnub-locationbar.html"
-          class="url"
-        onclick="window.open('http://singpolyma-tech.blogspot.com/2006/04/yubnub-locationbar.html'); window.close();"/>
-  <separator class="thin"/>
-</vbox>
-<spring flex="1"/>
-<image src="chrome://yubnub/skin/yubnubb.png"/>
-</groupbox>
-
-  <hbox>
-  <spacer flex="1"/>
-   <button label="Close" oncommand="window.close();"/>
-  </hbox>
-
-</window>
\ No newline at end of file
diff --git a/firefox/yubnub/chrome/content/yubnub/yubnubOverlay.js b/firefox/yubnub/chrome/content/yubnub/yubnubOverlay.js
index 2442565..bf8aacd 100644
--- a/firefox/yubnub/chrome/content/yubnub/yubnubOverlay.js
+++ b/firefox/yubnub/chrome/content/yubnub/yubnubOverlay.js
@@ -115,7 +115,7 @@ function YubNubGo(param) {
       cmdstr = cmdstr[1];
       isyubnub = true;
    }//end if match y:
-   if(!isyubnub && (cmdstr.match(/^[^ ]+\.[a-z]{1,4}(\/[^ ]*)?$/m) || cmdstr.match(/^about:.*$/m) || cmdstr.match(/^javascript:.*$/m) || cmdstr.match(/^http:.*$/m) || cmdstr.match(/^ftp[:\.].*$/m) || cmdstr.match(/^file[:\.].*$/m) || cmdstr.match(/^\d\d?\d?.\d\d?\d?.\d\d?\d?.\d\d?\d?$/m)))
+   if(!isyubnub && (cmdstr.match(/^[^ ]+\.[a-z]{1,4}(:[\d]+)?(\/[^ ]*)?$/m) || cmdstr.match(/^about:.*$/m) || cmdstr.match(/^javascript:.*$/m) || cmdstr.match(/^http:.*$/m) || cmdstr.match(/^ftp[:\.].*$/m) || cmdstr.match(/^file[:\.].*$/m) || cmdstr.match(/^\d\d?\d?.\d\d?\d?.\d\d?\d?.\d\d?\d?$/m)))
       return handleURLBarCommand(param);
    else
       YubNubGOTO('http://yubnub.org/parser/parse?sourceid=Mozilla-search&command='+encodeURIComponent(cmdstr));
diff --git a/firefox/yubnub/chrome/content/yubnub/yubnubOverlay.js~ b/firefox/yubnub/chrome/content/yubnub/yubnubOverlay.js~
deleted file mode 100644
index aa3de17..0000000
--- a/firefox/yubnub/chrome/content/yubnub/yubnubOverlay.js~
+++ /dev/null
@@ -1,160 +0,0 @@
-var YubNubHistory = [];
-var YubNubHistoryIdx = 0;
-var wasctrl = false;
-String.prototype.trim = function() { return this.replace(/^\s+|\s+$/g, ""); };
-
-var prefs = Components.classes["@mozilla.org/preferences-service;1"].
-                getService(Components.interfaces.nsIPrefBranch);
-if(prefs.getPrefType("yubnub.history") == prefs.PREF_STRING)
-   YubNubHistory = prefs.getCharPref("yubnub.history").split('{-}');
-
-function isDigit(num) {
-	if (num.length>1){return false;}
-	var string="1234567890";
-	if (string.indexOf(num)!=-1){return true;}
-	return false;
-	}
-   
-function isInteger(val){
-	for(var i=0;i<val.length;i++){
-		if(!isDigit(val.charAt(i))){return false;}
-	}
-	return true;
-}
-   
-function YubNubBarICO() {
-   var baricon = document.getElementById("page-proxy-favicon");
-   baricon.src = "chrome://yubnub/skin/yubnub.png";
-}//end function YubNubBarICO
-
-function YubNubGOTO(url) {
-   var locbar = document.getElementById("urlbar");
-   locbar.value = url;
-   window._content.document.location = url;
-   YubNubBarICO();
-}//end function YubNubGOTO
-
-function YubNubdohistory(cmdstr) {
-   YubNubHistory.push(cmdstr);
-   if(YubNubHistory.length > 50)
-      YubNubHistory.shift();
-   YubNubHistoryIdx = YubNubHistory.length;
-   prefs.setCharPref("yubnub.history",YubNubHistory.join('{-}'));
-   var uri = Components.classes["@mozilla.org/network/io-service;1"].getService(Components.interfaces.nsIIOService).newURI('y:'+cmdstr, null, null);
-   var history = Components.classes["@mozilla.org/browser/global-history;2"].getService(Components.interfaces.nsIBrowserHistory);
-   history.addPageWithDetails(uri,cmdstr,new Date().getTime());
-   history.markPageAsTyped(uri);
-}//end function YubNubdohistory
-
-function YubNubGo(param) {
-   YubNubBarICO();
-   var locbar = document.getElementById("urlbar");
-   var cmdstr = locbar.value;
-   var cmd = new String(locbar.value).split(' ');
-   cmd = cmd[0];
-   var hadkey = false;
-   var bmURL = '';
-   
-   //get keywords
-      var dataSource = Components.classes["@mozilla.org/rdf/datasource;1?name=bookmarks"]
-                                 .getService(Components.interfaces.nsIRDFDataSource);
-      var service = Components.classes["@mozilla.org/rdf/rdf-service;1"]
-                              .getService(Components.interfaces.nsIRDFService);
-      var resources = dataSource.GetAllResources();
-	var shortcutURLPredicate = service.GetResource( "http://home.netscape.com/NC-rdf#ShortcutURL" ); 
-      var namePredicate = service.GetResource( "http://home.netscape.com/NC-rdf#Name" );
-      var urlPredicate = service.GetResource( "http://home.netscape.com/NC-rdf#URL" );
-      
-      while( resources.hasMoreElements( ) )
-      {
-        var bookmark = resources.getNext( );
-      
-        if( bookmark instanceof Components.interfaces.nsIRDFResource )
-        {
-          var name = dataSource.GetTarget( bookmark, namePredicate, true );
-          var shortcutURL = dataSource.GetTarget( bookmark, shortcutURLPredicate, true );
-          var URL = dataSource.GetTarget( bookmark, urlPredicate, true );
-         
-          if( shortcutURL instanceof Components.interfaces.nsIRDFLiteral &&
-              name instanceof Components.interfaces.nsIRDFLiteral && 
-              URL instanceof Components.interfaces.nsIRDFLiteral )
-          {
-            hadkey = hadkey || (shortcutURL.Value == cmd);
-            if(hadkey) {bmURL = URL.Value; break;}
-          }
-        }
-      }
-   if(hadkey) {
-      var value = {'%s':cmdstr};
-      if(bmURL.match(/\${/)) {
-         value = cmdstr.split(' -');
-         for(var i in value) {
-            if(i == 0) {value['%s'] = value[i];continue;}
-            var tmp = value[i].split(' ');
-            var key = tmp.shift();
-            tmp = tmp.join(' ');
-            value[key.trim()] = tmp;
-         }//for...in value
-      }//end if switches
-      var tmp = value['%s'].split(' ');
-      tmp.shift();
-      value['%s'] = tmp.join(' ');
-      tmp = bmURL;
-      tmp = tmp.replace(/%s/,value['%s']);
-      for(var i in value) {
-         if(isInteger(i) || i == '%s') continue;
-         tmp = tmp.replace(new RegExp('\\${'+i+'}','g'),value[i]);
-      }//end for ... in value
-      YubNubGOTO(tmp);
-      YubNubdohistory(cmdstr);
-      return true;
-   }//end if hadkey
-   var isyubnub = false;
-   if(cmdstr.match(/^y:.*$/m)) {//if is y:
-      cmdstr = cmdstr.match(/^y:(.*)$/m);
-      cmdstr = cmdstr[1];
-      isyubnub = true;
-   }//end if match y:
-   if(!isyubnub && (cmdstr.match(/^[^ ]+\.[a-z]{1,4}(\/[^ ]*)?$/m) || cmdstr.match(/^about:.*$/m) || cmdstr.match(/^javascript:.*$/m) || cmdstr.match(/^http:.*$/m) || cmdstr.match(/^\d\d?\d?.\d\d?\d?.\d\d?\d?.\d\d?\d?$/m)))
-      return handleURLBarCommand(param);
-   else
-      YubNubGOTO('http://yubnub.org/parser/parse?sourceid=Mozilla-search&command='+encodeURIComponent(cmdstr));
-   YubNubdohistory(cmdstr);
-   return true;
-}//end function yubnubgo
-
-function YubNubKey(event) {
-   if(event.keyCode == 17) {wasctrl = true;return false;}
-   if(wasctrl && event.keyCode == 38) {
-      var locbar = document.getElementById("urlbar");
-      YubNubHistoryIdx--;
-      if(YubNubHistoryIdx < 0)
-         YubNubHistoryIdx = YubNubHistory.length-1;
-      locbar.value = YubNubHistory[YubNubHistoryIdx];
-      wasctrl = false;
-      return false;
-   }//end if up-arrow
-   if(wasctrl && event.keyCode == 40) {
-      var locbar = document.getElementById("urlbar");
-      YubNubHistoryIdx++;
-      if(YubNubHistoryIdx > YubNubHistory.length-1)
-         YubNubHistoryIdx = 0;
-      locbar.value = YubNubHistory[YubNubHistoryIdx];
-      if(locbar.value == 'undefined')
-         locbar.value = '';
-      wasctrl = false;
-      return false;
-   }//end if down-arrow
-   wasctrl = false;
-   return true;
-}//end YubNubKey
-
-
-/* auto icon-changeing code */
-
-function blank2yubico() {
-   if(!window._content.document.location || new String(window._content.document.location).match(/^about:.*$/m))
-      YubNubBarICO();
-}//end functin blank2yubico
-window.addEventListener("pageshow", blank2yubico, false);
-window.addEventListener('focus', blank2yubico, false);
\ No newline at end of file
diff --git a/firefox/yubnub/install.js b/firefox/yubnub/install.js
index f2c7d36..5c6565f 100644
--- a/firefox/yubnub/install.js
+++ b/firefox/yubnub/install.js
@@ -6,7 +6,7 @@ var XpiInstaller = {
 	// --- Editable items begin ---
 	extFullName: 'YubNub LocationBar', // The name displayed to the user (don't include the version)
 	extShortName: 'yubnub', // The leafname of the JAR file (without the .jar part)
-	extVersion: '0.18',
+	extVersion: '0.19',
 	extAuthor: 'Stephen Paul Weber',
 	extLocaleNames: null, // e.g. ['en-US', 'en-GB']
 	extSkinNames: null, // e.g. ['classic', 'modern']
diff --git a/firefox/yubnub/install.rdf b/firefox/yubnub/install.rdf
index 1f83bad..a6da8a3 100644
--- a/firefox/yubnub/install.rdf
+++ b/firefox/yubnub/install.rdf
@@ -7,7 +7,7 @@ xmlns:em="http://www.mozilla.org/2004/em-rdf#">
 
 		<em:id>{3120A7EC-D068-11DA-9B41-B622A1EF5492}</em:id>
 		<em:name>YubNub LocationBar</em:name>
-		<em:version>0.17</em:version>
+		<em:version>0.19</em:version>
 		<em:description>Adds YubNub support to locationbar</em:description>
 		<em:creator>Stephen Paul Weber</em:creator>
 		<em:homepageURL>http://singpolyma-tech.blogspot.com/</em:homepageURL>