diff --git a/modules/themekey.system.inc b/modules/themekey.system.inc
index cf45060..6fc1ffa 100644
--- a/modules/themekey.system.inc
+++ b/modules/themekey.system.inc
@@ -123,22 +123,22 @@ function themekey_system_themekey_properties() {
   );
 
   $attributes['system:user_browser'] = array(
-    'description' => t("System: Browser - Information about user's browser. Possible values: 'Blazer [VERSION]', 'Internet Explorer [VERSION]', 'Mozilla Firefox [VERSION]', 'Netscape [VERSION]', 'Google Chrome [VERSION]', 'Safari [VERSION]', 'Galeon [VERSION]', 'Konqueror [VERSION]', 'Gecko based', 'Opera [VERSION]', 'Lynx [VERSION]', 'Fennec [VERSION]', 'Maemo [VERSION]', 'unknown'"),
+    'description' => t("System: Browser - Information about user's browser. Possible values: 'Blazer [VERSION]', 'Internet Explorer [VERSION]', 'Internet Explorer Mobile [VERSION]', 'Mozilla Firefox [VERSION]', 'Netscape [VERSION]', 'Google Chrome [VERSION]', 'Safari [VERSION]', 'Galeon [VERSION]', 'Konqueror [VERSION]', 'Gecko based', 'Opera [VERSION]', 'Lynx [VERSION]', 'Fennec [VERSION]', 'Maemo [VERSION]', 'unknown'"),
     'page cache' => THEMEKEY_PAGECACHE_UNSUPPORTED,
   );
 
   $attributes['system:user_browser_simplified'] = array(
-    'description' => t("System: Browser - Simplified information about user's browser. Possible values: 'Blazer', 'Internet Explorer', 'Mozilla Firefox', 'Netscape', 'Google Chrome', 'Safari', 'Galeon', 'Konqueror', 'Gecko based', 'Opera', 'Lynx', 'Fennec', 'Maemo', 'unknown'"),
+    'description' => t("System: Browser - Simplified information about user's browser. Possible values: 'Blazer', 'Internet Explorer', 'Internet Explorer Mobile', 'Mozilla Firefox', 'Netscape', 'Google Chrome', 'Safari', 'Galeon', 'Konqueror', 'Gecko based', 'Opera', 'Lynx', 'Fennec', 'Maemo', 'unknown'"),
     'page cache' => THEMEKEY_PAGECACHE_UNSUPPORTED,
   );
 
   $attributes['system:user_os'] = array(
-    'description' => t("System: Operating System - Information about user's browser. Possible values: 'Windows XP', 'Windows Vista', 'Windows 98', 'Windows 2000', 'Windows 2003 server', 'Windows NT',  'Windows ME', 'Windows CE', 'Windows ME', 'iPhone', 'iPad', 'Mac OS X', 'Macintosh', 'Linux', 'Free BSD', 'Symbian', 'webOS', 'Android', 'Blackberry', 'unknown'"),
+    'description' => t("System: Operating System - Information about user's browser. Possible values: 'Windows XP', 'Windows Vista', 'Windows 98', 'Windows 2000', 'Windows 2003 server', 'Windows NT',  'Windows ME', 'Windows CE', 'Windows ME', 'Windows Phone', 'iPhone', 'iPad', 'Mac OS X', 'Macintosh', 'Linux', 'Free BSD', 'Symbian', 'webOS', 'Android', 'Blackberry', 'unknown'"),
     'page cache' => THEMEKEY_PAGECACHE_UNSUPPORTED,
   );
 
   $attributes['system:user_os_simplified'] = array(
-    'description' => t("System: Operating System - Simplified information about user's browser. Possible values: 'Windows', 'iPhone', 'iPad', 'Mac OS X', 'Macintosh', 'Linux', 'Free BSD', 'Symbian', 'webOS', 'Android', 'Blackberry', 'unknown'"),
+    'description' => t("System: Operating System - Simplified information about user's browser. Possible values: 'Windows', 'Windows Phone', 'iPhone', 'iPad', 'Mac OS X', 'Macintosh', 'Linux', 'Free BSD', 'Symbian', 'webOS', 'Android', 'Blackberry', 'unknown'"),
     'page cache' => THEMEKEY_PAGECACHE_UNSUPPORTED,
   );
 
diff --git a/modules/themekey_browser_detection.php b/modules/themekey_browser_detection.php
index 2ef61b2..a5e487d 100644
--- a/modules/themekey_browser_detection.php
+++ b/modules/themekey_browser_detection.php
@@ -60,10 +60,15 @@ class ThemekeyBrowserDetection {
         return 'Blazer ' . $matches[1];
       }
       //deal with IE
-      if (preg_match("/MSIE ([0-9]{1}\.[0-9]{1,2})/", $useragent, $matches)) {
+      if (preg_match("/MSIE ([0-9]{1,2}\.[0-9]{1,2})/", $useragent, $matches)) {
         return 'Internet Explorer ' . $matches[1];
       }
     }
+    elseif (strpos($useragent, 'IEMobile') !== FALSE) {
+      if (preg_match("/IEMobile\/([0-9]{1,2}\.[0-9]{1,2})/", $useragent, $matches)) {
+        return 'Internet Explorer Mobile ' . $matches[1];
+      }
+    }
     elseif (strpos($useragent, 'Gecko')) {
       //deal with Gecko based
 
@@ -188,6 +193,9 @@ class ThemekeyBrowserDetection {
     elseif (strpos($useragent, 'win 9x 4.90') !== FALSE) {
       return 'Windows ME';
     }
+    elseif (strpos($useragent, 'windows phone') !== FALSE) {
+      return 'Windows Phone';
+    }
     elseif (strpos($useragent, 'iphone') !== FALSE) {
       return 'iPhone';
     }
@@ -235,7 +243,10 @@ class ThemekeyBrowserDetection {
    * @access public
    */
   static function getOsSimplified($os) {
-    if (strpos($os, 'Windows') !== FALSE) {
+    if (strpos($os, 'Windows Phone') !== FALSE) {
+      return 'Windows Phone';
+    }
+    elseif (strpos($os, 'Windows') !== FALSE) {
       return 'Windows';
     }
     else {