diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..1ecdc79
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/fxkeyboard*
diff --git a/src/chrome.manifest b/src/chrome.manifest
index 3731dca..c2d5040 100644
--- a/src/chrome.manifest
+++ b/src/chrome.manifest
@@ -1,12 +1,5 @@
 content	fxkeyboard chrome/content/ 
 
 locale	fxkeyboard en-US chrome/locale/en-US/
-locale	fxkeyboard de-DE chrome/locale/de-DE/
-locale	fxkeyboard sl-SI chrome/locale/sl-SI/
-locale	fxkeyboard hr-HR chrome/locale/hr-HR/
-locale  fxkeyboard ru-RU chrome/locale/ru-RU/
-locale	fxkeyboard it-IT chrome/locale/it-IT/
-locale	fxkeyboard pl-PL chrome/locale/pl-PL/
-locale	fxkeyboard fr-FR chrome/locale/fr-FR/
 
 overlay	chrome://browser/content/browser.xul	chrome://fxkeyboard/locale/overlay.xul
diff --git a/src/chrome/content/overlay.css b/src/chrome/content/overlay.css
index fcac560..7891ca2 100644
--- a/src/chrome/content/overlay.css
+++ b/src/chrome/content/overlay.css
@@ -4,8 +4,5 @@
 
 #fxKeyboardToolbar  button {
 	min-width:1px;
+	font-family: mono;
 }
-
-.fxKeyboardActionKeys {
-	font-weight:bold;
-}
\ No newline at end of file
diff --git a/src/chrome/content/overlay.js b/src/chrome/content/overlay.js
index 394692b..fd322e3 100644
--- a/src/chrome/content/overlay.js
+++ b/src/chrome/content/overlay.js
@@ -32,7 +32,7 @@ var fxKeyboard = {
 				buttons[b].flex = 1;
 		}
 	
-		this.shift = 0; // 0 closed, 1 open, 2 persistent
+		//this.shift = 0; // 0 closed, 1 open, 2 persistent
 		this.toolbar = document.getElementById('fxKeyboardToolbar');
 		this.mainKeys = document.getElementById('fxKeyboardMainKeys');
 		this.keys = this.mainKeys.getElementsByClassName('fxKeyboardKey');
@@ -88,11 +88,11 @@ var fxKeyboard = {
 	{
 		// press a key on the focused item
 		if (typeof(key)=='string') {
-			if (this.shift > 0) {
+			/*if (this.shift > 0) {
 				key = key.toUpperCase();
 				if ( this.shift<2 )
 					this.undoShift();
-			}
+			}*/
 			key = key.charCodeAt(0);
 		} 
 		
@@ -110,7 +110,7 @@ var fxKeyboard = {
 		evt.initKeyEvent("keypress", true, true, null, false, false, false, false, key, 0);
 		this.focus.dispatchEvent(evt);
 	},
-	undoShift: function () {
+	/*undoShift: function () {
 		fxKeyboard.shift = 0;
 		for( var k in fxKeyboard.keys) {
 			if (fxKeyboard.keys[k].label!==undefined)
@@ -145,33 +145,27 @@ var fxKeyboard = {
 				this.undoShift();
 				break;
 		}
-	},
-	switchAltKeys: function () {
+	},*/
+	switchAltKeys: function ( keep ) {
 		// reset shift
-		if ( this.shift > 0) {
+		/*if ( this.shift > 0) {
 			document.getElementById('fxKeyboardShift').style.color = 'inherit';
 			this.undoShift();
-		}
+		}*/
 	
-		switch ( this.alt ) {
-			case 0:
-				// show alt
-				this.mainKeys.collapsed = true;
-				this.altKeys.collapsed = false;
-				this.alt = 1;
-				break;
-			case 1:
-				// keep alt
+		if (this.alt > 0) {
+			document.getElementById('fxKeyboardAlt').style.color = 'inherit';
+			this.mainKeys.collapsed = false;
+			this.altKeys.collapsed = true;
+			this.alt = 0;
+		} else {
+			this.mainKeys.collapsed = true;
+			this.altKeys.collapsed = false;
+			this.alt = 1;
+			if (keep) {
 				document.getElementById('fxKeyboardAlt').style.color = 'red';
 				this.alt = 2;
-				break;
-			default:
-				// show default
-				document.getElementById('fxKeyboardAlt').style.color = 'inherit';
-				this.mainKeys.collapsed = false;
-				this.altKeys.collapsed = true;
-				this.alt = 0;
-				break;
+			}
 		}
 	},	
 	doClear: function() {
diff --git a/src/chrome/locale/de-DE/overlay.xul b/src/chrome/locale/de-DE/overlay.xul
deleted file mode 100644
index 1abfbb6..0000000
--- a/src/chrome/locale/de-DE/overlay.xul
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet href="chrome://fxkeyboard/content/overlay.css" type="text/css"?>
-<overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-	<script type="application/x-javascript" src="chrome://fxkeyboard/content/overlay.js"/>
-	<vbox>
-		<hbox collapsed="true" id="fxKeyboardToolbar" flex="1">
-			<vbox flex="1">
-				<vbox flex="1" id="fxKeyboardMainKeys" >
-					<hbox flex="1">
-						<button label="q" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('q')"/>
-						<button label="w" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('w')"/>
-						<button label="e" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('e')"/>
-						<button label="r" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('r')"/>
-						<button label="t" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('t')"/>
-						<button label="z" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('z')"/>
-						<button label="u" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('u')"/>
-						<button label="i" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('i')"/>
-						<button label="o" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('o')"/>
-						<button label="p" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('p')"/>
-						<button label="ü" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('ü')"/>
-						<button label="ß" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('ß')"/>
-					</hbox>
-					<hbox flex="1">
-						<button label="a" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('a')"/>
-						<button label="s" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('s')"/>
-						<button label="d" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('d')"/>
-						<button label="f" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('f')"/>
-						<button label="g" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('g')"/>
-						<button label="h" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('h')"/>
-						<button label="j" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('j')"/>
-						<button label="k" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('k')"/>
-						<button label="l" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('l')"/>
-						<button label="ö" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('ö')"/>
-						<button label="ä" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('ä')"/>
-					</hbox>
-					<hbox flex="1">
-						<button label="Umschalt" flex="2" class="fxKeyboardActionKeys" id="fxKeyboardShift" oncommand="fxKeyboard.doShift()"/>
-						<button label="y" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('y')"/>
-						<button label="x" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('x')"/>
-						<button label="c" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('c')"/>
-						<button label="v" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('v')"/>
-						<button label="b" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('b')"/>
-						<button label="n" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('n')"/>
-						<button label="m" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('m')"/>
-						<button label="&#8592; Rücktaste" type="repeat" class="fxKeyboardActionKeys" flex="2" oncommand="fxKeyboard.doSpecialKey(8)"/>
-					</hbox>
-				</vbox>
-				<vbox id="fxKeyboardAltKeys" collapsed="true" >
-					<hbox flex="1">
-						<button label="1" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('1')"/>
-						<button label="2" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('2')"/>
-						<button label="3" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('3')"/>
-						<button label="4" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('4')"/>
-						<button label="5" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('5')"/>
-						<button label="6" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('6')"/>
-						<button label="7" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('7')"/>
-						<button label="8" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('8')"/>
-						<button label="9" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('9')"/>
-						<button label="0" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('0')"/>
-					</hbox>
-					<hbox flex="1">
-						<button label="@" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('@')"/>
-						<button label="#" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('#')"/>
-						<button label="$" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('$')"/>
-						<button label="%" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('%')"/>
-						<button label="&amp;" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('&amp;')"/>
-						<button label="*" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('*')"/>
-						<button label="-" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('-')"/>
-						<button label="+" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('+')"/>
-						<button label="." class="fxKeyboardKey" oncommand="fxKeyboard.doKey('.')"/>
-						<button label="," class="fxKeyboardKey" oncommand="fxKeyboard.doKey(',')"/>
-					</hbox>
-					<hbox flex="1">
-						<button label="Umschalt" flex="2" class="fxKeyboardActionKeys" oncommand="fxKeyboard.doShift()"/>
-						<button label="!" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('!')"/>
-						<button label="&#34;" class="fxKeyboardKey" oncommand="fxKeyboard.doKey(34)"/>
-						<button label="'" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('\'')"/>
-						<button label=":" class="fxKeyboardKey" oncommand="fxKeyboard.doKey(':')"/>
-						<button label=";" class="fxKeyboardKey" oncommand="fxKeyboard.doKey(';')"/>
-						<button label="&#47;" class="fxKeyboardKey" oncommand="fxKeyboard.doKey(47)"/>
-						<button label="?" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('?')"/>
-						<button label="(" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('(')"/>
-						<button label=")" class="fxKeyboardKey" oncommand="fxKeyboard.doKey(')')"/>
-						<button label="&#8592; Rücktaste" type="repeat" class="fxKeyboardActionKeys"  flex="2" oncommand="fxKeyboard.doSpecialKey(8)"/>
-					</hbox>
-				</vbox>
-				<hbox flex="1" id="fxKeyboardBottomRow">
-					<button label="?123" flex="1" class="fxKeyboardActionKeys" id="fxKeyboardAlt" oncommand="fxKeyboard.switchAltKeys()" />
-					<button label="&#10008; Löschen" flex="1" class="fxKeyboardActionKeys" oncommand="fxKeyboard.doClear()" />
-					<button label="&#160;" flex="5" id="fxKeyboardSpace" oncommand="fxKeyboard.doKey(32)" />
-					<button label="&#10004; Eingabe" class="fxKeyboardActionKeys" flex="1" oncommand="fxKeyboard.doSpecialKey(13)"/>
-				</hbox>
-			</vbox>
-		</hbox>
-	</vbox>
-</overlay>
\ No newline at end of file
diff --git a/src/chrome/locale/en-US/overlay.xul b/src/chrome/locale/en-US/overlay.xul
index 44b869e..330547e 100644
--- a/src/chrome/locale/en-US/overlay.xul
+++ b/src/chrome/locale/en-US/overlay.xul
@@ -7,6 +7,23 @@
 			<vbox flex="1">
 				<vbox flex="1" id="fxKeyboardMainKeys" >
 					<hbox flex="1">
+						<button label="`" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('`')"/>
+						<button label="1" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('1')"/>
+						<button label="2" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('2')"/>
+						<button label="3" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('3')"/>
+						<button label="4" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('4')"/>
+						<button label="5" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('5')"/>
+						<button label="6" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('6')"/>
+						<button label="7" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('7')"/>
+						<button label="8" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('8')"/>
+						<button label="9" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('9')"/>
+						<button label="0" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('0')"/>
+						<button label="-" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('-')"/>
+						<button label="=" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('=')"/>
+						<button label="&#8592;" type="repeat" class="fxKeyboardActionKeys topleft"  flex="2" oncommand="fxKeyboard.doSpecialKey(8)"/>
+					</hbox>
+					<hbox flex="1">
+						<button label="Tab" class="fxKeyboardActionKeys topleft" flex="1" oncommand="fxKeyboard.doKey('\t')"/>
 						<button label="q" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('q')"/>
 						<button label="w" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('w')"/>
 						<button label="e" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('e')"/>
@@ -17,8 +34,13 @@
 						<button label="i" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('i')"/>
 						<button label="o" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('o')"/>
 						<button label="p" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('p')"/>
+						<button label="[" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('[')"/>
+						<button label="]" class="fxKeyboardKey" oncommand="fxKeyboard.doKey(']')"/>
+						<button label="\" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('\\')"/>
+						<button label="Del" type="repeat" class="fxKeyboardActionKeys topleft" oncommand="fxKeyboard.doSpecialKey(46)"/>
 					</hbox>
 					<hbox flex="1">
+						<button label="Caps" flex="2" class="fxKeyboardActionKeys topleft" oncommand="fxKeyboard.switchAltKeys(true)" />
 						<button label="a" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('a')"/>
 						<button label="s" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('s')"/>
 						<button label="d" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('d')"/>
@@ -28,9 +50,12 @@
 						<button label="j" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('j')"/>
 						<button label="k" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('k')"/>
 						<button label="l" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('l')"/>
+						<button label=";" class="fxKeyboardKey" oncommand="fxKeyboard.doKey(';')"/>
+						<button label="'" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('\'')"/>
+						<button label="Enter" class="fxKeyboardActionKeys topleft" flex="2" oncommand="fxKeyboard.doSpecialKey(13)"/>
 					</hbox>
 					<hbox flex="1">
-						<button label="Shift" flex="2" class="fxKeyboardActionKeys" id="fxKeyboardShift" oncommand="fxKeyboard.doShift()"/>
+						<button label="Shift" flex="3" class="fxKeyboardActionKeys topleft" oncommand="fxKeyboard.switchAltKeys()" />
 						<button label="z" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('z')"/>
 						<button label="x" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('x')"/>
 						<button label="c" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('c')"/>
@@ -38,53 +63,78 @@
 						<button label="b" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('b')"/>
 						<button label="n" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('n')"/>
 						<button label="m" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('m')"/>
-						<button label="&#8592; Backspace" type="repeat" class="fxKeyboardActionKeys" flex="2" oncommand="fxKeyboard.doSpecialKey(8)"/>
+						<button label="," class="fxKeyboardKey" oncommand="fxKeyboard.doKey(',')"/>
+						<button label="." class="fxKeyboardKey" oncommand="fxKeyboard.doKey('.')"/>
+						<button label="/" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('/')"/>
+						<button label="Shift" flex="3" class="fxKeyboardActionKeys topleft" oncommand="fxKeyboard.switchAltKeys()" />
 					</hbox>
 				</vbox>
 				<vbox id="fxKeyboardAltKeys" collapsed="true" >
 					<hbox flex="1">
-						<button label="1" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('1')"/>
-						<button label="2" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('2')"/>
-						<button label="3" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('3')"/>
-						<button label="4" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('4')"/>
-						<button label="5" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('5')"/>
-						<button label="6" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('6')"/>
-						<button label="7" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('7')"/>
-						<button label="8" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('8')"/>
-						<button label="9" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('9')"/>
-						<button label="0" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('0')"/>
-					</hbox>
-					<hbox flex="1">
+						<button label="~" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('~')"/>
+						<button label="!" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('!')"/>
 						<button label="@" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('@')"/>
 						<button label="#" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('#')"/>
 						<button label="$" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('$')"/>
 						<button label="%" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('%')"/>
-						<button label="&amp;" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('&amp;')"/>
+						<button label="^" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('^')"/>
+						<button label="&#38;" class="fxKeyboardKey" oncommand="fxKeyboard.doKey(38)"/>
 						<button label="*" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('*')"/>
-						<button label="-" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('-')"/>
+						<button label="(" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('(')"/>
+						<button label=")" class="fxKeyboardKey" oncommand="fxKeyboard.doKey(')')"/>
+						<button label="_" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('_')"/>
 						<button label="+" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('+')"/>
-						<button label="." class="fxKeyboardKey" oncommand="fxKeyboard.doKey('.')"/>
-						<button label="," class="fxKeyboardKey" oncommand="fxKeyboard.doKey(',')"/>
+						<button label="&#8592;" type="repeat" class="fxKeyboardActionKeys topleft"  flex="2" oncommand="fxKeyboard.doSpecialKey(8)"/>
 					</hbox>
 					<hbox flex="1">
-						<button label="Shift" flex="2" class="fxKeyboardActionKeys" oncommand="fxKeyboard.doShift()"/>
-						<button label="!" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('!')"/>
-						<button label="&#34;" class="fxKeyboardKey" oncommand="fxKeyboard.doKey(34)"/>
-						<button label="'" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('\'')"/>
+						<button label="Tab" class="fxKeyboardActionKeys topleft" flex="1" oncommand="fxKeyboard.doKey('\t')"/>
+						<button label="Q" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('Q')"/>
+						<button label="W" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('W')"/>
+						<button label="E" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('E')"/>
+						<button label="R" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('R')"/>
+						<button label="T" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('T')"/>
+						<button label="Y" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('Y')"/>
+						<button label="U" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('U')"/>
+						<button label="I" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('I')"/>
+						<button label="O" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('O')"/>
+						<button label="P" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('P')"/>
+						<button label="{" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('{')"/>
+						<button label="}" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('}')"/>
+						<button label="|" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('|')"/>
+						<button label="Del" type="repeat" class="fxKeyboardActionKeys topleft" oncommand="fxKeyboard.doSpecialKey(127)"/>
+					</hbox>
+					<hbox flex="1">
+						<button label="Caps" flex="2" class="fxKeyboardActionKeys topleft" id="fxKeyboardAlt" oncommand="fxKeyboard.switchAltKeys(true)" />
+						<button label="A" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('A')"/>
+						<button label="S" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('S')"/>
+						<button label="D" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('D')"/>
+						<button label="F" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('F')"/>
+						<button label="G" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('G')"/>
+						<button label="H" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('H')"/>
+						<button label="J" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('J')"/>
+						<button label="K" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('K')"/>
+						<button label="L" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('L')"/>
 						<button label=":" class="fxKeyboardKey" oncommand="fxKeyboard.doKey(':')"/>
-						<button label=";" class="fxKeyboardKey" oncommand="fxKeyboard.doKey(';')"/>
-						<button label="&#47;" class="fxKeyboardKey" oncommand="fxKeyboard.doKey(47)"/>
+						<button label='"' class="fxKeyboardKey" oncommand="fxKeyboard.doKey(34)"/>
+						<button label="Enter" class="fxKeyboardActionKeys topleft" flex="2" oncommand="fxKeyboard.doSpecialKey(13)"/>
+					</hbox>
+					<hbox flex="1">
+						<button label="Shift" flex="3" class="fxKeyboardActionKeys topleft" oncommand="fxKeyboard.switchAltKeys()" />
+						<button label="Z" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('Z')"/>
+						<button label="X" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('X')"/>
+						<button label="C" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('C')"/>
+						<button label="V" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('V')"/>
+						<button label="B" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('B')"/>
+						<button label="N" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('N')"/>
+						<button label="M" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('M')"/>
+						<button label="&#60;" class="fxKeyboardKey" oncommand="fxKeyboard.doKey(60)"/>
+						<button label="&#62;" class="fxKeyboardKey" oncommand="fxKeyboard.doKey(62)"/>
 						<button label="?" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('?')"/>
-						<button label="(" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('(')"/>
-						<button label=")" class="fxKeyboardKey" oncommand="fxKeyboard.doKey(')')"/>
-						<button label="&#8592; Backspace" type="repeat" class="fxKeyboardActionKeys"  flex="2" oncommand="fxKeyboard.doSpecialKey(8)"/>
+						<button label="Shift" flex="3" class="fxKeyboardActionKeys topleft" oncommand="fxKeyboard.switchAltKeys()" />
 					</hbox>
 				</vbox>
 				<hbox flex="1" id="fxKeyboardBottomRow">
-					<button label="?123" flex="1" class="fxKeyboardActionKeys" id="fxKeyboardAlt" oncommand="fxKeyboard.switchAltKeys()" />
-					<button label="&#10008; Clear" flex="1" class="fxKeyboardActionKeys" oncommand="fxKeyboard.doClear()" />
 					<button label="&#160;" flex="5" id="fxKeyboardSpace" oncommand="fxKeyboard.doKey(32)" />
-					<button label="&#10004; Enter" class="fxKeyboardActionKeys" flex="1" oncommand="fxKeyboard.doSpecialKey(13)"/>
 				</hbox>
 			</vbox>
 		</hbox>
diff --git a/src/chrome/locale/fr-FR/overlay.xul b/src/chrome/locale/fr-FR/overlay.xul
deleted file mode 100644
index 9f12da9..0000000
--- a/src/chrome/locale/fr-FR/overlay.xul
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet href="chrome://fxkeyboard/content/overlay.css" type="text/css"?>
-<overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-	<script type="application/x-javascript" src="chrome://fxkeyboard/content/overlay.js"/>
-	<vbox>
-		<hbox collapsed="true" id="fxKeyboardToolbar" flex="1">
-			<vbox flex="1">
-				<vbox flex="1" id="fxKeyboardMainKeys" >
-					<hbox flex="1">
-						<button label="a" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('a')"/>
-						<button label="z" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('z')"/>
-						<button label="e" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('e')"/>
-						<button label="r" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('r')"/>
-						<button label="t" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('t')"/>
-						<button label="y" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('y')"/>
-						<button label="u" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('u')"/>
-						<button label="i" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('i')"/>
-						<button label="o" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('o')"/>
-						<button label="p" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('p')"/>
-					</hbox>
-					<hbox flex="1">
-						<button label="q" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('q')"/>
-						<button label="s" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('s')"/>
-						<button label="d" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('d')"/>
-						<button label="f" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('f')"/>
-						<button label="g" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('g')"/>
-						<button label="h" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('h')"/>
-						<button label="j" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('j')"/>
-						<button label="k" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('k')"/>
-						<button label="l" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('l')"/>
-					</hbox>
-					<hbox flex="1">
-						<button label="Maj" flex="2" class="fxKeyboardActionKeys" id="fxKeyboardShift" oncommand="fxKeyboard.doShift()"/>
-						<button label="w" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('w')"/>
-						<button label="x" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('x')"/>
-						<button label="c" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('c')"/>
-						<button label="v" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('v')"/>
-						<button label="b" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('b')"/>
-						<button label="n" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('n')"/>
-						<button label="m" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('m')"/>
-						<button label="&#8592; Retour" type="repeat" class="fxKeyboardActionKeys" flex="2" oncommand="fxKeyboard.doSpecialKey(8)"/>
-					</hbox>
-				</vbox>
-				<vbox id="fxKeyboardAltKeys" collapsed="true" >
-					<hbox flex="1">
-						<button label="1" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('1')"/>
-						<button label="2" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('2')"/>
-						<button label="3" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('3')"/>
-						<button label="4" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('4')"/>
-						<button label="5" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('5')"/>
-						<button label="6" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('6')"/>
-						<button label="7" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('7')"/>
-						<button label="8" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('8')"/>
-						<button label="9" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('9')"/>
-						<button label="0" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('0')"/>
-					</hbox>
-					<hbox flex="1">
-						<button label="@" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('@')"/>
-						<button label="#" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('#')"/>
-						<button label="$" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('$')"/>
-						<button label="%" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('%')"/>
-						<button label="&amp;" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('&amp;')"/>
-						<button label="*" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('*')"/>
-						<button label="-" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('-')"/>
-						<button label="+" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('+')"/>
-						<button label="." class="fxKeyboardKey" oncommand="fxKeyboard.doKey('.')"/>
-						<button label="," class="fxKeyboardKey" oncommand="fxKeyboard.doKey(',')"/>
-					</hbox>
-					<hbox flex="1">
-						<button label="Maj" flex="2" class="fxKeyboardActionKeys" oncommand="fxKeyboard.doShift()"/>
-						<button label="!" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('!')"/>
-						<button label="&#34;" class="fxKeyboardKey" oncommand="fxKeyboard.doKey(34)"/>
-						<button label="'" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('\'')"/>
-						<button label=":" class="fxKeyboardKey" oncommand="fxKeyboard.doKey(':')"/>
-						<button label=";" class="fxKeyboardKey" oncommand="fxKeyboard.doKey(';')"/>
-						<button label="&#47;" class="fxKeyboardKey" oncommand="fxKeyboard.doKey(47)"/>
-						<button label="?" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('?')"/>
-						<button label="(" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('(')"/>
-						<button label=")" class="fxKeyboardKey" oncommand="fxKeyboard.doKey(')')"/>
-						<button label="&#8592; Retour" type="repeat" class="fxKeyboardActionKeys"  flex="2" oncommand="fxKeyboard.doSpecialKey(8)"/>
-					</hbox>
-				</vbox>
-				<hbox flex="1" id="fxKeyboardBottomRow">
-					<button label="?123" flex="1" class="fxKeyboardActionKeys" id="fxKeyboardAlt" oncommand="fxKeyboard.switchAltKeys()" />
-					<button label="&#10008; Effacer" flex="1" class="fxKeyboardActionKeys" oncommand="fxKeyboard.doClear()" />
-					<button label="&#160;" flex="5" id="fxKeyboardSpace" oncommand="fxKeyboard.doKey(32)" />
-					<button label="&#10004; Entrée" class="fxKeyboardActionKeys" flex="1" oncommand="fxKeyboard.doSpecialKey(13)"/>
-				</hbox>
-			</vbox>
-		</hbox>
-	</vbox>
-</overlay>
\ No newline at end of file
diff --git a/src/chrome/locale/hr-HR/overlay.xul b/src/chrome/locale/hr-HR/overlay.xul
deleted file mode 100644
index ffe6722..0000000
--- a/src/chrome/locale/hr-HR/overlay.xul
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet href="chrome://fxkeyboard/content/overlay.css" type="text/css"?>
-<overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-	<script type="application/x-javascript" src="chrome://fxkeyboard/content/overlay.js"/>
-	<vbox>
-		<hbox collapsed="true" id="fxKeyboardToolbar" flex="1">
-			<vbox flex="1">
-				<vbox flex="1" id="fxKeyboardMainKeys" >
-					<hbox flex="1">
-						<button label="q" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('q')"/>
-						<button label="w" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('w')"/>
-						<button label="e" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('e')"/>
-						<button label="r" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('r')"/>
-						<button label="t" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('t')"/>
-						<button label="z" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('z')"/>
-						<button label="u" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('u')"/>
-						<button label="i" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('i')"/>
-						<button label="o" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('o')"/>
-						<button label="p" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('p')"/>
-						<button label="š" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('š')"/>
-					</hbox>
-					<hbox flex="1">
-						<button label="a" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('a')"/>
-						<button label="s" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('s')"/>
-						<button label="d" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('d')"/>
-						<button label="f" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('f')"/>
-						<button label="g" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('g')"/>
-						<button label="h" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('h')"/>
-						<button label="j" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('j')"/>
-						<button label="k" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('k')"/>
-						<button label="l" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('l')"/>
-						<button label="č" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('č')"/>
-						<button label="ć" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('ć')"/>
-					</hbox>
-					<hbox flex="1">
-						<button label="Shift" flex="2" class="fxKeyboardActionKeys" id="fxKeyboardShift" oncommand="fxKeyboard.doShift()"/>
-						<button label="y" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('y')"/>
-						<button label="x" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('x')"/>
-						<button label="c" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('c')"/>
-						<button label="v" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('v')"/>
-						<button label="b" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('b')"/>
-						<button label="n" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('n')"/>
-						<button label="m" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('m')"/>
-						<button label="đ" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('đ')"/>
-						<button label="ž" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('ž')"/>
-						<button label="&#8592; Brisanje" type="repeat" class="fxKeyboardActionKeys" flex="2" oncommand="fxKeyboard.doSpecialKey(8)"/>
-					</hbox>
-				</vbox>
-				<vbox id="fxKeyboardAltKeys" collapsed="true" >
-					<hbox flex="1">
-						<button label="1" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('1')"/>
-						<button label="2" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('2')"/>
-						<button label="3" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('3')"/>
-						<button label="4" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('4')"/>
-						<button label="5" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('5')"/>
-						<button label="6" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('6')"/>
-						<button label="7" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('7')"/>
-						<button label="8" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('8')"/>
-						<button label="9" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('9')"/>
-						<button label="0" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('0')"/>
-					</hbox>
-					<hbox flex="1">
-						<button label="@" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('@')"/>
-						<button label="#" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('#')"/>
-						<button label="$" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('$')"/>
-						<button label="%" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('%')"/>
-						<button label="&amp;" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('&amp;')"/>
-						<button label="*" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('*')"/>
-						<button label="-" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('-')"/>
-						<button label="+" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('+')"/>
-						<button label="." class="fxKeyboardKey" oncommand="fxKeyboard.doKey('.')"/>
-						<button label="," class="fxKeyboardKey" oncommand="fxKeyboard.doKey(',')"/>
-					</hbox>
-					<hbox flex="1">
-						<button label="Shift" flex="2" class="fxKeyboardActionKeys" oncommand="fxKeyboard.doShift()"/>
-						<button label="!" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('!')"/>
-						<button label="&#34;" class="fxKeyboardKey" oncommand="fxKeyboard.doKey(34)"/>
-						<button label="'" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('\'')"/>
-						<button label=":" class="fxKeyboardKey" oncommand="fxKeyboard.doKey(':')"/>
-						<button label=";" class="fxKeyboardKey" oncommand="fxKeyboard.doKey(';')"/>
-						<button label="&#47;" class="fxKeyboardKey" oncommand="fxKeyboard.doKey(47)"/>
-						<button label="?" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('?')"/>
-						<button label="(" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('(')"/>
-						<button label=")" class="fxKeyboardKey" oncommand="fxKeyboard.doKey(')')"/>
-						<button label="&#8592; Brisanje" type="repeat" class="fxKeyboardActionKeys"  flex="2" oncommand="fxKeyboard.doSpecialKey(8)"/>
-					</hbox>
-				</vbox>
-				<hbox flex="1" id="fxKeyboardBottomRow">
-					<button label="?123" flex="1" class="fxKeyboardActionKeys" id="fxKeyboardAlt" oncommand="fxKeyboard.switchAltKeys()" />
-					<button label="&#10008; Obriši" flex="1" class="fxKeyboardActionKeys" oncommand="fxKeyboard.doClear()" />
-					<button label="&#160;" flex="5" id="fxKeyboardSpace" oncommand="fxKeyboard.doKey(32)" />
-					<button label="&#10004; Enter" class="fxKeyboardActionKeys" flex="1" oncommand="fxKeyboard.doSpecialKey(13)"/>
-				</hbox>
-			</vbox>
-		</hbox>
-	</vbox>
-</overlay>
\ No newline at end of file
diff --git a/src/chrome/locale/it-IT/overlay.xul b/src/chrome/locale/it-IT/overlay.xul
deleted file mode 100644
index 63cd503..0000000
--- a/src/chrome/locale/it-IT/overlay.xul
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet href="chrome://fxkeyboard/content/overlay.css" type="text/css"?>
-<overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-	<script type="application/x-javascript" src="chrome://fxkeyboard/content/overlay.js"/>
-	<vbox>
-		<hbox collapsed="true" id="fxKeyboardToolbar" flex="1">
-			<vbox flex="1">
-				<vbox flex="1" id="fxKeyboardMainKeys" >
-					<hbox flex="1">
-						<button label="q" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('q')"/>
-						<button label="w" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('w')"/>
-						<button label="e" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('e')"/>
-						<button label="r" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('r')"/>
-						<button label="t" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('t')"/>
-						<button label="y" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('y')"/>
-						<button label="u" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('u')"/>
-						<button label="i" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('i')"/>
-						<button label="o" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('o')"/>
-						<button label="p" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('p')"/>
-					</hbox>
-					<hbox flex="1">
-						<button label="a" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('a')"/>
-						<button label="s" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('s')"/>
-						<button label="d" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('d')"/>
-						<button label="f" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('f')"/>
-						<button label="g" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('g')"/>
-						<button label="h" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('h')"/>
-						<button label="j" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('j')"/>
-						<button label="k" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('k')"/>
-						<button label="l" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('l')"/>
-					</hbox>
-					<hbox flex="1">
-						<button label="Shift" flex="2" class="fxKeyboardActionKeys" id="fxKeyboardShift" oncommand="fxKeyboard.doShift()"/>
-						<button label="z" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('z')"/>
-						<button label="x" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('x')"/>
-						<button label="c" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('c')"/>
-						<button label="v" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('v')"/>
-						<button label="b" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('b')"/>
-						<button label="n" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('n')"/>
-						<button label="m" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('m')"/>
-						<button label="&#8592; Backspace" type="repeat" class="fxKeyboardActionKeys" flex="2" oncommand="fxKeyboard.doSpecialKey(8)"/>
-					</hbox>
-				</vbox>
-				<vbox id="fxKeyboardAltKeys" collapsed="true" >
-					<hbox flex="1">
-						<button label="1" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('1')"/>
-						<button label="2" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('2')"/>
-						<button label="3" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('3')"/>
-						<button label="4" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('4')"/>
-						<button label="5" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('5')"/>
-						<button label="6" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('6')"/>
-						<button label="7" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('7')"/>
-						<button label="8" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('8')"/>
-						<button label="9" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('9')"/>
-						<button label="0" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('0')"/>
-					</hbox>
-					<hbox flex="1">
-						<button label="!" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('!')"/>
-						<button label="&#34;" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('&#34;')"/>
-						<button label="£" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('£')"/>
-						<button label="$" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('$')"/>
-						<button label="%" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('%')"/>
-						<button label="&amp;" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('&amp;')"/>
-						<button label="/" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('/')"/>
-						<button label="(" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('(')"/>
-						<button label=")" class="fxKeyboardKey" oncommand="fxKeyboard.doKey(')')"/>
-						<button label="=" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('=')"/>
-					</hbox>
-					<hbox flex="1">
-						<button label="Shift" flex="2" class="fxKeyboardActionKeys" oncommand="fxKeyboard.doShift()"/>
-						<button label="," class="fxKeyboardKey" oncommand="fxKeyboard.doKey(',')"/>
-						<button label="." class="fxKeyboardKey" oncommand="fxKeyboard.doKey('.')"/>
-						<button label=";" class="fxKeyboardKey" oncommand="fxKeyboard.doKey(';')"/>
-						<button label=":" class="fxKeyboardKey" oncommand="fxKeyboard.doKey(':')"/>
-						<button label="-" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('-')"/>
-						<button label="’" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('’')"/>
-						<button label="?" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('?')"/>
-						<button label="@" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('@')"/>
-						<button label="#" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('#')"/>
-						<button label="&#8592; Cancella" type="repeat" class="fxKeyboardActionKeys"  flex="2" oncommand="fxKeyboard.doSpecialKey(8)"/>
-					</hbox>
-				</vbox>
-				<hbox flex="1" id="fxKeyboardBottomRow">
-					<button label="?123" flex="1" class="fxKeyboardActionKeys" id="fxKeyboardAlt" oncommand="fxKeyboard.switchAltKeys()" />
-					<button label="&#10008; Cancella tutto" flex="1" class="fxKeyboardActionKeys" oncommand="fxKeyboard.doClear()" />
-					<button label="&#160; Spazio" flex="5" id="fxKeyboardSpace" oncommand="fxKeyboard.doKey(32)" />
-					<button label="&#10004; Invio" class="fxKeyboardActionKeys" flex="1" oncommand="fxKeyboard.doSpecialKey(13)"/>
-				</hbox>
-			</vbox>
-		</hbox>
-	</vbox>
-</overlay>
\ No newline at end of file
diff --git a/src/chrome/locale/pl-PL/overlay.xul b/src/chrome/locale/pl-PL/overlay.xul
deleted file mode 100644
index 83af6bf..0000000
--- a/src/chrome/locale/pl-PL/overlay.xul
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet href="chrome://fxkeyboard/content/overlay.css" type="text/css"?>
-<overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-	<script type="application/x-javascript" src="chrome://fxkeyboard/content/overlay.js"/>
-	<vbox>
-		<hbox collapsed="true" id="fxKeyboardToolbar" flex="1">
-			<vbox flex="1">
-				<vbox flex="1" id="fxKeyboardMainKeys" >
-					<hbox flex="1">
-						<button label="q" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('q')"/>
-						<button label="w" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('w')"/>
-						<button label="e" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('e')"/>
-						<button label="ę" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('ę')"/>
-						<button label="r" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('r')"/>
-						<button label="t" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('t')"/>
-						<button label="y" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('y')"/>
-						<button label="u" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('u')"/>
-						<button label="i" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('i')"/>
-						<button label="o" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('o')"/>
-						<button label="ó" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('ó')"/>
-						<button label="p" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('p')"/>
-					</hbox>
-					<hbox flex="1">
-						<button label="a" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('a')"/>
-						<button label="ą" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('ą')"/>
-						<button label="s" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('s')"/>
-						<button label="ś" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('ś')"/>
-						<button label="d" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('d')"/>
-						<button label="f" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('f')"/>
-						<button label="g" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('g')"/>
-						<button label="h" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('h')"/>
-						<button label="j" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('j')"/>
-						<button label="k" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('k')"/>
-						<button label="l" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('l')"/>
-						<button label="ł" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('ł')"/>
-					</hbox>
-					<hbox flex="1">
-						<button label="Shift" flex="2" class="fxKeyboardActionKeys" id="fxKeyboardShift" oncommand="fxKeyboard.doShift()"/>
-						<button label="z" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('z')"/>
-						<button label="ż" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('ż')"/>
-						<button label="ź" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('ź')"/>
-						<button label="x" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('x')"/>
-						<button label="c" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('c')"/>
-						<button label="ć" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('ć')"/>
-						<button label="v" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('v')"/>
-						<button label="b" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('b')"/>
-						<button label="n" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('n')"/>
-						<button label="ń" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('ń')"/>
-						<button label="m" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('m')"/>
-						<button label="&#8592; Backspace" type="repeat" class="fxKeyboardActionKeys" flex="2" oncommand="fxKeyboard.doSpecialKey(8)"/>
-					</hbox>
-				</vbox>
-				<vbox id="fxKeyboardAltKeys" collapsed="true" >
-					<hbox flex="1">
-						<button label="1" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('1')"/>
-						<button label="2" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('2')"/>
-						<button label="3" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('3')"/>
-						<button label="4" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('4')"/>
-						<button label="5" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('5')"/>
-						<button label="6" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('6')"/>
-						<button label="7" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('7')"/>
-						<button label="8" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('8')"/>
-						<button label="9" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('9')"/>
-						<button label="0" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('0')"/>
-						<button label="-" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('-')"/>
-						<button label="+" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('+')"/>
-						<button label="=" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('=')"/>
-						<button label="_" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('_')"/>
-					</hbox>
-					<hbox flex="1">
-						<button label="&#126;" class="fxKeyboardKey" oncommand="fxKeyboard.doKey(126)"/>
-						<button label="@" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('@')"/>
-						<button label="#" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('#')"/>
-						<button label="$" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('$')"/>
-						<button label="%" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('%')"/>
-						<button label="&#94;" class="fxKeyboardKey" oncommand="fxKeyboard.doKey(94)"/>
-						<button label="&amp;" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('&amp;')"/>
-						<button label="*" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('*')"/>
-						<button label="." class="fxKeyboardKey" oncommand="fxKeyboard.doKey('.')"/>
-						<button label="," class="fxKeyboardKey" oncommand="fxKeyboard.doKey(',')"/>
-                        <button label="&#60;" class="fxKeyboardKey" oncommand="fxKeyboard.doKey(60)"/>
-                        <button label="&#62;" class="fxKeyboardKey" oncommand="fxKeyboard.doKey(62)"/>
-                        <button label="&#123;" class="fxKeyboardKey" oncommand="fxKeyboard.doKey(123)"/>
-                        <button label="&#125;" class="fxKeyboardKey" oncommand="fxKeyboard.doKey(125)"/>
-					</hbox>
-					<hbox flex="1">
-						<button label="Shift" flex="2" class="fxKeyboardActionKeys" oncommand="fxKeyboard.doShift()"/>
-						<button label="!" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('!')"/>
-						<button label="&#34;" class="fxKeyboardKey" oncommand="fxKeyboard.doKey(34)"/>
-						<button label="'" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('\'')"/>
-						<button label=":" class="fxKeyboardKey" oncommand="fxKeyboard.doKey(':')"/>
-						<button label=";" class="fxKeyboardKey" oncommand="fxKeyboard.doKey(';')"/>
-						<button label="&#47;" class="fxKeyboardKey" oncommand="fxKeyboard.doKey(47)"/>
-						<button label="&#92;" class="fxKeyboardKey" oncommand="fxKeyboard.doKey(92)"/>
-						<button label="&#124;" class="fxKeyboardKey" oncommand="fxKeyboard.doKey(124)"/>
-						<button label="?" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('?')"/>
-						<button label="(" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('(')"/>
-						<button label=")" class="fxKeyboardKey" oncommand="fxKeyboard.doKey(')')"/>
-						<button label="&#8592; Backspace" type="repeat" class="fxKeyboardActionKeys"  flex="2" oncommand="fxKeyboard.doSpecialKey(8)"/>
-					</hbox>
-				</vbox>
-				<hbox flex="1" id="fxKeyboardBottomRow">
-					<button label="?123" flex="1" class="fxKeyboardActionKeys" id="fxKeyboardAlt" oncommand="fxKeyboard.switchAltKeys()" />
-					<button label="&#10008; Clear" flex="1" class="fxKeyboardActionKeys" oncommand="fxKeyboard.doClear()" />
-					<button label="&#160;" flex="5" id="fxKeyboardSpace" oncommand="fxKeyboard.doKey(32)" />
-					<button label="&#10004; Enter" class="fxKeyboardActionKeys" flex="1" oncommand="fxKeyboard.doSpecialKey(13)"/>
-				</hbox>
-			</vbox>
-		</hbox>
-	</vbox>
-</overlay>
diff --git a/src/chrome/locale/ru-RU/overlay.xul b/src/chrome/locale/ru-RU/overlay.xul
deleted file mode 100644
index de357be..0000000
--- a/src/chrome/locale/ru-RU/overlay.xul
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet href="chrome://fxkeyboard/content/overlay.css" type="text/css"?>
-<overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-	<script type="application/x-javascript" src="chrome://fxkeyboard/content/overlay.js"/>
-	<vbox>
-		<hbox collapsed="true" id="fxKeyboardToolbar" flex="1">
-			<vbox flex="1">
-				<vbox flex="1" id="fxKeyboardMainKeys" >
-					<hbox flex="1">
-						<button label="й" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('й')"/>
-						<button label="ц" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('ц')"/>
-						<button label="у" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('у')"/>
-						<button label="к" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('к')"/>
-						<button label="е" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('е')"/>
-						<button label="н" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('н')"/>
-						<button label="г" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('г')"/>
-						<button label="ш" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('ш')"/>
-						<button label="щ" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('щ')"/>
-						<button label="з" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('з')"/>
-						<button label="х" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('х')"/>
-						<button label="ъ" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('ъ')"/>
-					</hbox>
-					<hbox flex="1">
-						<button label="ф" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('ф')"/>
-						<button label="ы" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('ы')"/>
-						<button label="в" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('в')"/>
-						<button label="а" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('а')"/>
-						<button label="п" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('п')"/>
-						<button label="р" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('р')"/>
-						<button label="о" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('о')"/>
-						<button label="л" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('л')"/>
-						<button label="д" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('д')"/>
-						<button label="ж" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('ж')"/>
-						<button label="э" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('э')"/>
-					</hbox>
-					<hbox flex="1">
-						<button label="Shift" flex="2" class="fxKeyboardActionKeys" id="fxKeyboardShift" oncommand="fxKeyboard.doShift()"/>
-						<button label="я" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('я')"/>
-						<button label="ч" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('ч')"/>
-						<button label="с" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('с')"/>
-						<button label="м" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('м')"/>
-						<button label="и" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('и')"/>
-						<button label="т" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('т')"/>
-						<button label="ь" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('ь')"/>
-						<button label="б" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('б')"/>
-						<button label="ю" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('ю')"/>
-						<button label="&#8592; Backspace" type="repeat" class="fxKeyboardActionKeys" flex="2" oncommand="fxKeyboard.doSpecialKey(8)"/>
-					</hbox>
-				</vbox>
-				<vbox id="fxKeyboardAltKeys" collapsed="true" >
-					<hbox flex="1">
-						<button label="1" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('1')"/>
-						<button label="2" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('2')"/>
-						<button label="3" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('3')"/>
-						<button label="4" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('4')"/>
-						<button label="5" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('5')"/>
-						<button label="6" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('6')"/>
-						<button label="7" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('7')"/>
-						<button label="8" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('8')"/>
-						<button label="9" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('9')"/>
-						<button label="0" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('0')"/>
-					</hbox>
-					<hbox flex="1">
-						<button label="@" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('@')"/>
-						<button label="#" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('#')"/>
-						<button label="$" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('$')"/>
-						<button label="%" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('%')"/>
-						<button label="&amp;" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('&amp;')"/>
-						<button label="*" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('*')"/>
-						<button label="-" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('-')"/>
-						<button label="+" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('+')"/>
-						<button label="." class="fxKeyboardKey" oncommand="fxKeyboard.doKey('.')"/>
-						<button label="," class="fxKeyboardKey" oncommand="fxKeyboard.doKey(',')"/>
-					</hbox>
-					<hbox flex="1">
-						<button label="Shift" flex="2" class="fxKeyboardActionKeys" oncommand="fxKeyboard.doShift()"/>
-						<button label="!" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('!')"/>
-						<button label="&#34;" class="fxKeyboardKey" oncommand="fxKeyboard.doKey(34)"/>
-						<button label="'" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('\'')"/>
-						<button label=":" class="fxKeyboardKey" oncommand="fxKeyboard.doKey(':')"/>
-						<button label=";" class="fxKeyboardKey" oncommand="fxKeyboard.doKey(';')"/>
-						<button label="&#47;" class="fxKeyboardKey" oncommand="fxKeyboard.doKey(47)"/>
-						<button label="?" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('?')"/>
-						<button label="(" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('(')"/>
-						<button label=")" class="fxKeyboardKey" oncommand="fxKeyboard.doKey(')')"/>
-						<button label="&#8592; Backspace" type="repeat" class="fxKeyboardActionKeys"  flex="2" oncommand="fxKeyboard.doSpecialKey(8)"/>
-					</hbox>
-				</vbox>
-				<hbox flex="1" id="fxKeyboardBottomRow">
-					<button label="?123" flex="1" class="fxKeyboardActionKeys" id="fxKeyboardAlt" oncommand="fxKeyboard.switchAltKeys()" />
-					<button label="&#10008; Clear" flex="1" class="fxKeyboardActionKeys" oncommand="fxKeyboard.doClear()" />
-					<button label="&#160;" flex="5" id="fxKeyboardSpace" oncommand="fxKeyboard.doKey(32)" />
-					<button label="&#10004; Enter" class="fxKeyboardActionKeys" flex="1" oncommand="fxKeyboard.doSpecialKey(13)"/>
-				</hbox>
-			</vbox>
-		</hbox>
-	</vbox>
-</overlay>
diff --git a/src/chrome/locale/sl-SI/overlay.xul b/src/chrome/locale/sl-SI/overlay.xul
deleted file mode 100644
index 328fa7d..0000000
--- a/src/chrome/locale/sl-SI/overlay.xul
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet href="chrome://fxkeyboard/content/overlay.css" type="text/css"?>
-<overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-	<script type="application/x-javascript" src="chrome://fxkeyboard/content/overlay.js"/>
-	<vbox>
-		<hbox collapsed="true" id="fxKeyboardToolbar" flex="1">
-			<vbox flex="1">
-				<vbox flex="1" id="fxKeyboardMainKeys" >
-					<hbox flex="1">
-						<button label="q" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('q')"/>
-						<button label="w" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('w')"/>
-						<button label="e" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('e')"/>
-						<button label="r" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('r')"/>
-						<button label="t" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('t')"/>
-						<button label="z" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('z')"/>
-						<button label="u" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('u')"/>
-						<button label="i" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('i')"/>
-						<button label="o" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('o')"/>
-						<button label="p" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('p')"/>
-						<button label="š" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('š')"/>
-					</hbox>
-					<hbox flex="1">
-						<button label="a" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('a')"/>
-						<button label="s" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('s')"/>
-						<button label="d" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('d')"/>
-						<button label="f" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('f')"/>
-						<button label="g" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('g')"/>
-						<button label="h" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('h')"/>
-						<button label="j" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('j')"/>
-						<button label="k" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('k')"/>
-						<button label="l" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('l')"/>
-						<button label="č" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('č')"/>
-						<button label="ć" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('ć')"/>
-					</hbox>
-					<hbox flex="1">
-						<button label="Dvigalka" flex="2" class="fxKeyboardActionKeys" id="fxKeyboardShift" oncommand="fxKeyboard.doShift()"/>
-						<button label="y" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('y')"/>
-						<button label="x" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('x')"/>
-						<button label="c" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('c')"/>
-						<button label="v" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('v')"/>
-						<button label="b" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('b')"/>
-						<button label="n" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('n')"/>
-						<button label="m" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('m')"/>
-						<button label="đ" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('đ')"/>
-						<button label="ž" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('ž')"/>
-						<button label="&#8592; Vračalka" type="repeat" class="fxKeyboardActionKeys" flex="2" oncommand="fxKeyboard.doSpecialKey(8)"/>
-					</hbox>
-				</vbox>
-				<vbox id="fxKeyboardAltKeys" collapsed="true" >
-					<hbox flex="1">
-						<button label="1" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('1')"/>
-						<button label="2" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('2')"/>
-						<button label="3" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('3')"/>
-						<button label="4" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('4')"/>
-						<button label="5" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('5')"/>
-						<button label="6" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('6')"/>
-						<button label="7" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('7')"/>
-						<button label="8" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('8')"/>
-						<button label="9" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('9')"/>
-						<button label="0" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('0')"/>
-					</hbox>
-					<hbox flex="1">
-						<button label="@" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('@')"/>
-						<button label="#" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('#')"/>
-						<button label="$" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('$')"/>
-						<button label="%" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('%')"/>
-						<button label="&amp;" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('&amp;')"/>
-						<button label="*" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('*')"/>
-						<button label="-" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('-')"/>
-						<button label="+" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('+')"/>
-						<button label="." class="fxKeyboardKey" oncommand="fxKeyboard.doKey('.')"/>
-						<button label="," class="fxKeyboardKey" oncommand="fxKeyboard.doKey(',')"/>
-					</hbox>
-					<hbox flex="1">
-						<button label="Dvigalka" flex="2" class="fxKeyboardActionKeys" oncommand="fxKeyboard.doShift()"/>
-						<button label="!" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('!')"/>
-						<button label="&#34;" class="fxKeyboardKey" oncommand="fxKeyboard.doKey(34)"/>
-						<button label="'" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('\'')"/>
-						<button label=":" class="fxKeyboardKey" oncommand="fxKeyboard.doKey(':')"/>
-						<button label=";" class="fxKeyboardKey" oncommand="fxKeyboard.doKey(';')"/>
-						<button label="&#47;" class="fxKeyboardKey" oncommand="fxKeyboard.doKey(47)"/>
-						<button label="?" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('?')"/>
-						<button label="(" class="fxKeyboardKey" oncommand="fxKeyboard.doKey('(')"/>
-						<button label=")" class="fxKeyboardKey" oncommand="fxKeyboard.doKey(')')"/>
-						<button label="&#8592; Vračalka" type="repeat" class="fxKeyboardActionKeys"  flex="2" oncommand="fxKeyboard.doSpecialKey(8)"/>
-					</hbox>
-				</vbox>
-				<hbox flex="1" id="fxKeyboardBottomRow">
-					<button label="?123" flex="1" class="fxKeyboardActionKeys" id="fxKeyboardAlt" oncommand="fxKeyboard.switchAltKeys()" />
-					<button label="&#10008; Izbriši" flex="1" class="fxKeyboardActionKeys" oncommand="fxKeyboard.doClear()" />
-					<button label="&#160;" flex="5" id="fxKeyboardSpace" oncommand="fxKeyboard.doKey(32)" />
-					<button label="&#10004; Vnesi" class="fxKeyboardActionKeys" flex="1" oncommand="fxKeyboard.doSpecialKey(13)"/>
-				</hbox>
-			</vbox>
-		</hbox>
-	</vbox>
-</overlay>
\ No newline at end of file
diff --git a/src/install.rdf b/src/install.rdf
index 0810c2f..7e62c18 100644
--- a/src/install.rdf
+++ b/src/install.rdf
@@ -3,7 +3,7 @@
 	<Description about="urn:mozilla:install-manifest">
 		<em:id>fxkeyboard@zabreznik.net</em:id>
 		<em:name>FxKeyboard</em:name> 
-		<em:version>2.4.2</em:version>
+		<em:version>2.4.2~alternate</em:version>
 		<em:description>A virtual keyboard for Firefox</em:description>
 		<em:creator>Marko Zabreznik</em:creator>
 		<em:homepageURL>http://zabreznik.net</em:homepageURL>
@@ -14,7 +14,7 @@
 		<Description>
 			<em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
 			<em:minVersion>4.0.*</em:minVersion>
-			<em:maxVersion>16.*</em:maxVersion>
+			<em:maxVersion>30.*</em:maxVersion>
 		</Description>
 		</em:targetApplication>
 	</Description>