diff --git a/.gitignore b/.gitignore
index e0b064b..6b028df 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,7 @@ config.h
 config.log
 config.status
 demo/demo.js
+demo/keyboard.png
 demo/vt100.js
 libtool
 Makefile
diff --git a/demo/demo.html b/demo/demo.html
index b62a92d..4ffed56 100644
--- a/demo/demo.html
+++ b/demo/demo.html
@@ -2,6 +2,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:v="urn:schemas-microsoft-com:vml" xml:lang="en" lang="en">
   <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
     <!--
     ShellInABox - Make command line applications available as AJAX web applications
     Copyright (C) 2008-2010 Markus Gutschke markus@shellinabox.com
diff --git a/demo/keyboard.html b/demo/keyboard.html
index 6a95f3b..f2aa88d 100644
--- a/demo/keyboard.html
+++ b/demo/keyboard.html
@@ -2,6 +2,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:v="urn:schemas-microsoft-com:vml" xml:lang="en" lang="en">
 <head>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 </head>
 <body><pre class="box"><div
   ><i id="27">Esc</i><i id="112">F1</i><i id="113">F2</i><i id="114">F3</i
diff --git a/demo/keyboard.png b/demo/keyboard.png
deleted file mode 100644
index feef519..0000000
Binary files a/demo/keyboard.png and /dev/null differ
diff --git a/shellinabox/cgi_root.html b/shellinabox/cgi_root.html
index 620ec61..0816065 100644
--- a/shellinabox/cgi_root.html
+++ b/shellinabox/cgi_root.html
@@ -2,6 +2,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:v="urn:schemas-microsoft-com:vml" xml:lang="en" lang="en">
   <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
     <!--
     ShellInABox - Make command line applications available as AJAX web applications
     Copyright (C) 2008-2009 Markus Gutschke markus@shellinabox.com
diff --git a/shellinabox/keyboard-layout.html b/shellinabox/keyboard-layout.html
index 6a95f3b..f2aa88d 100644
--- a/shellinabox/keyboard-layout.html
+++ b/shellinabox/keyboard-layout.html
@@ -2,6 +2,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:v="urn:schemas-microsoft-com:vml" xml:lang="en" lang="en">
 <head>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 </head>
 <body><pre class="box"><div
   ><i id="27">Esc</i><i id="112">F1</i><i id="113">F2</i><i id="114">F3</i
diff --git a/shellinabox/keyboard.png b/shellinabox/keyboard.png
index feef519..1523fb6 100644
Binary files a/shellinabox/keyboard.png and b/shellinabox/keyboard.png differ
diff --git a/shellinabox/root_page.html b/shellinabox/root_page.html
index 41b6488..931a205 100644
--- a/shellinabox/root_page.html
+++ b/shellinabox/root_page.html
@@ -2,6 +2,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:v="urn:schemas-microsoft-com:vml" xml:lang="en" lang="en">
   <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
     <!--
     ShellInABox - Make command line applications available as AJAX web applications
     Copyright (C) 2008-2010 Markus Gutschke markus@shellinabox.com
diff --git a/shellinabox/vt100.jspp b/shellinabox/vt100.jspp
index b29b2c2..d98f617 100755
--- a/shellinabox/vt100.jspp
+++ b/shellinabox/vt100.jspp
@@ -887,8 +887,8 @@ VT100.prototype.initializeElements = function(container) {
                        '<div class="hidden">' +
                          '<div id="usercss"></div>' +
                          '<pre><div><span id="space"></span></div></pre>' +
-                         '<input type="textfield" id="input" autocorrect="off" autocapitalize="off" />' +
-                         '<input type="textfield" id="cliphelper" />' +
+                         '<input type="text" id="input" autocapitalize="off" autocapitalize="off" />' +
+                         '<input type="text" id="cliphelper" />' +
                          (typeof suppressAllAudio != 'undefined' &&
                           suppressAllAudio ? "" :
                          embed + '<bgsound id="beep_bgsound" loop=1 />') +
