diff --git a/docs/config/config.md b/docs/config/config.md
index 2225667c..2aecc80f 100644
--- a/docs/config/config.md
+++ b/docs/config/config.md
@@ -25,7 +25,7 @@ Values and defaults:
 * platformName - one of (windows|mac|linux|android|ios|winphone)} - platform name, default: windows
 * platformVersion - platform number like 7,8 for windows; 4.4,5.0 for android;, default: *
 * platformResolution - format: /\d+x\d+/- platform resolution, WIDTHxHEIGHT, default: resolved from available
-* ui5.theme - one of (bluecrystal|belize|hcp) - UI5 theme, default belize
+* ui5.theme - one of (bluecrystal|belize|fiori_3) - UI5 theme, default belize
 * ui5.direction - one of (rtl|ltr) - UI5 direction, default: ltr
 * ui5.mode - one of (cosy|compact) - UI5 mode, default: cosy
 
@@ -39,10 +39,12 @@ browsers:[{
 Specify on command line in ':' -separated notation:
 ```
 $ uiveri5 --browsers=ie:11
+$ uiveri5 --browsers=chrome::::::fiori_3
+$ uiveri5 --browsers=chrome:::::::rtl
+$ uiveri5 --browsers=chrome::::::::compact
 ```
 Runtime attributes are extracted sequentially in the order they are defined above.
 
-
 Specify chrome mobile emulator:
 ```
 $ uiveri5 --browsers=chromeMobileEmulation
diff --git a/e2e/browser/fixture/apps/browser/index.html b/e2e/browser/fixture/apps/browser/index.html
index 2c9bf2cd..215deca3 100644
--- a/e2e/browser/fixture/apps/browser/index.html
+++ b/e2e/browser/fixture/apps/browser/index.html
@@ -10,7 +10,7 @@
 		<!-- to use latest OpenUI5 nightly build, change source to "https://openui5nightly.hana.ondemand.com/resources/sap-ui-core.js" -->
 		<script src="https://openui5nightly.hana.ondemand.com/resources/sap-ui-core.js"
 			id="sap-ui-bootstrap"
-			data-sap-ui-theme="sap_belize"
+			data-sap-ui-theme="sap_fiori_3"
 			data-sap-ui-libs="sap.m">
 		</script>
 	</head>
diff --git a/e2e/scenario/fixture/apps/formauth/app.html b/e2e/scenario/fixture/apps/formauth/app.html
index 6a612a41..d0458442 100644
--- a/e2e/scenario/fixture/apps/formauth/app.html
+++ b/e2e/scenario/fixture/apps/formauth/app.html
@@ -21,7 +21,7 @@
 
 		<script src="https://openui5nightly.hana.ondemand.com/resources/sap-ui-core.js"
 			id="sap-ui-bootstrap"
-			data-sap-ui-theme="sap_belize"
+			data-sap-ui-theme="sap_fiori_3"
 			data-sap-ui-libs="sap.m">
 		</script>
 
diff --git a/e2e/scenario/fixture/apps/logs/app.html b/e2e/scenario/fixture/apps/logs/app.html
index 8c24d983..e4a08752 100644
--- a/e2e/scenario/fixture/apps/logs/app.html
+++ b/e2e/scenario/fixture/apps/logs/app.html
@@ -6,7 +6,7 @@
 
         <script src="https://openui5nightly.hana.ondemand.com/resources/sap-ui-core.js"
             id="sap-ui-bootstrap"
-            data-sap-ui-theme="sap_belize"
+            data-sap-ui-theme="sap_fiori_3"
             data-sap-ui-libs="sap.m">
         </script>
 
diff --git a/e2e/scenario/fixture/apps/plugin/app.html b/e2e/scenario/fixture/apps/plugin/app.html
index b5a1b661..dbf2b84d 100644
--- a/e2e/scenario/fixture/apps/plugin/app.html
+++ b/e2e/scenario/fixture/apps/plugin/app.html
@@ -6,7 +6,7 @@
 
 		<script src="https://openui5nightly.hana.ondemand.com/resources/sap-ui-core.js"
 			id="sap-ui-bootstrap"
-			data-sap-ui-theme="sap_belize"
+			data-sap-ui-theme="sap_fiori_3"
 			data-sap-ui-libs="sap.m">
 		</script>
 
diff --git a/src/runtimeResolver.js b/src/runtimeResolver.js
index 17bc67e7..799947ab 100644
--- a/src/runtimeResolver.js
+++ b/src/runtimeResolver.js
@@ -33,7 +33,7 @@ var supportedPlatformNames = [
   'windows','mac','linux','android','ios','winphone'
 ];
 var supportedUI5Themes = [
-  'bluecrystal','belize','hcb'
+  'bluecrystal','belize','fiori_3'
 ];
 var supportedUI5Directions = [
   'ltr','rtl'
@@ -51,7 +51,7 @@ var supportedUI5Modes = [
  * @param {number} platformVersion - platform number like 7,8 for windows; 4.4,5.0 for android;, default: *
  * @param {string(default|/\d+x\d+/)} platformResolution - platform resolution, WIDTHxHEIGHT, default: resolved from available
  * @param {string} deviceName - device name, default: *
- * @param {string(bluecrystal|belize|hcb)} ui5.theme - UI5 theme, default belize
+ * @param {string(bluecrystal|belize|fiori_3)} ui5.theme - UI5 theme, default belize
  * @param {string(rtl|ltr)} ui5.direction - UI5 direction, default: ltr
  * @param {string(cozy|compact)} ui5.mode - UI5 mode, default: cozy
  * @param {Object} capabilities - additional browser capabilities object