diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResConfigFlags.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResConfigFlags.java
index c8442b2c..f5ecdf57 100644
--- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResConfigFlags.java
+++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResConfigFlags.java
@@ -52,7 +52,7 @@ public class ResConfigFlags {
     private final char[] localeVariant;
 
     private final byte screenLayout2;
-    private final byte colorimetry;
+    private final byte colorMode;
 
     public final boolean isInvalid;
 
@@ -82,7 +82,7 @@ public class ResConfigFlags {
         localeScript = null;
         localeVariant = null;
         screenLayout2 = 0;
-        colorimetry = COLOR_WIDE_UNDEFINED;
+        colorMode = COLOR_WIDE_UNDEFINED;
         isInvalid = false;
         mQualifiers = "";
         size = 0;
@@ -95,7 +95,7 @@ public class ResConfigFlags {
                           short sdkVersion, byte screenLayout, byte uiMode,
                           short smallestScreenWidthDp, short screenWidthDp,
                           short screenHeightDp, char[] localeScript, char[] localeVariant,
-                          byte screenLayout2, byte colorimetry, boolean isInvalid, int size) {
+                          byte screenLayout2, byte colorMode, boolean isInvalid, int size) {
         if (orientation < 0 || orientation > 3) {
             LOGGER.warning("Invalid orientation value: " + orientation);
             orientation = 0;
@@ -159,7 +159,7 @@ public class ResConfigFlags {
         this.localeScript = localeScript;
         this.localeVariant = localeVariant;
         this.screenLayout2 = screenLayout2;
-        this.colorimetry = colorimetry;
+        this.colorMode = colorMode;
         this.isInvalid = isInvalid;
         this.size = size;
         mQualifiers = generateQualifiers();
@@ -235,7 +235,15 @@ public class ResConfigFlags {
                 ret.append("-notlong");
                 break;
         }
-        switch (colorimetry & COLOR_HDR_MASK) {
+        switch (screenLayout2 & MASK_SCREENROUND) {
+            case SCREENLAYOUT_ROUND_NO:
+                ret.append("-notround");
+                break;
+            case SCREENLAYOUT_ROUND_YES:
+                ret.append("-round");
+                break;
+        }
+        switch (colorMode & COLOR_HDR_MASK) {
             case COLOR_HDR_YES:
                 ret.append("-highdr");
                 break;
@@ -243,7 +251,7 @@ public class ResConfigFlags {
                 ret.append("-lowdr");
                 break;
         }
-        switch (colorimetry & COLOR_WIDE_MASK) {
+        switch (colorMode & COLOR_WIDE_MASK) {
             case COLOR_WIDE_YES:
                 ret.append("-widecg");
                 break;
@@ -251,14 +259,6 @@ public class ResConfigFlags {
                 ret.append("-nowidecg");
                 break;
         }
-        switch (screenLayout2 & MASK_SCREENROUND) {
-            case SCREENLAYOUT_ROUND_NO:
-                ret.append("-notround");
-                break;
-            case SCREENLAYOUT_ROUND_YES:
-                ret.append("-round");
-                break;
-        }
         switch (orientation) {
             case ORIENTATION_PORT:
                 ret.append("-port");
@@ -419,7 +419,7 @@ public class ResConfigFlags {
     }
 
     private short getNaturalSdkVersionRequirement() {
-        if ((uiMode & MASK_UI_MODE_TYPE) == UI_MODE_TYPE_VR_HEADSET || (colorimetry & COLOR_WIDE_MASK) != 0 || ((colorimetry & COLOR_HDR_MASK) != 0)) {
+        if ((uiMode & MASK_UI_MODE_TYPE) == UI_MODE_TYPE_VR_HEADSET || (colorMode & COLOR_WIDE_MASK) != 0 || ((colorMode & COLOR_HDR_MASK) != 0)) {
             return SDK_OREO;
         }
         if ((screenLayout2 & MASK_SCREENROUND) != 0) {
diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/ARSCDecoder.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/ARSCDecoder.java
index 3bb87613..650e8119 100644
--- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/ARSCDecoder.java
+++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/ARSCDecoder.java
@@ -386,10 +386,10 @@ public class ARSCDecoder {
         }
 
         byte screenLayout2 = 0;
-        byte colorimetry = 0;
+        byte colorMode = 0;
         if (size >= 52) {
             screenLayout2 = mIn.readByte();
-            colorimetry = mIn.readByte();
+            colorMode = mIn.readByte();
             mIn.skipBytes(2); // reserved padding
             read = 52;
         }
@@ -427,7 +427,7 @@ public class ARSCDecoder {
                 inputFlags, screenWidth, screenHeight, sdkVersion,
                 screenLayout, uiMode, smallestScreenWidthDp, screenWidthDp,
                 screenHeightDp, localeScript, localeVariant, screenLayout2,
-                colorimetry,isInvalid, size);
+                colorMode, isInvalid, size);
     }
 
     private char[] unpackLanguageOrRegion(byte in0, byte in1, char base) throws AndrolibException {