diff --git a/backend/genesys/tables_sensor.cpp b/backend/genesys/tables_sensor.cpp
index c93e5fddb..018ff8df0 100644
--- a/backend/genesys/tables_sensor.cpp
+++ b/backend/genesys/tables_sensor.cpp
@@ -546,23 +546,10 @@ void genesys_init_sensor_tables()
     sensor.gain_white_ref = 0;
     sensor.exposure = { 0x0400, 0x0400, 0x0400 };
     sensor.custom_regs = {
-        { 0x16, 0x00 },
-        { 0x17, 0x02 },
-        { 0x18, 0x00 },
-        { 0x19, 0x50 },
-        { 0x1a, 0x00 }, // TODO: 1a-1d: these do no harm, but may be neccessery for CCD
-        { 0x1b, 0x00 },
-        { 0x1c, 0x00 },
-        { 0x1d, 0x02 },
-        { 0x52, 0x05 }, // [GB](HI|LOW) not needed for cis
-        { 0x53, 0x07 },
-        { 0x54, 0x00 },
-        { 0x55, 0x00 },
-        { 0x56, 0x00 },
-        { 0x57, 0x00 },
-        { 0x58, 0x3a },
-        { 0x59, 0x03 },
-        { 0x5a, 0x40 },
+        { 0x16, 0x00 }, { 0x17, 0x02 }, { 0x18, 0x00 }, { 0x19, 0x50 },
+        { 0x1a, 0x00 }, { 0x1b, 0x00 }, { 0x1c, 0x00 }, { 0x1d, 0x02 },
+        { 0x52, 0x05 }, { 0x53, 0x07 }, { 0x54, 0x00 }, { 0x55, 0x00 },
+        { 0x56, 0x00 }, { 0x57, 0x00 }, { 0x58, 0x3a }, { 0x59, 0x03 }, { 0x5a, 0x40 },
         { 0x70, 0x00 }, { 0x71, 0x00 }, { 0x72, 0x00 }, { 0x73, 0x00 },
     };
     sensor.gamma = { 1.0f, 1.0f, 1.0f };
@@ -779,23 +766,10 @@ void genesys_init_sensor_tables()
     sensor.gain_white_ref = 200;
     sensor.exposure = { 0x1100, 0x1100, 0x1100 };
     sensor.custom_regs = {
-        { 0x16, 0x00 },
-        { 0x17, 0x02 },
-        { 0x18, 0x04 },
-        { 0x19, 0x50 },
-        { 0x1a, 0x10 },
-        { 0x1b, 0x00 },
-        { 0x1c, 0x20 },
-        { 0x1d, 0x02 },
-        { 0x52, 0x04 }, // [GB](HI|LOW) not needed for cis
-        { 0x53, 0x05 },
-        { 0x54, 0x00 },
-        { 0x55, 0x00 },
-        { 0x56, 0x00 },
-        { 0x57, 0x00 },
-        { 0x58, 0x54 },
-        { 0x59, 0x03 },
-        { 0x5a, 0x00 },
+        { 0x16, 0x00 }, { 0x17, 0x02 }, { 0x18, 0x04 }, { 0x19, 0x50 },
+        { 0x1a, 0x10 }, { 0x1b, 0x00 }, { 0x1c, 0x20 }, { 0x1d, 0x02 },
+        { 0x52, 0x04 }, { 0x53, 0x05 }, { 0x54, 0x00 }, { 0x55, 0x00 },
+        { 0x56, 0x00 }, { 0x57, 0x00 }, { 0x58, 0x54 }, { 0x59, 0x03 }, { 0x5a, 0x00 },
         { 0x70, 0x00 }, { 0x71, 0x00 }, { 0x72, 0x00 }, { 0x73, 0x00 },
     };
     sensor.gamma = { 1.0f, 1.0f, 1.0f };
@@ -835,23 +809,10 @@ void genesys_init_sensor_tables()
     sensor.gain_white_ref = 200;
     sensor.exposure = { 0x1100, 0x1100, 0x1100 };
     sensor.custom_regs = {
-        { 0x16, 0x00 },
-        { 0x17, 0x02 },
-        { 0x18, 0x04 },
-        { 0x19, 0x50 },
-        { 0x1a, 0x10 },
-        { 0x1b, 0x00 },
-        { 0x1c, 0x20 },
-        { 0x1d, 0x02 },
-        { 0x52, 0x04 }, // [GB](HI|LOW) not needed for cis
-        { 0x53, 0x05 },
-        { 0x54, 0x00 },
-        { 0x55, 0x00 },
-        { 0x56, 0x00 },
-        { 0x57, 0x00 },
-        { 0x58, 0x54 },
-        { 0x59, 0x03 },
-        { 0x5a, 0x00 },
+        { 0x16, 0x00 }, { 0x17, 0x02 }, { 0x18, 0x04 }, { 0x19, 0x50 },
+        { 0x1a, 0x10 }, { 0x1b, 0x00 }, { 0x1c, 0x20 }, { 0x1d, 0x02 },
+        { 0x52, 0x04 }, { 0x53, 0x05 }, { 0x54, 0x00 }, { 0x55, 0x00 },
+        { 0x56, 0x00 }, { 0x57, 0x00 }, { 0x58, 0x54 }, { 0x59, 0x03 }, { 0x5a, 0x00 },
         { 0x70, 0x00 }, { 0x71, 0x00 }, { 0x72, 0x00 }, { 0x73, 0x00 },
     };
     sensor.gamma = { 1.0f, 1.0f, 1.0f };
@@ -892,23 +853,10 @@ void genesys_init_sensor_tables()
     sensor.gain_white_ref = 200;
     sensor.exposure = { 0x1544, 0x1544, 0x1544 };
     sensor.custom_regs = {
-        { 0x16, 0x00 },
-        { 0x17, 0x02 },
-        { 0x18, 0x04 },
-        { 0x19, 0x50 },
-        { 0x1a, 0x10 },
-        { 0x1b, 0x00 },
-        { 0x1c, 0x20 },
-        { 0x1d, 0x02 },
-        { 0x52, 0x04 }, // [GB](HI|LOW) not needed for cis
-        { 0x53, 0x05 },
-        { 0x54, 0x00 },
-        { 0x55, 0x00 },
-        { 0x56, 0x00 },
-        { 0x57, 0x00 },
-        { 0x58, 0x54 },
-        { 0x59, 0x03 },
-        { 0x5a, 0x00 },
+        { 0x16, 0x00 }, { 0x17, 0x02 }, { 0x18, 0x04 }, { 0x19, 0x50 },
+        { 0x1a, 0x10 }, { 0x1b, 0x00 }, { 0x1c, 0x20 }, { 0x1d, 0x02 },
+        { 0x52, 0x04 }, { 0x53, 0x05 }, { 0x54, 0x00 }, { 0x55, 0x00 },
+        { 0x56, 0x00 }, { 0x57, 0x00 }, { 0x58, 0x54 }, { 0x59, 0x03 }, { 0x5a, 0x00 },
         { 0x70, 0x00 }, { 0x71, 0x00 }, { 0x72, 0x00 }, { 0x73, 0x00 },
     };
     sensor.gamma = { 1.0f, 1.0f, 1.0f };
@@ -948,23 +896,10 @@ void genesys_init_sensor_tables()
     sensor.gain_white_ref = 200;
     sensor.exposure = { 0x1100, 0x1100, 0x1100 };
     sensor.custom_regs = {
-        { 0x16, 0x00 },
-        { 0x17, 0x02 },
-        { 0x18, 0x04 },
-        { 0x19, 0x50 },
-        { 0x1a, 0x10 },
-        { 0x1b, 0x00 },
-        { 0x1c, 0x20 },
-        { 0x1d, 0x02 },
-        { 0x52, 0x04 }, // [GB](HI|LOW) not needed for cis
-        { 0x53, 0x05 },
-        { 0x54, 0x00 },
-        { 0x55, 0x00 },
-        { 0x56, 0x00 },
-        { 0x57, 0x00 },
-        { 0x58, 0x54 },
-        { 0x59, 0x03 },
-        { 0x5a, 0x00 },
+        { 0x16, 0x00 }, { 0x17, 0x02 }, { 0x18, 0x04 }, { 0x19, 0x50 },
+        { 0x1a, 0x10 }, { 0x1b, 0x00 }, { 0x1c, 0x20 }, { 0x1d, 0x02 },
+        { 0x52, 0x04 }, { 0x53, 0x05 }, { 0x54, 0x00 }, { 0x55, 0x00 },
+        { 0x56, 0x00 }, { 0x57, 0x00 }, { 0x58, 0x54 }, { 0x59, 0x03 }, { 0x5a, 0x00 },
         { 0x70, 0x00 }, { 0x71, 0x00 }, { 0x72, 0x00 }, { 0x73, 0x00 },
     };
     sensor.gamma = { 1.0f, 1.0f, 1.0f };
@@ -1004,23 +939,10 @@ void genesys_init_sensor_tables()
     sensor.gain_white_ref = 200;
     sensor.exposure = { 0x1100, 0x1100, 0x1100 };
     sensor.custom_regs = {
-        { 0x16, 0x00 },
-        { 0x17, 0x02 },
-        { 0x18, 0x04 },
-        { 0x19, 0x50 },
-        { 0x1a, 0x10 },
-        { 0x1b, 0x00 },
-        { 0x1c, 0x20 },
-        { 0x1d, 0x02 },
-        { 0x52, 0x04 }, // [GB](HI|LOW) not needed for cis
-        { 0x53, 0x05 },
-        { 0x54, 0x00 },
-        { 0x55, 0x00 },
-        { 0x56, 0x00 },
-        { 0x57, 0x00 },
-        { 0x58, 0x54 },
-        { 0x59, 0x03 },
-        { 0x5a, 0x00 },
+        { 0x16, 0x00 }, { 0x17, 0x02 }, { 0x18, 0x04 }, { 0x19, 0x50 },
+        { 0x1a, 0x10 }, { 0x1b, 0x00 }, { 0x1c, 0x20 }, { 0x1d, 0x02 },
+        { 0x52, 0x04 }, { 0x53, 0x05 }, { 0x54, 0x00 }, { 0x55, 0x00 },
+        { 0x56, 0x00 }, { 0x57, 0x00 }, { 0x58, 0x54 }, { 0x59, 0x03 }, { 0x5a, 0x00 },
         { 0x70, 0x00 }, { 0x71, 0x00 }, { 0x72, 0x00 }, { 0x73, 0x00 },
     };
     sensor.gamma = { 1.0f, 1.0f, 1.0f };
@@ -1061,23 +983,10 @@ void genesys_init_sensor_tables()
     sensor.gain_white_ref = 200;
     sensor.exposure = { 0x1100, 0x1100, 0x1100 };
     sensor.custom_regs = {
-        { 0x16, 0x00 },
-        { 0x17, 0x02 },
-        { 0x18, 0x04 },
-        { 0x19, 0x50 },
-        { 0x1a, 0x10 },
-        { 0x1b, 0x00 },
-        { 0x1c, 0x20 },
-        { 0x1d, 0x02 },
-        { 0x52, 0x04 }, // [GB](HI|LOW) not needed for cis
-        { 0x53, 0x05 },
-        { 0x54, 0x00 },
-        { 0x55, 0x00 },
-        { 0x56, 0x00 },
-        { 0x57, 0x00 },
-        { 0x58, 0x54 },
-        { 0x59, 0x03 },
-        { 0x5a, 0x00 },
+        { 0x16, 0x00 }, { 0x17, 0x02 }, { 0x18, 0x04 }, { 0x19, 0x50 },
+        { 0x1a, 0x10 }, { 0x1b, 0x00 }, { 0x1c, 0x20 }, { 0x1d, 0x02 },
+        { 0x52, 0x04 }, { 0x53, 0x05 }, { 0x54, 0x00 }, { 0x55, 0x00 },
+        { 0x56, 0x00 }, { 0x57, 0x00 }, { 0x58, 0x54 }, { 0x59, 0x03 }, { 0x5a, 0x00 },
         { 0x70, 0x00 }, { 0x71, 0x00 }, { 0x72, 0x00 }, { 0x73, 0x00 },
     };
     sensor.gamma = { 1.0f, 1.0f, 1.0f };
@@ -3121,23 +3030,10 @@ void genesys_init_sensor_tables()
     sensor.gain_white_ref = 230;
     sensor.exposure = { 0x0000, 0x0000, 0x0000 };
     sensor.custom_regs = {
-        { 0x16, 0x33 },
-        { 0x17, 0x0b },
-        { 0x18, 0x11 },
-        { 0x19, 0x2a },
-        { 0x1a, 0x00 },
-        { 0x1b, 0x00 },
-        { 0x1c, 0x00 },
-        { 0x1d, 0xc4 },
-        { 0x52, 0x07 }, // [GB](HI|LOW) not needed for cis
-        { 0x53, 0x0a },
-        { 0x54, 0x0c },
-        { 0x55, 0x00 },
-        { 0x56, 0x02 },
-        { 0x57, 0x06 },
-        { 0x58, 0x22 },
-        { 0x59, 0x69 },
-        { 0x5a, 0x40 },
+        { 0x16, 0x33 }, { 0x17, 0x0b }, { 0x18, 0x11 }, { 0x19, 0x2a },
+        { 0x1a, 0x00 }, { 0x1b, 0x00 }, { 0x1c, 0x00 }, { 0x1d, 0xc4 },
+        { 0x52, 0x07 }, { 0x53, 0x0a }, { 0x54, 0x0c }, { 0x55, 0x00 },
+        { 0x56, 0x02 }, { 0x57, 0x06 }, { 0x58, 0x22 }, { 0x59, 0x69 }, { 0x5a, 0x40 },
         { 0x70, 0x00 }, { 0x71, 0x00 }, { 0x72, 0x00 }, { 0x73, 0x00 },
     };
     sensor.gamma = { 1.0f, 1.0f, 1.0f };
@@ -3643,23 +3539,10 @@ void genesys_init_sensor_tables()
     // maps to 0x70-0x73 for GL841
     sensor.exposure = { 0x1000, 0x1000, 0x0500 };
     sensor.custom_regs = {
-        { 0x16, 0x00 },
-        { 0x17, 0x01 },
-        { 0x18, 0x00 },
-        { 0x19, 0x06 },
-        { 0x1a, 0x00 },
-        { 0x1b, 0x00 },
-        { 0x1c, 0x00 },
-        { 0x1d, 0x04 },
-        { 0x52, 0x03 },
-        { 0x53, 0x07 },
-        { 0x54, 0x00 },
-        { 0x55, 0x00 },
-        { 0x56, 0x00 },
-        { 0x57, 0x00 },
-        { 0x58, 0x29 },
-        { 0x59, 0x69 },
-        { 0x5a, 0x55 },
+        { 0x16, 0x00 }, { 0x17, 0x01 }, { 0x18, 0x00 }, { 0x19, 0x06 },
+        { 0x1a, 0x00 }, { 0x1b, 0x00 }, { 0x1c, 0x00 }, { 0x1d, 0x04 },
+        { 0x52, 0x03 }, { 0x53, 0x07 }, { 0x54, 0x00 }, { 0x55, 0x00 },
+        { 0x56, 0x00 }, { 0x57, 0x00 }, { 0x58, 0x29 }, { 0x59, 0x69 }, { 0x5a, 0x55 },
         { 0x70, 0x00 }, { 0x71, 0x05 }, { 0x72, 0x07 }, { 0x73, 0x09 },
     };
     sensor.gamma = { 1.0f, 1.0f, 1.0f };