diff --git a/public/static/css/mapguesser.css b/public/static/css/mapguesser.css
index 65a4637..01538a9 100644
--- a/public/static/css/mapguesser.css
+++ b/public/static/css/mapguesser.css
@@ -241,7 +241,7 @@ button.green:enabled:hover, button.green:enabled:focus, a.button.green:hover, a.
     background-color: #1b7d31;
 }
 
-input[type=text], select, textarea {
+input.text, select, textarea {
     background-color: #f9fafb;
     border: solid #c8d2e1 1px;
     border-radius: 2px;
@@ -250,7 +250,7 @@ input[type=text], select, textarea {
     font-weight: 300;
 }
 
-input[type=text], select {
+input.text, select {
     height: 30px;
     line-height: 30px;
     padding: 0 5px;
@@ -265,11 +265,11 @@ textarea {
     resize: none;
 }
 
-input[type=text].big, select.big, textarea.big, div.inputWithButton>input[type=text] {
+input.text.big, select.big, textarea.big, div.inputWithButton>input.text {
     font-size: 18px;
 }
 
-input[type=text].big, select.big, div.inputWithButton>input[type=text] {
+input.text.big, select.big, div.inputWithButton>input.text {
     height: 35px;
     line-height: 35px;
     padding: 0 6px;
@@ -284,19 +284,19 @@ input.fullWidth, select.fullWidth, textarea.fullWidth {
     width: 100%;
 }
 
-input[type=text]:disabled, select:disabled, textarea:disabled {
+input.text:disabled, select:disabled, textarea:disabled {
     background-color: #dfdfdf;
     border: solid #dfdfdf 1px;
     color: #000000;
 }
 
-input[type=text]:focus, select:focus, textarea:focus {
+input.text:focus, select:focus, textarea:focus {
     background-color: #ffffff;
     border: solid #29457f 2px;
     outline: none;
 }
 
-input[type=text]:focus, select:focus {
+input.text:focus, select:focus {
     padding: 0 4px;
 }
 
@@ -304,16 +304,16 @@ textarea:focus {
     padding: 4px;
 }
 
-input[type=text].big:focus, select.big:focus {
+input.text.big:focus, select.big:focus {
     padding: 0 5px;
 }
 
-div.inputWithButton>input[type=text] {
+div.inputWithButton>input.text {
     width: 100%;
     padding: 0 83px 0 6px;
 }
 
-div.inputWithButton>input[type=text]:focus {
+div.inputWithButton>input.text:focus {
     padding: 0 82px 0 5px;
 }
 
diff --git a/views/account/account.php b/views/account/account.php
index 5ace830..b83e909 100644
--- a/views/account/account.php
+++ b/views/account/account.php
@@ -9,24 +9,24 @@
             <?php if ($user['password'] !== null && $user['google_sub'] !== null): ?>
                 <p class="justify small">Please confirm your identity with your password or with Google to modify your account.</p>
                 <div class="inputWithButton">
-                    <input type="password" name="password" placeholder="Current password" required minlength="6" autofocus><!--
+                    <input type="password" class="text name="password" placeholder="Current password" required minlength="6" autofocus><!--
                  --><button id="authenticateWithGoogleButton" class="yellow" type="button">Google</button>
                 </div>
             <?php elseif ($user['password'] !== null): ?>
                 <p class="justify small">Please confirm your identity with your password to modify your account.</p>
-                <input class="big fullWidth" type="password" name="password" placeholder="Current password" required minlength="6" autofocus>
+                <input type="password" class="text big fullWidth" name="password" placeholder="Current password" required minlength="6" autofocus>
             <?php elseif ($user['google_sub'] !== null): ?>
                 <p class="justify small">Please confirm your identity with Google to modify your account.</p>
                 <div class="inputWithButton">
-                    <input type="text" name="password" placeholder="Authenticate with Google..." disabled><!--
+                    <input type="text" class="text" name="password" placeholder="Authenticate with Google..." disabled><!--
                  --><button id="authenticateWithGoogleButton" class="yellow" type="button">Google</button>
                 </div>
             <?php endif; ?>
             <hr>
             <?php /* TODO: disabled for the time being, email modification should be implemented */ ?>
-            <input class="big fullWidth" type="email" name="email" placeholder="Email address" value="<?= $user['email'] ?>" disabled>
-            <input class="big fullWidth marginTop" type="password" name="password_new" placeholder="New password" minlength="6">
-            <input class="big fullWidth marginTop" type="password" name="password_new_confirm" placeholder="New password confirmation" minlength="6">
+            <input type="email" class="text big fullWidth" name="email" placeholder="Email address" value="<?= $user['email'] ?>" disabled>
+            <input type="password" class="text big fullWidth marginTop" name="password_new" placeholder="New password" minlength="6">
+            <input type="password" class="text big fullWidth marginTop" name="password_new_confirm" placeholder="New password confirmation" minlength="6">
             <p id="accountFormError" class="formError justify marginTop"></p>
             <div class="right marginTop">
                 <button type="submit" name="submit" disabled>Save</button>
diff --git a/views/account/delete.php b/views/account/delete.php
index 51f4c36..c667333 100644
--- a/views/account/delete.php
+++ b/views/account/delete.php
@@ -10,16 +10,16 @@
             <?php if ($user['password'] !== null && $user['google_sub'] !== null): ?>
                 <p class="justify small">Please confirm your identity with your password or with Google to delete your account.</p>
                 <div class="inputWithButton">
-                    <input type="password" name="password" placeholder="Current password" required minlength="6" autofocus><!--
+                    <input type="password" class="text" name="password" placeholder="Current password" required minlength="6" autofocus><!--
                  --><button id="authenticateWithGoogleButton" class="yellow" type="button">Google</button>
                 </div>
             <?php elseif ($user['password'] !== null): ?>
                 <p class="justify small">Please confirm your identity with your password to delete your account.</p>
-                <input class="big fullWidth" type="password" name="password" placeholder="Current password" required minlength="6" autofocus>
+                <input type="password" class="text big fullWidth" name="password" placeholder="Current password" required minlength="6" autofocus>
             <?php elseif ($user['google_sub'] !== null): ?>
                 <p class="justify small">Please confirm your identity with Google to delete your account.</p>
                 <div class="inputWithButton">
-                    <input type="text" name="password" placeholder="Authenticate with Google..." disabled><!--
+                    <input type="text" class="text" name="password" placeholder="Authenticate with Google..." disabled><!--
                  --><button id="authenticateWithGoogleButton" class="yellow" type="button">Google</button>
                 </div>
             <?php endif; ?>
diff --git a/views/admin/map_editor.php b/views/admin/map_editor.php
index 2908278..afc856d 100644
--- a/views/admin/map_editor.php
+++ b/views/admin/map_editor.php
@@ -19,7 +19,7 @@
                 </button>
            </span><!--
         --><span class="inline hideOnMobile">
-               <input type="text" id="jumpCoordinates" placeholder="Insert coordinates here" />
+               <input type="text" class="text" id="jumpCoordinates" placeholder="Insert coordinates here" />
                <button id="jumpButton" disabled >Jump</button>
            </span><!--
         --><span><!--
@@ -52,8 +52,8 @@
 <div id="metadata" class="modal">
     <h2>Edit map data</h2>
     <form id="metadataForm" class="marginTop" data-no-submit="true">
-        <input class="fullWidth" type="text" name="name" value="<?= $mapName ?>" placeholder="Name of the map">
-        <textarea  class="fullWidth marginTop" name="description" rows="4" placeholder="Description of the map"><?= $mapDescription ?></textarea>
+        <input type="text" class="text fullWidth" name="name" value="<?= $mapName ?>" placeholder="Name of the map">
+        <textarea class="fullWidth marginTop" name="description" rows="4" placeholder="Description of the map"><?= $mapDescription ?></textarea>
         <div class="marginTop">
             <input type="checkbox" id="unlisted" name="unlisted" <?= $mapUnlisted ? 'checked' : '' ?>><label for="unlisted">Unlisted</label>
         </div>
diff --git a/views/login/google_signup.php b/views/login/google_signup.php
index 172c2e1..1cb0149 100644
--- a/views/login/google_signup.php
+++ b/views/login/google_signup.php
@@ -11,7 +11,7 @@
             <?php else: ?>
                 <p class="justify">Please confirm your sign up request. Your account will be linked to your Google account.</p>
             <?php endif; ?>
-            <input class="big fullWidth marginTop" type="email" name="email" placeholder="Email address" value="<?= $email ?>" disabled>
+            <input type="email" class="text big fullWidth marginTop" name="email" placeholder="Email address" value="<?= $email ?>" disabled>
             <div class="right">
                 <button class="marginTop marginRight" type="submit">
                     <?php if ($found): ?>
diff --git a/views/login/login.php b/views/login/login.php
index 3319030..77881a0 100644
--- a/views/login/login.php
+++ b/views/login/login.php
@@ -4,8 +4,8 @@
     <h2>Login</h2>
     <div class="box">
         <form id="loginForm" action="/login" method="post" data-redirect-on-success="/">
-            <input class="big fullWidth" type="email" name="email" placeholder="Email address" required autofocus>
-            <input class="big fullWidth marginTop" type="password" name="password" placeholder="Password" required minlength="6">
+            <input type="email" class="text big fullWidth" name="email" placeholder="Email address" required autofocus>
+            <input type="password"  class="text big fullWidth marginTop" name="password" placeholder="Password" required minlength="6">
             <p id="loginFormError" class="formError justify marginTop"></p>
             <div class="right marginTop">
                 <button type="submit">Login</button>
diff --git a/views/login/password_reset_request.php b/views/login/password_reset_request.php
index 4f0b862..22d5fe5 100644
--- a/views/login/password_reset_request.php
+++ b/views/login/password_reset_request.php
@@ -4,7 +4,7 @@
     <h2>Request password reset</h2>
     <div class="box">
         <form id="passwordResetForm" action="/password/requestReset" method="post" data-redirect-on-success="/password/requestReset/success">
-            <input class="big fullWidth" type="email" name="email" placeholder="Email address" value="<?= isset($email) ? $email : '' ?>" required autofocus>
+            <input type="email" class="text big fullWidth" name="email" placeholder="Email address" value="<?= isset($email) ? $email : '' ?>" required autofocus>
             <p id="passwordResetFormError" class="formError justify marginTop"></p>
             <div class="right marginTop">
                 <button type="submit">Continue</button>
diff --git a/views/login/reset_password.php b/views/login/reset_password.php
index ad8750a..28dc505 100644
--- a/views/login/reset_password.php
+++ b/views/login/reset_password.php
@@ -5,9 +5,9 @@
     <div class="box">
         <?php if ($success) : ?>
             <form id="resetPasswordForm" action="/password/reset/<?= $token ?>" method="post" data-redirect-on-success="/">
-                <input class="big fullWidth" type="email" name="email" placeholder="Email address" value="<?= $email ?>" disabled>
-                <input class="big fullWidth marginTop" type="password" name="password" placeholder="Password" required minlength="6" autofocus>
-                <input class="big fullWidth marginTop" type="password" name="password_confirm" placeholder="Password confirmation" required minlength="6">
+                <input type="email" class="text big fullWidth" name="email" placeholder="Email address" value="<?= $email ?>" disabled>
+                <input type="password" class="text big fullWidth marginTop" name="password" placeholder="Password" required minlength="6" autofocus>
+                <input type="password" class="text big fullWidth marginTop" name="password_confirm" placeholder="Password confirmation" required minlength="6">
                 <p id="resetPasswordFormError" class="formError justify marginTop"></p>
                 <div class="right">
                     <button class="marginTop" type="submit">Reset password</button>
diff --git a/views/login/signup.php b/views/login/signup.php
index 1af3863..75ea59d 100644
--- a/views/login/signup.php
+++ b/views/login/signup.php
@@ -8,12 +8,12 @@
         <form id="signupForm" action="/signup" method="post" data-redirect-on-success="/signup/success">
             <?php if (isset($email)): ?>
                 <p class="justify">No user found with the given email address. Sign up with one click!</p>
-                <input class="big fullWidth marginTop" type="email" name="email" placeholder="Email address" value="<?= $email ?>" required>
-                <input class="big fullWidth marginTop" type="password" name="password" placeholder="Password confirmation" required minlength="6" autofocus>
+                <input type="email" class="text big fullWidth marginTop" name="email" placeholder="Email address" value="<?= $email ?>" required>
+                <input type="password" class="text big fullWidth marginTop" name="password" placeholder="Password confirmation" required minlength="6" autofocus>
             <?php else: ?>
-                <input class="big fullWidth" type="email" name="email" placeholder="Email address" required autofocus>
-                <input class="big fullWidth marginTop" type="password" name="password" placeholder="Password" required minlength="6">
-                <input class="big fullWidth marginTop" type="password" name="password_confirm" placeholder="Password confirmation" minlength="6">
+                <input type="email" class="text big fullWidth" name="email" placeholder="Email address" required autofocus>
+                <input type="password" class="text big fullWidth marginTop" name="password" placeholder="Password" required minlength="6">
+                <input type="password" class="text big fullWidth marginTop" name="password_confirm" placeholder="Password confirmation" minlength="6">
             <?php endif; ?>
             <p id="signupFormError" class="formError justify marginTop"></p>
             <div class="right">
diff --git a/views/maps.php b/views/maps.php
index 79c76ae..82a79c9 100644
--- a/views/maps.php
+++ b/views/maps.php
@@ -25,7 +25,7 @@ TODO: condition!
         <a id="createNewRoomButton" class="button fullWidth green" href="" title="Create new room">Create new room</a>
         <p class="bold center marginTop marginBottom">OR</p>
         <div class="inputWithButton">
-            <input type="text" name="roomId" placeholder="Room to connect" required minlength="6" maxlength="6"><!--
+            <input type="text" class="text" name="roomId" placeholder="Room to connect" required minlength="6" maxlength="6"><!--
          --><button id="authenticateWithGoogleButton" type="submit">Connect</button>
         </div>
         <div class="right">
@@ -36,13 +36,6 @@ TODO: condition!
 <div id="challenge" class="modal">
     <h2>Challenge (gamma)</h2>
     <form id="challengeForm" class="marginTop" method="get">
-        <!--
-        <div class="inputWithButton">
-            <input type="text" name="challengeToken" placeholder="Challenge to enter" required minlength="6" maxlength="6">
-        </div>
-        <p class="bold center marginTop marginBottom">OR</p>
-        -->
-
         <div id="restrictions" class="marginTop marginBottom">
             <h3>Optional restrictions</h3>
             <div class="marginTop">