diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index 00aef7e1b..1d4f2bc8d 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -191,6 +191,10 @@ jobs:
             triplet: x64-windows-static
             toolchain: ./cmake/llvm-win32-x86_64.cmake
             vcvars: x64
+#          - name: ARM
+#            triplet: arm-windows-static
+#            toolchain: ./cmake/llvm-win32-arm.cmake
+#            vcvars: x64_arm
           - name: ARM64
             triplet: arm64-windows-static
             toolchain: ./cmake/llvm-win32-aarch64.cmake
@@ -217,7 +221,7 @@ jobs:
 
       - name: Setup NuGet Credentials
         run: >
-          & (C:/vcpkg/vcpkg fetch nuget | tail -n 2)
+          & (C:/vcpkg/vcpkg --vcpkg-root "${{ env.VCPKG_ROOT }}" fetch nuget | tail -n 2)
           sources add
           -source "https://nuget.pkg.github.com/86Box/index.json"
           -storepasswordincleartext
diff --git a/README.md b/README.md
index a1e1b4432..20671420e 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,7 @@
 =====
 
 [![Build Status](https://ci.86box.net/job/86Box/badge/icon)](https://ci.86box.net/job/86Box/)
+[![License](https://img.shields.io/github/license/86Box/86Box)](COPYING) [![Latest release](https://img.shields.io/github/release/86Box/86Box.svg)](https://github.com/86Box/86Box/releases) [![Downloads](https://img.shields.io/github/downloads/86Box/86Box/total.svg)](https://github.com/86Box/86Box/releases)
 
 **86Box** is a low level x86 emulator that runs older operating systems and software designed for IBM PC systems and compatibles from 1981 through fairly recent system designs based on the PCI bus.
 
diff --git a/src/cdrom/cdrom.c b/src/cdrom/cdrom.c
index 3ca7e6885..5ae071902 100644
--- a/src/cdrom/cdrom.c
+++ b/src/cdrom/cdrom.c
@@ -1868,10 +1868,8 @@ cdrom_insert(uint8_t id)
 {
     cdrom_t *dev = &cdrom[id];
 
-    if (dev->bus_type) {
-        if (dev->insert)
-            dev->insert(dev->priv);
-    }
+    if (dev->bus_type && dev->insert)
+        dev->insert(dev->priv);
 }
 
 /* The mechanics of ejecting a CD-ROM from a drive. */
diff --git a/src/chipset/CMakeLists.txt b/src/chipset/CMakeLists.txt
index a3c5e84de..708354926 100644
--- a/src/chipset/CMakeLists.txt
+++ b/src/chipset/CMakeLists.txt
@@ -17,8 +17,8 @@ add_library(chipset OBJECT 82c100.c acc2168.c cs8230.c ali1429.c ali1435.c ali14
     ali1531.c ali1541.c ali1543.c ali1621.c ali6117.c headland.c ims8848.c intel_82335.c
     compaq_386.c contaq_82c59x.c cs4031.c intel_420ex.c intel_4x0.c intel_i450kx.c
     intel_815ep.c intel_ich2.c intel_sio.c intel_piix.c ../ioapic.c neat.c opti283.c opti291.c opti391.c opti495.c
-    opti822.c opti895.c opti5x7.c scamp.c scat.c sis_85c310.c sis_85c4xx.c sis_85c496.c
-    sis_85c50x.c sis_5511.c sis_5571.c via_vt82c49x.c via_vt82c505.c
+    opti602.c opti822.c opti895.c opti5x7.c scamp.c scat.c sis_85c310.c sis_85c4xx.c
+    sis_85c496.c sis_85c50x.c sis_5511.c sis_5571.c via_vt82c49x.c via_vt82c505.c
     gc100.c stpc.c umc_8886.c umc_hb4.c
     via_apollo.c via_pipc.c vl82c480.c wd76c10.c)
 
diff --git a/src/chipset/compaq_386.c b/src/chipset/compaq_386.c
index 0f90cc6af..c671f3696 100644
--- a/src/chipset/compaq_386.c
+++ b/src/chipset/compaq_386.c
@@ -100,9 +100,8 @@ typedef struct cpq_386_t {
 static uint8_t
 cpq_read_ram(uint32_t addr, void *priv)
 {
-    cpq_ram_t *dev = (cpq_ram_t *) priv;
-    uint8_t ret = 0xff;
-    uint32_t old = addr;
+    const cpq_ram_t *dev = (cpq_ram_t *) priv;
+    uint8_t          ret = 0xff;
 
     addr = (addr - dev->virt_base) + dev->phys_base;
 
@@ -115,9 +114,8 @@ cpq_read_ram(uint32_t addr, void *priv)
 static uint16_t
 cpq_read_ramw(uint32_t addr, void *priv)
 {
-    cpq_ram_t *dev = (cpq_ram_t *) priv;
-    uint16_t ret = 0xffff;
-    uint32_t old = addr;
+    const cpq_ram_t *dev = (cpq_ram_t *) priv;
+    uint16_t         ret = 0xffff;
 
     addr = (addr - dev->virt_base) + dev->phys_base;
 
@@ -130,9 +128,8 @@ cpq_read_ramw(uint32_t addr, void *priv)
 static uint32_t
 cpq_read_raml(uint32_t addr, void *priv)
 {
-    cpq_ram_t *dev = (cpq_ram_t *) priv;
-    uint32_t ret = 0xffffffff;
-    uint32_t old = addr;
+    const cpq_ram_t *dev = (cpq_ram_t *) priv;
+    uint32_t         ret = 0xffffffff;
 
     addr = (addr - dev->virt_base) + dev->phys_base;
 
@@ -145,8 +142,7 @@ cpq_read_raml(uint32_t addr, void *priv)
 static void
 cpq_write_ram(uint32_t addr, uint8_t val, void *priv)
 {
-    cpq_ram_t *dev = (cpq_ram_t *) priv;
-    uint32_t old = addr;
+    const cpq_ram_t *dev = (cpq_ram_t *) priv;
 
     addr = (addr - dev->virt_base) + dev->phys_base;
 
@@ -157,8 +153,7 @@ cpq_write_ram(uint32_t addr, uint8_t val, void *priv)
 static void
 cpq_write_ramw(uint32_t addr, uint16_t val, void *priv)
 {
-    cpq_ram_t *dev = (cpq_ram_t *) priv;
-    uint32_t old = addr;
+    const cpq_ram_t *dev = (cpq_ram_t *) priv;
 
     addr = (addr - dev->virt_base) + dev->phys_base;
 
@@ -169,8 +164,7 @@ cpq_write_ramw(uint32_t addr, uint16_t val, void *priv)
 static void
 cpq_write_raml(uint32_t addr, uint32_t val, void *priv)
 {
-    cpq_ram_t *dev = (cpq_ram_t *) priv;
-    uint32_t old = addr;
+    const cpq_ram_t *dev = (cpq_ram_t *) priv;
 
     addr = (addr - dev->virt_base) + dev->phys_base;
 
@@ -181,8 +175,8 @@ cpq_write_raml(uint32_t addr, uint32_t val, void *priv)
 static uint8_t
 cpq_read_regs(uint32_t addr, void *priv)
 {
-    cpq_386_t *dev = (cpq_386_t *) priv;
-    uint8_t ret = 0xff;
+    const cpq_386_t *dev = (cpq_386_t *) priv;
+    uint8_t          ret = 0xff;
 
     addr &= 0x00000fff;
 
@@ -195,6 +189,9 @@ cpq_read_regs(uint32_t addr, void *priv)
             /* RAM Setup Port (Read/Write) */
             ret = dev->regs[addr];
             break;
+
+        default:
+            break;
     }
 
     return ret;
@@ -203,7 +200,6 @@ cpq_read_regs(uint32_t addr, void *priv)
 static uint16_t
 cpq_read_regsw(uint32_t addr, void *priv)
 {
-    cpq_386_t *dev = (cpq_386_t *) priv;
     uint16_t ret = 0xffff;
 
     ret = cpq_read_regs(addr, priv);
@@ -215,7 +211,6 @@ cpq_read_regsw(uint32_t addr, void *priv)
 static uint32_t
 cpq_read_regsl(uint32_t addr, void *priv)
 {
-    cpq_386_t *dev = (cpq_386_t *) priv;
     uint32_t ret = 0xffffffff;
 
     ret = cpq_read_regsw(addr, priv);
@@ -306,8 +301,6 @@ cpq_recalc_ram(cpq_386_t *dev)
     uint8_t  end;
     uint8_t  k;
     uint32_t virt_base;
-    uint32_t virt_addr;
-    uint32_t phys_addr;
     cpq_ram_t *cram;
 
     for (uint16_t i = 0x10; i < sys_min_high; i++)
@@ -393,14 +386,15 @@ cpq_write_regs(uint32_t addr, uint8_t val, void *priv)
                 cpq_recalc_cache(dev);
             }
             break;
+
+        default:
+            break;
     }
 }
 
 static void
 cpq_write_regsw(uint32_t addr, uint16_t val, void *priv)
 {
-    cpq_386_t *dev = (cpq_386_t *) priv;
-
     cpq_write_regs(addr, val & 0xff, priv);
     cpq_write_regs(addr + 1, (val >> 8) & 0xff, priv);
 }
@@ -408,8 +402,6 @@ cpq_write_regsw(uint32_t addr, uint16_t val, void *priv)
 static void
 cpq_write_regsl(uint32_t addr, uint32_t val, void *priv)
 {
-    cpq_386_t *dev = (cpq_386_t *) priv;
-
     cpq_write_regsw(addr, val & 0xff, priv);
     cpq_write_regsw(addr + 2, (val >> 16) & 0xff, priv);
 }
@@ -436,11 +428,9 @@ compaq_ram_init(cpq_ram_t *dev)
 static void
 compaq_ram_diags_parse(cpq_386_t *dev)
 {
-    uint8_t val = dev->regs[0x00000001];
+    uint8_t  val = dev->regs[0x00000001];
     uint32_t accum = 0x00100000;
 
-        val;
-
     for (uint8_t i = 0; i < 4; i++) {
         dev->ram_bases[i] = accum;
 
@@ -451,6 +441,9 @@ compaq_ram_diags_parse(cpq_386_t *dev)
             case RAM_DIAG_H_SYS_RAM_4MB:
                 dev->ram_sizes[i] = 0x00400000;
                 break;
+
+            default:
+                break;
         }
         if (i == 0)
             dev->ram_sizes[i] -= 0x00100000;
@@ -476,8 +469,6 @@ compaq_recalc_base_ram(cpq_386_t *dev)
     uint8_t  low_end     = 0x00;
     uint8_t  high_start  = 0x00;
     uint8_t  high_end    = 0x00;
-    uint32_t phys_addr   = 0x00000000;
-    uint32_t virt_addr   = 0x00000000;
     cpq_ram_t *cram;
 
     switch (base_mem) {
@@ -618,7 +609,7 @@ compaq_386_close(void *priv)
 }
 
 static void *
-compaq_386_init(const device_t *info)
+compaq_386_init(UNUSED(const device_t *info))
 {
     cpq_386_t *dev = (cpq_386_t *) calloc(1, sizeof(cpq_386_t));
 
@@ -706,6 +697,9 @@ compaq_386_init(const device_t *info)
                 dev->regs[0x00000001] = RAM_DIAG_H_SYS_RAM_4MB | RAM_DIAG_H_MOD_A_RAM_4MB |
                                         RAM_DIAG_H_MOD_B_RAM_4MB | RAM_DIAG_H_MOD_C_RAM_4MB;
                 break;
+
+            default:
+                break;
         }
     } else
         dev->regs[0x00000001] = RAM_DIAG_H_SYS_RAM_1MB | RAM_DIAG_H_MOD_A_RAM_NONE |
diff --git a/src/chipset/opti602.c b/src/chipset/opti602.c
new file mode 100644
index 000000000..f95df4784
--- /dev/null
+++ b/src/chipset/opti602.c
@@ -0,0 +1,238 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Implementation of the OPTi 82C601/82C602 Buffer Devices.
+ *
+ * Authors: Miran Grca, <mgrca8@gmail.com>
+ *
+ *          Copyright 2023 Miran Grca.
+ */
+#include <stdarg.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <wchar.h>
+#define HAVE_STDARG_H
+#include <86box/86box.h>
+#include "cpu.h"
+#include <86box/io.h>
+#include <86box/device.h>
+#include <86box/mem.h>
+#include <86box/timer.h>
+#include <86box/nvr.h>
+#include <86box/smram.h>
+#include <86box/port_92.h>
+#include <86box/chipset.h>
+
+typedef struct opti602_t {
+    uint8_t    idx;
+
+    uint8_t    regs[256];
+    uint8_t    gpio[32];
+
+    uint16_t   gpio_base;
+
+    uint16_t   gpio_mask;
+    uint16_t   gpio_size;
+
+    nvr_t     *nvr;
+} opti602_t;
+
+#ifdef ENABLE_OPTI602_LOG
+int opti602_do_log = ENABLE_OPTI602_LOG;
+
+static void
+opti602_log(const char *fmt, ...)
+{
+    va_list ap;
+
+    if (opti602_do_log) {
+        va_start(ap, fmt);
+        pclog_ex(fmt, ap);
+        va_end(ap);
+    }
+}
+#else
+#    define opti602_log(fmt, ...)
+#endif
+
+static void
+opti602_gpio_write(uint16_t addr, uint8_t val, void *priv)
+{
+    opti602_t *dev = (opti602_t *) priv;
+
+    dev->gpio[addr - dev->gpio_base] = val;
+}
+
+static uint8_t
+opti602_gpio_read(uint16_t addr, void *priv)
+{
+    opti602_t *dev = (opti602_t *) priv;
+    uint8_t ret = 0xff;
+
+    ret = dev->gpio[addr - dev->gpio_base];
+
+    return ret;
+}
+
+static void
+opti602_gpio_recalc(opti602_t *dev)
+{
+    if (dev->gpio_base != 0x0000)
+        io_removehandler(dev->gpio_base, dev->gpio_size, opti602_gpio_read, NULL, NULL, opti602_gpio_write, NULL, NULL, dev);
+
+    dev->gpio_base = dev->regs[0xf8];
+    dev->gpio_base |= (((uint16_t) dev->regs[0xf7]) << 8);
+
+    dev->gpio_size = 1 << ((dev->regs[0xf9] >> 2) & 0x07);
+
+    dev->gpio_mask = ~(dev->gpio_size - 1);
+    dev->gpio_base &= dev->gpio_mask;
+
+    dev->gpio_mask = ~dev->gpio_mask;
+
+    if (dev->gpio_base != 0x0000)
+        io_sethandler(dev->gpio_base, dev->gpio_size, opti602_gpio_read, NULL, NULL, opti602_gpio_write, NULL, NULL, dev);
+}
+
+static void
+opti602_write(uint16_t addr, uint8_t val, void *priv)
+{
+    opti602_t *dev = (opti602_t *) priv;
+
+    switch (addr) {
+        case 0x22:
+            dev->idx = val;
+            break;
+        case 0x24:
+           if ((dev->idx == 0xea) || ((dev->idx >= 0xf7) && (dev->idx <= 0xfa))) { 
+                dev->regs[dev->idx] = val;
+                opti602_log("dev->regs[%04x] = %08x\n", dev->idx, val);
+
+                /* TODO: Registers 0x30-0x3F for OPTi 802GP and 898. */
+                switch (dev->idx) {
+                    case 0xea:
+                        /* GREEN Power Port */
+                        break;
+
+                    case 0xf7:
+                    case 0xf8:
+                        /* General Purpose Chip Select Registers */
+                        opti602_gpio_recalc(dev);
+                        break;
+
+                    case 0xf9:
+                        /* General Purpose Chip Select Register */
+                        nvr_bank_set(0, !!(val & 0x20), dev->nvr);
+                        opti602_gpio_recalc(dev);
+                        break;
+
+                    case 0xfa:
+                        /* GPM Port */
+                        break;
+
+                    default:
+                        break;
+                }
+            }
+            break;
+
+        default:
+            break;
+    }
+}
+
+static uint8_t
+opti602_read(uint16_t addr, void *priv)
+{
+    uint8_t          ret = 0xff;
+    const opti602_t *dev = (opti602_t *) priv;
+
+    switch (addr) {
+        case 0x24:
+           if ((dev->idx == 0xea) || ((dev->idx >= 0xf7) && (dev->idx <= 0xfa))) { 
+                ret = dev->regs[dev->idx];
+                if ((dev->idx == 0xfa) && (dev->regs[0xf9] & 0x40))
+                    ret |= dev->regs[0xea];
+            }
+            break;
+
+        default:
+            break;
+    }
+
+    return ret;
+}
+
+static void
+opti602_reset(void *priv)
+{
+    opti602_t *dev = (opti602_t *) priv;
+
+    memset(dev->regs, 0x00, 256 * sizeof(uint8_t));
+    memset(dev->gpio, 0x00, 32 * sizeof(uint8_t));
+
+    dev->regs[0xfa] = 0x07;
+
+    dev->gpio[0x01] |= 0xfe;
+
+    nvr_bank_set(0, 0, dev->nvr);
+    opti602_gpio_recalc(dev);
+}
+
+static void
+opti602_close(void *priv)
+{
+    opti602_t *dev = (opti602_t *) priv;
+
+    free(dev);
+}
+
+static void *
+opti602_init(const device_t *info)
+{
+    opti602_t *dev = (opti602_t *) calloc(1, sizeof(opti602_t));
+
+    io_sethandler(0x0022, 0x0001, opti602_read, NULL, NULL, opti602_write, NULL, NULL, dev);
+    io_sethandler(0x0024, 0x0001, opti602_read, NULL, NULL, opti602_write, NULL, NULL, dev);
+
+    dev->nvr   = device_add(&at_mb_nvr_device);
+
+    opti602_reset(dev);
+
+    return dev;
+}
+
+const device_t opti601_device = {
+    .name          = "OPTi 82C601",
+    .internal_name = "opti601",
+    .flags         = 0,
+    .local         = 0,
+    .init          = opti602_init,
+    .close         = opti602_close,
+    .reset         = opti602_reset,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t opti602_device = {
+    .name          = "OPTi 82C602",
+    .internal_name = "opti602",
+    .flags         = 0,
+    .local         = 0,
+    .init          = opti602_init,
+    .close         = opti602_close,
+    .reset         = opti602_reset,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
diff --git a/src/chipset/opti895.c b/src/chipset/opti895.c
index 512c4fc82..77297ae95 100644
--- a/src/chipset/opti895.c
+++ b/src/chipset/opti895.c
@@ -140,6 +140,8 @@ opti895_write(uint16_t addr, uint8_t val, void *priv)
 {
     opti895_t *dev = (opti895_t *) priv;
 
+    opti895_log("opti895_write(%04X, %08X)\n", addr, val);
+
     switch (addr) {
         case 0x22:
             dev->idx = val;
@@ -231,6 +233,8 @@ opti895_read(uint16_t addr, void *priv)
             break;
     }
 
+    opti895_log("opti895_read(%04X) = %02X\n", addr, ret);
+
     return ret;
 }
 
diff --git a/src/chipset/via_apollo.c b/src/chipset/via_apollo.c
index 2d3633115..7c1203c3a 100644
--- a/src/chipset/via_apollo.c
+++ b/src/chipset/via_apollo.c
@@ -10,13 +10,12 @@
  *
  *
  *
- * Authors: Sarah Walker, <https://pcem-emulator.co.uk/>
- *          Miran Grca, <mgrca8@gmail.com>
- *          Melissa Goad, <mszoopers@protonmail.com>
+ * Authors: Miran Grca, <mgrca8@gmail.com>
+ *          RichardG, <richardg867@gmail.com>
  *          Tiseno100,
  *
  *          Copyright 2020 Miran Grca.
- *          Copyright 2020 Melissa Goad.
+ *          Copyright 2020 RichardG.
  *          Copyright 2020 Tiseno100.
  */
 #include <stdio.h>
diff --git a/src/chipset/via_pipc.c b/src/chipset/via_pipc.c
index b284cb6b9..a8e0f9ff2 100644
--- a/src/chipset/via_pipc.c
+++ b/src/chipset/via_pipc.c
@@ -10,14 +10,10 @@
  *
  *
  *
- * Authors: Sarah Walker, <https://pcem-emulator.co.uk/>
- *          Miran Grca, <mgrca8@gmail.com>
- *          Melissa Goad, <mszoopers@protonmail.com>
+ * Authors: Miran Grca, <mgrca8@gmail.com>
  *          RichardG, <richardg867@gmail.com>
  *
- *          Copyright 2008-2020 Sarah Walker.
  *          Copyright 2016-2020 Miran Grca.
- *          Copyright 2020 Melissa Goad.
  *          Copyright 2020-2021 RichardG.
  */
 #include <stdarg.h>
diff --git a/src/codegen_new/codegen_backend_x86-64_ops.c b/src/codegen_new/codegen_backend_x86-64_ops.c
index 33fb500db..a41296225 100644
--- a/src/codegen_new/codegen_backend_x86-64_ops.c
+++ b/src/codegen_new/codegen_backend_x86-64_ops.c
@@ -1,6 +1,7 @@
 #if defined __amd64__ || defined _M_X64
 
 #    include <stdint.h>
+#    include <inttypes.h>
 #    include <86box/86box.h>
 #    include "cpu.h"
 #    include <86box/mem.h>
@@ -125,7 +126,7 @@ host_x86_ADD64_REG_IMM(codeblock_t *block, int dst_reg, uint64_t imm_data)
         codegen_alloc_bytes(block, 4);
         codegen_addbyte4(block, 0x48, 0x83, 0xc0 | RM_OP_ADD | (dst_reg & 7), imm_data & 0xff); /*ADD dst_reg, imm_data*/
     } else
-        fatal("ADD64_REG_IMM !is_imm8 %016llx\n", imm_data);
+        fatal("ADD64_REG_IMM !is_imm8 %016" PRIx64 "\n", imm_data);
 }
 void
 host_x86_ADD8_REG_REG(codeblock_t *block, int dst_reg, int src_reg)
@@ -1614,7 +1615,7 @@ host_x86_SUB64_REG_IMM(codeblock_t *block, int dst_reg, uint64_t imm_data)
         codegen_alloc_bytes(block, 4);
         codegen_addbyte4(block, 0x48, 0x83, 0xc0 | RM_OP_SUB | (dst_reg & 7), imm_data & 0xff); /*SUB dst_reg, imm_data*/
     } else
-        fatal("SUB64_REG_IMM !is_imm8 %016llx\n", imm_data);
+        fatal("SUB64_REG_IMM !is_imm8 %016" PRIx64 "\n", imm_data);
 }
 void
 host_x86_SUB8_REG_REG(codeblock_t *block, int dst_reg, int src_reg)
diff --git a/src/config.c b/src/config.c
index d917d4548..427b81884 100644
--- a/src/config.c
+++ b/src/config.c
@@ -619,35 +619,35 @@ load_input_devices(void)
             else {
                 c = ini_section_get_int(cat, "joystick_type", 8);
                 switch (c) {
-                    case 1:
+                    case JS_TYPE_2AXIS_4BUTTON:
                         joystick_type = joystick_get_from_internal_name("2axis_4button");
                         break;
-                    case 2:
+                    case JS_TYPE_2AXIS_6BUTTON:
                         joystick_type = joystick_get_from_internal_name("2axis_6button");
                         break;
-                    case 3:
+                    case JS_TYPE_2AXIS_8BUTTON:
                         joystick_type = joystick_get_from_internal_name("2axis_8button");
                         break;
-                    case 4:
+                    case JS_TYPE_4AXIS_4BUTTON:
                         joystick_type = joystick_get_from_internal_name("4axis_4button");
                         break;
-                    case 5:
+                    case JS_TYPE_CH_FLIGHTSTICK_PRO:
                         joystick_type = joystick_get_from_internal_name("ch_flightstick_pro");
                         break;
-                    case 6:
+                    case JS_TYPE_SIDEWINDER_PAD:
                         joystick_type = joystick_get_from_internal_name("sidewinder_pad");
                         break;
-                    case 7:
+                    case JS_TYPE_THRUSTMASTER_FCS:
                         joystick_type = joystick_get_from_internal_name("thrustmaster_fcs");
                         break;
                     default:
-                        joystick_type = 0;
+                        joystick_type = JS_TYPE_NONE;
                         break;
                 }
             }
         }
     } else
-        joystick_type = 0;
+        joystick_type = JS_TYPE_NONE;
 
     for (c = 0; c < joystick_get_max_joysticks(joystick_type); c++) {
         sprintf(temp, "joystick_%i_nr", c);
@@ -2923,16 +2923,14 @@ save_floppy_and_cdrom_drives(void)
         }
 
         sprintf(temp, "cdrom_%02i_parameters", c + 1);
-        if (cdrom[c].bus_type == 0) {
+        if (cdrom[c].bus_type == 0)
             ini_section_delete_var(cat, temp);
-        } else { /*In case one wants an ATAPI drive on SCSI and vice-versa.*/
-            if (cdrom[c].bus_type == CDROM_BUS_ATAPI) {
-                if (cdrom_drive_types[cdrom_get_type(c)].bus_type == BUS_TYPE_SCSI)
-                    cdrom[c].bus_type = CDROM_BUS_SCSI;
-            } else if (cdrom[c].bus_type == CDROM_BUS_SCSI) {
-                if (cdrom_drive_types[cdrom_get_type(c)].bus_type == BUS_TYPE_IDE)
-                    cdrom[c].bus_type = CDROM_BUS_ATAPI;
-            }
+        else {
+            /* In case one wants an ATAPI drive on SCSI and vice-versa. */
+            if ((cdrom_drive_types[cdrom_get_type(c)].bus_type != BUS_TYPE_BOTH) &&
+                (cdrom_drive_types[cdrom_get_type(c)].bus_type != cdrom[c].bus_type))
+                cdrom[c].bus_type = cdrom_drive_types[cdrom_get_type(c)].bus_type;
+
             sprintf(tmp2, "%u, %s", cdrom[c].sound_on,
                     hdd_bus_to_string(cdrom[c].bus_type, 1));
             ini_section_set_string(cat, temp, tmp2);
diff --git a/src/cpu/386.c b/src/cpu/386.c
index 5dd143efd..4daa2936b 100644
--- a/src/cpu/386.c
+++ b/src/cpu/386.c
@@ -77,7 +77,6 @@ x386_log(const char *fmt, ...)
 static __inline void
 fetch_ea_32_long(uint32_t rmdat)
 {
-    eal_r = eal_w = NULL;
     easeg         = cpu_state.ea_seg->base;
     if (cpu_rm == 4) {
         uint8_t sib = rmdat >> 8;
@@ -122,19 +121,11 @@ fetch_ea_32_long(uint32_t rmdat)
             cpu_state.eaaddr = getlong();
         }
     }
-    if (easeg != 0xFFFFFFFF && ((easeg + cpu_state.eaaddr) & 0xFFF) <= 0xFFC) {
-        uint32_t addr = easeg + cpu_state.eaaddr;
-        if (readlookup2[addr >> 12] != (uintptr_t) -1)
-            eal_r = (uint32_t *) (readlookup2[addr >> 12] + addr);
-        if (writelookup2[addr >> 12] != (uintptr_t) -1)
-            eal_w = (uint32_t *) (writelookup2[addr >> 12] + addr);
-    }
 }
 
 static __inline void
 fetch_ea_16_long(uint32_t rmdat)
 {
-    eal_r = eal_w = NULL;
     easeg         = cpu_state.ea_seg->base;
     if (!cpu_mod && cpu_rm == 6) {
         cpu_state.eaaddr = getword();
@@ -158,13 +149,6 @@ fetch_ea_16_long(uint32_t rmdat)
         }
         cpu_state.eaaddr &= 0xFFFF;
     }
-    if (easeg != 0xFFFFFFFF && ((easeg + cpu_state.eaaddr) & 0xFFF) <= 0xFFC) {
-        uint32_t addr = easeg + cpu_state.eaaddr;
-        if (readlookup2[addr >> 12] != (uintptr_t) -1)
-            eal_r = (uint32_t *) (readlookup2[addr >> 12] + addr);
-        if (writelookup2[addr >> 12] != (uintptr_t) -1)
-            eal_w = (uint32_t *) (writelookup2[addr >> 12] + addr);
-    }
 }
 
 #define fetch_ea_16(rmdat)       \
@@ -225,11 +209,23 @@ fetch_ea_16_long(uint32_t rmdat)
 
 #define CLOCK_CYCLES_ALWAYS(c) cycles -= (c)
 
+#define CHECK_READ_CS(chseg, low, high)                                          \
+    if ((low < (chseg)->limit_low) || (high > (chseg)->limit_high))              \
+        x86gpf("Limit check (READ)", 0);                                         \
+    if (msw & 1 && !(cpu_state.eflags & VM_FLAG) && !((chseg)->access & 0x80)) { \
+        if ((chseg) == &cpu_state.seg_ss)                                        \
+            x86ss(NULL, (chseg)->seg & 0xfffc);                                  \
+        else                                                                     \
+            x86np("Read from seg not present", (chseg)->seg & 0xfffc);           \
+    }
+
 #include "386_ops.h"
 
 void
 exec386_2386(int cycs)
 {
+    int      ol;
+
     int      vector;
     int      tempi;
     int      cycdiff;
@@ -264,6 +260,12 @@ exec386_2386(int cycs)
             cpu_state.ssegs  = 0;
 
             fetchdat = fastreadl_fetch(cs + cpu_state.pc);
+            ol = opcode_length[fetchdat & 0xff];
+            if (ol < 4) {
+                CHECK_READ_CS(&cpu_state.seg_cs, cpu_state.pc, cpu_state.pc + ol - 1);
+            } else {
+                CHECK_READ_CS(&cpu_state.seg_cs, cpu_state.pc, cpu_state.pc + 3);
+            }
 
             if (!cpu_state.abrt) {
 #ifdef ENABLE_386_LOG
diff --git a/src/cpu/386_common.h b/src/cpu/386_common.h
index b709e743d..f39733cff 100644
--- a/src/cpu/386_common.h
+++ b/src/cpu/386_common.h
@@ -225,19 +225,19 @@ int checkio(uint32_t port, int mask);
 static __inline uint8_t
 fastreadb(uint32_t a)
 {
-    return readmembl(a);
+    return readmembl_2386(a);
 }
 
 static __inline uint16_t
 fastreadw(uint32_t a)
 {
-    return readmemwl(a);
+    return readmemwl_2386(a);
 }
 
 static __inline uint32_t
 fastreadl(uint32_t a)
 {
-    return readmemll(a);
+    return readmemll_2386(a);
 }
 #else
 static __inline uint8_t
@@ -351,7 +351,7 @@ fastreadw_fetch(uint32_t a)
         return val;
     }
 
-    return readmemwl(a);
+    return readmemwl_2386(a);
 }
 
 static __inline uint32_t
@@ -359,14 +359,14 @@ fastreadl_fetch(uint32_t a)
 {
     uint32_t val;
 
-    if ((a & 0xFFF) > 0xFFC) {
+    if (cpu_16bitbus || ((a & 0xFFF) > 0xFFC)) {
         val = fastreadw_fetch(a);
         if (opcode_length[val & 0xff] > 2)
             val |= (fastreadw(a + 2) << 16);
         return val;
     }
 
-    return readmemll(a);
+    return readmemll_2386(a);
 }
 #else
 static __inline uint16_t
diff --git a/src/device.c b/src/device.c
index 6154de708..01f7355c4 100644
--- a/src/device.c
+++ b/src/device.c
@@ -731,27 +731,51 @@ device_is_valid(const device_t *device, int m)
     if (device == NULL)
         return 1;
 
+    if ((device->flags & DEVICE_PCJR) && !machine_has_bus(m, MACHINE_BUS_PCJR))
+        return 0;
+
+    if ((device->flags & DEVICE_XTKBC) && machine_has_bus(m, MACHINE_BUS_ISA16) && !machine_has_bus(m, MACHINE_BUS_DM_KBC))
+        return 0;
+
     if ((device->flags & DEVICE_AT) && !machine_has_bus(m, MACHINE_BUS_ISA16))
         return 0;
 
-    if ((device->flags & DEVICE_CBUS) && !machine_has_bus(m, MACHINE_BUS_CBUS))
+    if ((device->flags & DEVICE_ATKBC) && !machine_has_bus(m, MACHINE_BUS_ISA16) && !machine_has_bus(m, MACHINE_BUS_DM_KBC))
         return 0;
 
     if ((device->flags & DEVICE_ISA) && !machine_has_bus(m, MACHINE_BUS_ISA))
         return 0;
 
+    if ((device->flags & DEVICE_CBUS) && !machine_has_bus(m, MACHINE_BUS_CBUS))
+        return 0;
+
+    if ((device->flags & DEVICE_PCMCIA) && !machine_has_bus(m, MACHINE_BUS_PCMCIA))
+        return 0;
+
     if ((device->flags & DEVICE_MCA) && !machine_has_bus(m, MACHINE_BUS_MCA))
         return 0;
 
+    if ((device->flags & DEVICE_HIL) && !machine_has_bus(m, MACHINE_BUS_HIL))
+        return 0;
+
     if ((device->flags & DEVICE_EISA) && !machine_has_bus(m, MACHINE_BUS_EISA))
         return 0;
 
+    if ((device->flags & DEVICE_OLB) && !machine_has_bus(m, MACHINE_BUS_OLB))
+        return 0;
+
     if ((device->flags & DEVICE_VLB) && !machine_has_bus(m, MACHINE_BUS_VLB))
         return 0;
 
     if ((device->flags & DEVICE_PCI) && !machine_has_bus(m, MACHINE_BUS_PCI))
         return 0;
 
+    if ((device->flags & DEVICE_CARDBUS) && !machine_has_bus(m, MACHINE_BUS_CARDBUS))
+        return 0;
+
+    if ((device->flags & DEVICE_USB) && !machine_has_bus(m, MACHINE_BUS_USB))
+        return 0;
+
     if ((device->flags & DEVICE_AGP) && !machine_has_bus(m, MACHINE_BUS_AGP))
         return 0;
 
diff --git a/src/device/clock_ics9xxx.c b/src/device/clock_ics9xxx.c
index 21a4c14ba..263170741 100644
--- a/src/device/clock_ics9xxx.c
+++ b/src/device/clock_ics9xxx.c
@@ -99,811 +99,811 @@ static const ics9xxx_model_t ics9xxx_models[] = {
     = 6 ICS9xxx_MODEL_END()
 #endif
     ICS9xxx_MODEL(ICS9150_08)
-	.max_reg = 5,
-	.regs = {0x00, 0xff, 0xff, 0xff, 0x6f, 0xbf},
-	.fs_regs = {{0, 4, 4, 7}, {0, 5, 4, 4}, {0, 6, 5, 6}, {0, 7, 4, 1}, {-1, -1, -1, -1}},
-	.hw_select = {0, 3},
-	.frequencies = (const ics9xxx_frequency_t[]) {
-		{.bus =  5000, .pci_div = 2},
-		{.bus =  7500, .pci_div = 2},
-		{.bus =  8333, .pci_div = 2},
-		{.bus =  6680, .pci_div = 2},
-		{.bus = 10300, .pci_div = 3},
-		{.bus = 11200, .pci_div = 3},
-		{.bus = 13333, .pci_div = 4},
-		{.bus = 10020, .pci_div = 3},
-		{0}
-	}
+    .max_reg = 5,
+    .regs = {0x00, 0xff, 0xff, 0xff, 0x6f, 0xbf},
+    .fs_regs = {{0, 4, 4, 7}, {0, 5, 4, 4}, {0, 6, 5, 6}, {0, 7, 4, 1}, {-1, -1, -1, -1}},
+    .hw_select = {0, 3},
+    .frequencies = (const ics9xxx_frequency_t[]) {
+        {.bus =  5000, .pci_div = 2},
+        {.bus =  7500, .pci_div = 2},
+        {.bus =  8333, .pci_div = 2},
+        {.bus =  6680, .pci_div = 2},
+        {.bus = 10300, .pci_div = 3},
+        {.bus = 11200, .pci_div = 3},
+        {.bus = 13333, .pci_div = 4},
+        {.bus = 10020, .pci_div = 3},
+        {0}
+    }
     ICS9xxx_MODEL_END()
     ICS9xxx_MODEL(ICS9248_39)
-	.max_reg = 5,
-	.regs = {0x00, 0x7f, 0xff, 0xbf, 0xf5, 0xff},
-	.fs_regs = {{0, 4, 3, 6}, {0, 5, 4, 3}, {0, 6, 1, 7}, {0, 7, 4, 1}, {-1, -1, -1, -1}},
-	.hw_select = {0, 3},
-	.frequencies_ref = ICS9250_08
+    .max_reg = 5,
+    .regs = {0x00, 0x7f, 0xff, 0xbf, 0xf5, 0xff},
+    .fs_regs = {{0, 4, 3, 6}, {0, 5, 4, 3}, {0, 6, 1, 7}, {0, 7, 4, 1}, {-1, -1, -1, -1}},
+    .hw_select = {0, 3},
+    .frequencies_ref = ICS9250_08
     ICS9xxx_MODEL_END()
 #ifdef ENABLE_ICS9xxx_DETECT
     ICS9xxx_MODEL(ICS9248_81)
-	.max_reg = 5,
-	.regs = {0x82, 0xfe, 0x7f, 0xff, 0xff, 0xb7},
-	.fs_regs = {{0, 4, 1, 0}, {0, 5, 2, 7}, {0, 6, 5, 6}, {0, 2, 5, 3}, {-1, -1, -1, -1}},
-	.hw_select = {0, 3},
-	.frequencies = (const ics9xxx_frequency_t[]) {
-		{.bus =  9000, .ram_mult =       1, .pci_div = 3},
-		{.bus =  6670, .ram_mult =     1.5, .pci_div = 2},
-		{.bus =  9500, .ram_mult = 2.0/3.0, .pci_div = 3},
-		{.bus = 10000, .ram_mult = 2.0/3.0, .pci_div = 3},
-		{.bus = 10000, .ram_mult =    0.75, .pci_div = 3},
-		{.bus = 11200, .ram_mult = 2.0/3.0, .pci_div = 3},
-		{.bus = 12400, .ram_mult = 2.0/3.0, .pci_div = 4},
-		{.bus = 13330, .ram_mult = 2.0/3.0, .pci_div = 4},
-		{.bus =  6670, .ram_mult =       1, .pci_div = 2},
-		{.bus =  7500, .ram_mult =       1, .pci_div = 3},
-		{.bus =  8330, .ram_mult =       1, .pci_div = 3},
-		{.bus =  9500, .ram_mult =       1, .pci_div = 3},
-		{.bus = 10000, .ram_mult =       1, .pci_div = 3},
-		{.bus = 11200, .ram_mult =       1, .pci_div = 3},
-		{.bus = 12400, .ram_mult =       1, .pci_div = 4},
-		{.bus = 13330, .ram_mult =       1, .pci_div = 4},
-		{0}
-	}
+    .max_reg = 5,
+    .regs = {0x82, 0xfe, 0x7f, 0xff, 0xff, 0xb7},
+    .fs_regs = {{0, 4, 1, 0}, {0, 5, 2, 7}, {0, 6, 5, 6}, {0, 2, 5, 3}, {-1, -1, -1, -1}},
+    .hw_select = {0, 3},
+    .frequencies = (const ics9xxx_frequency_t[]) {
+        {.bus =  9000, .ram_mult =       1, .pci_div = 3},
+        {.bus =  6670, .ram_mult =     1.5, .pci_div = 2},
+        {.bus =  9500, .ram_mult = 2.0/3.0, .pci_div = 3},
+        {.bus = 10000, .ram_mult = 2.0/3.0, .pci_div = 3},
+        {.bus = 10000, .ram_mult =    0.75, .pci_div = 3},
+        {.bus = 11200, .ram_mult = 2.0/3.0, .pci_div = 3},
+        {.bus = 12400, .ram_mult = 2.0/3.0, .pci_div = 4},
+        {.bus = 13330, .ram_mult = 2.0/3.0, .pci_div = 4},
+        {.bus =  6670, .ram_mult =       1, .pci_div = 2},
+        {.bus =  7500, .ram_mult =       1, .pci_div = 3},
+        {.bus =  8330, .ram_mult =       1, .pci_div = 3},
+        {.bus =  9500, .ram_mult =       1, .pci_div = 3},
+        {.bus = 10000, .ram_mult =       1, .pci_div = 3},
+        {.bus = 11200, .ram_mult =       1, .pci_div = 3},
+        {.bus = 12400, .ram_mult =       1, .pci_div = 4},
+        {.bus = 13330, .ram_mult =       1, .pci_div = 4},
+        {0}
+    }
     ICS9xxx_MODEL_END()
     ICS9xxx_MODEL(ICS9248_95)
-	.max_reg = 5,
-	.regs = {0x82, 0xff, 0xff, 0xff, 0xd5, 0xff},
-	.fs_regs = {{0, 4, -1, -1}, {0, 5, 4, 3}, {0, 6, -1, -1}, {0, 2, 4, 1}, {-1, -1, -1, -1}},
-	.hw_select = {0, 3},
-	.frequencies = (const ics9xxx_frequency_t[]) {
-		{.bus =  6667, .pci_div = 2},
-		{.bus = 10000, .pci_div = 3},
-		{.bus = 10030, .pci_div = 3},
-		{.bus = 13333, .pci_div = 4},
-		{.bus = 10500, .pci_div = 3},
-		{.bus = 13337, .pci_div = 4},
-		{.bus = 13700, .pci_div = 4},
-		{.bus =  7500, .pci_div = 2},
-		{.bus = 10000, .pci_div = 3},
-		{.bus =  9500, .pci_div = 2},
-		{.bus =  9700, .pci_div = 3},
-		{.bus = 13333, .pci_div = 4},
-		{.bus =  9000, .pci_div = 3},
-		{.bus =  9622, .pci_div = 3},
-		{.bus =  6681, .pci_div = 2},
-		{.bus =  9150, .pci_div = 3},
-		{0}
-	}
+    .max_reg = 5,
+    .regs = {0x82, 0xff, 0xff, 0xff, 0xd5, 0xff},
+    .fs_regs = {{0, 4, -1, -1}, {0, 5, 4, 3}, {0, 6, -1, -1}, {0, 2, 4, 1}, {-1, -1, -1, -1}},
+    .hw_select = {0, 3},
+    .frequencies = (const ics9xxx_frequency_t[]) {
+        {.bus =  6667, .pci_div = 2},
+        {.bus = 10000, .pci_div = 3},
+        {.bus = 10030, .pci_div = 3},
+        {.bus = 13333, .pci_div = 4},
+        {.bus = 10500, .pci_div = 3},
+        {.bus = 13337, .pci_div = 4},
+        {.bus = 13700, .pci_div = 4},
+        {.bus =  7500, .pci_div = 2},
+        {.bus = 10000, .pci_div = 3},
+        {.bus =  9500, .pci_div = 2},
+        {.bus =  9700, .pci_div = 3},
+        {.bus = 13333, .pci_div = 4},
+        {.bus =  9000, .pci_div = 3},
+        {.bus =  9622, .pci_div = 3},
+        {.bus =  6681, .pci_div = 2},
+        {.bus =  9150, .pci_div = 3},
+        {0}
+    }
     ICS9xxx_MODEL_END()
     ICS9xxx_MODEL(ICS9248_98)
-	.max_reg = 6,
-	.regs = {0x00, 0x7f, 0xff, 0xbf, 0xf5, 0xff, 0x06},
-	.fs_regs = {{0, 4, 3, 6}, {0, 5, 4, 3}, {0, 6, 1, 7}, {0, 7, 4, 1}, {0, 2, -1, -1}},
-	.hw_select = {0, 3},
-	.frequencies = (const ics9xxx_frequency_t[]) {
-		{.bus =  8000, .pci_div = 2},
-		{.bus =  7500, .pci_div = 2},
-		{.bus =  8331, .pci_div = 2},
-		{.bus =  6682, .pci_div = 2},
-		{.bus = 10300, .pci_div = 3},
-		{.bus = 11201, .pci_div = 3},
-		{.bus =  6801, .pci_div = 2},
-		{.bus = 10023, .pci_div = 3},
-		{.bus = 12000, .pci_div = 3},
-		{.bus = 11499, .pci_div = 3},
-		{.bus = 10999, .pci_div = 3},
-		{.bus = 10500, .pci_div = 3},
-		{.bus = 14000, .pci_div = 4},
-		{.bus = 15000, .pci_div = 4},
-		{.bus = 12400, .pci_div = 4},
-		{.bus = 13299, .pci_div = 4},
-		{.bus = 13500, .pci_div = 4},
-		{.bus = 12999, .pci_div = 4},
-		{.bus = 12600, .pci_div = 4},
-		{.bus = 11800, .pci_div = 3},
-		{.bus = 11598, .pci_div = 3},
-		{.bus =  9500, .pci_div = 3},
-		{.bus =  9000, .pci_div = 3},
-		{.bus =  8501, .pci_div = 3},
-		{.bus = 16600, .pci_div = 4},
-		{.bus = 16001, .pci_div = 4},
-		{.bus = 15499, .pci_div = 4},
-		{.bus = 14795, .pci_div = 4},
-		{.bus = 14598, .pci_div = 4},
-		{.bus = 14398, .pci_div = 4},
-		{.bus = 14199, .pci_div = 4},
-		{.bus = 13801, .pci_div = 4},
-		{0}
-	}
+    .max_reg = 6,
+    .regs = {0x00, 0x7f, 0xff, 0xbf, 0xf5, 0xff, 0x06},
+    .fs_regs = {{0, 4, 3, 6}, {0, 5, 4, 3}, {0, 6, 1, 7}, {0, 7, 4, 1}, {0, 2, -1, -1}},
+    .hw_select = {0, 3},
+    .frequencies = (const ics9xxx_frequency_t[]) {
+        {.bus =  8000, .pci_div = 2},
+        {.bus =  7500, .pci_div = 2},
+        {.bus =  8331, .pci_div = 2},
+        {.bus =  6682, .pci_div = 2},
+        {.bus = 10300, .pci_div = 3},
+        {.bus = 11201, .pci_div = 3},
+        {.bus =  6801, .pci_div = 2},
+        {.bus = 10023, .pci_div = 3},
+        {.bus = 12000, .pci_div = 3},
+        {.bus = 11499, .pci_div = 3},
+        {.bus = 10999, .pci_div = 3},
+        {.bus = 10500, .pci_div = 3},
+        {.bus = 14000, .pci_div = 4},
+        {.bus = 15000, .pci_div = 4},
+        {.bus = 12400, .pci_div = 4},
+        {.bus = 13299, .pci_div = 4},
+        {.bus = 13500, .pci_div = 4},
+        {.bus = 12999, .pci_div = 4},
+        {.bus = 12600, .pci_div = 4},
+        {.bus = 11800, .pci_div = 3},
+        {.bus = 11598, .pci_div = 3},
+        {.bus =  9500, .pci_div = 3},
+        {.bus =  9000, .pci_div = 3},
+        {.bus =  8501, .pci_div = 3},
+        {.bus = 16600, .pci_div = 4},
+        {.bus = 16001, .pci_div = 4},
+        {.bus = 15499, .pci_div = 4},
+        {.bus = 14795, .pci_div = 4},
+        {.bus = 14598, .pci_div = 4},
+        {.bus = 14398, .pci_div = 4},
+        {.bus = 14199, .pci_div = 4},
+        {.bus = 13801, .pci_div = 4},
+        {0}
+    }
     ICS9xxx_MODEL_END()
     ICS9xxx_MODEL(ICS9248_101)
-	.max_reg = 5,
-	.regs = {0x82, 0xff, 0xff, 0xff, 0xf5, 0xff},
-	.fs_regs = {{0, 4, -1, -1}, {0, 5, 4, 3}, {0, 6, -1, -1}, {0, 2, 4, 1}, {-1, -1, -1, -1}},
-	.hw_select = {0, 3},
-	.frequencies = (const ics9xxx_frequency_t[]) {
-		{.bus = 12400, .pci_div = 3},
-		{.bus = 12000, .pci_div = 3},
-		{.bus = 11499, .pci_div = 3},
-		{.bus = 10999, .pci_div = 3},
-		{.bus = 10500, .pci_div = 3},
-		{.bus =  8331, .pci_div = 2},
-		{.bus = 13700, .pci_div = 4},
-		{.bus =  7500, .pci_div = 2},
-		{.bus = 10000, .pci_div = 3},
-		{.bus =  9500, .pci_div = 3},
-		{.bus =  8331, .pci_div = 3},
-		{.bus = 13333, .pci_div = 4},
-		{.bus =  9000, .pci_div = 3},
-		{.bus =  9622, .pci_div = 3},
-		{.bus =  6682, .pci_div = 2},
-		{.bus =  9150, .pci_div = 3},
-		{0}
-	}
+    .max_reg = 5,
+    .regs = {0x82, 0xff, 0xff, 0xff, 0xf5, 0xff},
+    .fs_regs = {{0, 4, -1, -1}, {0, 5, 4, 3}, {0, 6, -1, -1}, {0, 2, 4, 1}, {-1, -1, -1, -1}},
+    .hw_select = {0, 3},
+    .frequencies = (const ics9xxx_frequency_t[]) {
+        {.bus = 12400, .pci_div = 3},
+        {.bus = 12000, .pci_div = 3},
+        {.bus = 11499, .pci_div = 3},
+        {.bus = 10999, .pci_div = 3},
+        {.bus = 10500, .pci_div = 3},
+        {.bus =  8331, .pci_div = 2},
+        {.bus = 13700, .pci_div = 4},
+        {.bus =  7500, .pci_div = 2},
+        {.bus = 10000, .pci_div = 3},
+        {.bus =  9500, .pci_div = 3},
+        {.bus =  8331, .pci_div = 3},
+        {.bus = 13333, .pci_div = 4},
+        {.bus =  9000, .pci_div = 3},
+        {.bus =  9622, .pci_div = 3},
+        {.bus =  6682, .pci_div = 2},
+        {.bus =  9150, .pci_div = 3},
+        {0}
+    }
     ICS9xxx_MODEL_END()
     ICS9xxx_MODEL(ICS9248_103)
-	.max_reg = 5,
-	.regs = {0x82, 0xff, 0xff, 0xff, 0xf5, 0xff},
-	.fs_regs = {{0, 4, -1, -1}, {0, 5, 4, 3}, {0, 6, -1, -1}, {0, 2, 4, 1}, {-1, -1, -1, -1}},
-	.hw_select = {0, 3},
-	.frequencies_ref = ICS9248_101
+    .max_reg = 5,
+    .regs = {0x82, 0xff, 0xff, 0xff, 0xf5, 0xff},
+    .fs_regs = {{0, 4, -1, -1}, {0, 5, 4, 3}, {0, 6, -1, -1}, {0, 2, 4, 1}, {-1, -1, -1, -1}},
+    .hw_select = {0, 3},
+    .frequencies_ref = ICS9248_101
     ICS9xxx_MODEL_END()
     ICS9xxx_MODEL(ICS9248_107)
-	.max_reg = 6,
-	.regs = {0x02, 0xff, 0xff, 0xec, 0xde, 0xff, 0x06},
-	.fs_regs = {{0, 4, 4, 5}, {0, 5, 3, 4}, {0, 6, 3, 0}, {0, 7, 3, 1}, {0, 2, 4, 0}},
-	.hw_select = {0, 3},
-	.frequencies = (const ics9xxx_frequency_t[]) {
-		{.bus = 10300, .pci_div = 3},
-		{.bus = 10000, .pci_div = 3},
-		{.bus = 10045, .pci_div = 3},
-		{.bus = 10090, .pci_div = 3},
-		{.bus = 10710, .pci_div = 2},
-		{.bus = 10900, .pci_div = 3},
-		{.bus = 11200, .pci_div = 3},
-		{.bus = 11400, .pci_div = 4},
-		{.bus = 11600, .pci_div = 4},
-		{.bus = 11800, .pci_div = 4},
-		{.bus = 13330, .pci_div = 3},
-		{.bus = 12000, .pci_div = 4},
-		{.bus = 12200, .pci_div = 4},
-		{.bus = 12500, .pci_div = 4},
-		{.bus =  5000, .pci_div = 2},
-		{.bus =  6670, .pci_div = 4},
-		{.bus = 13330, .pci_div = 3},
-		{.bus = 13390, .pci_div = 3},
-		{.bus = 13800, .pci_div = 4},
-		{.bus = 14200, .pci_div = 4},
-		{.bus = 14600, .pci_div = 4},
-		{.bus = 15000, .pci_div = 4},
-		{.bus = 15300, .pci_div = 4},
-		{.bus = 15600, .pci_div = 4},
-		{.bus = 15910, .pci_div = 3},
-		{.bus = 16200, .pci_div = 4},
-		{.bus = 16670, .pci_div = 4},
-		{.bus = 16800, .pci_div = 4},
-		{.bus = 17100, .pci_div = 4},
-		{.bus = 17400, .pci_div = 4},
-		{.bus = 17700, .pci_div = 4},
-		{.bus = 18000, .pci_div = 4},
-		{0}
-	}
+    .max_reg = 6,
+    .regs = {0x02, 0xff, 0xff, 0xec, 0xde, 0xff, 0x06},
+    .fs_regs = {{0, 4, 4, 5}, {0, 5, 3, 4}, {0, 6, 3, 0}, {0, 7, 3, 1}, {0, 2, 4, 0}},
+    .hw_select = {0, 3},
+    .frequencies = (const ics9xxx_frequency_t[]) {
+        {.bus = 10300, .pci_div = 3},
+        {.bus = 10000, .pci_div = 3},
+        {.bus = 10045, .pci_div = 3},
+        {.bus = 10090, .pci_div = 3},
+        {.bus = 10710, .pci_div = 2},
+        {.bus = 10900, .pci_div = 3},
+        {.bus = 11200, .pci_div = 3},
+        {.bus = 11400, .pci_div = 4},
+        {.bus = 11600, .pci_div = 4},
+        {.bus = 11800, .pci_div = 4},
+        {.bus = 13330, .pci_div = 3},
+        {.bus = 12000, .pci_div = 4},
+        {.bus = 12200, .pci_div = 4},
+        {.bus = 12500, .pci_div = 4},
+        {.bus =  5000, .pci_div = 2},
+        {.bus =  6670, .pci_div = 4},
+        {.bus = 13330, .pci_div = 3},
+        {.bus = 13390, .pci_div = 3},
+        {.bus = 13800, .pci_div = 4},
+        {.bus = 14200, .pci_div = 4},
+        {.bus = 14600, .pci_div = 4},
+        {.bus = 15000, .pci_div = 4},
+        {.bus = 15300, .pci_div = 4},
+        {.bus = 15600, .pci_div = 4},
+        {.bus = 15910, .pci_div = 3},
+        {.bus = 16200, .pci_div = 4},
+        {.bus = 16670, .pci_div = 4},
+        {.bus = 16800, .pci_div = 4},
+        {.bus = 17100, .pci_div = 4},
+        {.bus = 17400, .pci_div = 4},
+        {.bus = 17700, .pci_div = 4},
+        {.bus = 18000, .pci_div = 4},
+        {0}
+    }
     ICS9xxx_MODEL_END()
     ICS9xxx_MODEL(ICS9248_112)
-	.max_reg = 6,
-	.regs = {0x02, 0x1f, 0xff, 0xff, 0xfb, 0xff, 0x06},
-	.fs_regs = {{0, 4, 1, 6}, {0, 5, 4, 2}, {0, 6, 1, 5}, {0, 7, 1, 7}, {0, 2, -1, -1}},
-	.hw_select = {0, 3},
-	.frequencies = (const ics9xxx_frequency_t[]) {
-		{.bus =  6680, .ram_mult =  1.5, .pci_div = 2},
-		{.bus =  6800, .ram_mult =  1.5, .pci_div = 2},
-		{.bus = 10030, .ram_mult =    1, .pci_div = 3},
-		{.bus = 10300, .ram_mult =    1, .pci_div = 3},
-		{.bus = 13372, .ram_mult = 0.75, .pci_div = 4},
-		{.bus = 14500, .ram_mult = 0.75, .pci_div = 4},
-		{.bus = 13372, .ram_mult = 0.75, .pci_div = 4},
-		{.bus = 13733, .ram_mult = 0.75, .pci_div = 4},
-		{.bus = 14000, .ram_mult = 0.75, .pci_div = 4},
-		{.bus = 14000, .ram_mult =    1, .pci_div = 2},
-		{.bus = 11800, .ram_mult =    1, .pci_div = 3},
-		{.bus = 12400, .ram_mult =    1, .pci_div = 3},
-		{.bus = 13369, .ram_mult =    1, .pci_div = 2},
-		{.bus = 13700, .ram_mult =    1, .pci_div = 2},
-		{.bus = 15000, .ram_mult = 0.75, .pci_div = 4},
-		{.bus =  7250, .ram_mult =  1.5, .pci_div = 2},
-		{.bus =  7500, .ram_mult =  1.5, .pci_div = 2},
-		{.bus =  8300, .ram_mult =    1, .pci_div = 6},
-		{.bus = 11000, .ram_mult =    1, .pci_div = 2},
-		{.bus = 12000, .ram_mult =    1, .pci_div = 3},
-		{.bus = 12500, .ram_mult =    1, .pci_div = 2},
-		{.bus =  6925, .ram_mult =  1.5, .pci_div = 1},
-		{.bus =  7000, .ram_mult =  1.5, .pci_div = 2},
-		{.bus =  7667, .ram_mult =  1.5, .pci_div = 2},
-		{.bus = 14500, .ram_mult =    1, .pci_div = 3},
-		{.bus =  6650, .ram_mult =  1.5, .pci_div = 2},
-		{.bus = 15000, .ram_mult =    1, .pci_div = 3},
-		{.bus =  9975, .ram_mult =    1, .pci_div = 3},
-		{.bus = 15500, .ram_mult =    1, .pci_div = 2},
-		{.bus = 16650, .ram_mult =    1, .pci_div = 3},
-		{.bus = 15333, .ram_mult = 0.75, .pci_div = 4},
-		{.bus = 13300, .ram_mult = 0.75, .pci_div = 4},
-		{0}
-	}
+    .max_reg = 6,
+    .regs = {0x02, 0x1f, 0xff, 0xff, 0xfb, 0xff, 0x06},
+    .fs_regs = {{0, 4, 1, 6}, {0, 5, 4, 2}, {0, 6, 1, 5}, {0, 7, 1, 7}, {0, 2, -1, -1}},
+    .hw_select = {0, 3},
+    .frequencies = (const ics9xxx_frequency_t[]) {
+        {.bus =  6680, .ram_mult =  1.5, .pci_div = 2},
+        {.bus =  6800, .ram_mult =  1.5, .pci_div = 2},
+        {.bus = 10030, .ram_mult =    1, .pci_div = 3},
+        {.bus = 10300, .ram_mult =    1, .pci_div = 3},
+        {.bus = 13372, .ram_mult = 0.75, .pci_div = 4},
+        {.bus = 14500, .ram_mult = 0.75, .pci_div = 4},
+        {.bus = 13372, .ram_mult = 0.75, .pci_div = 4},
+        {.bus = 13733, .ram_mult = 0.75, .pci_div = 4},
+        {.bus = 14000, .ram_mult = 0.75, .pci_div = 4},
+        {.bus = 14000, .ram_mult =    1, .pci_div = 2},
+        {.bus = 11800, .ram_mult =    1, .pci_div = 3},
+        {.bus = 12400, .ram_mult =    1, .pci_div = 3},
+        {.bus = 13369, .ram_mult =    1, .pci_div = 2},
+        {.bus = 13700, .ram_mult =    1, .pci_div = 2},
+        {.bus = 15000, .ram_mult = 0.75, .pci_div = 4},
+        {.bus =  7250, .ram_mult =  1.5, .pci_div = 2},
+        {.bus =  7500, .ram_mult =  1.5, .pci_div = 2},
+        {.bus =  8300, .ram_mult =    1, .pci_div = 6},
+        {.bus = 11000, .ram_mult =    1, .pci_div = 2},
+        {.bus = 12000, .ram_mult =    1, .pci_div = 3},
+        {.bus = 12500, .ram_mult =    1, .pci_div = 2},
+        {.bus =  6925, .ram_mult =  1.5, .pci_div = 1},
+        {.bus =  7000, .ram_mult =  1.5, .pci_div = 2},
+        {.bus =  7667, .ram_mult =  1.5, .pci_div = 2},
+        {.bus = 14500, .ram_mult =    1, .pci_div = 3},
+        {.bus =  6650, .ram_mult =  1.5, .pci_div = 2},
+        {.bus = 15000, .ram_mult =    1, .pci_div = 3},
+        {.bus =  9975, .ram_mult =    1, .pci_div = 3},
+        {.bus = 15500, .ram_mult =    1, .pci_div = 2},
+        {.bus = 16650, .ram_mult =    1, .pci_div = 3},
+        {.bus = 15333, .ram_mult = 0.75, .pci_div = 4},
+        {.bus = 13300, .ram_mult = 0.75, .pci_div = 4},
+        {0}
+    }
     ICS9xxx_MODEL_END()
     ICS9xxx_MODEL(ICS9248_138)
-	.max_reg = 6,
-	.regs = {0x02, 0x3f, 0x7f, 0x6f, 0xff, 0xff, 0x06},
-	.fs_regs = {{0, 4, 2, 7}, {0, 5, 1, 6}, {0, 6, 1, 7}, {0, 7, 3, 4}, {0, 2, 3, 7}},
-	.hw_select = {0, 3},
-	.frequencies = (const ics9xxx_frequency_t[]) {
-		{.bus =  6667, .ram_mult =  1.5, .pci_div = 2},
-		{.bus =  6687, .ram_mult =  1.5, .pci_div = 2},
-		{.bus =  6867, .ram_mult =  1.5, .pci_div = 2},
-		{.bus =  7134, .ram_mult =  1.5, .pci_div = 2},
-		{.bus = 10000, .ram_mult =    1, .pci_div = 3},
-		{.bus = 10030, .ram_mult =    1, .pci_div = 3},
-		{.bus = 10300, .ram_mult =    1, .pci_div = 3},
-		{.bus = 10700, .ram_mult =    1, .pci_div = 2},
-		{.bus = 13333, .ram_mult =    1, .pci_div = 4},
-		{.bus = 13372, .ram_mult =    1, .pci_div = 4},
-		{.bus = 13733, .ram_mult =    1, .pci_div = 4},
-		{.bus = 12000, .ram_mult =    1, .pci_div = 4},
-		{.bus = 13333, .ram_mult = 0.75, .pci_div = 4},
-		{.bus = 13372, .ram_mult = 0.75, .pci_div = 4},
-		{.bus = 13733, .ram_mult = 0.75, .pci_div = 4},
-		{.bus = 12000, .ram_mult = 0.75, .pci_div = 4},
-		{.bus = 13600, .ram_mult =    1, .pci_div = 4},
-		{.bus = 14000, .ram_mult =    1, .pci_div = 4},
-		{.bus = 14266, .ram_mult =    1, .pci_div = 3},
-		{.bus = 14533, .ram_mult =    1, .pci_div = 4},
-		{.bus = 13600, .ram_mult = 0.75, .pci_div = 4},
-		{.bus = 14000, .ram_mult = 0.75, .pci_div = 4},
-		{.bus = 14266, .ram_mult = 0.75, .pci_div = 3},
-		{.bus = 14533, .ram_mult = 0.75, .pci_div = 4},
-		{.bus = 14666, .ram_mult =    1, .pci_div = 3},
-		{.bus = 15333, .ram_mult =    1, .pci_div = 4},
-		{.bus = 16000, .ram_mult =    1, .pci_div = 4},
-		{.bus = 16667, .ram_mult =    1, .pci_div = 3},
-		{.bus = 14666, .ram_mult = 0.75, .pci_div = 3},
-		{.bus = 16000, .ram_mult = 0.75, .pci_div = 4},
-		{.bus = 16667, .ram_mult = 0.75, .pci_div = 3},
-		{.bus = 20000, .ram_mult =    1, .pci_div = 6},
-		{0}
-	}
+    .max_reg = 6,
+    .regs = {0x02, 0x3f, 0x7f, 0x6f, 0xff, 0xff, 0x06},
+    .fs_regs = {{0, 4, 2, 7}, {0, 5, 1, 6}, {0, 6, 1, 7}, {0, 7, 3, 4}, {0, 2, 3, 7}},
+    .hw_select = {0, 3},
+    .frequencies = (const ics9xxx_frequency_t[]) {
+        {.bus =  6667, .ram_mult =  1.5, .pci_div = 2},
+        {.bus =  6687, .ram_mult =  1.5, .pci_div = 2},
+        {.bus =  6867, .ram_mult =  1.5, .pci_div = 2},
+        {.bus =  7134, .ram_mult =  1.5, .pci_div = 2},
+        {.bus = 10000, .ram_mult =    1, .pci_div = 3},
+        {.bus = 10030, .ram_mult =    1, .pci_div = 3},
+        {.bus = 10300, .ram_mult =    1, .pci_div = 3},
+        {.bus = 10700, .ram_mult =    1, .pci_div = 2},
+        {.bus = 13333, .ram_mult =    1, .pci_div = 4},
+        {.bus = 13372, .ram_mult =    1, .pci_div = 4},
+        {.bus = 13733, .ram_mult =    1, .pci_div = 4},
+        {.bus = 12000, .ram_mult =    1, .pci_div = 4},
+        {.bus = 13333, .ram_mult = 0.75, .pci_div = 4},
+        {.bus = 13372, .ram_mult = 0.75, .pci_div = 4},
+        {.bus = 13733, .ram_mult = 0.75, .pci_div = 4},
+        {.bus = 12000, .ram_mult = 0.75, .pci_div = 4},
+        {.bus = 13600, .ram_mult =    1, .pci_div = 4},
+        {.bus = 14000, .ram_mult =    1, .pci_div = 4},
+        {.bus = 14266, .ram_mult =    1, .pci_div = 3},
+        {.bus = 14533, .ram_mult =    1, .pci_div = 4},
+        {.bus = 13600, .ram_mult = 0.75, .pci_div = 4},
+        {.bus = 14000, .ram_mult = 0.75, .pci_div = 4},
+        {.bus = 14266, .ram_mult = 0.75, .pci_div = 3},
+        {.bus = 14533, .ram_mult = 0.75, .pci_div = 4},
+        {.bus = 14666, .ram_mult =    1, .pci_div = 3},
+        {.bus = 15333, .ram_mult =    1, .pci_div = 4},
+        {.bus = 16000, .ram_mult =    1, .pci_div = 4},
+        {.bus = 16667, .ram_mult =    1, .pci_div = 3},
+        {.bus = 14666, .ram_mult = 0.75, .pci_div = 3},
+        {.bus = 16000, .ram_mult = 0.75, .pci_div = 4},
+        {.bus = 16667, .ram_mult = 0.75, .pci_div = 3},
+        {.bus = 20000, .ram_mult =    1, .pci_div = 6},
+        {0}
+    }
     ICS9xxx_MODEL_END()
     ICS9xxx_MODEL(ICS9248_141)
-	.max_reg = 6,
-	.regs = {0x02, 0x6b, 0x7f, 0xff, 0xff, 0xe7, 0x06},
-	.fs_regs = {{0, 4, 2, 7}, {0, 5, 5, 3}, {0, 6, 1, 7}, {0, 7, 1, 4}, {0, 2, -1, -1}},
-	.hw_select = {0, 3},
-	.frequencies = (const ics9xxx_frequency_t[]) {
-		{.bus =  9000, .pci_div = 3},
-		{.bus =  9500, .pci_div = 2},
-		{.bus = 10100, .pci_div = 2},
-		{.bus = 10200, .pci_div = 3},
-		{.bus = 10090, .pci_div = 3},
-		{.bus = 10300, .pci_div = 3},
-		{.bus = 10500, .pci_div = 3},
-		{.bus = 10000, .pci_div = 3},
-		{.bus = 10700, .pci_div = 2},
-		{.bus = 10900, .pci_div = 3},
-		{.bus = 11000, .pci_div = 2},
-		{.bus = 11100, .pci_div = 3},
-		{.bus = 11300, .pci_div = 2},
-		{.bus = 11500, .pci_div = 3},
-		{.bus = 11700, .pci_div = 3},
-		{.bus = 13330, .pci_div = 3},
-		{.bus = 12000, .pci_div = 3},
-		{.bus = 12500, .pci_div = 4},
-		{.bus = 13000, .pci_div = 4},
-		{.bus = 13372, .pci_div = 4},
-		{.bus = 13500, .pci_div = 4},
-		{.bus = 13700, .pci_div = 4},
-		{.bus = 13900, .pci_div = 4},
-		{.bus = 10000, .pci_div = 3},
-		{.bus = 14000, .pci_div = 4},
-		{.bus = 14300, .pci_div = 4},
-		{.bus = 14500, .pci_div = 4},
-		{.bus = 14800, .pci_div = 4},
-		{.bus = 15000, .pci_div = 4},
-		{.bus = 15500, .pci_div = 4},
-		{.bus = 16666, .pci_div = 3},
-		{.bus = 13333, .pci_div = 4},
-		{0}
-	}
+    .max_reg = 6,
+    .regs = {0x02, 0x6b, 0x7f, 0xff, 0xff, 0xe7, 0x06},
+    .fs_regs = {{0, 4, 2, 7}, {0, 5, 5, 3}, {0, 6, 1, 7}, {0, 7, 1, 4}, {0, 2, -1, -1}},
+    .hw_select = {0, 3},
+    .frequencies = (const ics9xxx_frequency_t[]) {
+        {.bus =  9000, .pci_div = 3},
+        {.bus =  9500, .pci_div = 2},
+        {.bus = 10100, .pci_div = 2},
+        {.bus = 10200, .pci_div = 3},
+        {.bus = 10090, .pci_div = 3},
+        {.bus = 10300, .pci_div = 3},
+        {.bus = 10500, .pci_div = 3},
+        {.bus = 10000, .pci_div = 3},
+        {.bus = 10700, .pci_div = 2},
+        {.bus = 10900, .pci_div = 3},
+        {.bus = 11000, .pci_div = 2},
+        {.bus = 11100, .pci_div = 3},
+        {.bus = 11300, .pci_div = 2},
+        {.bus = 11500, .pci_div = 3},
+        {.bus = 11700, .pci_div = 3},
+        {.bus = 13330, .pci_div = 3},
+        {.bus = 12000, .pci_div = 3},
+        {.bus = 12500, .pci_div = 4},
+        {.bus = 13000, .pci_div = 4},
+        {.bus = 13372, .pci_div = 4},
+        {.bus = 13500, .pci_div = 4},
+        {.bus = 13700, .pci_div = 4},
+        {.bus = 13900, .pci_div = 4},
+        {.bus = 10000, .pci_div = 3},
+        {.bus = 14000, .pci_div = 4},
+        {.bus = 14300, .pci_div = 4},
+        {.bus = 14500, .pci_div = 4},
+        {.bus = 14800, .pci_div = 4},
+        {.bus = 15000, .pci_div = 4},
+        {.bus = 15500, .pci_div = 4},
+        {.bus = 16666, .pci_div = 3},
+        {.bus = 13333, .pci_div = 4},
+        {0}
+    }
     ICS9xxx_MODEL_END()
     ICS9xxx_MODEL(ICS9248_143)
-	.max_reg = 5,
-	.regs = {0x82, 0xff, 0xff, 0xff, 0xd5, 0xff},
-	.fs_regs = {{0, 4, -1, -1}, {0, 5, 4, 3}, {0, 6, -1, -1}, {0, 2, 4, 1}, {-1, -1, -1, -1}},
-	.frequencies = (const ics9xxx_frequency_t[]) {
-		{.bus =  6667, .pci_div = 2},
-		{.bus = 10000, .pci_div = 3},
-		{.bus = 10030, .pci_div = 3},
-		{.bus = 13333, .pci_div = 4},
-		{.bus = 10500, .pci_div = 3},
-		{.bus = 13337, .pci_div = 4},
-		{.bus = 13700, .pci_div = 4},
-		{.bus =  7500, .pci_div = 2},
-		{.bus = 10000, .pci_div = 3},
-		{.bus =  9500, .pci_div = 2},
-		{.bus =  9700, .pci_div = 3},
-		{.bus = 13333, .pci_div = 4},
-		{.bus =  9000, .pci_div = 3},
-		{.bus =  9622, .pci_div = 3},
-		{.bus =  6681, .pci_div = 2},
-		{.bus =  9150, .pci_div = 3},
-		{0}
-	}
+    .max_reg = 5,
+    .regs = {0x82, 0xff, 0xff, 0xff, 0xd5, 0xff},
+    .fs_regs = {{0, 4, -1, -1}, {0, 5, 4, 3}, {0, 6, -1, -1}, {0, 2, 4, 1}, {-1, -1, -1, -1}},
+    .frequencies = (const ics9xxx_frequency_t[]) {
+        {.bus =  6667, .pci_div = 2},
+        {.bus = 10000, .pci_div = 3},
+        {.bus = 10030, .pci_div = 3},
+        {.bus = 13333, .pci_div = 4},
+        {.bus = 10500, .pci_div = 3},
+        {.bus = 13337, .pci_div = 4},
+        {.bus = 13700, .pci_div = 4},
+        {.bus =  7500, .pci_div = 2},
+        {.bus = 10000, .pci_div = 3},
+        {.bus =  9500, .pci_div = 2},
+        {.bus =  9700, .pci_div = 3},
+        {.bus = 13333, .pci_div = 4},
+        {.bus =  9000, .pci_div = 3},
+        {.bus =  9622, .pci_div = 3},
+        {.bus =  6681, .pci_div = 2},
+        {.bus =  9150, .pci_div = 3},
+        {0}
+    }
     ICS9xxx_MODEL_END()
     ICS9xxx_MODEL(ICS9248_151)
-	.max_reg = 6,
-	.regs = {0x80, 0x4f, 0xff, 0x3f, 0xff, 0xff, 0x06},
-	.fs_regs = {{0, 4, -1, -1}, {0, 5, -1, -1}, {0, 6, 3, 7}, {0, 1, 1, 4}, {0, 2, 1, 5}},
-	.hw_select = {0, 3},
-	.frequencies = (const ics9xxx_frequency_t[]) {
-		{.bus = 20000, .pci_div = 5, .agp_div = 2.5},
-		{.bus = 19000, .pci_div = 5, .agp_div = 2.5},
-		{.bus = 18000, .pci_div = 5, .agp_div = 2.5},
-		{.bus = 17000, .pci_div = 5, .agp_div = 2.5},
-		{.bus = 16600, .pci_div = 5, .agp_div = 2.5},
-		{.bus = 16000, .pci_div = 5, .agp_div = 2.5},
-		{.bus = 15000, .pci_div = 4, .agp_div =   2},
-		{.bus = 14500, .pci_div = 4, .agp_div =   2},
-		{.bus = 14000, .pci_div = 4, .agp_div =   2},
-		{.bus = 13600, .pci_div = 4, .agp_div =   2},
-		{.bus = 13000, .pci_div = 4, .agp_div =   2},
-		{.bus = 12400, .pci_div = 4, .agp_div =   2},
-		{.bus =  6667, .pci_div = 1, .agp_div =   1},
-		{.bus = 10000, .pci_div = 3, .agp_div = 1.5},
-		{.bus = 11800, .pci_div = 3, .agp_div = 1.5},
-		{.bus = 13333, .pci_div = 3, .agp_div =   2},
-		{.bus =  6680, .pci_div = 2, .agp_div =   1},
-		{.bus = 10020, .pci_div = 3, .agp_div = 1.5},
-		{.bus = 11500, .pci_div = 3, .agp_div = 1.5},
-		{.bus = 13340, .pci_div = 4, .agp_div =   2},
-		{.bus =  6680, .pci_div = 2, .agp_div =   1},
-		{.bus = 10020, .pci_div = 3, .agp_div = 1.5},
-		{.bus = 11000, .pci_div = 2, .agp_div = 1.5},
-		{.bus = 13340, .pci_div = 4, .agp_div =   2},
-		{.bus = 10500, .pci_div = 3, .agp_div = 1.5},
-		{.bus =  9000, .pci_div = 3, .agp_div = 1.5},
-		{.bus =  8500, .pci_div = 3, .agp_div = 1.5},
-		{.bus =  7800, .pci_div = 2, .agp_div =   1},
-		{.bus =  6667, .pci_div = 1, .agp_div =   1},
-		{.bus = 10000, .pci_div = 3, .agp_div = 1.5},
-		{.bus =  7500, .pci_div = 2, .agp_div =   1},
-		{.bus = 13333, .pci_div = 3, .agp_div =   2},
-		{0}
-	}
+    .max_reg = 6,
+    .regs = {0x80, 0x4f, 0xff, 0x3f, 0xff, 0xff, 0x06},
+    .fs_regs = {{0, 4, -1, -1}, {0, 5, -1, -1}, {0, 6, 3, 7}, {0, 1, 1, 4}, {0, 2, 1, 5}},
+    .hw_select = {0, 3},
+    .frequencies = (const ics9xxx_frequency_t[]) {
+        {.bus = 20000, .pci_div = 5, .agp_div = 2.5},
+        {.bus = 19000, .pci_div = 5, .agp_div = 2.5},
+        {.bus = 18000, .pci_div = 5, .agp_div = 2.5},
+        {.bus = 17000, .pci_div = 5, .agp_div = 2.5},
+        {.bus = 16600, .pci_div = 5, .agp_div = 2.5},
+        {.bus = 16000, .pci_div = 5, .agp_div = 2.5},
+        {.bus = 15000, .pci_div = 4, .agp_div =   2},
+        {.bus = 14500, .pci_div = 4, .agp_div =   2},
+        {.bus = 14000, .pci_div = 4, .agp_div =   2},
+        {.bus = 13600, .pci_div = 4, .agp_div =   2},
+        {.bus = 13000, .pci_div = 4, .agp_div =   2},
+        {.bus = 12400, .pci_div = 4, .agp_div =   2},
+        {.bus =  6667, .pci_div = 1, .agp_div =   1},
+        {.bus = 10000, .pci_div = 3, .agp_div = 1.5},
+        {.bus = 11800, .pci_div = 3, .agp_div = 1.5},
+        {.bus = 13333, .pci_div = 3, .agp_div =   2},
+        {.bus =  6680, .pci_div = 2, .agp_div =   1},
+        {.bus = 10020, .pci_div = 3, .agp_div = 1.5},
+        {.bus = 11500, .pci_div = 3, .agp_div = 1.5},
+        {.bus = 13340, .pci_div = 4, .agp_div =   2},
+        {.bus =  6680, .pci_div = 2, .agp_div =   1},
+        {.bus = 10020, .pci_div = 3, .agp_div = 1.5},
+        {.bus = 11000, .pci_div = 2, .agp_div = 1.5},
+        {.bus = 13340, .pci_div = 4, .agp_div =   2},
+        {.bus = 10500, .pci_div = 3, .agp_div = 1.5},
+        {.bus =  9000, .pci_div = 3, .agp_div = 1.5},
+        {.bus =  8500, .pci_div = 3, .agp_div = 1.5},
+        {.bus =  7800, .pci_div = 2, .agp_div =   1},
+        {.bus =  6667, .pci_div = 1, .agp_div =   1},
+        {.bus = 10000, .pci_div = 3, .agp_div = 1.5},
+        {.bus =  7500, .pci_div = 2, .agp_div =   1},
+        {.bus = 13333, .pci_div = 3, .agp_div =   2},
+        {0}
+    }
     ICS9xxx_MODEL_END()
     ICS9xxx_MODEL(ICS9248_192)
-	.max_reg = 6,
-	.regs = {0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},
-	.fs_regs = {{0, 4, -1, -1}, {0, 5, 4, 3}, {0, 6, -1, -1}, {0, 7, -1, -1}, {0, 2, -1, -1}},
-	.hw_select = {0, 3},
-	.frequencies = (const ics9xxx_frequency_t[]) {
-		{.bus = 6000, .pci_div = 2},
-		{.bus = 6000, .pci_div = 2},
-		{.bus = 6000, .pci_div = 2},
-		{.bus = 6000, .pci_div = 2},
-		{.bus = 6659, .pci_div = 2},
-		{.bus = 6659, .pci_div = 2},
-		{.bus = 6659, .pci_div = 2},
-		{.bus = 6659, .pci_div = 2},
-		{.bus = 6731, .pci_div = 2},
-		{.bus = 6864, .pci_div = 2},
-		{.bus = 6995, .pci_div = 2},
-		{.bus = 7259, .pci_div = 2},
-		{.bus = 6150, .pci_div = 2},
-		{.bus = 6300, .pci_div = 2},
-		{.bus = 6400, .pci_div = 2},
-		{.bus = 6500, .pci_div = 2},
-		{.bus = 6000, .pci_div = 2},
-		{.bus = 6659, .pci_div = 2},
-		{.bus = 5000, .pci_div = 2},
-		{.bus = 4800, .pci_div = 2},
-		{.bus = 5880, .pci_div = 2},
-		{.bus = 5760, .pci_div = 2},
-		{.bus = 5640, .pci_div = 2},
-		{.bus = 5400, .pci_div = 2},
-		{.bus = 6000, .pci_div = 2},
-		{.bus = 6000, .pci_div = 2},
-		{.bus = 6000, .pci_div = 2},
-		{.bus = 6000, .pci_div = 2},
-		{.bus = 6659, .pci_div = 2},
-		{.bus = 6659, .pci_div = 2},
-		{.bus = 6659, .pci_div = 2},
-		{.bus = 6659, .pci_div = 2},
-		{0}
-	}
+    .max_reg = 6,
+    .regs = {0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},
+    .fs_regs = {{0, 4, -1, -1}, {0, 5, 4, 3}, {0, 6, -1, -1}, {0, 7, -1, -1}, {0, 2, -1, -1}},
+    .hw_select = {0, 3},
+    .frequencies = (const ics9xxx_frequency_t[]) {
+        {.bus = 6000, .pci_div = 2},
+        {.bus = 6000, .pci_div = 2},
+        {.bus = 6000, .pci_div = 2},
+        {.bus = 6000, .pci_div = 2},
+        {.bus = 6659, .pci_div = 2},
+        {.bus = 6659, .pci_div = 2},
+        {.bus = 6659, .pci_div = 2},
+        {.bus = 6659, .pci_div = 2},
+        {.bus = 6731, .pci_div = 2},
+        {.bus = 6864, .pci_div = 2},
+        {.bus = 6995, .pci_div = 2},
+        {.bus = 7259, .pci_div = 2},
+        {.bus = 6150, .pci_div = 2},
+        {.bus = 6300, .pci_div = 2},
+        {.bus = 6400, .pci_div = 2},
+        {.bus = 6500, .pci_div = 2},
+        {.bus = 6000, .pci_div = 2},
+        {.bus = 6659, .pci_div = 2},
+        {.bus = 5000, .pci_div = 2},
+        {.bus = 4800, .pci_div = 2},
+        {.bus = 5880, .pci_div = 2},
+        {.bus = 5760, .pci_div = 2},
+        {.bus = 5640, .pci_div = 2},
+        {.bus = 5400, .pci_div = 2},
+        {.bus = 6000, .pci_div = 2},
+        {.bus = 6000, .pci_div = 2},
+        {.bus = 6000, .pci_div = 2},
+        {.bus = 6000, .pci_div = 2},
+        {.bus = 6659, .pci_div = 2},
+        {.bus = 6659, .pci_div = 2},
+        {.bus = 6659, .pci_div = 2},
+        {.bus = 6659, .pci_div = 2},
+        {0}
+    }
     ICS9xxx_MODEL_END()
 #endif
     ICS9xxx_MODEL(ICS9250_08)
-	.max_reg = 5,
-	.regs = {0x00, 0xff, 0xff, 0xff, 0x6d, 0xbf},
-	.fs_regs = {{0, 4, 4, 7}, {0, 5, 4, 4}, {0, 6, 5, 6}, {0, 2, 4, 1}, {-1, -1, -1, -1}},
-	.hw_select = {0, 3},
-	.frequencies = (const ics9xxx_frequency_t[]) {
-		{.bus = 12400, .pci_div = 3},
-		{.bus =  7500, .pci_div = 2},
-		{.bus =  8333, .pci_div = 2},
-		{.bus =  6680, .pci_div = 2},
-		{.bus = 10300, .pci_div = 3},
-		{.bus = 11200, .pci_div = 3},
-		{.bus = 13300, .pci_div = 3},
-		{.bus = 10030, .pci_div = 3},
-		{.bus = 12000, .pci_div = 3},
-		{.bus = 11500, .pci_div = 3},
-		{.bus = 11000, .pci_div = 3},
-		{.bus = 10500, .pci_div = 3},
-		{.bus = 14000, .pci_div = 4},
-		{.bus = 15000, .pci_div = 4},
-		{.bus = 12400, .pci_div = 4},
-		{.bus = 13300, .pci_div = 4},
-		{0}
-	}
+    .max_reg = 5,
+    .regs = {0x00, 0xff, 0xff, 0xff, 0x6d, 0xbf},
+    .fs_regs = {{0, 4, 4, 7}, {0, 5, 4, 4}, {0, 6, 5, 6}, {0, 2, 4, 1}, {-1, -1, -1, -1}},
+    .hw_select = {0, 3},
+    .frequencies = (const ics9xxx_frequency_t[]) {
+        {.bus = 12400, .pci_div = 3},
+        {.bus =  7500, .pci_div = 2},
+        {.bus =  8333, .pci_div = 2},
+        {.bus =  6680, .pci_div = 2},
+        {.bus = 10300, .pci_div = 3},
+        {.bus = 11200, .pci_div = 3},
+        {.bus = 13300, .pci_div = 3},
+        {.bus = 10030, .pci_div = 3},
+        {.bus = 12000, .pci_div = 3},
+        {.bus = 11500, .pci_div = 3},
+        {.bus = 11000, .pci_div = 3},
+        {.bus = 10500, .pci_div = 3},
+        {.bus = 14000, .pci_div = 4},
+        {.bus = 15000, .pci_div = 4},
+        {.bus = 12400, .pci_div = 4},
+        {.bus = 13300, .pci_div = 4},
+        {0}
+    }
     ICS9xxx_MODEL_END()
 #ifdef ENABLE_ICS9xxx_DETECT
     ICS9xxx_MODEL(ICS9250_10)
-	.max_reg = 5,
-	.regs = {0x1f, 0xff, 0xfe, 0x00, 0x00, 0x06},
-	.fs_regs = {{5, 0, -1, -1}, {5, 3, -1, -1}, {5, 4, -1, -1}, {-1, -1, -1, -1}, {-1, -1, -1, -1}},
-	.hw_select = {-1, -1},
-	.frequencies = (const ics9xxx_frequency_t[]) {
-		{.bus =  6667, .ram_mult = 1.5, .pci_div = 2},
-		{.bus =  7067, .ram_mult = 1.5, .pci_div = 2},
-		{.bus =  7466, .ram_mult = 1.5, .pci_div = 2},
-		{.bus =  8266, .ram_mult = 1.5, .pci_div = 2},
-		{.bus =  6350, .ram_mult = 1.5, .pci_div = 2},
-		{.bus =  6867, .ram_mult = 1.5, .pci_div = 2},
-		{.bus =  7267, .ram_mult = 1.5, .pci_div = 2},
-		{.bus =  8866, .ram_mult = 1.5, .pci_div = 2},
-		{.bus = 10000, .ram_mult =   1, .pci_div = 3},
-		{.bus = 10600, .ram_mult =   1, .pci_div = 3},
-		{.bus = 11200, .ram_mult =   1, .pci_div = 3},
-		{.bus = 12400, .ram_mult =   1, .pci_div = 3},
-		{.bus =  9525, .ram_mult =   1, .pci_div = 3},
-		{.bus = 10300, .ram_mult =   1, .pci_div = 3},
-		{.bus = 10900, .ram_mult =   1, .pci_div = 3},
-		{.bus = 13300, .ram_mult =   1, .pci_div = 3},
-		{0}
-	}
+    .max_reg = 5,
+    .regs = {0x1f, 0xff, 0xfe, 0x00, 0x00, 0x06},
+    .fs_regs = {{5, 0, -1, -1}, {5, 3, -1, -1}, {5, 4, -1, -1}, {-1, -1, -1, -1}, {-1, -1, -1, -1}},
+    .hw_select = {-1, -1},
+    .frequencies = (const ics9xxx_frequency_t[]) {
+        {.bus =  6667, .ram_mult = 1.5, .pci_div = 2},
+        {.bus =  7067, .ram_mult = 1.5, .pci_div = 2},
+        {.bus =  7466, .ram_mult = 1.5, .pci_div = 2},
+        {.bus =  8266, .ram_mult = 1.5, .pci_div = 2},
+        {.bus =  6350, .ram_mult = 1.5, .pci_div = 2},
+        {.bus =  6867, .ram_mult = 1.5, .pci_div = 2},
+        {.bus =  7267, .ram_mult = 1.5, .pci_div = 2},
+        {.bus =  8866, .ram_mult = 1.5, .pci_div = 2},
+        {.bus = 10000, .ram_mult =   1, .pci_div = 3},
+        {.bus = 10600, .ram_mult =   1, .pci_div = 3},
+        {.bus = 11200, .ram_mult =   1, .pci_div = 3},
+        {.bus = 12400, .ram_mult =   1, .pci_div = 3},
+        {.bus =  9525, .ram_mult =   1, .pci_div = 3},
+        {.bus = 10300, .ram_mult =   1, .pci_div = 3},
+        {.bus = 10900, .ram_mult =   1, .pci_div = 3},
+        {.bus = 13300, .ram_mult =   1, .pci_div = 3},
+        {0}
+    }
     ICS9xxx_MODEL_END()
     ICS9xxx_MODEL(ICS9250_13)
-	.max_reg = 5,
-	.regs = {0x82, 0xcf, 0x7f, 0xff, 0xff, 0xf7},
-	.fs_regs = {{0, 4, 1, 4}, {0, 5, 5, 7}, {0, 6, 1, 5}, {0, 2, 2, 7}, {-1, -1, -1, -1}},
-	.hw_select = {0, 3},
-	.frequencies = (const ics9xxx_frequency_t[]) {
-		{.bus = 9000, .ram_mult = 1, .pci_div = 2},
-		{.bus = 8901, .ram_mult = 1, .pci_div = 2},
-		{.bus = 8800, .ram_mult = 1, .pci_div = 2},
-		{.bus = 8699, .ram_mult = 1, .pci_div = 2},
-		{.bus = 8591, .ram_mult = 1, .pci_div = 2},
-		{.bus = 8501, .ram_mult = 1, .pci_div = 2},
-		{.bus = 8400, .ram_mult = 1, .pci_div = 2},
-		{.bus = 8200, .ram_mult = 1, .pci_div = 2},
-		{.bus = 8101, .ram_mult = 1, .pci_div = 2},
-		{.bus = 8000, .ram_mult = 1, .pci_div = 2},
-		{.bus = 8331, .ram_mult = 1, .pci_div = 2},
-		{.bus = 6849, .ram_mult = 1, .pci_div = 2},
-		{.bus = 7800, .ram_mult = 1, .pci_div = 2},
-		{.bus = 7500, .ram_mult = 1, .pci_div = 2},
-		{.bus = 7199, .ram_mult = 1, .pci_div = 2},
-		{.bus = 6682, .ram_mult = 1, .pci_div = 2},
-		{0}
-	}
+    .max_reg = 5,
+    .regs = {0x82, 0xcf, 0x7f, 0xff, 0xff, 0xf7},
+    .fs_regs = {{0, 4, 1, 4}, {0, 5, 5, 7}, {0, 6, 1, 5}, {0, 2, 2, 7}, {-1, -1, -1, -1}},
+    .hw_select = {0, 3},
+    .frequencies = (const ics9xxx_frequency_t[]) {
+        {.bus = 9000, .ram_mult = 1, .pci_div = 2},
+        {.bus = 8901, .ram_mult = 1, .pci_div = 2},
+        {.bus = 8800, .ram_mult = 1, .pci_div = 2},
+        {.bus = 8699, .ram_mult = 1, .pci_div = 2},
+        {.bus = 8591, .ram_mult = 1, .pci_div = 2},
+        {.bus = 8501, .ram_mult = 1, .pci_div = 2},
+        {.bus = 8400, .ram_mult = 1, .pci_div = 2},
+        {.bus = 8200, .ram_mult = 1, .pci_div = 2},
+        {.bus = 8101, .ram_mult = 1, .pci_div = 2},
+        {.bus = 8000, .ram_mult = 1, .pci_div = 2},
+        {.bus = 8331, .ram_mult = 1, .pci_div = 2},
+        {.bus = 6849, .ram_mult = 1, .pci_div = 2},
+        {.bus = 7800, .ram_mult = 1, .pci_div = 2},
+        {.bus = 7500, .ram_mult = 1, .pci_div = 2},
+        {.bus = 7199, .ram_mult = 1, .pci_div = 2},
+        {.bus = 6682, .ram_mult = 1, .pci_div = 2},
+        {0}
+    }
     ICS9xxx_MODEL_END()
     ICS9xxx_MODEL(ICS9250_14)
-	.max_reg = 5,
-	.regs = {0x02, 0x1f, 0xff, 0xff, 0xeb, 0xff},
-	.fs_regs = {{0, 4, 1, 6}, {0, 5, 4, 2}, {0, 6, 1, 5}, {0, 7, 1, 7}, {0, 2, 4, 4}},
-	.hw_select = {0, 3},
-	.frequencies = (const ics9xxx_frequency_t[]) {
-		{.bus =  6781, .ram_mult = 1.5, .pci_div = 2},
-		{.bus =  7000, .ram_mult = 1.5, .pci_div = 2},
-		{.bus =  7201, .ram_mult = 1.5, .pci_div = 2},
-		{.bus =  6667, .ram_mult = 1.5, .pci_div = 2},
-		{.bus =  7301, .ram_mult = 1.5, .pci_div = 2},
-		{.bus =  7500, .ram_mult = 1.5, .pci_div = 2},
-		{.bus =  7700, .ram_mult = 1.5, .pci_div = 2},
-		{.bus =  7801, .ram_mult = 1.5, .pci_div = 2},
-		{.bus =  8000, .ram_mult = 1.5, .pci_div = 2},
-		{.bus =  8300, .ram_mult = 1.5, .pci_div = 2},
-		{.bus =  8449, .ram_mult = 1.5, .pci_div = 2},
-		{.bus = 10000, .ram_mult = 1.5, .pci_div = 2},
-		{.bus =  8608, .ram_mult = 1.5, .pci_div = 2},
-		{.bus =  8800, .ram_mult = 1.5, .pci_div = 2},
-		{.bus =  9000, .ram_mult = 1.5, .pci_div = 2},
-		{.bus =  9500, .ram_mult = 1.5, .pci_div = 2},
-		{.bus =  4990, .ram_mult =   1, .pci_div = 3},
-		{.bus = 10000, .ram_mult =   1, .pci_div = 3},
-		{.bus =  7485, .ram_mult =   1, .pci_div = 3},
-		{.bus =  6658, .ram_mult =   1, .pci_div = 3},
-		{.bus =  8284, .ram_mult =   1, .pci_div = 3},
-		{.bus =  8981, .ram_mult =   1, .pci_div = 3},
-		{.bus =  9480, .ram_mult =   1, .pci_div = 3},
-		{.bus = 10050, .ram_mult =   1, .pci_div = 3},
-		{.bus = 10478, .ram_mult =   1, .pci_div = 3},
-		{.bus = 11177, .ram_mult =   1, .pci_div = 3},
-		{.bus = 11477, .ram_mult =   1, .pci_div = 3},
-		{.bus = 10000, .ram_mult =   1, .pci_div = 3},
-		{.bus = 12375, .ram_mult =   1, .pci_div = 3},
-		{.bus = 13274, .ram_mult =   1, .pci_div = 3},
-		{.bus = 13975, .ram_mult =   1, .pci_div = 3},
-		{.bus = 14969, .ram_mult =   1, .pci_div = 3},
-		{0}
-	}
+    .max_reg = 5,
+    .regs = {0x02, 0x1f, 0xff, 0xff, 0xeb, 0xff},
+    .fs_regs = {{0, 4, 1, 6}, {0, 5, 4, 2}, {0, 6, 1, 5}, {0, 7, 1, 7}, {0, 2, 4, 4}},
+    .hw_select = {0, 3},
+    .frequencies = (const ics9xxx_frequency_t[]) {
+        {.bus =  6781, .ram_mult = 1.5, .pci_div = 2},
+        {.bus =  7000, .ram_mult = 1.5, .pci_div = 2},
+        {.bus =  7201, .ram_mult = 1.5, .pci_div = 2},
+        {.bus =  6667, .ram_mult = 1.5, .pci_div = 2},
+        {.bus =  7301, .ram_mult = 1.5, .pci_div = 2},
+        {.bus =  7500, .ram_mult = 1.5, .pci_div = 2},
+        {.bus =  7700, .ram_mult = 1.5, .pci_div = 2},
+        {.bus =  7801, .ram_mult = 1.5, .pci_div = 2},
+        {.bus =  8000, .ram_mult = 1.5, .pci_div = 2},
+        {.bus =  8300, .ram_mult = 1.5, .pci_div = 2},
+        {.bus =  8449, .ram_mult = 1.5, .pci_div = 2},
+        {.bus = 10000, .ram_mult = 1.5, .pci_div = 2},
+        {.bus =  8608, .ram_mult = 1.5, .pci_div = 2},
+        {.bus =  8800, .ram_mult = 1.5, .pci_div = 2},
+        {.bus =  9000, .ram_mult = 1.5, .pci_div = 2},
+        {.bus =  9500, .ram_mult = 1.5, .pci_div = 2},
+        {.bus =  4990, .ram_mult =   1, .pci_div = 3},
+        {.bus = 10000, .ram_mult =   1, .pci_div = 3},
+        {.bus =  7485, .ram_mult =   1, .pci_div = 3},
+        {.bus =  6658, .ram_mult =   1, .pci_div = 3},
+        {.bus =  8284, .ram_mult =   1, .pci_div = 3},
+        {.bus =  8981, .ram_mult =   1, .pci_div = 3},
+        {.bus =  9480, .ram_mult =   1, .pci_div = 3},
+        {.bus = 10050, .ram_mult =   1, .pci_div = 3},
+        {.bus = 10478, .ram_mult =   1, .pci_div = 3},
+        {.bus = 11177, .ram_mult =   1, .pci_div = 3},
+        {.bus = 11477, .ram_mult =   1, .pci_div = 3},
+        {.bus = 10000, .ram_mult =   1, .pci_div = 3},
+        {.bus = 12375, .ram_mult =   1, .pci_div = 3},
+        {.bus = 13274, .ram_mult =   1, .pci_div = 3},
+        {.bus = 13975, .ram_mult =   1, .pci_div = 3},
+        {.bus = 14969, .ram_mult =   1, .pci_div = 3},
+        {0}
+    }
     ICS9xxx_MODEL_END()
     ICS9xxx_MODEL(ICS9250_16)
-	.max_reg = 5,
-	.regs = {0x1f, 0xff, 0xff, 0x00, 0x00, 0x06},
-	.fs_regs = {{5, 0, -1, -1}, {5, 3, -1, -1}, {-1, -1, -1, -1}, {-1, -1, -1, -1}, {-1, -1, -1, -1}},
-	.hw_select = {-1, -1},
-	.frequencies = (const ics9xxx_frequency_t[]) {
-		{.bus =  6667, .ram_mult =  1.5, .pci_div = 2},
-		{.bus =  7000, .ram_mult =  1.5, .pci_div = 2},
-		{.bus =  7267, .ram_mult =  1.5, .pci_div = 2},
-		{.bus =  7467, .ram_mult =  1.5, .pci_div = 2},
-		{.bus = 10000, .ram_mult =    1, .pci_div = 3},
-		{.bus = 10500, .ram_mult =    1, .pci_div = 3},
-		{.bus = 10900, .ram_mult =    1, .pci_div = 3},
-		{.bus = 11201, .ram_mult =    1, .pci_div = 3},
-		{.bus = 13334, .ram_mult =    1, .pci_div = 3},
-		{.bus = 14000, .ram_mult = 0.75, .pci_div = 4},
-		{.bus = 12000, .ram_mult = 0.75, .pci_div = 4},
-		{.bus = 12400, .ram_mult =    1, .pci_div = 3},
-		{.bus = 13334, .ram_mult = 0.75, .pci_div = 4},
-		{.bus = 15000, .ram_mult =    1, .pci_div = 4},
-		{.bus = 14000, .ram_mult =    1, .pci_div = 4},
-		{.bus = 13299, .ram_mult =    1, .pci_div = 4},
-		{0}
-	}
+    .max_reg = 5,
+    .regs = {0x1f, 0xff, 0xff, 0x00, 0x00, 0x06},
+    .fs_regs = {{5, 0, -1, -1}, {5, 3, -1, -1}, {-1, -1, -1, -1}, {-1, -1, -1, -1}, {-1, -1, -1, -1}},
+    .hw_select = {-1, -1},
+    .frequencies = (const ics9xxx_frequency_t[]) {
+        {.bus =  6667, .ram_mult =  1.5, .pci_div = 2},
+        {.bus =  7000, .ram_mult =  1.5, .pci_div = 2},
+        {.bus =  7267, .ram_mult =  1.5, .pci_div = 2},
+        {.bus =  7467, .ram_mult =  1.5, .pci_div = 2},
+        {.bus = 10000, .ram_mult =    1, .pci_div = 3},
+        {.bus = 10500, .ram_mult =    1, .pci_div = 3},
+        {.bus = 10900, .ram_mult =    1, .pci_div = 3},
+        {.bus = 11201, .ram_mult =    1, .pci_div = 3},
+        {.bus = 13334, .ram_mult =    1, .pci_div = 3},
+        {.bus = 14000, .ram_mult = 0.75, .pci_div = 4},
+        {.bus = 12000, .ram_mult = 0.75, .pci_div = 4},
+        {.bus = 12400, .ram_mult =    1, .pci_div = 3},
+        {.bus = 13334, .ram_mult = 0.75, .pci_div = 4},
+        {.bus = 15000, .ram_mult =    1, .pci_div = 4},
+        {.bus = 14000, .ram_mult =    1, .pci_div = 4},
+        {.bus = 13299, .ram_mult =    1, .pci_div = 4},
+        {0}
+    }
     ICS9xxx_MODEL_END()
 #endif
     ICS9xxx_MODEL(ICS9250_18)
-	.max_reg = 5,
-	.regs = {0x02, 0xff, 0xff, 0xff, 0x6d, 0xbf},
-	.fs_regs = {{0, 4, 4, 7}, {0, 5, 4, 4}, {0, 6, 5, 6}, {0, 7, 4, 1}, {-1, -1, -1, -1}},
-	.hw_select = {0, 3},
-	.frequencies = (const ics9xxx_frequency_t[]) {
-		{.bus =  8000, .pci_div = 2},
-		{.bus =  7500, .pci_div = 2},
-		{.bus =  8331, .pci_div = 2},
-		{.bus =  6690, .pci_div = 2},
-		{.bus = 10300, .pci_div = 3},
-		{.bus = 11201, .pci_div = 3},
-		{.bus =  6801, .pci_div = 2},
-		{.bus = 10070, .pci_div = 3},
-		{.bus = 12000, .pci_div = 3},
-		{.bus = 11499, .pci_div = 3},
-		{.bus = 10999, .pci_div = 3},
-		{.bus = 10500, .pci_div = 3},
-		{.bus = 14000, .pci_div = 4},
-		{.bus = 15000, .pci_div = 4},
-		{.bus = 12400, .pci_div = 4},
-		{.bus = 13390, .pci_div = 4},
-		{.bus = 13500, .pci_div = 4},
-		{.bus = 12999, .pci_div = 4},
-		{.bus = 12600, .pci_div = 4},
-		{.bus = 11800, .pci_div = 4},
-		{.bus = 11598, .pci_div = 4},
-		{.bus =  9500, .pci_div = 3},
-		{.bus =  9000, .pci_div = 3},
-		{.bus =  8501, .pci_div = 3},
-		{.bus = 16600, .pci_div = 4},
-		{.bus = 16001, .pci_div = 4},
-		{.bus = 15499, .pci_div = 4},
-		{.bus = 14795, .pci_div = 4},
-		{.bus = 14598, .pci_div = 4},
-		{.bus = 14398, .pci_div = 4},
-		{.bus = 14199, .pci_div = 4},
-		{.bus = 13801, .pci_div = 4},
-		{0}
-	}
+    .max_reg = 5,
+    .regs = {0x02, 0xff, 0xff, 0xff, 0x6d, 0xbf},
+    .fs_regs = {{0, 4, 4, 7}, {0, 5, 4, 4}, {0, 6, 5, 6}, {0, 7, 4, 1}, {-1, -1, -1, -1}},
+    .hw_select = {0, 3},
+    .frequencies = (const ics9xxx_frequency_t[]) {
+        {.bus =  8000, .pci_div = 2},
+        {.bus =  7500, .pci_div = 2},
+        {.bus =  8331, .pci_div = 2},
+        {.bus =  6690, .pci_div = 2},
+        {.bus = 10300, .pci_div = 3},
+        {.bus = 11201, .pci_div = 3},
+        {.bus =  6801, .pci_div = 2},
+        {.bus = 10070, .pci_div = 3},
+        {.bus = 12000, .pci_div = 3},
+        {.bus = 11499, .pci_div = 3},
+        {.bus = 10999, .pci_div = 3},
+        {.bus = 10500, .pci_div = 3},
+        {.bus = 14000, .pci_div = 4},
+        {.bus = 15000, .pci_div = 4},
+        {.bus = 12400, .pci_div = 4},
+        {.bus = 13390, .pci_div = 4},
+        {.bus = 13500, .pci_div = 4},
+        {.bus = 12999, .pci_div = 4},
+        {.bus = 12600, .pci_div = 4},
+        {.bus = 11800, .pci_div = 4},
+        {.bus = 11598, .pci_div = 4},
+        {.bus =  9500, .pci_div = 3},
+        {.bus =  9000, .pci_div = 3},
+        {.bus =  8501, .pci_div = 3},
+        {.bus = 16600, .pci_div = 4},
+        {.bus = 16001, .pci_div = 4},
+        {.bus = 15499, .pci_div = 4},
+        {.bus = 14795, .pci_div = 4},
+        {.bus = 14598, .pci_div = 4},
+        {.bus = 14398, .pci_div = 4},
+        {.bus = 14199, .pci_div = 4},
+        {.bus = 13801, .pci_div = 4},
+        {0}
+    }
     ICS9xxx_MODEL_END()
 #ifdef ENABLE_ICS9xxx_DETECT
     ICS9xxx_MODEL(ICS9250_19)
-	.max_reg = 5,
-	.regs = {0x02, 0xff, 0xff, 0xff, 0x6d, 0xbf},
-	.fs_regs = {{0, 4, 4, 7}, {0, 5, 4, 4}, {0, 6, 5, 6}, {0, 7, 4, 1}, {-1, -1, -1, -1}},
-	.hw_select = {0, 3},
-	.frequencies_ref = ICS9250_08
+    .max_reg = 5,
+    .regs = {0x02, 0xff, 0xff, 0xff, 0x6d, 0xbf},
+    .fs_regs = {{0, 4, 4, 7}, {0, 5, 4, 4}, {0, 6, 5, 6}, {0, 7, 4, 1}, {-1, -1, -1, -1}},
+    .hw_select = {0, 3},
+    .frequencies_ref = ICS9250_08
     ICS9xxx_MODEL_END()
     ICS9xxx_MODEL(ICS9250_23)
-	.max_reg = 5,
-	.regs = {0x02, 0x1f, 0xff, 0xff, 0xeb, 0xff},
-	.fs_regs = {{0, 4, 1, 6}, {0, 5, 4, 2}, {0, 6, 1, 5}, {0, 7, 1, 7}, {0, 2, 4, 4}},
-	.hw_select = {0, 3},
-	.frequencies = (const ics9xxx_frequency_t[]) {
-		{.bus =  6900, .ram_mult =  1.5, .pci_div = 2},
-		{.bus =  7000, .ram_mult =  1.5, .pci_div = 2},
-		{.bus =  7100, .ram_mult =  1.5, .pci_div = 2},
-		{.bus =  6690, .ram_mult =  1.5, .pci_div = 2},
-		{.bus =  7200, .ram_mult =  1.5, .pci_div = 2},
-		{.bus =  7500, .ram_mult =  1.5, .pci_div = 2},
-		{.bus =  7660, .ram_mult =  1.5, .pci_div = 2},
-		{.bus =  8500, .ram_mult =  1.5, .pci_div = 2},
-		{.bus =  6800, .ram_mult =  1.5, .pci_div = 2},
-		{.bus =  7400, .ram_mult =  1.5, .pci_div = 2},
-		{.bus = 14000, .ram_mult =    1, .pci_div = 4},
-		{.bus = 13333, .ram_mult =    1, .pci_div = 4},
-		{.bus = 15000, .ram_mult =    1, .pci_div = 4},
-		{.bus = 15500, .ram_mult =    1, .pci_div = 4},
-		{.bus = 16600, .ram_mult =    1, .pci_div = 4},
-		{.bus = 16600, .ram_mult =    1, .pci_div = 3},
-		{.bus = 11177, .ram_mult =    1, .pci_div = 3},
-		{.bus = 10478, .ram_mult =    1, .pci_div = 3},
-		{.bus = 10951, .ram_mult =    1, .pci_div = 3},
-		{.bus = 10090, .ram_mult =    1, .pci_div = 3},
-		{.bus = 11700, .ram_mult =    1, .pci_div = 3},
-		{.bus = 12375, .ram_mult =    1, .pci_div = 3},
-		{.bus = 13333, .ram_mult =    1, .pci_div = 3},
-		{.bus = 14250, .ram_mult =    1, .pci_div = 3},
-		{.bus = 13600, .ram_mult = 0.75, .pci_div = 4},
-		{.bus = 14000, .ram_mult = 0.75, .pci_div = 4},
-		{.bus = 14300, .ram_mult = 0.75, .pci_div = 4},
-		{.bus = 13390, .ram_mult = 0.75, .pci_div = 4},
-		{.bus = 14667, .ram_mult = 0.75, .pci_div = 4},
-		{.bus = 14933, .ram_mult = 0.75, .pci_div = 4},
-		{.bus = 15330, .ram_mult = 0.75, .pci_div = 4},
-		{.bus = 16667, .ram_mult = 0.75, .pci_div = 4},
-		{0}
-	}
+    .max_reg = 5,
+    .regs = {0x02, 0x1f, 0xff, 0xff, 0xeb, 0xff},
+    .fs_regs = {{0, 4, 1, 6}, {0, 5, 4, 2}, {0, 6, 1, 5}, {0, 7, 1, 7}, {0, 2, 4, 4}},
+    .hw_select = {0, 3},
+    .frequencies = (const ics9xxx_frequency_t[]) {
+        {.bus =  6900, .ram_mult =  1.5, .pci_div = 2},
+        {.bus =  7000, .ram_mult =  1.5, .pci_div = 2},
+        {.bus =  7100, .ram_mult =  1.5, .pci_div = 2},
+        {.bus =  6690, .ram_mult =  1.5, .pci_div = 2},
+        {.bus =  7200, .ram_mult =  1.5, .pci_div = 2},
+        {.bus =  7500, .ram_mult =  1.5, .pci_div = 2},
+        {.bus =  7660, .ram_mult =  1.5, .pci_div = 2},
+        {.bus =  8500, .ram_mult =  1.5, .pci_div = 2},
+        {.bus =  6800, .ram_mult =  1.5, .pci_div = 2},
+        {.bus =  7400, .ram_mult =  1.5, .pci_div = 2},
+        {.bus = 14000, .ram_mult =    1, .pci_div = 4},
+        {.bus = 13333, .ram_mult =    1, .pci_div = 4},
+        {.bus = 15000, .ram_mult =    1, .pci_div = 4},
+        {.bus = 15500, .ram_mult =    1, .pci_div = 4},
+        {.bus = 16600, .ram_mult =    1, .pci_div = 4},
+        {.bus = 16600, .ram_mult =    1, .pci_div = 3},
+        {.bus = 11177, .ram_mult =    1, .pci_div = 3},
+        {.bus = 10478, .ram_mult =    1, .pci_div = 3},
+        {.bus = 10951, .ram_mult =    1, .pci_div = 3},
+        {.bus = 10090, .ram_mult =    1, .pci_div = 3},
+        {.bus = 11700, .ram_mult =    1, .pci_div = 3},
+        {.bus = 12375, .ram_mult =    1, .pci_div = 3},
+        {.bus = 13333, .ram_mult =    1, .pci_div = 3},
+        {.bus = 14250, .ram_mult =    1, .pci_div = 3},
+        {.bus = 13600, .ram_mult = 0.75, .pci_div = 4},
+        {.bus = 14000, .ram_mult = 0.75, .pci_div = 4},
+        {.bus = 14300, .ram_mult = 0.75, .pci_div = 4},
+        {.bus = 13390, .ram_mult = 0.75, .pci_div = 4},
+        {.bus = 14667, .ram_mult = 0.75, .pci_div = 4},
+        {.bus = 14933, .ram_mult = 0.75, .pci_div = 4},
+        {.bus = 15330, .ram_mult = 0.75, .pci_div = 4},
+        {.bus = 16667, .ram_mult = 0.75, .pci_div = 4},
+        {0}
+    }
     ICS9xxx_MODEL_END()
     ICS9xxx_MODEL(ICS9250_25)
-	.max_reg = 6,
-	.regs = {0x02, 0x1f, 0xff, 0xff, 0xeb, 0xff, 0x06},
-	.fs_regs = {{0, 4, 1, 6}, {0, 5, 4, 2}, {0, 6, 1, 5}, {0, 7, 1, 7}, {0, 2, 4, 4}},
-	.hw_select = {0, 3},
-	.frequencies = (const ics9xxx_frequency_t[]) {
-		{.bus =  5500, .ram_mult =  1.5, .pci_div = 2},
-		{.bus =  6000, .ram_mult =  1.5, .pci_div = 2},
-		{.bus =  6680, .ram_mult =  1.5, .pci_div = 2},
-		{.bus =  6833, .ram_mult =  1.5, .pci_div = 2},
-		{.bus =  7000, .ram_mult =  1.5, .pci_div = 2},
-		{.bus =  7200, .ram_mult =  1.5, .pci_div = 2},
-		{.bus =  7500, .ram_mult =  1.5, .pci_div = 2},
-		{.bus =  7700, .ram_mult =  1.5, .pci_div = 2},
-		{.bus =  8330, .ram_mult =    1, .pci_div = 3},
-		{.bus =  9000, .ram_mult =    1, .pci_div = 3},
-		{.bus = 10030, .ram_mult =    1, .pci_div = 3},
-		{.bus = 10300, .ram_mult =    1, .pci_div = 3},
-		{.bus = 11250, .ram_mult =    1, .pci_div = 3},
-		{.bus = 11500, .ram_mult =    1, .pci_div = 3},
-		{.bus = 12000, .ram_mult =    1, .pci_div = 3},
-		{.bus = 12500, .ram_mult =    1, .pci_div = 3},
-		{.bus = 12800, .ram_mult =    1, .pci_div = 4},
-		{.bus = 13000, .ram_mult =    1, .pci_div = 4},
-		{.bus = 13370, .ram_mult =    1, .pci_div = 4},
-		{.bus = 13700, .ram_mult =    1, .pci_div = 4},
-		{.bus = 14000, .ram_mult =    1, .pci_div = 4},
-		{.bus = 14500, .ram_mult =    1, .pci_div = 4},
-		{.bus = 15000, .ram_mult =    1, .pci_div = 4},
-		{.bus = 15333, .ram_mult =    1, .pci_div = 4},
-		{.bus = 12500, .ram_mult = 0.75, .pci_div = 4},
-		{.bus = 13000, .ram_mult = 0.75, .pci_div = 4},
-		{.bus = 13370, .ram_mult = 0.75, .pci_div = 4},
-		{.bus = 13700, .ram_mult = 0.75, .pci_div = 4},
-		{.bus = 14000, .ram_mult = 0.75, .pci_div = 4},
-		{.bus = 14500, .ram_mult = 0.75, .pci_div = 4},
-		{.bus = 15000, .ram_mult = 0.75, .pci_div = 4},
-		{.bus = 15333, .ram_mult = 0.75, .pci_div = 4},
-		{0}
-	}
+    .max_reg = 6,
+    .regs = {0x02, 0x1f, 0xff, 0xff, 0xeb, 0xff, 0x06},
+    .fs_regs = {{0, 4, 1, 6}, {0, 5, 4, 2}, {0, 6, 1, 5}, {0, 7, 1, 7}, {0, 2, 4, 4}},
+    .hw_select = {0, 3},
+    .frequencies = (const ics9xxx_frequency_t[]) {
+        {.bus =  5500, .ram_mult =  1.5, .pci_div = 2},
+        {.bus =  6000, .ram_mult =  1.5, .pci_div = 2},
+        {.bus =  6680, .ram_mult =  1.5, .pci_div = 2},
+        {.bus =  6833, .ram_mult =  1.5, .pci_div = 2},
+        {.bus =  7000, .ram_mult =  1.5, .pci_div = 2},
+        {.bus =  7200, .ram_mult =  1.5, .pci_div = 2},
+        {.bus =  7500, .ram_mult =  1.5, .pci_div = 2},
+        {.bus =  7700, .ram_mult =  1.5, .pci_div = 2},
+        {.bus =  8330, .ram_mult =    1, .pci_div = 3},
+        {.bus =  9000, .ram_mult =    1, .pci_div = 3},
+        {.bus = 10030, .ram_mult =    1, .pci_div = 3},
+        {.bus = 10300, .ram_mult =    1, .pci_div = 3},
+        {.bus = 11250, .ram_mult =    1, .pci_div = 3},
+        {.bus = 11500, .ram_mult =    1, .pci_div = 3},
+        {.bus = 12000, .ram_mult =    1, .pci_div = 3},
+        {.bus = 12500, .ram_mult =    1, .pci_div = 3},
+        {.bus = 12800, .ram_mult =    1, .pci_div = 4},
+        {.bus = 13000, .ram_mult =    1, .pci_div = 4},
+        {.bus = 13370, .ram_mult =    1, .pci_div = 4},
+        {.bus = 13700, .ram_mult =    1, .pci_div = 4},
+        {.bus = 14000, .ram_mult =    1, .pci_div = 4},
+        {.bus = 14500, .ram_mult =    1, .pci_div = 4},
+        {.bus = 15000, .ram_mult =    1, .pci_div = 4},
+        {.bus = 15333, .ram_mult =    1, .pci_div = 4},
+        {.bus = 12500, .ram_mult = 0.75, .pci_div = 4},
+        {.bus = 13000, .ram_mult = 0.75, .pci_div = 4},
+        {.bus = 13370, .ram_mult = 0.75, .pci_div = 4},
+        {.bus = 13700, .ram_mult = 0.75, .pci_div = 4},
+        {.bus = 14000, .ram_mult = 0.75, .pci_div = 4},
+        {.bus = 14500, .ram_mult = 0.75, .pci_div = 4},
+        {.bus = 15000, .ram_mult = 0.75, .pci_div = 4},
+        {.bus = 15333, .ram_mult = 0.75, .pci_div = 4},
+        {0}
+    }
     ICS9xxx_MODEL_END()
     ICS9xxx_MODEL(ICS9250_26)
-	.max_reg = 5,
-	.regs = {0x1e, 0xff, 0xff, 0x00, 0x00, 0x06},
-	.fs_regs = {{5, 0, -1, -1}, {5, 3, -1, -1}, {-1, -1, -1, -1}, {-1, -1, -1, -1}, {-1, -1, -1, -1}},
-	.hw_select = {-1, -1},
-	.frequencies_ref = ICS9250_16
+    .max_reg = 5,
+    .regs = {0x1e, 0xff, 0xff, 0x00, 0x00, 0x06},
+    .fs_regs = {{5, 0, -1, -1}, {5, 3, -1, -1}, {-1, -1, -1, -1}, {-1, -1, -1, -1}, {-1, -1, -1, -1}},
+    .hw_select = {-1, -1},
+    .frequencies_ref = ICS9250_16
     ICS9xxx_MODEL_END()
     ICS9xxx_MODEL(ICS9250_27)
-	.max_reg = 5,
-	.regs = {0x0f, 0xff, 0xfe, 0x00, 0x00, 0x00},
-	.fs_regs = {{-1, -1, -1, -1}, {-1, -1, -1, -1}, {3, 0, -1, -1}, {-1, -1, -1, -1}, {-1, -1, -1, -1}},
-	.hw_select = {-1, -1},
-	.frequencies = (const ics9xxx_frequency_t[]) {
-		{.bus =  6666, .ram_mult =  1.5, .pci_div = 2},
-		{.bus = 13332, .ram_mult =    1, .pci_div = 4},
-		{.bus = 10000, .ram_mult =    1, .pci_div = 3},
-		{.bus = 13332, .ram_mult = 0.75, .pci_div = 4},
-		{.bus =  6666, .ram_mult =  1.5, .pci_div = 2},
-		{.bus = 13332, .ram_mult =    1, .pci_div = 4},
-		{.bus = 10000, .ram_mult =    1, .pci_div = 3},
-		{.bus = 13332, .ram_mult =    1, .pci_div = 4},
-		{0}
-	}
+    .max_reg = 5,
+    .regs = {0x0f, 0xff, 0xfe, 0x00, 0x00, 0x00},
+    .fs_regs = {{-1, -1, -1, -1}, {-1, -1, -1, -1}, {3, 0, -1, -1}, {-1, -1, -1, -1}, {-1, -1, -1, -1}},
+    .hw_select = {-1, -1},
+    .frequencies = (const ics9xxx_frequency_t[]) {
+        {.bus =  6666, .ram_mult =  1.5, .pci_div = 2},
+        {.bus = 13332, .ram_mult =    1, .pci_div = 4},
+        {.bus = 10000, .ram_mult =    1, .pci_div = 3},
+        {.bus = 13332, .ram_mult = 0.75, .pci_div = 4},
+        {.bus =  6666, .ram_mult =  1.5, .pci_div = 2},
+        {.bus = 13332, .ram_mult =    1, .pci_div = 4},
+        {.bus = 10000, .ram_mult =    1, .pci_div = 3},
+        {.bus = 13332, .ram_mult =    1, .pci_div = 4},
+        {0}
+    }
     ICS9xxx_MODEL_END()
     ICS9xxx_MODEL(ICS9250_28)
-	.max_reg = 4,
-	.regs = {0x1e, 0xff, 0xfe, 0x00, 0x00},
-	.fs_regs = {{-1, -1, -1, -1}, {-1, -1, -1, -1}, {3, 0, -1, -1}, {-1, -1, -1, -1}, {-1, -1, -1, -1}},
-	.hw_select = {-1, -1},
-	.frequencies_ref = ICS9250_27
+    .max_reg = 4,
+    .regs = {0x1e, 0xff, 0xfe, 0x00, 0x00},
+    .fs_regs = {{-1, -1, -1, -1}, {-1, -1, -1, -1}, {3, 0, -1, -1}, {-1, -1, -1, -1}, {-1, -1, -1, -1}},
+    .hw_select = {-1, -1},
+    .frequencies_ref = ICS9250_27
     ICS9xxx_MODEL_END()
     ICS9xxx_MODEL(ICS9250_29)
-	.max_reg = 5,
-	.regs = {0x16, 0xff, 0xfe, 0x00, 0x00, 0x00},
-	.fs_regs = {{-1, -1, -1, -1}, {-1, -1, -1, -1}, {3, 0, -1, -1}, {-1, -1, -1, -1}, {-1, -1, -1, -1}},
-	.hw_select = {-1, -1},
-	.frequencies_ref = ICS9250_27
+    .max_reg = 5,
+    .regs = {0x16, 0xff, 0xfe, 0x00, 0x00, 0x00},
+    .fs_regs = {{-1, -1, -1, -1}, {-1, -1, -1, -1}, {3, 0, -1, -1}, {-1, -1, -1, -1}, {-1, -1, -1, -1}},
+    .hw_select = {-1, -1},
+    .frequencies_ref = ICS9250_27
     ICS9xxx_MODEL_END()
     ICS9xxx_MODEL(ICS9250_30)
-	.max_reg = 6,
-	.regs = {0x02, 0x0f, 0xff, 0xff, 0xeb, 0xff, 0x06},
-	.fs_regs = {{0, 4, 1, 6}, {0, 5, 4, 2}, {0, 6, 1, 5}, {0, 7, 1, 7}, {0, 2, 4, 4}},
-	.hw_select = {0, 3},
-	.frequencies = (const ics9xxx_frequency_t[]) {
-		{.bus =  6667, .ram_mult =  1.5, .pci_div = 2},
-		{.bus =  6000, .ram_mult =  1.5, .pci_div = 2},
-		{.bus =  6680, .ram_mult =  1.5, .pci_div = 2},
-		{.bus =  6833, .ram_mult =  1.5, .pci_div = 2},
-		{.bus =  7000, .ram_mult =  1.5, .pci_div = 2},
-		{.bus =  7500, .ram_mult =  1.5, .pci_div = 2},
-		{.bus =  8000, .ram_mult =  1.5, .pci_div = 2},
-		{.bus =  8300, .ram_mult =  1.5, .pci_div = 2},
-		{.bus = 10000, .ram_mult =    1, .pci_div = 3},
-		{.bus =  9000, .ram_mult =    1, .pci_div = 3},
-		{.bus = 10030, .ram_mult =    1, .pci_div = 3},
-		{.bus = 10300, .ram_mult =    1, .pci_div = 3},
-		{.bus = 10500, .ram_mult =    1, .pci_div = 3},
-		{.bus = 11000, .ram_mult =    1, .pci_div = 3},
-		{.bus = 11500, .ram_mult =    1, .pci_div = 3},
-		{.bus = 20000, .ram_mult =    1, .pci_div = 6},
-		{.bus = 13333, .ram_mult =    1, .pci_div = 4},
-		{.bus = 16667, .ram_mult =    1, .pci_div = 4},
-		{.bus = 13370, .ram_mult =    1, .pci_div = 4},
-		{.bus = 13700, .ram_mult =    1, .pci_div = 4},
-		{.bus = 14000, .ram_mult =    1, .pci_div = 4},
-		{.bus = 14500, .ram_mult =    1, .pci_div = 4},
-		{.bus = 15000, .ram_mult =    1, .pci_div = 4},
-		{.bus = 16000, .ram_mult =    1, .pci_div = 4},
-		{.bus = 13333, .ram_mult = 0.75, .pci_div = 4},
-		{.bus = 16667, .ram_mult = 0.75, .pci_div = 4},
-		{.bus = 13370, .ram_mult = 0.75, .pci_div = 4},
-		{.bus = 13700, .ram_mult = 0.75, .pci_div = 4},
-		{.bus = 14000, .ram_mult = 0.75, .pci_div = 4},
-		{.bus = 14500, .ram_mult = 0.75, .pci_div = 4},
-		{.bus = 15000, .ram_mult = 0.75, .pci_div = 4},
-		{.bus = 16000, .ram_mult = 0.75, .pci_div = 4},
-		{0}
-	}
+    .max_reg = 6,
+    .regs = {0x02, 0x0f, 0xff, 0xff, 0xeb, 0xff, 0x06},
+    .fs_regs = {{0, 4, 1, 6}, {0, 5, 4, 2}, {0, 6, 1, 5}, {0, 7, 1, 7}, {0, 2, 4, 4}},
+    .hw_select = {0, 3},
+    .frequencies = (const ics9xxx_frequency_t[]) {
+        {.bus =  6667, .ram_mult =  1.5, .pci_div = 2},
+        {.bus =  6000, .ram_mult =  1.5, .pci_div = 2},
+        {.bus =  6680, .ram_mult =  1.5, .pci_div = 2},
+        {.bus =  6833, .ram_mult =  1.5, .pci_div = 2},
+        {.bus =  7000, .ram_mult =  1.5, .pci_div = 2},
+        {.bus =  7500, .ram_mult =  1.5, .pci_div = 2},
+        {.bus =  8000, .ram_mult =  1.5, .pci_div = 2},
+        {.bus =  8300, .ram_mult =  1.5, .pci_div = 2},
+        {.bus = 10000, .ram_mult =    1, .pci_div = 3},
+        {.bus =  9000, .ram_mult =    1, .pci_div = 3},
+        {.bus = 10030, .ram_mult =    1, .pci_div = 3},
+        {.bus = 10300, .ram_mult =    1, .pci_div = 3},
+        {.bus = 10500, .ram_mult =    1, .pci_div = 3},
+        {.bus = 11000, .ram_mult =    1, .pci_div = 3},
+        {.bus = 11500, .ram_mult =    1, .pci_div = 3},
+        {.bus = 20000, .ram_mult =    1, .pci_div = 6},
+        {.bus = 13333, .ram_mult =    1, .pci_div = 4},
+        {.bus = 16667, .ram_mult =    1, .pci_div = 4},
+        {.bus = 13370, .ram_mult =    1, .pci_div = 4},
+        {.bus = 13700, .ram_mult =    1, .pci_div = 4},
+        {.bus = 14000, .ram_mult =    1, .pci_div = 4},
+        {.bus = 14500, .ram_mult =    1, .pci_div = 4},
+        {.bus = 15000, .ram_mult =    1, .pci_div = 4},
+        {.bus = 16000, .ram_mult =    1, .pci_div = 4},
+        {.bus = 13333, .ram_mult = 0.75, .pci_div = 4},
+        {.bus = 16667, .ram_mult = 0.75, .pci_div = 4},
+        {.bus = 13370, .ram_mult = 0.75, .pci_div = 4},
+        {.bus = 13700, .ram_mult = 0.75, .pci_div = 4},
+        {.bus = 14000, .ram_mult = 0.75, .pci_div = 4},
+        {.bus = 14500, .ram_mult = 0.75, .pci_div = 4},
+        {.bus = 15000, .ram_mult = 0.75, .pci_div = 4},
+        {.bus = 16000, .ram_mult = 0.75, .pci_div = 4},
+        {0}
+    }
     ICS9xxx_MODEL_END()
     ICS9xxx_MODEL(ICS9250_32)
-	.max_reg = 4,
-	.regs = {0x07, 0xff, 0xff, 0x00, 0x00},
-	.fs_regs = {{-1, -1, -1, -1}, {-1, -1, -1, -1}, {-1, -1, -1, -1}, {-1, -1, -1, -1}, {-1, -1, -1, -1}}
+    .max_reg = 4,
+    .regs = {0x07, 0xff, 0xff, 0x00, 0x00},
+    .fs_regs = {{-1, -1, -1, -1}, {-1, -1, -1, -1}, {-1, -1, -1, -1}, {-1, -1, -1, -1}, {-1, -1, -1, -1}}
     ICS9xxx_MODEL_END()
     ICS9xxx_MODEL(ICS9250_38)
-	.max_reg = 6,
-	.regs = {0x18, 0x07, 0xfe, 0xc7, 0xfc, 0x00, 0x80},
-	.fs_regs = {{0, 0, -1, -1}, {0, 1, -1, -1}, {0, 2, -1, -1}, {-1, -1, -1, -1}, {-1, -1, -1, -1}},
-	.normal_bits_fixed = 1,
-	.frequencies = (const ics9xxx_frequency_t[]) {
-		{.bus =  6666, .ram_mult =       1, .pci_div = 1},
-		{.bus = 10000, .ram_mult = 2.0/3.0, .pci_div = 3},
-		{.bus = 20000, .ram_mult = 1.0/3.0, .pci_div = 6},
-		{.bus = 13333, .ram_mult =     0.5, .pci_div = 2},
-		{.bus =  6666, .ram_mult =       1, .pci_div = 1},
-		{.bus = 10000, .ram_mult = 2.0/3.0, .pci_div = 3},
-		{.bus = 20000, .ram_mult = 1.0/3.0, .pci_div = 6},
-		{.bus = 13333, .ram_mult =     0.5, .pci_div = 2},
-		{0}
-	}
+    .max_reg = 6,
+    .regs = {0x18, 0x07, 0xfe, 0xc7, 0xfc, 0x00, 0x80},
+    .fs_regs = {{0, 0, -1, -1}, {0, 1, -1, -1}, {0, 2, -1, -1}, {-1, -1, -1, -1}, {-1, -1, -1, -1}},
+    .normal_bits_fixed = 1,
+    .frequencies = (const ics9xxx_frequency_t[]) {
+        {.bus =  6666, .ram_mult =       1, .pci_div = 1},
+        {.bus = 10000, .ram_mult = 2.0/3.0, .pci_div = 3},
+        {.bus = 20000, .ram_mult = 1.0/3.0, .pci_div = 6},
+        {.bus = 13333, .ram_mult =     0.5, .pci_div = 2},
+        {.bus =  6666, .ram_mult =       1, .pci_div = 1},
+        {.bus = 10000, .ram_mult = 2.0/3.0, .pci_div = 3},
+        {.bus = 20000, .ram_mult = 1.0/3.0, .pci_div = 6},
+        {.bus = 13333, .ram_mult =     0.5, .pci_div = 2},
+        {0}
+    }
     ICS9xxx_MODEL_END()
     ICS9xxx_MODEL(ICS9250_50)
-	.max_reg = 6,
-	.regs = {0x02, 0x6f, 0xff, 0xff, 0xef, 0xff, 0x06},
-	.fs_regs = {{-1, -1, 1, 6}, {-1, -1, 4, 2}, {-1, -1, 1, 5}, {0, 7, 1, 7}, {0, 2, 4, 4}},
-	.hw_select = {0, 3},
-	.frequencies = (const ics9xxx_frequency_t[]) {
-		[0 ... 7]   = {.bus =  6667, .ram_mult =  1.5, .pci_div = 2},
-		[8 ... 15]  = {.bus = 10000, .ram_mult =    1, .pci_div = 3},
-		[16 ... 23] = {.bus = 13333, .ram_mult =    1, .pci_div = 4},
-		[24 ... 31] = {.bus = 13333, .ram_mult = 0.75, .pci_div = 4},
-		{0}
-	}
+    .max_reg = 6,
+    .regs = {0x02, 0x6f, 0xff, 0xff, 0xef, 0xff, 0x06},
+    .fs_regs = {{-1, -1, 1, 6}, {-1, -1, 4, 2}, {-1, -1, 1, 5}, {0, 7, 1, 7}, {0, 2, 4, 4}},
+    .hw_select = {0, 3},
+    .frequencies = (const ics9xxx_frequency_t[]) {
+        [0 ... 7]   = {.bus =  6667, .ram_mult =  1.5, .pci_div = 2},
+        [8 ... 15]  = {.bus = 10000, .ram_mult =    1, .pci_div = 3},
+        [16 ... 23] = {.bus = 13333, .ram_mult =    1, .pci_div = 4},
+        [24 ... 31] = {.bus = 13333, .ram_mult = 0.75, .pci_div = 4},
+        {0}
+    }
     ICS9xxx_MODEL_END()
 #endif
 };
@@ -1010,7 +1010,7 @@ ics9xxx_read(UNUSED(void *bus), UNUSED(uint8_t addr), void *priv)
     }
 #if 0
     else if ((dev->model_idx == ICS9250_50) && (dev->addr_register == 0))
-	ret = dev->regs[dev->addr_register] & 0x0b; /* -50 reads back revision ID instead */
+    ret = dev->regs[dev->addr_register] & 0x0b; /* -50 reads back revision ID instead */
 #endif
     else
         ret = dev->regs[dev->addr_register];
@@ -1079,32 +1079,32 @@ ics9xxx_write(UNUSED(void *bus), UNUSED(uint8_t addr), uint8_t data, void *priv)
         }
 
 #if 0
-	switch (dev->addr_register) {
-		case 0:
-			if (dev->model_idx == ICS9250_38)
-				data = (dev->regs[dev->addr_register] & ~0xe8) | (data & 0xe8);
-			break;
+    switch (dev->addr_register) {
+        case 0:
+            if (dev->model_idx == ICS9250_38)
+                data = (dev->regs[dev->addr_register] & ~0xe8) | (data & 0xe8);
+            break;
 
-		case 1:
-			if (dev->model_idx == ICS9250_38)
-				data = (dev->regs[dev->addr_register] & ~0xfe) | (data & 0xfe);
-			break;
+        case 1:
+            if (dev->model_idx == ICS9250_38)
+                data = (dev->regs[dev->addr_register] & ~0xfe) | (data & 0xfe);
+            break;
 
-		case 3:
-			if (dev->model_idx == ICS9250_32)
-				data ^= 0x70;
-			break;
+        case 3:
+            if (dev->model_idx == ICS9250_32)
+                data ^= 0x70;
+            break;
 
-		case 4:
-			if (dev->model_idx == ICS9250_38)
-				data = (dev->regs[dev->addr_register] & ~0xfc) | (data & 0xfc);
-			break;
+        case 4:
+            if (dev->model_idx == ICS9250_38)
+                data = (dev->regs[dev->addr_register] & ~0xfc) | (data & 0xfc);
+            break;
 
-		case 6:
-			if (dev->model_idx == ICS9250_38) /* read-only */
-				data = dev->regs[dev->addr_register];
-			break;
-	}
+        case 6:
+            if (dev->model_idx == ICS9250_38) /* read-only */
+                data = dev->regs[dev->addr_register];
+            break;
+    }
 #endif
         dev->regs[dev->addr_register] = data;
 
@@ -1117,20 +1117,20 @@ ics9xxx_write(UNUSED(void *bus), UNUSED(uint8_t addr), uint8_t data, void *priv)
                     break;
 #endif
 #if 0
-			case ICS9250_10:
-				ics9xxx_set(dev, (cpu_busspeed >= 100000000) * 0x08);
-				break;
+            case ICS9250_10:
+                ics9xxx_set(dev, (cpu_busspeed >= 100000000) * 0x08);
+                break;
 
-			case ICS9250_16:
-			case ICS9250_26:
-				ics9xxx_set(dev, ((cpu_busspeed >= 120000000) * 0x08) | ((((cpu_busspeed >= 100000000) && (cpu_busspeed < 120000000)) || (cpu_busspeed == 150000000) || (cpu_busspeed == 132999999)) * 0x04));
-				break;
+            case ICS9250_16:
+            case ICS9250_26:
+                ics9xxx_set(dev, ((cpu_busspeed >= 120000000) * 0x08) | ((((cpu_busspeed >= 100000000) && (cpu_busspeed < 120000000)) || (cpu_busspeed == 150000000) || (cpu_busspeed == 132999999)) * 0x04));
+                break;
 
-			case ICS9250_27:
-			case ICS9250_28:
-			case ICS9250_29:
-				ics9xxx_set(dev, ((cpu_busspeed == 100000000) * 0x02) | ((cpu_busspeed > 100000000) * 0x01));
-				break;
+            case ICS9250_27:
+            case ICS9250_28:
+            case ICS9250_29:
+                ics9xxx_set(dev, ((cpu_busspeed == 100000000) * 0x02) | ((cpu_busspeed > 100000000) * 0x01));
+                break;
 #endif
                 default:
                     ics9xxx_set(dev, 0x00);
diff --git a/src/device/keyboard_at.c b/src/device/keyboard_at.c
index 3b167d66f..21c4884b7 100644
--- a/src/device/keyboard_at.c
+++ b/src/device/keyboard_at.c
@@ -8,9 +8,11 @@
  *
  *          Implementation of PS/2 series Mouse devices.
  *
+ * Authors: Miran Grca, <mgrca8@gmail.com>
+ *          Fred N. van Kempen, <decwiz@yahoo.com>
  *
- *
- * Authors: Fred N. van Kempen, <decwiz@yahoo.com>
+ *          Copyright 2016-2023 Miran Grca.
+ *          Copyright 2017-2023 Fred N. van Kempen.
  */
 #include <stdarg.h>
 #include <stdio.h>
diff --git a/src/device/mouse_ps2.c b/src/device/mouse_ps2.c
index 251459199..c05753afb 100644
--- a/src/device/mouse_ps2.c
+++ b/src/device/mouse_ps2.c
@@ -8,9 +8,9 @@
  *
  *          Implementation of PS/2 series Mouse devices.
  *
+ * Authors: Miran Grca, <mgrca8@gmail.com>
  *
- *
- * Authors: Fred N. van Kempen, <decwiz@yahoo.com>
+ *          Copyright 2023 Miran Grca.
  */
 #include <stdarg.h>
 #include <stdatomic.h>
diff --git a/src/device/mouse_serial.c b/src/device/mouse_serial.c
index 91fdd498a..4e3720d1d 100644
--- a/src/device/mouse_serial.c
+++ b/src/device/mouse_serial.c
@@ -10,9 +10,9 @@
  *
  * TODO:    Add the Genius Serial Mouse.
  *
+ * Authors: Miran Grca, <mgrca8@gmail.com>
  *
- *
- * Authors: Fred N. van Kempen, <decwiz@yahoo.com>
+ *          Copyright 2023 Miran Grca.
  */
 #include <math.h>
 #include <stdarg.h>
@@ -193,8 +193,8 @@ sermouse_report_msystems(mouse_t *dev)
     dev->buf[0] |= (b & 0x02) ? 0x00 : 0x01; /* right button */
     dev->buf[1] = delta_x;
     dev->buf[2] = delta_y;
-    dev->buf[2] = delta_x;    /* same as byte 1 */
-    dev->buf[3] = delta_y;    /* same as byte 2 */
+    dev->buf[3] = delta_x;    /* same as byte 1 */
+    dev->buf[4] = delta_y;    /* same as byte 2 */
 
     return 5;
 }
@@ -215,8 +215,6 @@ sermouse_report_3bp(mouse_t *dev)
     dev->buf[0] |= (b & 0x02) ? 0x01 : 0x00; /* right button */
     dev->buf[1] = delta_x;
     dev->buf[2] = delta_y;
-    dev->buf[2] = delta_x;    /* same as byte 1 */
-    dev->buf[3] = delta_y;    /* same as byte 2 */
 
     return 3;
 }
diff --git a/src/device/phoenix_486_jumper.c b/src/device/phoenix_486_jumper.c
index dbdfbe946..a3c891c90 100644
--- a/src/device/phoenix_486_jumper.c
+++ b/src/device/phoenix_486_jumper.c
@@ -6,15 +6,16 @@
  *
  *          This file is part of the 86Box distribution.
  *
- *          Implementation of the Phoenix 486 Jumper Readout
+ *          Implementation of the Phoenix 486 Jumper Readout.
  *
  *
  *
- * Authors: Tiseno100
+ * Authors: Miran Grca, <mgrca8@gmail.com>
+ *          Tiseno100,
  *
- *          Copyright 2020 Tiseno100
+ *          Copyright 2020-2023 Miran Grca.
+ *          Copyright 2020-2023 Tiseno100.
  */
-
 #include <stdarg.h>
 #include <stdint.h>
 #include <stdio.h>
diff --git a/src/device/postcard.c b/src/device/postcard.c
index 15f396516..dbae3232a 100644
--- a/src/device/postcard.c
+++ b/src/device/postcard.c
@@ -29,13 +29,11 @@
 #include <86box/postcard.h>
 #include "cpu.h"
 
-#define POSTCARDS_NUM 4
-#define POSTCARD_MASK (POSTCARDS_NUM - 1)
+uint8_t         postcard_codes[POSTCARDS_NUM];
 
 static uint16_t postcard_port;
 static uint8_t  postcard_written[POSTCARDS_NUM];
 static uint8_t  postcard_ports_num = 1;
-static uint8_t  postcard_codes[POSTCARDS_NUM];
 static uint8_t  postcard_prev_codes[POSTCARDS_NUM];
 #define UISTR_LEN 32
 static char postcard_str[UISTR_LEN]; /* UI output string */
@@ -66,8 +64,10 @@ static void
 postcard_setui(void)
 {
     if (postcard_ports_num > 1) {
-        char ps[2][POSTCARDS_NUM][3] = { { 0 },
-                                          { 0 } };
+        char ps[2][POSTCARDS_NUM][3] = { { { 0 },
+                                           { 0 },
+                                        } };
+
         for (uint8_t i = 0; i < POSTCARDS_NUM; i++) {
             if (!postcard_written[i]) {
                 snprintf(ps[0][i], sizeof(ps[0][i]), "--");
diff --git a/src/device/serial.c b/src/device/serial.c
index 1587fbe03..3a5b237c2 100644
--- a/src/device/serial.c
+++ b/src/device/serial.c
@@ -112,7 +112,7 @@ serial_do_irq(serial_t *dev, int set)
     if (dev->irq != 0xff) {
         if (set || (dev->irq_state != !!set))
             picint_common(1 << dev->irq, !!(dev->type >= SERIAL_16450), set, &dev->irq_state);
-        if (dev->type >= SERIAL_16450)
+        if (dev->type < SERIAL_16450)
             dev->irq_state = !!set;
     }
 }
diff --git a/src/disk/minivhd/manage.c b/src/disk/minivhd/manage.c
index b04a7d2ce..7ac3989e6 100644
--- a/src/disk/minivhd/manage.c
+++ b/src/disk/minivhd/manage.c
@@ -439,14 +439,13 @@ MVHDAPI int
 mvhd_file_is_vhd(FILE* f)
 {
     uint8_t con_str[8];
-    size_t res;
 
     if (f == NULL) {
         return 0;
     }
 
     mvhd_fseeko64(f, -MVHD_FOOTER_SIZE, SEEK_END);
-    res = fread(con_str, sizeof con_str, 1, f);
+    (void) !fread(con_str, sizeof con_str, 1, f);
     if (mvhd_is_conectix_str(con_str)) {
         return 1;
     }
diff --git a/src/game/gameport.c b/src/game/gameport.c
index 413a1ff5a..323555984 100644
--- a/src/game/gameport.c
+++ b/src/game/gameport.c
@@ -58,7 +58,7 @@ typedef struct _joystick_instance_ {
     void                *dat;
 } joystick_instance_t;
 
-int joystick_type = 0;
+int joystick_type = JS_TYPE_NONE;
 
 static const joystick_if_t joystick_none = {
     .name          = "None",
@@ -128,21 +128,21 @@ int             gameport_instance_id = 0;
    or writes, and ports at the standard 200h location are prioritized. */
 static gameport_t *active_gameports = NULL;
 
-char *
+const char *
 joystick_get_name(int js)
 {
     if (!joysticks[js].joystick)
         return NULL;
-    return (char *) joysticks[js].joystick->name;
+    return joysticks[js].joystick->name;
 }
 
-char *
+const char *
 joystick_get_internal_name(int js)
 {
     if (joysticks[js].joystick == NULL)
         return "";
 
-    return (char *) joysticks[js].joystick->internal_name;
+    return joysticks[js].joystick->internal_name;
 }
 
 int
@@ -151,7 +151,7 @@ joystick_get_from_internal_name(char *s)
     int c = 0;
 
     while (joysticks[c].joystick != NULL) {
-        if (!strcmp((char *) joysticks[c].joystick->internal_name, s))
+        if (!strcmp(joysticks[c].joystick->internal_name, s))
             return c;
         c++;
     }
@@ -183,22 +183,22 @@ joystick_get_pov_count(int js)
     return joysticks[js].joystick->pov_count;
 }
 
-char *
+const char *
 joystick_get_axis_name(int js, int id)
 {
-    return (char *) joysticks[js].joystick->axis_names[id];
+    return joysticks[js].joystick->axis_names[id];
 }
 
-char *
+const char *
 joystick_get_button_name(int js, int id)
 {
-    return (char *) joysticks[js].joystick->button_names[id];
+    return joysticks[js].joystick->button_names[id];
 }
 
-char *
+const char *
 joystick_get_pov_name(int js, int id)
 {
-    return (char *) joysticks[js].joystick->pov_names[id];
+    return joysticks[js].joystick->pov_names[id];
 }
 
 static void
@@ -410,7 +410,7 @@ tmacm_init(UNUSED(const device_t *info))
     dev = malloc(sizeof(gameport_t));
     memset(dev, 0x00, sizeof(gameport_t));
 
-    port = device_get_config_hex16("port1_addr");
+    port = (uint16_t) device_get_config_hex16("port1_addr");
     switch (port) {
         case 0x201:
             dev = gameport_add(&gameport_201_device);
@@ -428,7 +428,7 @@ tmacm_init(UNUSED(const device_t *info))
             break;
     }
 
-    port = device_get_config_hex16("port2_addr");
+    port = (uint16_t) device_get_config_hex16("port2_addr");
     switch (port) {
         case 0x209:
             dev = gameport_add(&gameport_209_device);
diff --git a/src/include/86box/86box.h b/src/include/86box/86box.h
index 11dacef8c..c1f65d9f4 100644
--- a/src/include/86box/86box.h
+++ b/src/include/86box/86box.h
@@ -38,6 +38,9 @@
 /* Default language 0xFFFF = from system, 0x409 = en-US */
 #define DEFAULT_LANGUAGE 0x0409
 
+#define POSTCARDS_NUM 4
+#define POSTCARD_MASK (POSTCARDS_NUM - 1)
+
 #ifdef MIN
 #    undef MIN
 #endif
@@ -142,8 +145,6 @@ extern int    confirm_exit;       /* (C) enable exit confirmation */
 extern int    confirm_save;       /* (C) enable save confirmation */
 extern int enable_discord;        /* (C) enable Discord integration */
 
-extern int is_pentium; /* TODO: Move back to cpu/cpu.h when it's figured out,
-                                how to remove that hack from the ET4000/W32p. */
 extern int    fixed_size_x;
 extern int    fixed_size_y;
 extern double mouse_sensitivity;            /* (C) Mouse sensitivity scale */
@@ -178,7 +179,7 @@ extern void reset_screen_size_monitor(int monitor_index);
 extern void set_screen_size_natural(void);
 extern void update_mouse_msg(void);
 #if 0
-extern void	pc_reload(wchar_t *fn);
+extern void pc_reload(wchar_t *fn);
 #endif
 extern int  pc_init_modules(void);
 extern int  pc_init(int argc, char *argv[]);
@@ -207,7 +208,8 @@ extern double isa_timing;
 extern int    io_delay;
 extern int    framecountx;
 
-extern volatile int cpu_thread_run;
+extern volatile int     cpu_thread_run;
+extern          uint8_t postcard_codes[POSTCARDS_NUM];
 
 #ifdef __cplusplus
 }
diff --git a/src/include/86box/agpgart.h b/src/include/86box/agpgart.h
index fc2976c88..d3ed35c88 100644
--- a/src/include/86box/agpgart.h
+++ b/src/include/86box/agpgart.h
@@ -1,5 +1,5 @@
 /*
- * 86Box	A hypervisor and IBM PC system emulator that specializes in
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
  *          running old operating systems and software designed for IBM
  *          PC systems and compatibles from 1981 through fairly recent
  *          system designs based on the PCI bus.
diff --git a/src/include/86box/cdrom.h b/src/include/86box/cdrom.h
index 69b4e90f3..25c8dd528 100644
--- a/src/include/86box/cdrom.h
+++ b/src/include/86box/cdrom.h
@@ -60,12 +60,14 @@ enum {
     CDROM_BUS_USB      = 8
 };
 
-#define KNOWN_CDROM_DRIVE_TYPES 35
-#define BUS_TYPE_ALL 0
-#define BUS_TYPE_IDE 1
-#define BUS_TYPE_SCSI 2
+#define KNOWN_CDROM_DRIVE_TYPES    35
+#define BUS_TYPE_IDE                CDROM_BUS_ATAPI
+#define BUS_TYPE_SCSI               CDROM_BUS_SCSI
+#define BUS_TYPE_BOTH              -2
+#define BUS_TYPE_NONE              -1
 
-static const struct {
+static const struct
+{
     const char  vendor[9];
     const char  model[17];
     const char  revision[5];
@@ -73,7 +75,7 @@ static const struct {
     const char *internal_name;
     const int   bus_type;
 } cdrom_drive_types[] = {
-    { "86BOX",    "CD-ROM",             "1.00", "(ATAPI/SCSI) 86BOX CD-ROM 1.00",        "86BOX_CD-ROM_1.00",             BUS_TYPE_ALL  }, /*1*/
+    { "86BOX",    "CD-ROM",             "1.00", "(ATAPI/SCSI) 86BOX CD-ROM 1.00",        "86BOX_CD-ROM_1.00",             BUS_TYPE_BOTH  }, /*1*/
     { "AZT",      "CDA46802I",          "1.15", "(ATAPI) AZT CDA46802I 1.15",            "AZT_CDA46802I_1.15",            BUS_TYPE_IDE  }, /*2*/
     { "BTC",      "CD-ROM BCD36XH",     "U1.0", "(ATAPI) BTC CD-ROM BCD36XH U1.0",       "BTC_CD-ROM_BCD36XH_U1.0",       BUS_TYPE_IDE  }, /*3*/
     { "GOLDSTAR", "CRD-8160B",          "3.14", "(ATAPI) GOLDSTAR CRD-8160B 3.14",       "GOLDSTAR_CRD-8160B_3.14",       BUS_TYPE_IDE  }, /*4*/
@@ -108,7 +110,7 @@ static const struct {
     { "TOSHIBA",  "CD-ROM DRIVE:XM",    "3433", "(SCSI) TOSHIBA CD-ROM DRIVE:XM 3433",   "TOSHIBA_CD-ROM_DRIVEXM_3433",   BUS_TYPE_SCSI }, /*33*/
     { "TOSHIBA",  "CD-ROM XM-3301TA",   "0272", "(SCSI) TOSHIBA CD-ROM XM-3301TA 0272",  "TOSHIBA_CD-ROM_XM-3301TA_0272", BUS_TYPE_SCSI }, /*34*/
     { "TOSHIBA",  "CD-ROM XM-5701TA",   "3136", "(SCSI) TOSHIBA CD-ROM XM-5701TA 3136",  "TOSHIBA_CD-ROM_XM-5701TA_3136", BUS_TYPE_SCSI }, /*35*/
-    { "",         "",                   "",     "",                                      "",                              -1            },
+    { "",         "",                   "",     "",                                      "",                              BUS_TYPE_NONE },
 };
 
 /* To shut up the GCC compilers. */
diff --git a/src/include/86box/cdrom_interface.h b/src/include/86box/cdrom_interface.h
index 860a436e0..323ba9681 100644
--- a/src/include/86box/cdrom_interface.h
+++ b/src/include/86box/cdrom_interface.h
@@ -1,18 +1,18 @@
 /*
- * 86Box	A hypervisor and IBM PC system emulator that specializes in
- *		running old operating systems and software designed for IBM
- *		PC systems and compatibles from 1981 through fairly recent
- *		system designs based on the PCI bus.
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
  *
- *		This file is part of the 86Box distribution.
+ *          This file is part of the 86Box distribution.
  *
- *		Definitions for the common CD-ROM interface controller handler.
+ *          Definitions for the common CD-ROM interface controller handler.
  *
  *
  *
- * Authors:	TheCollector1995
+ * Authors: TheCollector1995
  *
- *		Copyright 2022 TheCollector1995.
+ *          Copyright 2022 TheCollector1995.
  */
 #ifndef EMU_CDROM_INTERFACE_H
 #define EMU_CDROM_INTERFACE_H
diff --git a/src/include/86box/chipset.h b/src/include/86box/chipset.h
index 932a08b70..e59fe99cc 100644
--- a/src/include/86box/chipset.h
+++ b/src/include/86box/chipset.h
@@ -115,6 +115,8 @@ extern const device_t opti283_device;
 extern const device_t opti291_device;
 extern const device_t opti493_device;
 extern const device_t opti495_device;
+extern const device_t opti601_device;
+extern const device_t opti602_device;
 extern const device_t opti802g_device;
 extern const device_t opti802g_pci_device;
 extern const device_t opti822_device;
diff --git a/src/include/86box/device.h b/src/include/86box/device.h
index fb2d78eb4..3019bbba8 100644
--- a/src/include/86box/device.h
+++ b/src/include/86box/device.h
@@ -58,19 +58,26 @@
 
 enum {
     DEVICE_PCJR      = 2,          /* requires an IBM PCjr */
-    DEVICE_AT        = 4,          /* requires an AT-compatible system */
-    DEVICE_PS2       = 8,          /* requires a PS/1 or PS/2 system */
-    DEVICE_ISA       = 0x10,       /* requires the ISA bus */
-    DEVICE_CBUS      = 0x20,       /* requires the C-BUS bus */
-    DEVICE_MCA       = 0x40,       /* requires the MCA bus */
-    DEVICE_EISA      = 0x80,       /* requires the EISA bus */
-    DEVICE_VLB       = 0x100,      /* requires the PCI bus */
-    DEVICE_PCI       = 0x200,      /* requires the VLB bus */
-    DEVICE_AGP       = 0x400,      /* requires the AGP bus */
-    DEVICE_AC97      = 0x800,      /* requires the AC'97 bus */
-    DEVICE_COM       = 0x1000,     /* requires a serial port */
-    DEVICE_LPT       = 0x2000,     /* requires a parallel port */
-    DEVICE_KBC       = 0x4000,     /* is a keyboard controller */
+    DEVICE_XTKBC     = 4,          /* requires an XT-compatible keyboard controller */
+    DEVICE_AT        = 8,          /* requires an AT-compatible system */
+    DEVICE_ATKBC     = 0x10,       /* requires an AT-compatible keyboard controller */
+    DEVICE_PS2       = 0x20,       /* requires a PS/1 or PS/2 system */
+    DEVICE_ISA       = 0x40,       /* requires the ISA bus */
+    DEVICE_CBUS      = 0x80,       /* requires the C-BUS bus */
+    DEVICE_PCMCIA    = 0x100,      /* requires the PCMCIA bus */
+    DEVICE_MCA       = 0x200,      /* requires the MCA bus */
+    DEVICE_HIL       = 0x400,      /* requires the HP HIL bus */
+    DEVICE_EISA      = 0x800,      /* requires the EISA bus */
+    DEVICE_OLB       = 0x1000,     /* requires the OPTi local bus */
+    DEVICE_VLB       = 0x2000,     /* requires the VLB bus */
+    DEVICE_PCI       = 0x4000,     /* requires the PCI bus */
+    DEVICE_CARDBUS   = 0x8000,     /* requires the CardBus bus */
+    DEVICE_USB       = 0x10000,    /* requires the USB bus */
+    DEVICE_AGP       = 0x20000,    /* requires the AGP bus */
+    DEVICE_AC97      = 0x40000,    /* requires the AC'97 bus */
+    DEVICE_COM       = 0x80000,    /* requires a serial port */
+    DEVICE_LPT       = 0x100000,   /* requires a parallel port */
+    DEVICE_KBC       = 0x200000,   /* is a keyboard controller */
 
     DEVICE_EXTPARAMS = 0x40000000, /* accepts extended parameters */
 
diff --git a/src/include/86box/gameport.h b/src/include/86box/gameport.h
index 3b779e4e3..ba3568464 100644
--- a/src/include/86box/gameport.h
+++ b/src/include/86box/gameport.h
@@ -24,6 +24,16 @@
 #define MAX_PLAT_JOYSTICKS  8
 #define MAX_JOYSTICKS       4
 
+#define JS_TYPE_NONE               0
+#define JS_TYPE_2AXIS_4BUTTON      1
+#define JS_TYPE_2AXIS_6BUTTON      2
+#define JS_TYPE_2AXIS_8BUTTON      3
+#define JS_TYPE_4AXIS_4BUTTON      4
+#define JS_TYPE_CH_FLIGHTSTICK_PRO 5
+#define JS_TYPE_SIDEWINDER_PAD     6
+#define JS_TYPE_THRUSTMASTER_FCS   7
+
+
 #define POV_X               0x80000000
 #define POV_Y               0x40000000
 #define SLIDER              0x20000000
@@ -84,11 +94,11 @@ typedef struct joystick_if_t {
     const char *internal_name;
 
     void   *(*init)(void);
-    void    (*close)(void *p);
-    uint8_t (*read)(void *p);
-    void    (*write)(void *p);
-    int     (*read_axis)(void *p, int axis);
-    void    (*a0_over)(void *p);
+    void    (*close)(void *priv);
+    uint8_t (*read)(void *priv);
+    void    (*write)(void *priv);
+    int     (*read_axis)(void *priv, int axis);
+    void    (*a0_over)(void *priv);
 
     int         axis_count;
     int         button_count;
@@ -133,16 +143,16 @@ extern void joystick_init(void);
 extern void joystick_close(void);
 extern void joystick_process(void);
 
-extern char *joystick_get_name(int js);
-extern char *joystick_get_internal_name(int js);
-extern int   joystick_get_from_internal_name(char *s);
-extern int   joystick_get_max_joysticks(int js);
-extern int   joystick_get_axis_count(int js);
-extern int   joystick_get_button_count(int js);
-extern int   joystick_get_pov_count(int js);
-extern char *joystick_get_axis_name(int js, int id);
-extern char *joystick_get_button_name(int js, int id);
-extern char *joystick_get_pov_name(int js, int id);
+extern const char *joystick_get_name(int js);
+extern const char *joystick_get_internal_name(int js);
+extern int         joystick_get_from_internal_name(char *s);
+extern int         joystick_get_max_joysticks(int js);
+extern int         joystick_get_axis_count(int js);
+extern int         joystick_get_button_count(int js);
+extern int         joystick_get_pov_count(int js);
+extern const char *joystick_get_axis_name(int js, int id);
+extern const char *joystick_get_button_name(int js, int id);
+extern const char *joystick_get_pov_name(int js, int id);
 
 extern void  gameport_update_joystick_type(void);
 extern void  gameport_remap(void *priv, uint16_t address);
diff --git a/src/include/86box/lpt.h b/src/include/86box/lpt.h
index eb3f54973..cdd584358 100644
--- a/src/include/86box/lpt.h
+++ b/src/include/86box/lpt.h
@@ -53,13 +53,13 @@ extern void lpt1_remove_ams(void);
 #define lpt4_remove() lpt_port_remove(3)
 
 #if 0
-#define lpt5_init(a)	lpt_port_init(4, a)
-#define lpt5_irq(a)	lpt_port_irq(4, a)
-#define lpt5_remove()	lpt_port_remove(4)
+#define lpt5_init(a)  lpt_port_init(4, a)
+#define lpt5_irq(a)   lpt_port_irq(4, a)
+#define lpt5_remove() lpt_port_remove(4)
 
-#define lpt6_init(a)	lpt_port_init(5, a)
-#define lpt6_irq(a)	lpt_port_irq(5, a)
-#define lpt6_remove()	lpt_port_remove(5)
+#define lpt6_init(a)  lpt_port_init(5, a)
+#define lpt6_irq(a)   lpt_port_irq(5, a)
+#define lpt6_remove() lpt_port_remove(5)
 #endif
 
 void lpt_devices_init(void);
diff --git a/src/include/86box/m_at_t3100e.h b/src/include/86box/m_at_t3100e.h
index c25d171b9..b9c2e24df 100644
--- a/src/include/86box/m_at_t3100e.h
+++ b/src/include/86box/m_at_t3100e.h
@@ -12,11 +12,11 @@
  *
  * Authors: Fred N. van Kempen, <decwiz@yahoo.com>
  *          Miran Grca, <mgrca8@gmail.com>
- *          Sarah Walker, <https://pcem-emulator.co.uk/>
+ *          John Elliott, <jce@seasip.info>
  *
  *          Copyright 2017-2018 Fred N. van Kempen.
  *          Copyright 2016-2018 Miran Grca.
- *          Copyright 2008-2018 Sarah Walker.
+ *          Copyright 2008-2018 John Elliott.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/include/86box/m_xt_t1000.h b/src/include/86box/m_xt_t1000.h
index d8e8cd56b..90916444c 100644
--- a/src/include/86box/m_xt_t1000.h
+++ b/src/include/86box/m_xt_t1000.h
@@ -12,11 +12,11 @@
  *
  * Authors: Fred N. van Kempen, <decwiz@yahoo.com>
  *          Miran Grca, <mgrca8@gmail.com>
- *          Sarah Walker, <https://pcem-emulator.co.uk/>
+ *          John Elliott, <jce@seasip.info>
  *
  *          Copyright 2017-2018 Fred N. van Kempen.
  *          Copyright 2016-2018 Miran Grca.
- *          Copyright 2008-2018 Sarah Walker.
+ *          Copyright 2008-2018 John Elliott.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/include/86box/machine.h b/src/include/86box/machine.h
index 1a9b133e9..903001e5b 100644
--- a/src/include/86box/machine.h
+++ b/src/include/86box/machine.h
@@ -28,18 +28,25 @@
 #define MACHINE_BUS_ISA       0x00000001 /* sys has ISA bus */
 #define MACHINE_BUS_CASSETTE  0x00000002 /* sys has cassette port */
 #define MACHINE_BUS_CARTRIDGE 0x00000004 /* sys has two cartridge bays */
-#define MACHINE_BUS_ISA16     0x00000008 /* sys has ISA16 bus - PC/AT architecture */
-#define MACHINE_BUS_CBUS      0x00000010 /* sys has C-BUS bus */
-#define MACHINE_BUS_PS2_LATCH 0x00000020 /* system has PS/2 keyboard controller IRQ latch */
-#define MACHINE_BUS_PS2_PORTS 0x00000040 /* system has PS/2 keyboard and mouse ports */
+#define MACHINE_BUS_PCJR      0x00000008 /* sys has PCjr sidecar bus */
+#define MACHINE_BUS_DM_KBC    0x00000010 /* system has keyboard controller that supports
+                                            both XT and AT keyboards */
+#define MACHINE_BUS_ISA16     0x00000020 /* sys has ISA16 bus - PC/AT architecture */
+#define MACHINE_BUS_CBUS      0x00000040 /* sys has C-BUS bus */
+#define MACHINE_BUS_PCMCIA    0x00000080 /* sys has PCMCIA bus */
+#define MACHINE_BUS_PS2_LATCH 0x00000100 /* system has PS/2 keyboard controller IRQ latch */
+#define MACHINE_BUS_PS2_PORTS 0x00000200 /* system has PS/2 keyboard and mouse ports */
 #define MACHINE_BUS_PS2       (MACHINE_BUS_PS2_LATCH | MACHINE_BUS_PS2_PORTS)
-#define MACHINE_BUS_EISA      0x00000080 /* sys has EISA bus */
-#define MACHINE_BUS_VLB       0x00000100 /* sys has VL bus */
-#define MACHINE_BUS_MCA       0x00000200 /* sys has MCA bus */
-#define MACHINE_BUS_PCI       0x00000400 /* sys has PCI bus */
-#define MACHINE_BUS_PCMCIA    0x00000800 /* sys has PCMCIA bus */
-#define MACHINE_BUS_AGP       0x00001000 /* sys has AGP bus */
-#define MACHINE_BUS_AC97      0x00002000 /* sys has AC97 bus (ACR/AMR/CNR slot) */
+#define MACHINE_BUS_HIL       0x00000400 /* system has HP HIL keyboard and mouse ports */
+#define MACHINE_BUS_EISA      0x00000800 /* sys has EISA bus */
+#define MACHINE_BUS_OLB       0x00001000 /* sys has OPTi local bus */
+#define MACHINE_BUS_VLB       0x00002000 /* sys has VL bus */
+#define MACHINE_BUS_MCA       0x00004000 /* sys has MCA bus */
+#define MACHINE_BUS_PCI       0x00008000 /* sys has PCI bus */
+#define MACHINE_BUS_CARDBUS   0x00010000 /* sys has CardBus bus */
+#define MACHINE_BUS_USB       0x00020000 /* sys has USB bus */
+#define MACHINE_BUS_AGP       0x00040000 /* sys has AGP bus */
+#define MACHINE_BUS_AC97      0x00080000 /* sys has AC97 bus (ACR/AMR/CNR slot) */
 /* Aliases. */
 #define MACHINE_CASSETTE  (MACHINE_BUS_CASSETTE)  /* sys has cassette port */
 #define MACHINE_CARTRIDGE (MACHINE_BUS_CARTRIDGE) /* sys has two cartridge bays */
@@ -73,61 +80,69 @@
 #define MACHINE_PS2_NOISA (MACHINE_PS2_AGP & ~MACHINE_AT)                     /* sys is AGP PS/2 without ISA */
 #define MACHINE_PS2_NOI97 (MACHINE_PS2_A97 & ~MACHINE_AT)                     /* sys is AGP/AC97 PS/2 without ISA */
 /* Feature flags for miscellaneous internal devices. */
-#define MACHINE_FLAGS_NONE 0x00000000 /* sys has no int devices */
-#define MACHINE_VIDEO      0x00000001 /* sys has int video */
-#define MACHINE_VIDEO_ONLY 0x00000002 /* sys has fixed video */
-#define MACHINE_MOUSE      0x00000004 /* sys has int mouse */
-#define MACHINE_FDC        0x00000008 /* sys has int FDC */
-#define MACHINE_LPT_PRI    0x00000010 /* sys has int pri LPT */
-#define MACHINE_LPT_SEC    0x00000020 /* sys has int sec LPT */
-#define MACHINE_UART_PRI   0x00000040 /* sys has int pri UART */
-#define MACHINE_UART_SEC   0x00000080 /* sys has int sec UART */
-#define MACHINE_UART_TER   0x00000100 /* sys has int ter UART */
-#define MACHINE_UART_QUA   0x00000200 /* sys has int qua UART */
-#define MACHINE_GAMEPORT   0x00000400 /* sys has int game port */
-#define MACHINE_SOUND      0x00000800 /* sys has int sound */
-#define MACHINE_NIC        0x00001000 /* sys has int NIC */
-#define MACHINE_MODEM      0x00002000 /* sys has int modem */
+#define MACHINE_FLAGS_NONE        0x00000000 /* sys has no int devices */
+#define MACHINE_SOFTFLOAT_ONLY    0x00000001 /* sys requires SoftFloat FPU */
+#define MACHINE_VIDEO             0x00000002 /* sys has int video */
+#define MACHINE_VIDEO_ONLY        0x00000004 /* sys has fixed video */
+#define MACHINE_MOUSE             0x00000008 /* sys has int mouse */
+#define MACHINE_FDC               0x00000010 /* sys has int FDC */
+#define MACHINE_LPT_PRI           0x00000020 /* sys has int pri LPT */
+#define MACHINE_LPT_SEC           0x00000040 /* sys has int sec LPT */
+#define MACHINE_LPT_TER           0x00000080 /* sys has int ter LPT */
+#define MACHINE_LPT_QUA           0x00000100 /* sys has int qua LPT */
+#define MACHINE_UART_PRI          0x00000200 /* sys has int pri UART */
+#define MACHINE_UART_SEC          0x00000400 /* sys has int sec UART */
+#define MACHINE_UART_TER          0x00000800 /* sys has int ter UART */
+#define MACHINE_UART_QUA          0x00001000 /* sys has int qua UART */
+#define MACHINE_GAMEPORT          0x00002000 /* sys has int game port */
+#define MACHINE_SOUND             0x00004000 /* sys has int sound */
+#define MACHINE_NIC               0x00008000 /* sys has int NIC */
+#define MACHINE_MODEM             0x00010000 /* sys has int modem */
 /* Feature flags for advanced devices. */
-#define MACHINE_APM  0x00004000 /* sys has APM */
-#define MACHINE_ACPI 0x00008000 /* sys has ACPI */
-#define MACHINE_HWM  0x00010000 /* sys has hw monitor */
-/* Combined flags. */
-#define MACHINE_VIDEO_FIXED   (MACHINE_VIDEO | MACHINE_VIDEO_ONLY) /* sys has fixed int video */
-#define MACHINE_SUPER_IO      (MACHINE_FDC | MACHINE_LPT_PRI | MACHINE_UART_PRI | MACHINE_UART_SEC)
-#define MACHINE_SUPER_IO_GAME (MACHINE_SUPER_IO | MACHINE_GAMEPORT)
-#define MACHINE_SUPER_IO_DUAL (MACHINE_SUPER_IO | MACHINE_LPT_SEC | MACHINE_UART_TER | MACHINE_UART_QUA)
-#define MACHINE_AV            (MACHINE_VIDEO | MACHINE_SOUND)    /* sys has video and sound */
-#define MACHINE_AG            (MACHINE_SOUND | MACHINE_GAMEPORT) /* sys has sound and game port */
+#define MACHINE_APM               0x00020000 /* sys has APM */
+#define MACHINE_ACPI              0x00040000 /* sys has ACPI */
+#define MACHINE_HWM               0x00080000 /* sys has hw monitor */
+#define MACHINE_COREBOOT          0x00100000 /* sys has coreboot BIOS */
 /* Feature flags for internal storage controllers. */
-#define MACHINE_HDC            0x03FE0000 /* sys has int HDC */
-#define MACHINE_MFM            0x00020000 /* sys has int MFM/RLL */
-#define MACHINE_XTA            0x00040000 /* sys has int XTA */
-#define MACHINE_ESDI           0x00080000 /* sys has int ESDI */
-#define MACHINE_IDE_PRI        0x00100000 /* sys has int pri IDE/ATAPI */
-#define MACHINE_IDE_SEC        0x00200000 /* sys has int sec IDE/ATAPI */
-#define MACHINE_IDE_TER        0x00400000 /* sys has int ter IDE/ATAPI */
-#define MACHINE_IDE_QUA        0x00800000 /* sys has int qua IDE/ATAPI */
-#define MACHINE_SCSI_PRI       0x01000000 /* sys has int pri SCSI */
-#define MACHINE_SCSI_SEC       0x02000000 /* sys has int sec SCSI */
-#define MACHINE_USB_PRI        0x04000000 /* sys has int pri USB */
-#define MACHINE_USB_SEC        0x08000000 /* sys has int sec USB */
-#define MACHINE_COREBOOT       0x10000000 /* sys has coreboot BIOS */
-#define MACHINE_SOFTFLOAT_ONLY 0x20000000 /* sys requires softfloat FPU */
+#define MACHINE_MFM               0x00200000 /* sys has int MFM/RLL */
+#define MACHINE_XTA               0x00400000 /* sys has int XTA */
+#define MACHINE_ESDI              0x00800000 /* sys has int ESDI */
+#define MACHINE_IDE_PRI           0x01000000 /* sys has int pri IDE/ATAPI */
+#define MACHINE_IDE_SEC           0x02000000 /* sys has int sec IDE/ATAPI */
+#define MACHINE_IDE_TER           0x04000000 /* sys has int ter IDE/ATAPI */
+#define MACHINE_IDE_QUA           0x08000000 /* sys has int qua IDE/ATAPI */
+#define MACHINE_SCSI_PRI          0x10000000 /* sys has int pri SCSI */
+#define MACHINE_SCSI_SEC          0x20000000 /* sys has int sec SCSI */
+#define MACHINE_USB_PRI           0x40000000 /* sys has int pri USB */
+#define MACHINE_USB_SEC           0x80000000 /* sys has int sec USB */
 /* Combined flags. */
-#define MACHINE_IDE        (MACHINE_IDE_PRI)                   /* sys has int single IDE/ATAPI - mark as pri IDE/ATAPI */
-#define MACHINE_IDE_DUAL   (MACHINE_IDE_PRI | MACHINE_IDE_SEC) /* sys has int dual IDE/ATAPI - mark as both pri and sec IDE/ATAPI */
-#define MACHINE_IDE_DUALTQ (MACHINE_IDE_TER | MACHINE_IDE_QUA)
-#define MACHINE_IDE_QUAD   (MACHINE_IDE_DUAL | MACHINE_IDE_DUALTQ) /* sys has int quad IDE/ATAPI - mark as dual + both ter and and qua IDE/ATAPI */
-#define MACHINE_SCSI       (MACHINE_SCSI_PRI)                      /* sys has int single SCSI - mark as pri SCSI */
-#define MACHINE_SCSI_DUAL  (MACHINE_SCSI_PRI | MACHINE_SCSI_SEC)   /* sys has int dual SCSI - mark as both pri and sec SCSI */
-#define MACHINE_USB        (MACHINE_USB_PRI)
-#define MACHINE_USB_DUAL   (MACHINE_USB_PRI | MACHINE_USB_SEC)
+#define MACHINE_LPT               (MACHINE_LPT-PRI | MACHINE_LPT_SEC | \
+                                   MACHINE_LPT_TER | MACHINE_LPT_QUA)
+#define MACHINE_UART              (MACHINE_UART_PRI | MACHINE_UART_SEC | \
+                                   MACHINE_UART_TER | MACHINE_UART_QUA)
+#define MACHINE_VIDEO_FIXED       (MACHINE_VIDEO | MACHINE_VIDEO_ONLY) /* sys has fixed int video */
+#define MACHINE_SUPER_IO          (MACHINE_FDC | MACHINE_LPT_PRI | MACHINE_UART_PRI | MACHINE_UART_SEC)
+#define MACHINE_SUPER_IO_GAME     (MACHINE_SUPER_IO | MACHINE_GAMEPORT)
+#define MACHINE_SUPER_IO_DUAL     (MACHINE_SUPER_IO | MACHINE_LPT_SEC | \
+                                   MACHINE_UART_TER | MACHINE_UART_QUA)
+#define MACHINE_AV                (MACHINE_VIDEO | MACHINE_SOUND)    /* sys has video and sound */
+#define MACHINE_AG                (MACHINE_SOUND | MACHINE_GAMEPORT) /* sys has sound and game port */
+/* Combined flag for internal storage controllerss. */
+#define MACHINE_IDE               (MACHINE_IDE_PRI) /* sys has int single IDE/ATAPI - mark as pri IDE/ATAPI */
+#define MACHINE_IDE_DUAL          (MACHINE_IDE_PRI | MACHINE_IDE_SEC) /* sys has int dual IDE/ATAPI - mark as both pri and sec IDE/ATAPI */
+#define MACHINE_IDE_DUALTQ        (MACHINE_IDE_TER | MACHINE_IDE_QUA)
+#define MACHINE_IDE_QUAD          (MACHINE_IDE_DUAL | MACHINE_IDE_DUALTQ) /* sys has int quad IDE/ATAPI - mark as dual + both ter and and qua IDE/ATAPI */
+#define MACHINE_SCSI              (MACHINE_SCSI_PRI) /* sys has int single SCSI - mark as pri SCSI */
+#define MACHINE_SCSI_DUAL         (MACHINE_SCSI_PRI | MACHINE_SCSI_SEC)  /* sys has int dual SCSI - mark as both pri and sec SCSI */
+#define MACHINE_USB               (MACHINE_USB_PRI)
+#define MACHINE_USB_DUAL          (MACHINE_USB_PRI | MACHINE_USB_SEC)
+#define MACHINE_HDC               (MACHINE_MFM | MACHINE_XTA | \
+                                   MACHINE_ESDI | MACHINE_IDE_QUAD | \
+                                   MACHINE_SCSI_DUAL | MACHINE_USB_DUAL)
 /* Special combined flags. */
-#define MACHINE_PIIX  (MACHINE_IDE_DUAL)
-#define MACHINE_PIIX3 (MACHINE_PIIX | MACHINE_USB)
-/* TODO: ACPI flag. */
-#define MACHINE_PIIX4 (MACHINE_PIIX3 | MACHINE_ACPI)
+#define MACHINE_PIIX              (MACHINE_IDE_DUAL)
+#define MACHINE_PIIX3             (MACHINE_PIIX | MACHINE_USB)
+#define MACHINE_PIIX4             (MACHINE_PIIX3 | MACHINE_ACPI)
 
 #define IS_ARCH(m, a) ((machines[m].bus_flags & (a)) ? 1 : 0)
 #define IS_AT(m)      (((machines[m].bus_flags & (MACHINE_BUS_ISA16 | MACHINE_BUS_EISA | MACHINE_BUS_VLB | MACHINE_BUS_MCA | MACHINE_BUS_PCI | MACHINE_BUS_PCMCIA | MACHINE_BUS_AGP | MACHINE_BUS_AC97)) && !(machines[m].bus_flags & MACHINE_PC98)) ? 1 : 0)
@@ -304,8 +319,8 @@ typedef struct _machine_ {
     void *kbc_device;
 #endif /* EMU_DEVICE_H */
     /* Bits:
-        7-0	Set bits are forced set on P1 (no forced set = 0x00);
-        15-8	Clear bits are forced clear on P1 (no foced clear = 0xff). */
+        7-0  Set bits are forced set on P1 (no forced set = 0x00);
+        15-8 Clear bits are forced clear on P1 (no foced clear = 0xff). */
     uint16_t kbc_p1;
     uint32_t gpio;
     uint32_t gpio_acpi;
diff --git a/src/include/86box/mouse.h b/src/include/86box/mouse.h
index 90000c0e2..5fa29b1a7 100644
--- a/src/include/86box/mouse.h
+++ b/src/include/86box/mouse.h
@@ -65,7 +65,7 @@ extern const device_t mouse_logibus_device;
 extern const device_t mouse_logibus_onboard_device;
 extern const device_t mouse_msinport_device;
 #    ifdef USE_GENIBUS
-extern const device_t	mouse_genibus_device;
+extern const device_t mouse_genibus_device;
 #    endif
 extern const device_t mouse_mssystems_device;
 extern const device_t mouse_msserial_device;
diff --git a/src/include/86box/net_3c501.h b/src/include/86box/net_3c501.h
index 996720f8f..c55151ab8 100644
--- a/src/include/86box/net_3c501.h
+++ b/src/include/86box/net_3c501.h
@@ -11,7 +11,7 @@
  *
  *
  *
- * Based on	@(#)Dev3C501.cpp Oracle (VirtualBox)
+ * Based on @(#)Dev3C501.cpp Oracle (VirtualBox)
  *
  * Authors: TheCollector1995, <mariogplayer@gmail.com>
  *          Oracle
diff --git a/src/include/86box/nvr.h b/src/include/86box/nvr.h
index baba6b6c4..8f2b45041 100644
--- a/src/include/86box/nvr.h
+++ b/src/include/86box/nvr.h
@@ -85,6 +85,7 @@ extern int nvr_dosave;
 #ifdef EMU_DEVICE_H
 extern const device_t at_nvr_old_device;
 extern const device_t at_nvr_device;
+extern const device_t at_mb_nvr_device;
 extern const device_t ps_nvr_device;
 extern const device_t amstrad_nvr_device;
 extern const device_t amstrad_megapc_nvr_device;
diff --git a/src/include/86box/plat.h b/src/include/86box/plat.h
index 44b0c691f..1552b032f 100644
--- a/src/include/86box/plat.h
+++ b/src/include/86box/plat.h
@@ -49,21 +49,12 @@ extern int strnicmp(const char *s1, const char *s2, size_t n);
 #    define ftello64 ftello
 #    define off64_t  off_t
 #elif defined(_MSC_VER)
-// # define fopen64	fopen
+// # define fopen64  fopen
 #    define fseeko64 _fseeki64
 #    define ftello64 _ftelli64
 #    define off64_t  off_t
 #endif
 
-#if __has_attribute(fallthrough)
-# define fallthrough __attribute__((fallthrough))
-#else
-# if __has_attribute(__fallthrough__)
-#  define fallthrough __attribute__((__fallthrough__))
-# endif
-# define fallthrough do {} while (0) /* fallthrough */
-#endif
-
 #ifdef _MSC_VER
 #    define UNUSED(arg) arg
 #else
@@ -89,6 +80,19 @@ extern "C" {
 #    define ssize_t intptr_t
 #endif
 
+#ifdef _MSC_VER
+# define fallthrough do {} while (0) /* fallthrough */
+#else
+# if __has_attribute(fallthrough)
+#  define fallthrough __attribute__((fallthrough))
+# else
+#  if __has_attribute(__fallthrough__)
+#   define fallthrough __attribute__((__fallthrough__))
+#  endif
+#  define fallthrough do {} while (0) /* fallthrough */
+# endif
+#endif
+
 /* Global variables residing in the platform module. */
 extern int          dopause;       /* system is paused */
 extern int          mouse_capture; /* mouse is captured in app */
diff --git a/src/include/86box/plat_dir.h b/src/include/86box/plat_dir.h
index 485314f46..965483d26 100644
--- a/src/include/86box/plat_dir.h
+++ b/src/include/86box/plat_dir.h
@@ -40,23 +40,23 @@ struct dirent {
 #    define d_namlen d_reclen
 
 typedef struct DIR_t {
-    short flags;  /* internal flags		*/
-    short offset; /* offset of entry into dir	*/
-    long  handle; /* open handle to Win32 system	*/
-    short sts;    /* last known status code	*/
-    char *dta;    /* internal work data		*/
+    short flags;  /* internal flags */
+    short offset; /* offset of entry into dir */
+    long  handle; /* open handle to Win32 system */
+    short sts;    /* last known status code */
+    char *dta;    /* internal work data */
 #    ifdef UNICODE
-    wchar_t dir[MAXDIRLEN + 1]; /* open dir			*/
+    wchar_t dir[MAXDIRLEN + 1]; /* open dir */
 #    else
-    char dir[MAXDIRLEN + 1]; /* open dir			*/
+    char dir[MAXDIRLEN + 1]; /* open dir */
 #    endif
-    struct dirent dent; /* actual directory entry	*/
+    struct dirent dent; /* actual directory entry */
 } DIR;
 
 /* Directory routine flags. */
-#    define DIR_F_LOWER  0x0001 /* force to lowercase		*/
-#    define DIR_F_SANE   0x0002 /* force this to sane path	*/
-#    define DIR_F_ISROOT 0x0010 /* this is the root directory	*/
+#    define DIR_F_LOWER  0x0001 /* force to lowercase */
+#    define DIR_F_SANE   0x0002 /* force this to sane path */
+#    define DIR_F_ISROOT 0x0010 /* this is the root directory */
 
 /* Function prototypes. */
 extern DIR           *opendir(const char *);
diff --git a/src/include/86box/plat_fallthrough.h b/src/include/86box/plat_fallthrough.h
index 8d3f4581b..aadd4e14d 100644
--- a/src/include/86box/plat_fallthrough.h
+++ b/src/include/86box/plat_fallthrough.h
@@ -18,13 +18,17 @@
 #ifndef EMU_PLAT_FALLTHROUGH_H
 #define EMU_PLAT_FALLTHROUGH_H
 
-#if __has_attribute(__fallthrough__)
-# define fallthrough __attribute__((__fallthrough__))
+#ifdef _MSC_VER
+# define fallthrough do {} while (0) /* fallthrough */
 #else
 # if __has_attribute(fallthrough)
 #  define fallthrough __attribute__((fallthrough))
+# else
+#  if __has_attribute(__fallthrough__)
+#   define fallthrough __attribute__((__fallthrough__))
+#  endif
+#  define fallthrough do {} while (0) /* fallthrough */
 # endif
-# define fallthrough do {} while (0) /* fallthrough */
 #endif
 
 #endif /*EMU_PLAT_FALLTHROUGH_H*/
diff --git a/src/include/86box/resource.h b/src/include/86box/resource.h
index 2080c3a3b..20067aa40 100644
--- a/src/include/86box/resource.h
+++ b/src/include/86box/resource.h
@@ -67,7 +67,7 @@
 #define IDT_CPU_SPEED    1710 /* CPU speed: */
 #define IDT_FPU          1711 /* FPU: */
 #define IDT_WAIT_STATES  1712 /* Wait states: */
-#define IDT_MB           1713 /* MB	== IDC_TEXT_MB */
+#define IDT_MB           1713 /* MB == IDC_TEXT_MB */
 #define IDT_MEMORY       1714 /* Memory: */
 
 /* DLG_CFG_VIDEO */
diff --git a/src/include/86box/row.h b/src/include/86box/row.h
index 9dab7d4c3..d873e6fba 100644
--- a/src/include/86box/row.h
+++ b/src/include/86box/row.h
@@ -1,18 +1,18 @@
 /*
- * 86Box	A hypervisor and IBM PC system emulator that specializes in
- *		running old operating systems and software designed for IBM
- *		PC systems and compatibles from 1981 through fairly recent
- *		system designs based on the PCI bus.
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
  *
- *		This file is part of the 86Box distribution.
+ *          This file is part of the 86Box distribution.
  *
- *		Definitions for the SMRAM interface.
+ *          Definitions for the SMRAM interface.
  *
  *
  *
- * Authors:	Miran Grca, <mgrca8@gmail.com>
+ * Authors: Miran Grca, <mgrca8@gmail.com>
  *
- *		Copyright 2016-2020 Miran Grca.
+ *          Copyright 2016-2020 Miran Grca.
  */
 
 #ifndef EMU_ROW_H
@@ -43,4 +43,4 @@ extern void         row_set_boundary(uint8_t row_id, uint32_t boundary);
 extern device_t     row_device;
 
 
-#endif	/*EMU_ROW_H*/
+#endif /*EMU_ROW_H*/
diff --git a/src/include/86box/scsi_x54x.h b/src/include/86box/scsi_x54x.h
index 29b7eb4fb..a7065b163 100644
--- a/src/include/86box/scsi_x54x.h
+++ b/src/include/86box/scsi_x54x.h
@@ -30,32 +30,32 @@
 #define NVR_SIZE      256   /* size of NVR */
 
 /* EEPROM map and bit definitions. */
-#define EE0_HOSTID  0x07 /* EE(0) [2:0]				*/
-#define EE0_ALTFLOP 0x80 /* EE(0) [7] FDC at 370h		*/
-#define EE1_IRQCH   0x07 /* EE(1) [3:0]				*/
-#define EE1_DMACH   0x70 /* EE(1) [7:4]				*/
-#define EE2_RMVOK   0x01 /* EE(2) [0] Support removable disks	*/
-#define EE2_HABIOS  0x02 /* EE(2) [1] HA Bios Space Reserved	*/
-#define EE2_INT19   0x04 /* EE(2) [2] HA Bios Controls INT19	*/
-#define EE2_DYNSCAN 0x08 /* EE(2) [3] Dynamically scan bus	*/
-#define EE2_TWODRV  0x10 /* EE(2) [4] Allow more than 2 drives	*/
-#define EE2_SEEKRET 0x20 /* EE(2) [5] Immediate return on seek	*/
-#define EE2_EXT1G   0x80 /* EE(2) [7] Extended Translation >1GB	*/
-#define EE3_SPEED   0x00 /* EE(3) [7:0] DMA Speed		*/
+#define EE0_HOSTID  0x07 /* EE(0) [2:0]                         */
+#define EE0_ALTFLOP 0x80 /* EE(0) [7] FDC at 370h               */
+#define EE1_IRQCH   0x07 /* EE(1) [3:0]                         */
+#define EE1_DMACH   0x70 /* EE(1) [7:4]                         */
+#define EE2_RMVOK   0x01 /* EE(2) [0] Support removable disks   */
+#define EE2_HABIOS  0x02 /* EE(2) [1] HA Bios Space Reserved    */
+#define EE2_INT19   0x04 /* EE(2) [2] HA Bios Controls INT19    */
+#define EE2_DYNSCAN 0x08 /* EE(2) [3] Dynamically scan bus      */
+#define EE2_TWODRV  0x10 /* EE(2) [4] Allow more than 2 drives  */
+#define EE2_SEEKRET 0x20 /* EE(2) [5] Immediate return on seek  */
+#define EE2_EXT1G   0x80 /* EE(2) [7] Extended Translation >1GB */
+#define EE3_SPEED   0x00 /* EE(3) [7:0] DMA Speed               */
 #define SPEED_33    0xFF
 #define SPEED_50    0x00
 #define SPEED_56    0x04
 #define SPEED_67    0x01
 #define SPEED_80    0x02
 #define SPEED_10    0x03
-#define EE4_FLOPTOK 0x80 /* EE(4) [7] Support Flopticals		*/
-#define EE6_PARITY  0x01 /* EE(6) [0] parity check enable	*/
-#define EE6_TERM    0x02 /* EE(6) [1] host term enable		*/
-#define EE6_RSTBUS  0x04 /* EE(6) [2] reset SCSI bus on boot	*/
-#define EEE_SYNC    0x01 /* EE(E) [0] Enable Sync Negotiation	*/
-#define EEE_DISCON  0x02 /* EE(E) [1] Enable Disconnection	*/
-#define EEE_FAST    0x04 /* EE(E) [2] Enable FAST SCSI		*/
-#define EEE_START   0x08 /* EE(E) [3] Enable Start Unit		*/
+#define EE4_FLOPTOK 0x80 /* EE(4) [7] Support Flopticals        */
+#define EE6_PARITY  0x01 /* EE(6) [0] parity check enable       */
+#define EE6_TERM    0x02 /* EE(6) [1] host term enable          */
+#define EE6_RSTBUS  0x04 /* EE(6) [2] reset SCSI bus on boot    */
+#define EEE_SYNC    0x01 /* EE(E) [0] Enable Sync Negotiation   */
+#define EEE_DISCON  0x02 /* EE(E) [1] Enable Disconnection      */
+#define EEE_FAST    0x04 /* EE(E) [2] Enable FAST SCSI          */
+#define EEE_START   0x08 /* EE(E) [3] Enable Start Unit         */
 
 /*
  * Host Adapter I/O ports.
@@ -166,11 +166,11 @@
 #define FOURTEEN_BYTES        0x00 /* Request Sense Buffer size */
 #define NO_AUTO_REQUEST_SENSE 0x01 /* No Request Sense Buffer */
 
-/*    Bytes 4, 5 and 6    Data Length		 - Data transfer byte count */
-/*    Bytes 7, 8 and 9    Data Pointer		 - SGD List or Data Buffer */
-/*    Bytes 10, 11 and 12 Link Pointer		 - Next CCB in Linked List */
-/*    Byte 13   Command Link ID			 - TBD (I don't know yet) */
-/*    Byte 14   Host Status			 - Host Adapter status */
+/*    Bytes 4, 5 and 6    Data Length  - Data transfer byte count */
+/*    Bytes 7, 8 and 9    Data Pointer - SGD List or Data Buffer */
+/*    Bytes 10, 11 and 12 Link Pointer - Next CCB in Linked List */
+/*    Byte 13   Command Link ID        - TBD (I don't know yet) */
+/*    Byte 14   Host Status            - Host Adapter status */
 #define CCB_COMPLETE            0x00 /* CCB completed without error */
 #define CCB_LINKED_COMPLETE     0x0A /* Linked command completed */
 #define CCB_LINKED_COMPLETE_INT 0x0B /* Linked complete with intr */
diff --git a/src/include/86box/snd_emu8k.h b/src/include/86box/snd_emu8k.h
index dd01eaac0..090ab662a 100644
--- a/src/include/86box/snd_emu8k.h
+++ b/src/include/86box/snd_emu8k.h
@@ -668,11 +668,11 @@ Short Delay         Short Delay + Feedback
 
 // Chorus Params
 typedef struct {
-        WORD	FbkLevel;	// Feedback Level (0xE600-0xE6FF)
-        WORD	Delay;		// Delay (0-0x0DA3)  [1/44100 sec]
-        WORD	LfoDepth;	// LFO Depth (0xBC00-0xBCFF)
-        DWORD	DelayR;		// Right Delay (0-0xFFFFFFFF) [1/256/44100 sec]
-        DWORD	LfoFreq;	// LFO Frequency (0-0xFFFFFFFF)
+        WORD  FbkLevel; // Feedback Level (0xE600-0xE6FF)
+        WORD  Delay;    // Delay (0-0x0DA3)  [1/44100 sec]
+        WORD  LfoDepth; // LFO Depth (0xBC00-0xBCFF)
+        DWORD DelayR;   // Right Delay (0-0xFFFFFFFF) [1/256/44100 sec]
+        DWORD LfoFreq;  // LFO Frequency (0-0xFFFFFFFF)
         } CHORUS_TYPE;
 
 
diff --git a/src/include/86box/snd_opl_nuked.h b/src/include/86box/snd_opl_nuked.h
index f82e85b0e..e53f860f1 100644
--- a/src/include/86box/snd_opl_nuked.h
+++ b/src/include/86box/snd_opl_nuked.h
@@ -8,7 +8,7 @@
  *
  *          Definitions for the NukedOPL3 driver.
  *
- * Version: @(#)snd_opl_nuked.h	1.0.5	2020/07/16
+ * Version: @(#)snd_opl_nuked.h 1.0.5 2020/07/16
  *
  * Authors: Fred N. van Kempen, <decwiz@yahoo.com>
  *          Miran Grca, <mgrca8@gmail.com>
diff --git a/src/include/86box/timer.h b/src/include/86box/timer.h
index e38ac51a3..586e3d2fe 100644
--- a/src/include/86box/timer.h
+++ b/src/include/86box/timer.h
@@ -7,6 +7,7 @@
 #define MAX_USEC64    1000000ULL
 #define MAX_USEC      1000000.0
 
+#define TIMER_PROCESS 4
 #define TIMER_SPLIT   2
 #define TIMER_ENABLED 1
 
@@ -117,6 +118,13 @@ timer_is_enabled(pc_timer_t *timer)
     return !!(timer->flags & TIMER_ENABLED);
 }
 
+/*True if timer currently on*/
+static __inline int
+timer_is_on(pc_timer_t *timer)
+{
+    return ((timer->flags & TIMER_ENABLED) && (timer->period > 0.0));
+}
+
 /*Return integer timestamp of timer*/
 static __inline uint32_t
 timer_get_ts_int(pc_timer_t *timer)
diff --git a/src/include/86box/vid_8514a.h b/src/include/86box/vid_8514a.h
index 72235520a..a78434bd2 100644
--- a/src/include/86box/vid_8514a.h
+++ b/src/include/86box/vid_8514a.h
@@ -42,6 +42,8 @@ typedef struct ibm8514_t {
     int type;
     int local;
     int bpp;
+    int on;
+    int accel_bpp;
 
     uint32_t vram_size;
     uint32_t vram_mask;
diff --git a/src/include/86box/vid_nga.h b/src/include/86box/vid_nga.h
index 93786b15e..bbb5b3c95 100644
--- a/src/include/86box/vid_nga.h
+++ b/src/include/86box/vid_nga.h
@@ -11,14 +11,10 @@
  *
  *
  *
- * Authors: Sarah Walker, <https://pcem-emulator.co.uk/>
- *          Miran Grca, <mgrca8@gmail.com>
- *          Fred N. van Kempen, <decwiz@yahoo.com>
+ * Authors: Miran Grca, <mgrca8@gmail.com>
  *          EngiNerd, <webmaster.crrc@yahoo.it>
  *
- *          Copyright 2008-2019 Sarah Walker.
  *          Copyright 2016-2019 Miran Grca.
- *          Copyright 2017-2019 Fred N. van Kempen.
  *          Copyright 2020 EngiNerd.
  */
 
diff --git a/src/include/86box/vid_ogc.h b/src/include/86box/vid_ogc.h
index 6b80f5859..839769e69 100644
--- a/src/include/86box/vid_ogc.h
+++ b/src/include/86box/vid_ogc.h
@@ -11,14 +11,10 @@
  *
  *
  *
- * Authors: Sarah Walker, <https://pcem-emulator.co.uk/>
- *          Miran Grca, <mgrca8@gmail.com>
- *          Fred N. van Kempen, <decwiz@yahoo.com>
+ * Authors: Miran Grca, <mgrca8@gmail.com>
  *          EngiNerd, <webmaster.crrc@yahoo.it>
  *
- *          Copyright 2008-2019 Sarah Walker.
  *          Copyright 2016-2019 Miran Grca.
- *          Copyright 2017-2019 Fred N. van Kempen.
  *          Copyright 2020 EngiNerd.
  */
 
diff --git a/src/include/86box/vid_pgc.h b/src/include/86box/vid_pgc.h
index a59ca3d8e..a203c11cf 100644
--- a/src/include/86box/vid_pgc.h
+++ b/src/include/86box/vid_pgc.h
@@ -156,12 +156,12 @@ extern void pgc_sto_raster(pgc_t *, int16_t *x, int16_t *y);
 extern void pgc_ito_raster(pgc_t *, int32_t *x, int32_t *y);
 extern void pgc_dto_raster(pgc_t *, double *x, double *y);
 #if 0
-extern int	pgc_input_byte(pgc_t *, uint8_t *val);
-extern int	pgc_output_byte(pgc_t *, uint8_t val);
+extern int pgc_input_byte(pgc_t *, uint8_t *val);
+extern int pgc_output_byte(pgc_t *, uint8_t val);
 #endif
 extern int pgc_output_string(pgc_t *, const char *val);
 #if 0
-extern int	pgc_error_byte(pgc_t *, uint8_t val);
+extern int pgc_error_byte(pgc_t *, uint8_t val);
 #endif
 extern int pgc_error_string(pgc_t *, const char *val);
 extern int pgc_error(pgc_t *, int err);
diff --git a/src/include/86box/vid_svga.h b/src/include/86box/vid_svga.h
index 2456f40d6..2fd2acf50 100644
--- a/src/include/86box/vid_svga.h
+++ b/src/include/86box/vid_svga.h
@@ -182,6 +182,7 @@ typedef struct svga_t {
     hwcursor_t overlay_latch;
 
     void (*render)(struct svga_t *svga);
+    void (*render8514)(struct svga_t *svga);
     void (*recalctimings_ex)(struct svga_t *svga);
 
     void (*video_out)(uint16_t addr, uint8_t val, void *priv);
@@ -271,7 +272,6 @@ typedef struct svga_t {
 } svga_t;
 
 extern int vga_on;
-extern int ibm8514_on;
 
 extern void    ibm8514_poll(ibm8514_t *dev, svga_t *svga);
 extern void    ibm8514_recalctimings(svga_t *svga);
diff --git a/src/include/86box/vid_voodoo_blitter.h b/src/include/86box/vid_voodoo_blitter.h
index 981c0856d..261352157 100644
--- a/src/include/86box/vid_voodoo_blitter.h
+++ b/src/include/86box/vid_voodoo_blitter.h
@@ -1,18 +1,18 @@
 /*
- * 86Box	A hypervisor and IBM PC system emulator that specializes in
- *		running old operating systems and software designed for IBM
- *		PC systems and compatibles from 1981 through fairly recent
- *		system designs based on the PCI bus.
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
  *
- *		This file is part of the 86Box distribution.
+ *          This file is part of the 86Box distribution.
  *
- *		3DFX Voodoo emulation.
+ *          3DFX Voodoo emulation.
  *
  *
  *
- * Authors:	Sarah Walker, <https://pcem-emulator.co.uk/>
+ * Authors: Sarah Walker, <https://pcem-emulator.co.uk/>
  *
- *		Copyright 2008-2020 Sarah Walker.
+ *          Copyright 2008-2020 Sarah Walker.
  */
 
 #ifndef VIDEO_VOODOO_BLITTER_H
diff --git a/src/include/86box/vid_voodoo_dither.h b/src/include/86box/vid_voodoo_dither.h
index 3580cada2..51ec91f2e 100644
--- a/src/include/86box/vid_voodoo_dither.h
+++ b/src/include/86box/vid_voodoo_dither.h
@@ -19,5145 +19,5140 @@
 #ifndef VIDEO_VOODOO_DITHER_H
 #define VIDEO_VOODOO_DITHER_H
 
-static const uint8_t dither_rb[256][4][4] =
-{
-	{
-		{0, 0, 0, 0},
-		{0, 0, 0, 0},
-		{0, 0, 0, 0},
-		{0, 0, 0, 0},
-	},
-	{
-		{0, 0, 0, 0},
-		{0, 0, 1, 0},
-		{0, 0, 0, 0},
-		{1, 0, 0, 0},
-	},
-	{
-		{0, 0, 0, 0},
-		{1, 0, 1, 0},
-		{0, 0, 0, 0},
-		{1, 0, 1, 0},
-	},
-	{
-		{0, 0, 0, 1},
-		{1, 0, 1, 0},
-		{0, 1, 0, 0},
-		{1, 0, 1, 0},
-	},
-	{
-		{0, 1, 0, 1},
-		{1, 0, 1, 0},
-		{0, 1, 0, 1},
-		{1, 0, 1, 0},
-	},
-	{
-		{0, 1, 0, 1},
-		{1, 0, 1, 1},
-		{0, 1, 0, 1},
-		{1, 1, 1, 0},
-	},
-	{
-		{0, 1, 0, 1},
-		{1, 1, 1, 1},
-		{0, 1, 0, 1},
-		{1, 1, 1, 1},
-	},
-	{
-		{0, 1, 1, 1},
-		{1, 1, 1, 1},
-		{1, 1, 0, 1},
-		{1, 1, 1, 1},
-	},
-	{
-		{1, 1, 1, 1},
-		{1, 1, 1, 1},
-		{1, 1, 1, 1},
-		{1, 1, 1, 1},
-	},
-	{
-		{1, 1, 1, 1},
-		{1, 1, 2, 1},
-		{1, 1, 1, 1},
-		{2, 1, 1, 1},
-	},
-	{
-		{1, 1, 1, 1},
-		{2, 1, 2, 1},
-		{1, 1, 1, 1},
-		{2, 1, 2, 1},
-	},
-	{
-		{1, 1, 1, 2},
-		{2, 1, 2, 1},
-		{1, 2, 1, 1},
-		{2, 1, 2, 1},
-	},
-	{
-		{1, 2, 1, 2},
-		{2, 1, 2, 1},
-		{1, 2, 1, 2},
-		{2, 1, 2, 1},
-	},
-	{
-		{1, 2, 1, 2},
-		{2, 1, 2, 2},
-		{1, 2, 1, 2},
-		{2, 2, 2, 1},
-	},
-	{
-		{1, 2, 1, 2},
-		{2, 2, 2, 2},
-		{1, 2, 1, 2},
-		{2, 2, 2, 2},
-	},
-	{
-		{1, 2, 2, 2},
-		{2, 2, 2, 2},
-		{2, 2, 1, 2},
-		{2, 2, 2, 2},
-	},
-	{
-		{1, 2, 2, 2},
-		{2, 2, 2, 2},
-		{2, 2, 2, 2},
-		{2, 2, 2, 2},
-	},
-	{
-		{2, 2, 2, 2},
-		{2, 2, 2, 2},
-		{2, 2, 2, 2},
-		{3, 2, 2, 2},
-	},
-	{
-		{2, 2, 2, 2},
-		{2, 2, 3, 2},
-		{2, 2, 2, 2},
-		{3, 2, 3, 2},
-	},
-	{
-		{2, 2, 2, 2},
-		{3, 2, 3, 2},
-		{2, 3, 2, 2},
-		{3, 2, 3, 2},
-	},
-	{
-		{2, 2, 2, 3},
-		{3, 2, 3, 2},
-		{2, 3, 2, 3},
-		{3, 2, 3, 2},
-	},
-	{
-		{2, 3, 2, 3},
-		{3, 2, 3, 2},
-		{2, 3, 2, 3},
-		{3, 3, 3, 2},
-	},
-	{
-		{2, 3, 2, 3},
-		{3, 2, 3, 3},
-		{2, 3, 2, 3},
-		{3, 3, 3, 3},
-	},
-	{
-		{2, 3, 2, 3},
-		{3, 3, 3, 3},
-		{3, 3, 2, 3},
-		{3, 3, 3, 3},
-	},
-	{
-		{2, 3, 3, 3},
-		{3, 3, 3, 3},
-		{3, 3, 3, 3},
-		{3, 3, 3, 3},
-	},
-	{
-		{3, 3, 3, 3},
-		{3, 3, 3, 3},
-		{3, 3, 3, 3},
-		{4, 3, 3, 3},
-	},
-	{
-		{3, 3, 3, 3},
-		{3, 3, 4, 3},
-		{3, 3, 3, 3},
-		{4, 3, 4, 3},
-	},
-	{
-		{3, 3, 3, 3},
-		{4, 3, 4, 3},
-		{3, 4, 3, 3},
-		{4, 3, 4, 3},
-	},
-	{
-		{3, 3, 3, 4},
-		{4, 3, 4, 3},
-		{3, 4, 3, 4},
-		{4, 3, 4, 3},
-	},
-	{
-		{3, 4, 3, 4},
-		{4, 3, 4, 3},
-		{3, 4, 3, 4},
-		{4, 4, 4, 3},
-	},
-	{
-		{3, 4, 3, 4},
-		{4, 3, 4, 4},
-		{3, 4, 3, 4},
-		{4, 4, 4, 4},
-	},
-	{
-		{3, 4, 3, 4},
-		{4, 4, 4, 4},
-		{4, 4, 3, 4},
-		{4, 4, 4, 4},
-	},
-	{
-		{3, 4, 4, 4},
-		{4, 4, 4, 4},
-		{4, 4, 3, 4},
-		{4, 4, 4, 4},
-	},
-	{
-		{4, 4, 4, 4},
-		{4, 4, 4, 4},
-		{4, 4, 4, 4},
-		{4, 4, 4, 4},
-	},
-	{
-		{4, 4, 4, 4},
-		{4, 4, 5, 4},
-		{4, 4, 4, 4},
-		{5, 4, 4, 4},
-	},
-	{
-		{4, 4, 4, 4},
-		{5, 4, 5, 4},
-		{4, 4, 4, 4},
-		{5, 4, 5, 4},
-	},
-	{
-		{4, 4, 4, 5},
-		{5, 4, 5, 4},
-		{4, 5, 4, 4},
-		{5, 4, 5, 4},
-	},
-	{
-		{4, 5, 4, 5},
-		{5, 4, 5, 4},
-		{4, 5, 4, 5},
-		{5, 4, 5, 4},
-	},
-	{
-		{4, 5, 4, 5},
-		{5, 4, 5, 5},
-		{4, 5, 4, 5},
-		{5, 5, 5, 4},
-	},
-	{
-		{4, 5, 4, 5},
-		{5, 5, 5, 5},
-		{4, 5, 4, 5},
-		{5, 5, 5, 5},
-	},
-	{
-		{4, 5, 5, 5},
-		{5, 5, 5, 5},
-		{5, 5, 4, 5},
-		{5, 5, 5, 5},
-	},
-	{
-		{5, 5, 5, 5},
-		{5, 5, 5, 5},
-		{5, 5, 5, 5},
-		{5, 5, 5, 5},
-	},
-	{
-		{5, 5, 5, 5},
-		{5, 5, 6, 5},
-		{5, 5, 5, 5},
-		{6, 5, 5, 5},
-	},
-	{
-		{5, 5, 5, 5},
-		{6, 5, 6, 5},
-		{5, 5, 5, 5},
-		{6, 5, 6, 5},
-	},
-	{
-		{5, 5, 5, 6},
-		{6, 5, 6, 5},
-		{5, 6, 5, 5},
-		{6, 5, 6, 5},
-	},
-	{
-		{5, 6, 5, 6},
-		{6, 5, 6, 5},
-		{5, 6, 5, 6},
-		{6, 5, 6, 5},
-	},
-	{
-		{5, 6, 5, 6},
-		{6, 5, 6, 6},
-		{5, 6, 5, 6},
-		{6, 6, 6, 5},
-	},
-	{
-		{5, 6, 5, 6},
-		{6, 6, 6, 6},
-		{5, 6, 5, 6},
-		{6, 6, 6, 6},
-	},
-	{
-		{5, 6, 5, 6},
-		{6, 6, 6, 6},
-		{6, 6, 5, 6},
-		{6, 6, 6, 6},
-	},
-	{
-		{5, 6, 6, 6},
-		{6, 6, 6, 6},
-		{6, 6, 6, 6},
-		{6, 6, 6, 6},
-	},
-	{
-		{6, 6, 6, 6},
-		{6, 6, 6, 6},
-		{6, 6, 6, 6},
-		{7, 6, 6, 6},
-	},
-	{
-		{6, 6, 6, 6},
-		{6, 6, 7, 6},
-		{6, 6, 6, 6},
-		{7, 6, 7, 6},
-	},
-	{
-		{6, 6, 6, 6},
-		{7, 6, 7, 6},
-		{6, 7, 6, 6},
-		{7, 6, 7, 6},
-	},
-	{
-		{6, 6, 6, 7},
-		{7, 6, 7, 6},
-		{6, 7, 6, 7},
-		{7, 6, 7, 6},
-	},
-	{
-		{6, 7, 6, 7},
-		{7, 6, 7, 6},
-		{6, 7, 6, 7},
-		{7, 7, 7, 6},
-	},
-	{
-		{6, 7, 6, 7},
-		{7, 6, 7, 7},
-		{6, 7, 6, 7},
-		{7, 7, 7, 7},
-	},
-	{
-		{6, 7, 6, 7},
-		{7, 7, 7, 7},
-		{7, 7, 6, 7},
-		{7, 7, 7, 7},
-	},
-	{
-		{6, 7, 7, 7},
-		{7, 7, 7, 7},
-		{7, 7, 7, 7},
-		{7, 7, 7, 7},
-	},
-	{
-		{7, 7, 7, 7},
-		{7, 7, 7, 7},
-		{7, 7, 7, 7},
-		{8, 7, 7, 7},
-	},
-	{
-		{7, 7, 7, 7},
-		{7, 7, 8, 7},
-		{7, 7, 7, 7},
-		{8, 7, 8, 7},
-	},
-	{
-		{7, 7, 7, 7},
-		{8, 7, 8, 7},
-		{7, 8, 7, 7},
-		{8, 7, 8, 7},
-	},
-	{
-		{7, 7, 7, 8},
-		{8, 7, 8, 7},
-		{7, 8, 7, 8},
-		{8, 7, 8, 7},
-	},
-	{
-		{7, 8, 7, 8},
-		{8, 7, 8, 7},
-		{7, 8, 7, 8},
-		{8, 8, 8, 7},
-	},
-	{
-		{7, 8, 7, 8},
-		{8, 7, 8, 8},
-		{7, 8, 7, 8},
-		{8, 8, 8, 8},
-	},
-	{
-		{7, 8, 7, 8},
-		{8, 8, 8, 8},
-		{7, 8, 7, 8},
-		{8, 8, 8, 8},
-	},
-	{
-		{7, 8, 8, 8},
-		{8, 8, 8, 8},
-		{8, 8, 7, 8},
-		{8, 8, 8, 8},
-	},
-	{
-		{8, 8, 8, 8},
-		{8, 8, 8, 8},
-		{8, 8, 8, 8},
-		{8, 8, 8, 8},
-	},
-	{
-		{8, 8, 8, 8},
-		{8, 8, 9, 8},
-		{8, 8, 8, 8},
-		{9, 8, 8, 8},
-	},
-	{
-		{8, 8, 8, 8},
-		{9, 8, 9, 8},
-		{8, 8, 8, 8},
-		{9, 8, 9, 8},
-	},
-	{
-		{8, 8, 8, 9},
-		{9, 8, 9, 8},
-		{8, 9, 8, 8},
-		{9, 8, 9, 8},
-	},
-	{
-		{8, 9, 8, 9},
-		{9, 8, 9, 8},
-		{8, 9, 8, 9},
-		{9, 8, 9, 8},
-	},
-	{
-		{8, 9, 8, 9},
-		{9, 8, 9, 9},
-		{8, 9, 8, 9},
-		{9, 9, 9, 8},
-	},
-	{
-		{8, 9, 8, 9},
-		{9, 9, 9, 9},
-		{8, 9, 8, 9},
-		{9, 9, 9, 9},
-	},
-	{
-		{8, 9, 9, 9},
-		{9, 9, 9, 9},
-		{9, 9, 8, 9},
-		{9, 9, 9, 9},
-	},
-	{
-		{9, 9, 9, 9},
-		{9, 9, 9, 9},
-		{9, 9, 9, 9},
-		{9, 9, 9, 9},
-	},
-	{
-		{9, 9, 9, 9},
-		{9, 9, 10, 9},
-		{9, 9, 9, 9},
-		{10, 9, 9, 9},
-	},
-	{
-		{9, 9, 9, 9},
-		{10, 9, 10, 9},
-		{9, 9, 9, 9},
-		{10, 9, 10, 9},
-	},
-	{
-		{9, 9, 9, 10},
-		{10, 9, 10, 9},
-		{9, 10, 9, 9},
-		{10, 9, 10, 9},
-	},
-	{
-		{9, 10, 9, 10},
-		{10, 9, 10, 9},
-		{9, 10, 9, 10},
-		{10, 9, 10, 9},
-	},
-	{
-		{9, 10, 9, 10},
-		{10, 9, 10, 10},
-		{9, 10, 9, 10},
-		{10, 10, 10, 9},
-	},
-	{
-		{9, 10, 9, 10},
-		{10, 9, 10, 10},
-		{9, 10, 9, 10},
-		{10, 10, 10, 10},
-	},
-	{
-		{9, 10, 9, 10},
-		{10, 10, 10, 10},
-		{10, 10, 9, 10},
-		{10, 10, 10, 10},
-	},
-	{
-		{9, 10, 10, 10},
-		{10, 10, 10, 10},
-		{10, 10, 10, 10},
-		{10, 10, 10, 10},
-	},
-	{
-		{10, 10, 10, 10},
-		{10, 10, 10, 10},
-		{10, 10, 10, 10},
-		{11, 10, 10, 10},
-	},
-	{
-		{10, 10, 10, 10},
-		{10, 10, 11, 10},
-		{10, 10, 10, 10},
-		{11, 10, 11, 10},
-	},
-	{
-		{10, 10, 10, 10},
-		{11, 10, 11, 10},
-		{10, 11, 10, 10},
-		{11, 10, 11, 10},
-	},
-	{
-		{10, 10, 10, 11},
-		{11, 10, 11, 10},
-		{10, 11, 10, 11},
-		{11, 10, 11, 10},
-	},
-	{
-		{10, 11, 10, 11},
-		{11, 10, 11, 10},
-		{10, 11, 10, 11},
-		{11, 11, 11, 10},
-	},
-	{
-		{10, 11, 10, 11},
-		{11, 10, 11, 11},
-		{10, 11, 10, 11},
-		{11, 11, 11, 11},
-	},
-	{
-		{10, 11, 10, 11},
-		{11, 11, 11, 11},
-		{11, 11, 10, 11},
-		{11, 11, 11, 11},
-	},
-	{
-		{10, 11, 11, 11},
-		{11, 11, 11, 11},
-		{11, 11, 11, 11},
-		{11, 11, 11, 11},
-	},
-	{
-		{11, 11, 11, 11},
-		{11, 11, 11, 11},
-		{11, 11, 11, 11},
-		{12, 11, 11, 11},
-	},
-	{
-		{11, 11, 11, 11},
-		{11, 11, 12, 11},
-		{11, 11, 11, 11},
-		{12, 11, 12, 11},
-	},
-	{
-		{11, 11, 11, 11},
-		{12, 11, 12, 11},
-		{11, 12, 11, 11},
-		{12, 11, 12, 11},
-	},
-	{
-		{11, 11, 11, 12},
-		{12, 11, 12, 11},
-		{11, 12, 11, 12},
-		{12, 11, 12, 11},
-	},
-	{
-		{11, 12, 11, 12},
-		{12, 11, 12, 11},
-		{11, 12, 11, 12},
-		{12, 12, 12, 11},
-	},
-	{
-		{11, 12, 11, 12},
-		{12, 11, 12, 12},
-		{11, 12, 11, 12},
-		{12, 12, 12, 11},
-	},
-	{
-		{11, 12, 11, 12},
-		{12, 12, 12, 12},
-		{11, 12, 11, 12},
-		{12, 12, 12, 12},
-	},
-	{
-		{11, 12, 12, 12},
-		{12, 12, 12, 12},
-		{12, 12, 11, 12},
-		{12, 12, 12, 12},
-	},
-	{
-		{12, 12, 12, 12},
-		{12, 12, 12, 12},
-		{12, 12, 12, 12},
-		{12, 12, 12, 12},
-	},
-	{
-		{12, 12, 12, 12},
-		{12, 12, 13, 12},
-		{12, 12, 12, 12},
-		{13, 12, 12, 12},
-	},
-	{
-		{12, 12, 12, 12},
-		{13, 12, 13, 12},
-		{12, 12, 12, 12},
-		{13, 12, 13, 12},
-	},
-	{
-		{12, 12, 12, 13},
-		{13, 12, 13, 12},
-		{12, 13, 12, 12},
-		{13, 12, 13, 12},
-	},
-	{
-		{12, 13, 12, 13},
-		{13, 12, 13, 12},
-		{12, 13, 12, 13},
-		{13, 12, 13, 12},
-	},
-	{
-		{12, 13, 12, 13},
-		{13, 12, 13, 13},
-		{12, 13, 12, 13},
-		{13, 13, 13, 12},
-	},
-	{
-		{12, 13, 12, 13},
-		{13, 13, 13, 13},
-		{12, 13, 12, 13},
-		{13, 13, 13, 13},
-	},
-	{
-		{12, 13, 13, 13},
-		{13, 13, 13, 13},
-		{13, 13, 12, 13},
-		{13, 13, 13, 13},
-	},
-	{
-		{13, 13, 13, 13},
-		{13, 13, 13, 13},
-		{13, 13, 13, 13},
-		{13, 13, 13, 13},
-	},
-	{
-		{13, 13, 13, 13},
-		{13, 13, 14, 13},
-		{13, 13, 13, 13},
-		{14, 13, 13, 13},
-	},
-	{
-		{13, 13, 13, 13},
-		{14, 13, 14, 13},
-		{13, 13, 13, 13},
-		{14, 13, 14, 13},
-	},
-	{
-		{13, 13, 13, 14},
-		{14, 13, 14, 13},
-		{13, 14, 13, 13},
-		{14, 13, 14, 13},
-	},
-	{
-		{13, 14, 13, 14},
-		{14, 13, 14, 13},
-		{13, 14, 13, 14},
-		{14, 13, 14, 13},
-	},
-	{
-		{13, 14, 13, 14},
-		{14, 13, 14, 13},
-		{13, 14, 13, 14},
-		{14, 14, 14, 13},
-	},
-	{
-		{13, 14, 13, 14},
-		{14, 13, 14, 14},
-		{13, 14, 13, 14},
-		{14, 14, 14, 14},
-	},
-	{
-		{13, 14, 13, 14},
-		{14, 14, 14, 14},
-		{14, 14, 13, 14},
-		{14, 14, 14, 14},
-	},
-	{
-		{13, 14, 14, 14},
-		{14, 14, 14, 14},
-		{14, 14, 14, 14},
-		{14, 14, 14, 14},
-	},
-	{
-		{14, 14, 14, 14},
-		{14, 14, 14, 14},
-		{14, 14, 14, 14},
-		{15, 14, 14, 14},
-	},
-	{
-		{14, 14, 14, 14},
-		{14, 14, 15, 14},
-		{14, 14, 14, 14},
-		{15, 14, 15, 14},
-	},
-	{
-		{14, 14, 14, 14},
-		{15, 14, 15, 14},
-		{14, 15, 14, 14},
-		{15, 14, 15, 14},
-	},
-	{
-		{14, 14, 14, 15},
-		{15, 14, 15, 14},
-		{14, 15, 14, 15},
-		{15, 14, 15, 14},
-	},
-	{
-		{14, 15, 14, 15},
-		{15, 14, 15, 14},
-		{14, 15, 14, 15},
-		{15, 15, 15, 14},
-	},
-	{
-		{14, 15, 14, 15},
-		{15, 14, 15, 15},
-		{14, 15, 14, 15},
-		{15, 15, 15, 15},
-	},
-	{
-		{14, 15, 14, 15},
-		{15, 15, 15, 15},
-		{15, 15, 14, 15},
-		{15, 15, 15, 15},
-	},
-	{
-		{14, 15, 15, 15},
-		{15, 15, 15, 15},
-		{15, 15, 15, 15},
-		{15, 15, 15, 15},
-	},
-	{
-		{15, 15, 15, 15},
-		{15, 15, 15, 15},
-		{15, 15, 15, 15},
-		{16, 15, 15, 15},
-	},
-	{
-		{15, 15, 15, 15},
-		{15, 15, 16, 15},
-		{15, 15, 15, 15},
-		{16, 15, 16, 15},
-	},
-	{
-		{15, 15, 15, 15},
-		{16, 15, 16, 15},
-		{15, 16, 15, 15},
-		{16, 15, 16, 15},
-	},
-	{
-		{15, 15, 15, 16},
-		{16, 15, 16, 15},
-		{15, 16, 15, 16},
-		{16, 15, 16, 15},
-	},
-	{
-		{15, 16, 15, 16},
-		{16, 15, 16, 15},
-		{15, 16, 15, 16},
-		{16, 16, 16, 15},
-	},
-	{
-		{15, 16, 15, 16},
-		{16, 15, 16, 16},
-		{15, 16, 15, 16},
-		{16, 16, 16, 16},
-	},
-	{
-		{15, 16, 15, 16},
-		{16, 16, 16, 16},
-		{16, 16, 15, 16},
-		{16, 16, 16, 16},
-	},
-	{
-		{15, 16, 16, 16},
-		{16, 16, 16, 16},
-		{16, 16, 16, 16},
-		{16, 16, 16, 16},
-	},
-	{
-		{16, 16, 16, 16},
-		{16, 16, 16, 16},
-		{16, 16, 16, 16},
-		{17, 16, 16, 16},
-	},
-	{
-		{16, 16, 16, 16},
-		{16, 16, 17, 16},
-		{16, 16, 16, 16},
-		{17, 16, 17, 16},
-	},
-	{
-		{16, 16, 16, 16},
-		{17, 16, 17, 16},
-		{16, 17, 16, 16},
-		{17, 16, 17, 16},
-	},
-	{
-		{16, 16, 16, 17},
-		{17, 16, 17, 16},
-		{16, 17, 16, 17},
-		{17, 16, 17, 16},
-	},
-	{
-		{16, 17, 16, 17},
-		{17, 16, 17, 16},
-		{16, 17, 16, 17},
-		{17, 17, 17, 16},
-	},
-	{
-		{16, 17, 16, 17},
-		{17, 16, 17, 17},
-		{16, 17, 16, 17},
-		{17, 17, 17, 17},
-	},
-	{
-		{16, 17, 16, 17},
-		{17, 17, 17, 17},
-		{17, 17, 16, 17},
-		{17, 17, 17, 17},
-	},
-	{
-		{16, 17, 17, 17},
-		{17, 17, 17, 17},
-		{17, 17, 17, 17},
-		{17, 17, 17, 17},
-	},
-	{
-		{17, 17, 17, 17},
-		{17, 17, 17, 17},
-		{17, 17, 17, 17},
-		{18, 17, 17, 17},
-	},
-	{
-		{17, 17, 17, 17},
-		{17, 17, 18, 17},
-		{17, 17, 17, 17},
-		{18, 17, 18, 17},
-	},
-	{
-		{17, 17, 17, 17},
-		{18, 17, 18, 17},
-		{17, 18, 17, 17},
-		{18, 17, 18, 17},
-	},
-	{
-		{17, 17, 17, 18},
-		{18, 17, 18, 17},
-		{17, 18, 17, 18},
-		{18, 17, 18, 17},
-	},
-	{
-		{17, 18, 17, 18},
-		{18, 17, 18, 17},
-		{17, 18, 17, 18},
-		{18, 17, 18, 17},
-	},
-	{
-		{17, 18, 17, 18},
-		{18, 17, 18, 18},
-		{17, 18, 17, 18},
-		{18, 18, 18, 17},
-	},
-	{
-		{17, 18, 17, 18},
-		{18, 18, 18, 18},
-		{17, 18, 17, 18},
-		{18, 18, 18, 18},
-	},
-	{
-		{17, 18, 18, 18},
-		{18, 18, 18, 18},
-		{18, 18, 17, 18},
-		{18, 18, 18, 18},
-	},
-	{
-		{18, 18, 18, 18},
-		{18, 18, 18, 18},
-		{18, 18, 18, 18},
-		{18, 18, 18, 18},
-	},
-	{
-		{18, 18, 18, 18},
-		{18, 18, 19, 18},
-		{18, 18, 18, 18},
-		{19, 18, 18, 18},
-	},
-	{
-		{18, 18, 18, 18},
-		{19, 18, 19, 18},
-		{18, 18, 18, 18},
-		{19, 18, 19, 18},
-	},
-	{
-		{18, 18, 18, 19},
-		{19, 18, 19, 18},
-		{18, 19, 18, 18},
-		{19, 18, 19, 18},
-	},
-	{
-		{18, 19, 18, 19},
-		{19, 18, 19, 18},
-		{18, 19, 18, 19},
-		{19, 18, 19, 18},
-	},
-	{
-		{18, 19, 18, 19},
-		{19, 18, 19, 19},
-		{18, 19, 18, 19},
-		{19, 19, 19, 18},
-	},
-	{
-		{18, 19, 18, 19},
-		{19, 19, 19, 19},
-		{18, 19, 18, 19},
-		{19, 19, 19, 19},
-	},
-	{
-		{18, 19, 19, 19},
-		{19, 19, 19, 19},
-		{19, 19, 18, 19},
-		{19, 19, 19, 19},
-	},
-	{
-		{19, 19, 19, 19},
-		{19, 19, 19, 19},
-		{19, 19, 19, 19},
-		{19, 19, 19, 19},
-	},
-	{
-		{19, 19, 19, 19},
-		{19, 19, 20, 19},
-		{19, 19, 19, 19},
-		{20, 19, 19, 19},
-	},
-	{
-		{19, 19, 19, 19},
-		{20, 19, 20, 19},
-		{19, 19, 19, 19},
-		{20, 19, 20, 19},
-	},
-	{
-		{19, 19, 19, 20},
-		{20, 19, 20, 19},
-		{19, 20, 19, 19},
-		{20, 19, 20, 19},
-	},
-	{
-		{19, 19, 19, 20},
-		{20, 19, 20, 19},
-		{19, 20, 19, 20},
-		{20, 19, 20, 19},
-	},
-	{
-		{19, 20, 19, 20},
-		{20, 19, 20, 19},
-		{19, 20, 19, 20},
-		{20, 20, 20, 19},
-	},
-	{
-		{19, 20, 19, 20},
-		{20, 19, 20, 20},
-		{19, 20, 19, 20},
-		{20, 20, 20, 20},
-	},
-	{
-		{19, 20, 19, 20},
-		{20, 20, 20, 20},
-		{20, 20, 19, 20},
-		{20, 20, 20, 20},
-	},
-	{
-		{19, 20, 20, 20},
-		{20, 20, 20, 20},
-		{20, 20, 20, 20},
-		{20, 20, 20, 20},
-	},
-	{
-		{20, 20, 20, 20},
-		{20, 20, 20, 20},
-		{20, 20, 20, 20},
-		{21, 20, 20, 20},
-	},
-	{
-		{20, 20, 20, 20},
-		{20, 20, 21, 20},
-		{20, 20, 20, 20},
-		{21, 20, 21, 20},
-	},
-	{
-		{20, 20, 20, 20},
-		{21, 20, 21, 20},
-		{20, 21, 20, 20},
-		{21, 20, 21, 20},
-	},
-	{
-		{20, 20, 20, 21},
-		{21, 20, 21, 20},
-		{20, 21, 20, 21},
-		{21, 20, 21, 20},
-	},
-	{
-		{20, 21, 20, 21},
-		{21, 20, 21, 20},
-		{20, 21, 20, 21},
-		{21, 21, 21, 20},
-	},
-	{
-		{20, 21, 20, 21},
-		{21, 20, 21, 21},
-		{20, 21, 20, 21},
-		{21, 21, 21, 21},
-	},
-	{
-		{20, 21, 20, 21},
-		{21, 21, 21, 21},
-		{21, 21, 20, 21},
-		{21, 21, 21, 21},
-	},
-	{
-		{20, 21, 21, 21},
-		{21, 21, 21, 21},
-		{21, 21, 21, 21},
-		{21, 21, 21, 21},
-	},
-	{
-		{21, 21, 21, 21},
-		{21, 21, 21, 21},
-		{21, 21, 21, 21},
-		{22, 21, 21, 21},
-	},
-	{
-		{21, 21, 21, 21},
-		{21, 21, 22, 21},
-		{21, 21, 21, 21},
-		{22, 21, 22, 21},
-	},
-	{
-		{21, 21, 21, 21},
-		{22, 21, 22, 21},
-		{21, 22, 21, 21},
-		{22, 21, 22, 21},
-	},
-	{
-		{21, 21, 21, 22},
-		{22, 21, 22, 21},
-		{21, 22, 21, 21},
-		{22, 21, 22, 21},
-	},
-	{
-		{21, 22, 21, 22},
-		{22, 21, 22, 21},
-		{21, 22, 21, 22},
-		{22, 21, 22, 21},
-	},
-	{
-		{21, 22, 21, 22},
-		{22, 21, 22, 22},
-		{21, 22, 21, 22},
-		{22, 22, 22, 21},
-	},
-	{
-		{21, 22, 21, 22},
-		{22, 22, 22, 22},
-		{21, 22, 21, 22},
-		{22, 22, 22, 22},
-	},
-	{
-		{21, 22, 22, 22},
-		{22, 22, 22, 22},
-		{22, 22, 21, 22},
-		{22, 22, 22, 22},
-	},
-	{
-		{22, 22, 22, 22},
-		{22, 22, 22, 22},
-		{22, 22, 22, 22},
-		{22, 22, 22, 22},
-	},
-	{
-		{22, 22, 22, 22},
-		{22, 22, 23, 22},
-		{22, 22, 22, 22},
-		{23, 22, 22, 22},
-	},
-	{
-		{22, 22, 22, 22},
-		{23, 22, 23, 22},
-		{22, 22, 22, 22},
-		{23, 22, 23, 22},
-	},
-	{
-		{22, 22, 22, 23},
-		{23, 22, 23, 22},
-		{22, 23, 22, 22},
-		{23, 22, 23, 22},
-	},
-	{
-		{22, 23, 22, 23},
-		{23, 22, 23, 22},
-		{22, 23, 22, 23},
-		{23, 22, 23, 22},
-	},
-	{
-		{22, 23, 22, 23},
-		{23, 22, 23, 23},
-		{22, 23, 22, 23},
-		{23, 23, 23, 22},
-	},
-	{
-		{22, 23, 22, 23},
-		{23, 23, 23, 23},
-		{22, 23, 22, 23},
-		{23, 23, 23, 23},
-	},
-	{
-		{22, 23, 23, 23},
-		{23, 23, 23, 23},
-		{23, 23, 22, 23},
-		{23, 23, 23, 23},
-	},
-	{
-		{23, 23, 23, 23},
-		{23, 23, 23, 23},
-		{23, 23, 23, 23},
-		{23, 23, 23, 23},
-	},
-	{
-		{23, 23, 23, 23},
-		{23, 23, 24, 23},
-		{23, 23, 23, 23},
-		{24, 23, 23, 23},
-	},
-	{
-		{23, 23, 23, 23},
-		{24, 23, 24, 23},
-		{23, 23, 23, 23},
-		{24, 23, 24, 23},
-	},
-	{
-		{23, 23, 23, 23},
-		{24, 23, 24, 23},
-		{23, 24, 23, 23},
-		{24, 23, 24, 23},
-	},
-	{
-		{23, 23, 23, 24},
-		{24, 23, 24, 23},
-		{23, 24, 23, 24},
-		{24, 23, 24, 23},
-	},
-	{
-		{23, 24, 23, 24},
-		{24, 23, 24, 23},
-		{23, 24, 23, 24},
-		{24, 24, 24, 23},
-	},
-	{
-		{23, 24, 23, 24},
-		{24, 23, 24, 24},
-		{23, 24, 23, 24},
-		{24, 24, 24, 24},
-	},
-	{
-		{23, 24, 23, 24},
-		{24, 24, 24, 24},
-		{24, 24, 23, 24},
-		{24, 24, 24, 24},
-	},
-	{
-		{23, 24, 24, 24},
-		{24, 24, 24, 24},
-		{24, 24, 24, 24},
-		{24, 24, 24, 24},
-	},
-	{
-		{24, 24, 24, 24},
-		{24, 24, 24, 24},
-		{24, 24, 24, 24},
-		{25, 24, 24, 24},
-	},
-	{
-		{24, 24, 24, 24},
-		{24, 24, 25, 24},
-		{24, 24, 24, 24},
-		{25, 24, 25, 24},
-	},
-	{
-		{24, 24, 24, 24},
-		{25, 24, 25, 24},
-		{24, 25, 24, 24},
-		{25, 24, 25, 24},
-	},
-	{
-		{24, 24, 24, 25},
-		{25, 24, 25, 24},
-		{24, 25, 24, 25},
-		{25, 24, 25, 24},
-	},
-	{
-		{24, 25, 24, 25},
-		{25, 24, 25, 24},
-		{24, 25, 24, 25},
-		{25, 25, 25, 24},
-	},
-	{
-		{24, 25, 24, 25},
-		{25, 24, 25, 25},
-		{24, 25, 24, 25},
-		{25, 25, 25, 25},
-	},
-	{
-		{24, 25, 24, 25},
-		{25, 25, 25, 25},
-		{25, 25, 24, 25},
-		{25, 25, 25, 25},
-	},
-	{
-		{24, 25, 25, 25},
-		{25, 25, 25, 25},
-		{25, 25, 25, 25},
-		{25, 25, 25, 25},
-	},
-	{
-		{25, 25, 25, 25},
-		{25, 25, 25, 25},
-		{25, 25, 25, 25},
-		{26, 25, 25, 25},
-	},
-	{
-		{25, 25, 25, 25},
-		{25, 25, 26, 25},
-		{25, 25, 25, 25},
-		{26, 25, 26, 25},
-	},
-	{
-		{25, 25, 25, 25},
-		{26, 25, 26, 25},
-		{25, 25, 25, 25},
-		{26, 25, 26, 25},
-	},
-	{
-		{25, 25, 25, 26},
-		{26, 25, 26, 25},
-		{25, 26, 25, 25},
-		{26, 25, 26, 25},
-	},
-	{
-		{25, 26, 25, 26},
-		{26, 25, 26, 25},
-		{25, 26, 25, 26},
-		{26, 25, 26, 25},
-	},
-	{
-		{25, 26, 25, 26},
-		{26, 25, 26, 26},
-		{25, 26, 25, 26},
-		{26, 26, 26, 25},
-	},
-	{
-		{25, 26, 25, 26},
-		{26, 26, 26, 26},
-		{25, 26, 25, 26},
-		{26, 26, 26, 26},
-	},
-	{
-		{25, 26, 26, 26},
-		{26, 26, 26, 26},
-		{26, 26, 25, 26},
-		{26, 26, 26, 26},
-	},
-	{
-		{26, 26, 26, 26},
-		{26, 26, 26, 26},
-		{26, 26, 26, 26},
-		{26, 26, 26, 26},
-	},
-	{
-		{26, 26, 26, 26},
-		{26, 26, 27, 26},
-		{26, 26, 26, 26},
-		{27, 26, 26, 26},
-	},
-	{
-		{26, 26, 26, 26},
-		{27, 26, 27, 26},
-		{26, 26, 26, 26},
-		{27, 26, 27, 26},
-	},
-	{
-		{26, 26, 26, 27},
-		{27, 26, 27, 26},
-		{26, 27, 26, 26},
-		{27, 26, 27, 26},
-	},
-	{
-		{26, 27, 26, 27},
-		{27, 26, 27, 26},
-		{26, 27, 26, 27},
-		{27, 26, 27, 26},
-	},
-	{
-		{26, 27, 26, 27},
-		{27, 26, 27, 27},
-		{26, 27, 26, 27},
-		{27, 27, 27, 26},
-	},
-	{
-		{26, 27, 26, 27},
-		{27, 27, 27, 27},
-		{26, 27, 26, 27},
-		{27, 27, 27, 27},
-	},
-	{
-		{26, 27, 27, 27},
-		{27, 27, 27, 27},
-		{27, 27, 26, 27},
-		{27, 27, 27, 27},
-	},
-	{
-		{27, 27, 27, 27},
-		{27, 27, 27, 27},
-		{27, 27, 27, 27},
-		{27, 27, 27, 27},
-	},
-	{
-		{27, 27, 27, 27},
-		{27, 27, 28, 27},
-		{27, 27, 27, 27},
-		{28, 27, 27, 27},
-	},
-	{
-		{27, 27, 27, 27},
-		{27, 27, 28, 27},
-		{27, 27, 27, 27},
-		{28, 27, 28, 27},
-	},
-	{
-		{27, 27, 27, 27},
-		{28, 27, 28, 27},
-		{27, 28, 27, 27},
-		{28, 27, 28, 27},
-	},
-	{
-		{27, 27, 27, 28},
-		{28, 27, 28, 27},
-		{27, 28, 27, 28},
-		{28, 27, 28, 27},
-	},
-	{
-		{27, 28, 27, 28},
-		{28, 27, 28, 27},
-		{27, 28, 27, 28},
-		{28, 28, 28, 27},
-	},
-	{
-		{27, 28, 27, 28},
-		{28, 27, 28, 28},
-		{27, 28, 27, 28},
-		{28, 28, 28, 28},
-	},
-	{
-		{27, 28, 27, 28},
-		{28, 28, 28, 28},
-		{28, 28, 27, 28},
-		{28, 28, 28, 28},
-	},
-	{
-		{27, 28, 28, 28},
-		{28, 28, 28, 28},
-		{28, 28, 28, 28},
-		{28, 28, 28, 28},
-	},
-	{
-		{28, 28, 28, 28},
-		{28, 28, 28, 28},
-		{28, 28, 28, 28},
-		{29, 28, 28, 28},
-	},
-	{
-		{28, 28, 28, 28},
-		{28, 28, 29, 28},
-		{28, 28, 28, 28},
-		{29, 28, 29, 28},
-	},
-	{
-		{28, 28, 28, 28},
-		{29, 28, 29, 28},
-		{28, 29, 28, 28},
-		{29, 28, 29, 28},
-	},
-	{
-		{28, 28, 28, 29},
-		{29, 28, 29, 28},
-		{28, 29, 28, 29},
-		{29, 28, 29, 28},
-	},
-	{
-		{28, 29, 28, 29},
-		{29, 28, 29, 28},
-		{28, 29, 28, 29},
-		{29, 29, 29, 28},
-	},
-	{
-		{28, 29, 28, 29},
-		{29, 28, 29, 29},
-		{28, 29, 28, 29},
-		{29, 29, 29, 29},
-	},
-	{
-		{28, 29, 28, 29},
-		{29, 29, 29, 29},
-		{29, 29, 28, 29},
-		{29, 29, 29, 29},
-	},
-	{
-		{28, 29, 29, 29},
-		{29, 29, 29, 29},
-		{29, 29, 29, 29},
-		{29, 29, 29, 29},
-	},
-	{
-		{29, 29, 29, 29},
-		{29, 29, 29, 29},
-		{29, 29, 29, 29},
-		{30, 29, 29, 29},
-	},
-	{
-		{29, 29, 29, 29},
-		{29, 29, 30, 29},
-		{29, 29, 29, 29},
-		{30, 29, 29, 29},
-	},
-	{
-		{29, 29, 29, 29},
-		{30, 29, 30, 29},
-		{29, 29, 29, 29},
-		{30, 29, 30, 29},
-	},
-	{
-		{29, 29, 29, 30},
-		{30, 29, 30, 29},
-		{29, 30, 29, 29},
-		{30, 29, 30, 29},
-	},
-	{
-		{29, 30, 29, 30},
-		{30, 29, 30, 29},
-		{29, 30, 29, 30},
-		{30, 29, 30, 29},
-	},
-	{
-		{29, 30, 29, 30},
-		{30, 29, 30, 30},
-		{29, 30, 29, 30},
-		{30, 30, 30, 29},
-	},
-	{
-		{29, 30, 29, 30},
-		{30, 30, 30, 30},
-		{29, 30, 29, 30},
-		{30, 30, 30, 30},
-	},
-	{
-		{29, 30, 30, 30},
-		{30, 30, 30, 30},
-		{30, 30, 29, 30},
-		{30, 30, 30, 30},
-	},
-	{
-		{30, 30, 30, 30},
-		{30, 30, 30, 30},
-		{30, 30, 30, 30},
-		{30, 30, 30, 30},
-	},
-	{
-		{30, 30, 30, 30},
-		{30, 30, 31, 30},
-		{30, 30, 30, 30},
-		{31, 30, 30, 30},
-	},
-	{
-		{30, 30, 30, 30},
-		{31, 30, 31, 30},
-		{30, 30, 30, 30},
-		{31, 30, 31, 30},
-	},
-	{
-		{30, 30, 30, 31},
-		{31, 30, 31, 30},
-		{30, 31, 30, 30},
-		{31, 30, 31, 30},
-	},
-	{
-		{30, 31, 30, 31},
-		{31, 30, 31, 30},
-		{30, 31, 30, 31},
-		{31, 30, 31, 30},
-	},
-	{
-		{30, 31, 30, 31},
-		{31, 30, 31, 31},
-		{30, 31, 30, 31},
-		{31, 31, 31, 30},
-	},
-	{
-		{30, 31, 30, 31},
-		{31, 31, 31, 31},
-		{30, 31, 30, 31},
-		{31, 31, 31, 31},
-	},
-	{
-		{30, 31, 31, 31},
-		{31, 31, 31, 31},
-		{31, 31, 30, 31},
-		{31, 31, 31, 31},
-	},
-	{
-		{31, 31, 31, 31},
-		{31, 31, 31, 31},
-		{31, 31, 31, 31},
-		{31, 31, 31, 31},
-	},
+static const uint8_t dither_rb[256][4][4] = {
+    {
+        {0, 0, 0, 0},
+        {0, 0, 0, 0},
+        {0, 0, 0, 0},
+        {0, 0, 0, 0},
+    },
+    {
+        {0, 0, 0, 0},
+        {0, 0, 1, 0},
+        {0, 0, 0, 0},
+        {1, 0, 0, 0},
+    },
+    {
+        {0, 0, 0, 0},
+        {1, 0, 1, 0},
+        {0, 0, 0, 0},
+        {1, 0, 1, 0},
+    },
+    {
+        {0, 0, 0, 1},
+        {1, 0, 1, 0},
+        {0, 1, 0, 0},
+        {1, 0, 1, 0},
+    },
+    {
+        {0, 1, 0, 1},
+        {1, 0, 1, 0},
+        {0, 1, 0, 1},
+        {1, 0, 1, 0},
+    },
+    {
+        {0, 1, 0, 1},
+        {1, 0, 1, 1},
+        {0, 1, 0, 1},
+        {1, 1, 1, 0},
+    },
+    {
+        {0, 1, 0, 1},
+        {1, 1, 1, 1},
+        {0, 1, 0, 1},
+        {1, 1, 1, 1},
+    },
+    {
+        {0, 1, 1, 1},
+        {1, 1, 1, 1},
+        {1, 1, 0, 1},
+        {1, 1, 1, 1},
+    },
+    {
+        {1, 1, 1, 1},
+        {1, 1, 1, 1},
+        {1, 1, 1, 1},
+        {1, 1, 1, 1},
+    },
+    {
+        {1, 1, 1, 1},
+        {1, 1, 2, 1},
+        {1, 1, 1, 1},
+        {2, 1, 1, 1},
+    },
+    {
+        {1, 1, 1, 1},
+        {2, 1, 2, 1},
+        {1, 1, 1, 1},
+        {2, 1, 2, 1},
+    },
+    {
+        {1, 1, 1, 2},
+        {2, 1, 2, 1},
+        {1, 2, 1, 1},
+        {2, 1, 2, 1},
+    },
+    {
+        {1, 2, 1, 2},
+        {2, 1, 2, 1},
+        {1, 2, 1, 2},
+        {2, 1, 2, 1},
+    },
+    {
+        {1, 2, 1, 2},
+        {2, 1, 2, 2},
+        {1, 2, 1, 2},
+        {2, 2, 2, 1},
+    },
+    {
+        {1, 2, 1, 2},
+        {2, 2, 2, 2},
+        {1, 2, 1, 2},
+        {2, 2, 2, 2},
+    },
+    {
+        {1, 2, 2, 2},
+        {2, 2, 2, 2},
+        {2, 2, 1, 2},
+        {2, 2, 2, 2},
+    },
+    {
+        {1, 2, 2, 2},
+        {2, 2, 2, 2},
+        {2, 2, 2, 2},
+        {2, 2, 2, 2},
+    },
+    {
+        {2, 2, 2, 2},
+        {2, 2, 2, 2},
+        {2, 2, 2, 2},
+        {3, 2, 2, 2},
+    },
+    {
+        {2, 2, 2, 2},
+        {2, 2, 3, 2},
+        {2, 2, 2, 2},
+        {3, 2, 3, 2},
+    },
+    {
+        {2, 2, 2, 2},
+        {3, 2, 3, 2},
+        {2, 3, 2, 2},
+        {3, 2, 3, 2},
+    },
+    {
+        {2, 2, 2, 3},
+        {3, 2, 3, 2},
+        {2, 3, 2, 3},
+        {3, 2, 3, 2},
+    },
+    {
+        {2, 3, 2, 3},
+        {3, 2, 3, 2},
+        {2, 3, 2, 3},
+        {3, 3, 3, 2},
+    },
+    {
+        {2, 3, 2, 3},
+        {3, 2, 3, 3},
+        {2, 3, 2, 3},
+        {3, 3, 3, 3},
+    },
+    {
+        {2, 3, 2, 3},
+        {3, 3, 3, 3},
+        {3, 3, 2, 3},
+        {3, 3, 3, 3},
+    },
+    {
+        {2, 3, 3, 3},
+        {3, 3, 3, 3},
+        {3, 3, 3, 3},
+        {3, 3, 3, 3},
+    },
+    {
+        {3, 3, 3, 3},
+        {3, 3, 3, 3},
+        {3, 3, 3, 3},
+        {4, 3, 3, 3},
+    },
+    {
+        {3, 3, 3, 3},
+        {3, 3, 4, 3},
+        {3, 3, 3, 3},
+        {4, 3, 4, 3},
+    },
+    {
+        {3, 3, 3, 3},
+        {4, 3, 4, 3},
+        {3, 4, 3, 3},
+        {4, 3, 4, 3},
+    },
+    {
+        {3, 3, 3, 4},
+        {4, 3, 4, 3},
+        {3, 4, 3, 4},
+        {4, 3, 4, 3},
+    },
+    {
+        {3, 4, 3, 4},
+        {4, 3, 4, 3},
+        {3, 4, 3, 4},
+        {4, 4, 4, 3},
+    },
+    {
+        {3, 4, 3, 4},
+        {4, 3, 4, 4},
+        {3, 4, 3, 4},
+        {4, 4, 4, 4},
+    },
+    {
+        {3, 4, 3, 4},
+        {4, 4, 4, 4},
+        {4, 4, 3, 4},
+        {4, 4, 4, 4},
+    },
+    {
+        {3, 4, 4, 4},
+        {4, 4, 4, 4},
+        {4, 4, 3, 4},
+        {4, 4, 4, 4},
+    },
+    {
+        {4, 4, 4, 4},
+        {4, 4, 4, 4},
+        {4, 4, 4, 4},
+        {4, 4, 4, 4},
+    },
+    {
+        {4, 4, 4, 4},
+        {4, 4, 5, 4},
+        {4, 4, 4, 4},
+        {5, 4, 4, 4},
+    },
+    {
+        {4, 4, 4, 4},
+        {5, 4, 5, 4},
+        {4, 4, 4, 4},
+        {5, 4, 5, 4},
+    },
+    {
+        {4, 4, 4, 5},
+        {5, 4, 5, 4},
+        {4, 5, 4, 4},
+        {5, 4, 5, 4},
+    },
+    {
+        {4, 5, 4, 5},
+        {5, 4, 5, 4},
+        {4, 5, 4, 5},
+        {5, 4, 5, 4},
+    },
+    {
+        {4, 5, 4, 5},
+        {5, 4, 5, 5},
+        {4, 5, 4, 5},
+        {5, 5, 5, 4},
+    },
+    {
+        {4, 5, 4, 5},
+        {5, 5, 5, 5},
+        {4, 5, 4, 5},
+        {5, 5, 5, 5},
+    },
+    {
+        {4, 5, 5, 5},
+        {5, 5, 5, 5},
+        {5, 5, 4, 5},
+        {5, 5, 5, 5},
+    },
+    {
+        {5, 5, 5, 5},
+        {5, 5, 5, 5},
+        {5, 5, 5, 5},
+        {5, 5, 5, 5},
+    },
+    {
+        {5, 5, 5, 5},
+        {5, 5, 6, 5},
+        {5, 5, 5, 5},
+        {6, 5, 5, 5},
+    },
+    {
+        {5, 5, 5, 5},
+        {6, 5, 6, 5},
+        {5, 5, 5, 5},
+        {6, 5, 6, 5},
+    },
+    {
+        {5, 5, 5, 6},
+        {6, 5, 6, 5},
+        {5, 6, 5, 5},
+        {6, 5, 6, 5},
+    },
+    {
+        {5, 6, 5, 6},
+        {6, 5, 6, 5},
+        {5, 6, 5, 6},
+        {6, 5, 6, 5},
+    },
+    {
+        {5, 6, 5, 6},
+        {6, 5, 6, 6},
+        {5, 6, 5, 6},
+        {6, 6, 6, 5},
+    },
+    {
+        {5, 6, 5, 6},
+        {6, 6, 6, 6},
+        {5, 6, 5, 6},
+        {6, 6, 6, 6},
+    },
+    {
+        {5, 6, 5, 6},
+        {6, 6, 6, 6},
+        {6, 6, 5, 6},
+        {6, 6, 6, 6},
+    },
+    {
+        {5, 6, 6, 6},
+        {6, 6, 6, 6},
+        {6, 6, 6, 6},
+        {6, 6, 6, 6},
+    },
+    {
+        {6, 6, 6, 6},
+        {6, 6, 6, 6},
+        {6, 6, 6, 6},
+        {7, 6, 6, 6},
+    },
+    {
+        {6, 6, 6, 6},
+        {6, 6, 7, 6},
+        {6, 6, 6, 6},
+        {7, 6, 7, 6},
+    },
+    {
+        {6, 6, 6, 6},
+        {7, 6, 7, 6},
+        {6, 7, 6, 6},
+        {7, 6, 7, 6},
+    },
+    {
+        {6, 6, 6, 7},
+        {7, 6, 7, 6},
+        {6, 7, 6, 7},
+        {7, 6, 7, 6},
+    },
+    {
+        {6, 7, 6, 7},
+        {7, 6, 7, 6},
+        {6, 7, 6, 7},
+        {7, 7, 7, 6},
+    },
+    {
+        {6, 7, 6, 7},
+        {7, 6, 7, 7},
+        {6, 7, 6, 7},
+        {7, 7, 7, 7},
+    },
+    {
+        {6, 7, 6, 7},
+        {7, 7, 7, 7},
+        {7, 7, 6, 7},
+        {7, 7, 7, 7},
+    },
+    {
+        {6, 7, 7, 7},
+        {7, 7, 7, 7},
+        {7, 7, 7, 7},
+        {7, 7, 7, 7},
+    },
+    {
+        {7, 7, 7, 7},
+        {7, 7, 7, 7},
+        {7, 7, 7, 7},
+        {8, 7, 7, 7},
+    },
+    {
+        {7, 7, 7, 7},
+        {7, 7, 8, 7},
+        {7, 7, 7, 7},
+        {8, 7, 8, 7},
+    },
+    {
+        {7, 7, 7, 7},
+        {8, 7, 8, 7},
+        {7, 8, 7, 7},
+        {8, 7, 8, 7},
+    },
+    {
+        {7, 7, 7, 8},
+        {8, 7, 8, 7},
+        {7, 8, 7, 8},
+        {8, 7, 8, 7},
+    },
+    {
+        {7, 8, 7, 8},
+        {8, 7, 8, 7},
+        {7, 8, 7, 8},
+        {8, 8, 8, 7},
+    },
+    {
+        {7, 8, 7, 8},
+        {8, 7, 8, 8},
+        {7, 8, 7, 8},
+        {8, 8, 8, 8},
+    },
+    {
+        {7, 8, 7, 8},
+        {8, 8, 8, 8},
+        {7, 8, 7, 8},
+        {8, 8, 8, 8},
+    },
+    {
+        {7, 8, 8, 8},
+        {8, 8, 8, 8},
+        {8, 8, 7, 8},
+        {8, 8, 8, 8},
+    },
+    {
+        {8, 8, 8, 8},
+        {8, 8, 8, 8},
+        {8, 8, 8, 8},
+        {8, 8, 8, 8},
+    },
+    {
+        {8, 8, 8, 8},
+        {8, 8, 9, 8},
+        {8, 8, 8, 8},
+        {9, 8, 8, 8},
+    },
+    {
+        {8, 8, 8, 8},
+        {9, 8, 9, 8},
+        {8, 8, 8, 8},
+        {9, 8, 9, 8},
+    },
+    {
+        {8, 8, 8, 9},
+        {9, 8, 9, 8},
+        {8, 9, 8, 8},
+        {9, 8, 9, 8},
+    },
+    {
+        {8, 9, 8, 9},
+        {9, 8, 9, 8},
+        {8, 9, 8, 9},
+        {9, 8, 9, 8},
+    },
+    {
+        {8, 9, 8, 9},
+        {9, 8, 9, 9},
+        {8, 9, 8, 9},
+        {9, 9, 9, 8},
+    },
+    {
+        {8, 9, 8, 9},
+        {9, 9, 9, 9},
+        {8, 9, 8, 9},
+        {9, 9, 9, 9},
+    },
+    {
+        {8, 9, 9, 9},
+        {9, 9, 9, 9},
+        {9, 9, 8, 9},
+        {9, 9, 9, 9},
+    },
+    {
+        {9, 9, 9, 9},
+        {9, 9, 9, 9},
+        {9, 9, 9, 9},
+        {9, 9, 9, 9},
+    },
+    {
+        {9, 9, 9, 9},
+        {9, 9, 10, 9},
+        {9, 9, 9, 9},
+        {10, 9, 9, 9},
+    },
+    {
+        {9, 9, 9, 9},
+        {10, 9, 10, 9},
+        {9, 9, 9, 9},
+        {10, 9, 10, 9},
+    },
+    {
+        {9, 9, 9, 10},
+        {10, 9, 10, 9},
+        {9, 10, 9, 9},
+        {10, 9, 10, 9},
+    },
+    {
+        {9, 10, 9, 10},
+        {10, 9, 10, 9},
+        {9, 10, 9, 10},
+        {10, 9, 10, 9},
+    },
+    {
+        {9, 10, 9, 10},
+        {10, 9, 10, 10},
+        {9, 10, 9, 10},
+        {10, 10, 10, 9},
+    },
+    {
+        {9, 10, 9, 10},
+        {10, 9, 10, 10},
+        {9, 10, 9, 10},
+        {10, 10, 10, 10},
+    },
+    {
+        {9, 10, 9, 10},
+        {10, 10, 10, 10},
+        {10, 10, 9, 10},
+        {10, 10, 10, 10},
+    },
+    {
+        {9, 10, 10, 10},
+        {10, 10, 10, 10},
+        {10, 10, 10, 10},
+        {10, 10, 10, 10},
+    },
+    {
+        {10, 10, 10, 10},
+        {10, 10, 10, 10},
+        {10, 10, 10, 10},
+        {11, 10, 10, 10},
+    },
+    {
+        {10, 10, 10, 10},
+        {10, 10, 11, 10},
+        {10, 10, 10, 10},
+        {11, 10, 11, 10},
+    },
+    {
+        {10, 10, 10, 10},
+        {11, 10, 11, 10},
+        {10, 11, 10, 10},
+        {11, 10, 11, 10},
+    },
+    {
+        {10, 10, 10, 11},
+        {11, 10, 11, 10},
+        {10, 11, 10, 11},
+        {11, 10, 11, 10},
+    },
+    {
+        {10, 11, 10, 11},
+        {11, 10, 11, 10},
+        {10, 11, 10, 11},
+        {11, 11, 11, 10},
+    },
+    {
+        {10, 11, 10, 11},
+        {11, 10, 11, 11},
+        {10, 11, 10, 11},
+        {11, 11, 11, 11},
+    },
+    {
+        {10, 11, 10, 11},
+        {11, 11, 11, 11},
+        {11, 11, 10, 11},
+        {11, 11, 11, 11},
+    },
+    {
+        {10, 11, 11, 11},
+        {11, 11, 11, 11},
+        {11, 11, 11, 11},
+        {11, 11, 11, 11},
+    },
+    {
+        {11, 11, 11, 11},
+        {11, 11, 11, 11},
+        {11, 11, 11, 11},
+        {12, 11, 11, 11},
+    },
+    {
+        {11, 11, 11, 11},
+        {11, 11, 12, 11},
+        {11, 11, 11, 11},
+        {12, 11, 12, 11},
+    },
+    {
+        {11, 11, 11, 11},
+        {12, 11, 12, 11},
+        {11, 12, 11, 11},
+        {12, 11, 12, 11},
+    },
+    {
+        {11, 11, 11, 12},
+        {12, 11, 12, 11},
+        {11, 12, 11, 12},
+        {12, 11, 12, 11},
+    },
+    {
+        {11, 12, 11, 12},
+        {12, 11, 12, 11},
+        {11, 12, 11, 12},
+        {12, 12, 12, 11},
+    },
+    {
+        {11, 12, 11, 12},
+        {12, 11, 12, 12},
+        {11, 12, 11, 12},
+        {12, 12, 12, 11},
+    },
+    {
+        {11, 12, 11, 12},
+        {12, 12, 12, 12},
+        {11, 12, 11, 12},
+        {12, 12, 12, 12},
+    },
+    {
+        {11, 12, 12, 12},
+        {12, 12, 12, 12},
+        {12, 12, 11, 12},
+        {12, 12, 12, 12},
+    },
+    {
+        {12, 12, 12, 12},
+        {12, 12, 12, 12},
+        {12, 12, 12, 12},
+        {12, 12, 12, 12},
+    },
+    {
+        {12, 12, 12, 12},
+        {12, 12, 13, 12},
+        {12, 12, 12, 12},
+        {13, 12, 12, 12},
+    },
+    {
+        {12, 12, 12, 12},
+        {13, 12, 13, 12},
+        {12, 12, 12, 12},
+        {13, 12, 13, 12},
+    },
+    {
+        {12, 12, 12, 13},
+        {13, 12, 13, 12},
+        {12, 13, 12, 12},
+        {13, 12, 13, 12},
+    },
+    {
+        {12, 13, 12, 13},
+        {13, 12, 13, 12},
+        {12, 13, 12, 13},
+        {13, 12, 13, 12},
+    },
+    {
+        {12, 13, 12, 13},
+        {13, 12, 13, 13},
+        {12, 13, 12, 13},
+        {13, 13, 13, 12},
+    },
+    {
+        {12, 13, 12, 13},
+        {13, 13, 13, 13},
+        {12, 13, 12, 13},
+        {13, 13, 13, 13},
+    },
+    {
+        {12, 13, 13, 13},
+        {13, 13, 13, 13},
+        {13, 13, 12, 13},
+        {13, 13, 13, 13},
+    },
+    {
+        {13, 13, 13, 13},
+        {13, 13, 13, 13},
+        {13, 13, 13, 13},
+        {13, 13, 13, 13},
+    },
+    {
+        {13, 13, 13, 13},
+        {13, 13, 14, 13},
+        {13, 13, 13, 13},
+        {14, 13, 13, 13},
+    },
+    {
+        {13, 13, 13, 13},
+        {14, 13, 14, 13},
+        {13, 13, 13, 13},
+        {14, 13, 14, 13},
+    },
+    {
+        {13, 13, 13, 14},
+        {14, 13, 14, 13},
+        {13, 14, 13, 13},
+        {14, 13, 14, 13},
+    },
+    {
+        {13, 14, 13, 14},
+        {14, 13, 14, 13},
+        {13, 14, 13, 14},
+        {14, 13, 14, 13},
+    },
+    {
+        {13, 14, 13, 14},
+        {14, 13, 14, 13},
+        {13, 14, 13, 14},
+        {14, 14, 14, 13},
+    },
+    {
+        {13, 14, 13, 14},
+        {14, 13, 14, 14},
+        {13, 14, 13, 14},
+        {14, 14, 14, 14},
+    },
+    {
+        {13, 14, 13, 14},
+        {14, 14, 14, 14},
+        {14, 14, 13, 14},
+        {14, 14, 14, 14},
+    },
+    {
+        {13, 14, 14, 14},
+        {14, 14, 14, 14},
+        {14, 14, 14, 14},
+        {14, 14, 14, 14},
+    },
+    {
+        {14, 14, 14, 14},
+        {14, 14, 14, 14},
+        {14, 14, 14, 14},
+        {15, 14, 14, 14},
+    },
+    {
+        {14, 14, 14, 14},
+        {14, 14, 15, 14},
+        {14, 14, 14, 14},
+        {15, 14, 15, 14},
+    },
+    {
+        {14, 14, 14, 14},
+        {15, 14, 15, 14},
+        {14, 15, 14, 14},
+        {15, 14, 15, 14},
+    },
+    {
+        {14, 14, 14, 15},
+        {15, 14, 15, 14},
+        {14, 15, 14, 15},
+        {15, 14, 15, 14},
+    },
+    {
+        {14, 15, 14, 15},
+        {15, 14, 15, 14},
+        {14, 15, 14, 15},
+        {15, 15, 15, 14},
+    },
+    {
+        {14, 15, 14, 15},
+        {15, 14, 15, 15},
+        {14, 15, 14, 15},
+        {15, 15, 15, 15},
+    },
+    {
+        {14, 15, 14, 15},
+        {15, 15, 15, 15},
+        {15, 15, 14, 15},
+        {15, 15, 15, 15},
+    },
+    {
+        {14, 15, 15, 15},
+        {15, 15, 15, 15},
+        {15, 15, 15, 15},
+        {15, 15, 15, 15},
+    },
+    {
+        {15, 15, 15, 15},
+        {15, 15, 15, 15},
+        {15, 15, 15, 15},
+        {16, 15, 15, 15},
+    },
+    {
+        {15, 15, 15, 15},
+        {15, 15, 16, 15},
+        {15, 15, 15, 15},
+        {16, 15, 16, 15},
+    },
+    {
+        {15, 15, 15, 15},
+        {16, 15, 16, 15},
+        {15, 16, 15, 15},
+        {16, 15, 16, 15},
+    },
+    {
+        {15, 15, 15, 16},
+        {16, 15, 16, 15},
+        {15, 16, 15, 16},
+        {16, 15, 16, 15},
+    },
+    {
+        {15, 16, 15, 16},
+        {16, 15, 16, 15},
+        {15, 16, 15, 16},
+        {16, 16, 16, 15},
+    },
+    {
+        {15, 16, 15, 16},
+        {16, 15, 16, 16},
+        {15, 16, 15, 16},
+        {16, 16, 16, 16},
+    },
+    {
+        {15, 16, 15, 16},
+        {16, 16, 16, 16},
+        {16, 16, 15, 16},
+        {16, 16, 16, 16},
+    },
+    {
+        {15, 16, 16, 16},
+        {16, 16, 16, 16},
+        {16, 16, 16, 16},
+        {16, 16, 16, 16},
+    },
+    {
+        {16, 16, 16, 16},
+        {16, 16, 16, 16},
+        {16, 16, 16, 16},
+        {17, 16, 16, 16},
+    },
+    {
+        {16, 16, 16, 16},
+        {16, 16, 17, 16},
+        {16, 16, 16, 16},
+        {17, 16, 17, 16},
+    },
+    {
+        {16, 16, 16, 16},
+        {17, 16, 17, 16},
+        {16, 17, 16, 16},
+        {17, 16, 17, 16},
+    },
+    {
+        {16, 16, 16, 17},
+        {17, 16, 17, 16},
+        {16, 17, 16, 17},
+        {17, 16, 17, 16},
+    },
+    {
+        {16, 17, 16, 17},
+        {17, 16, 17, 16},
+        {16, 17, 16, 17},
+        {17, 17, 17, 16},
+    },
+    {
+        {16, 17, 16, 17},
+        {17, 16, 17, 17},
+        {16, 17, 16, 17},
+        {17, 17, 17, 17},
+    },
+    {
+        {16, 17, 16, 17},
+        {17, 17, 17, 17},
+        {17, 17, 16, 17},
+        {17, 17, 17, 17},
+    },
+    {
+        {16, 17, 17, 17},
+        {17, 17, 17, 17},
+        {17, 17, 17, 17},
+        {17, 17, 17, 17},
+    },
+    {
+        {17, 17, 17, 17},
+        {17, 17, 17, 17},
+        {17, 17, 17, 17},
+        {18, 17, 17, 17},
+    },
+    {
+        {17, 17, 17, 17},
+        {17, 17, 18, 17},
+        {17, 17, 17, 17},
+        {18, 17, 18, 17},
+    },
+    {
+        {17, 17, 17, 17},
+        {18, 17, 18, 17},
+        {17, 18, 17, 17},
+        {18, 17, 18, 17},
+    },
+    {
+        {17, 17, 17, 18},
+        {18, 17, 18, 17},
+        {17, 18, 17, 18},
+        {18, 17, 18, 17},
+    },
+    {
+        {17, 18, 17, 18},
+        {18, 17, 18, 17},
+        {17, 18, 17, 18},
+        {18, 17, 18, 17},
+    },
+    {
+        {17, 18, 17, 18},
+        {18, 17, 18, 18},
+        {17, 18, 17, 18},
+        {18, 18, 18, 17},
+    },
+    {
+        {17, 18, 17, 18},
+        {18, 18, 18, 18},
+        {17, 18, 17, 18},
+        {18, 18, 18, 18},
+    },
+    {
+        {17, 18, 18, 18},
+        {18, 18, 18, 18},
+        {18, 18, 17, 18},
+        {18, 18, 18, 18},
+    },
+    {
+        {18, 18, 18, 18},
+        {18, 18, 18, 18},
+        {18, 18, 18, 18},
+        {18, 18, 18, 18},
+    },
+    {
+        {18, 18, 18, 18},
+        {18, 18, 19, 18},
+        {18, 18, 18, 18},
+        {19, 18, 18, 18},
+    },
+    {
+        {18, 18, 18, 18},
+        {19, 18, 19, 18},
+        {18, 18, 18, 18},
+        {19, 18, 19, 18},
+    },
+    {
+        {18, 18, 18, 19},
+        {19, 18, 19, 18},
+        {18, 19, 18, 18},
+        {19, 18, 19, 18},
+    },
+    {
+        {18, 19, 18, 19},
+        {19, 18, 19, 18},
+        {18, 19, 18, 19},
+        {19, 18, 19, 18},
+    },
+    {
+        {18, 19, 18, 19},
+        {19, 18, 19, 19},
+        {18, 19, 18, 19},
+        {19, 19, 19, 18},
+    },
+    {
+        {18, 19, 18, 19},
+        {19, 19, 19, 19},
+        {18, 19, 18, 19},
+        {19, 19, 19, 19},
+    },
+    {
+        {18, 19, 19, 19},
+        {19, 19, 19, 19},
+        {19, 19, 18, 19},
+        {19, 19, 19, 19},
+    },
+    {
+        {19, 19, 19, 19},
+        {19, 19, 19, 19},
+        {19, 19, 19, 19},
+        {19, 19, 19, 19},
+    },
+    {
+        {19, 19, 19, 19},
+        {19, 19, 20, 19},
+        {19, 19, 19, 19},
+        {20, 19, 19, 19},
+    },
+    {
+        {19, 19, 19, 19},
+        {20, 19, 20, 19},
+        {19, 19, 19, 19},
+        {20, 19, 20, 19},
+    },
+    {
+        {19, 19, 19, 20},
+        {20, 19, 20, 19},
+        {19, 20, 19, 19},
+        {20, 19, 20, 19},
+    },
+    {
+        {19, 19, 19, 20},
+        {20, 19, 20, 19},
+        {19, 20, 19, 20},
+        {20, 19, 20, 19},
+    },
+    {
+        {19, 20, 19, 20},
+        {20, 19, 20, 19},
+        {19, 20, 19, 20},
+        {20, 20, 20, 19},
+    },
+    {
+        {19, 20, 19, 20},
+        {20, 19, 20, 20},
+        {19, 20, 19, 20},
+        {20, 20, 20, 20},
+    },
+    {
+        {19, 20, 19, 20},
+        {20, 20, 20, 20},
+        {20, 20, 19, 20},
+        {20, 20, 20, 20},
+    },
+    {
+        {19, 20, 20, 20},
+        {20, 20, 20, 20},
+        {20, 20, 20, 20},
+        {20, 20, 20, 20},
+    },
+    {
+        {20, 20, 20, 20},
+        {20, 20, 20, 20},
+        {20, 20, 20, 20},
+        {21, 20, 20, 20},
+    },
+    {
+        {20, 20, 20, 20},
+        {20, 20, 21, 20},
+        {20, 20, 20, 20},
+        {21, 20, 21, 20},
+    },
+    {
+        {20, 20, 20, 20},
+        {21, 20, 21, 20},
+        {20, 21, 20, 20},
+        {21, 20, 21, 20},
+    },
+    {
+        {20, 20, 20, 21},
+        {21, 20, 21, 20},
+        {20, 21, 20, 21},
+        {21, 20, 21, 20},
+    },
+    {
+        {20, 21, 20, 21},
+        {21, 20, 21, 20},
+        {20, 21, 20, 21},
+        {21, 21, 21, 20},
+    },
+    {
+        {20, 21, 20, 21},
+        {21, 20, 21, 21},
+        {20, 21, 20, 21},
+        {21, 21, 21, 21},
+    },
+    {
+        {20, 21, 20, 21},
+        {21, 21, 21, 21},
+        {21, 21, 20, 21},
+        {21, 21, 21, 21},
+    },
+    {
+        {20, 21, 21, 21},
+        {21, 21, 21, 21},
+        {21, 21, 21, 21},
+        {21, 21, 21, 21},
+    },
+    {
+        {21, 21, 21, 21},
+        {21, 21, 21, 21},
+        {21, 21, 21, 21},
+        {22, 21, 21, 21},
+    },
+    {
+        {21, 21, 21, 21},
+        {21, 21, 22, 21},
+        {21, 21, 21, 21},
+        {22, 21, 22, 21},
+    },
+    {
+        {21, 21, 21, 21},
+        {22, 21, 22, 21},
+        {21, 22, 21, 21},
+        {22, 21, 22, 21},
+    },
+    {
+        {21, 21, 21, 22},
+        {22, 21, 22, 21},
+        {21, 22, 21, 21},
+        {22, 21, 22, 21},
+    },
+    {
+        {21, 22, 21, 22},
+        {22, 21, 22, 21},
+        {21, 22, 21, 22},
+        {22, 21, 22, 21},
+    },
+    {
+        {21, 22, 21, 22},
+        {22, 21, 22, 22},
+        {21, 22, 21, 22},
+        {22, 22, 22, 21},
+    },
+    {
+        {21, 22, 21, 22},
+        {22, 22, 22, 22},
+        {21, 22, 21, 22},
+        {22, 22, 22, 22},
+    },
+    {
+        {21, 22, 22, 22},
+        {22, 22, 22, 22},
+        {22, 22, 21, 22},
+        {22, 22, 22, 22},
+    },
+    {
+        {22, 22, 22, 22},
+        {22, 22, 22, 22},
+        {22, 22, 22, 22},
+        {22, 22, 22, 22},
+    },
+    {
+        {22, 22, 22, 22},
+        {22, 22, 23, 22},
+        {22, 22, 22, 22},
+        {23, 22, 22, 22},
+    },
+    {
+        {22, 22, 22, 22},
+        {23, 22, 23, 22},
+        {22, 22, 22, 22},
+        {23, 22, 23, 22},
+    },
+    {
+        {22, 22, 22, 23},
+        {23, 22, 23, 22},
+        {22, 23, 22, 22},
+        {23, 22, 23, 22},
+    },
+    {
+        {22, 23, 22, 23},
+        {23, 22, 23, 22},
+        {22, 23, 22, 23},
+        {23, 22, 23, 22},
+    },
+    {
+        {22, 23, 22, 23},
+        {23, 22, 23, 23},
+        {22, 23, 22, 23},
+        {23, 23, 23, 22},
+    },
+    {
+        {22, 23, 22, 23},
+        {23, 23, 23, 23},
+        {22, 23, 22, 23},
+        {23, 23, 23, 23},
+    },
+    {
+        {22, 23, 23, 23},
+        {23, 23, 23, 23},
+        {23, 23, 22, 23},
+        {23, 23, 23, 23},
+    },
+    {
+        {23, 23, 23, 23},
+        {23, 23, 23, 23},
+        {23, 23, 23, 23},
+        {23, 23, 23, 23},
+    },
+    {
+        {23, 23, 23, 23},
+        {23, 23, 24, 23},
+        {23, 23, 23, 23},
+        {24, 23, 23, 23},
+    },
+    {
+        {23, 23, 23, 23},
+        {24, 23, 24, 23},
+        {23, 23, 23, 23},
+        {24, 23, 24, 23},
+    },
+    {
+        {23, 23, 23, 23},
+        {24, 23, 24, 23},
+        {23, 24, 23, 23},
+        {24, 23, 24, 23},
+    },
+    {
+        {23, 23, 23, 24},
+        {24, 23, 24, 23},
+        {23, 24, 23, 24},
+        {24, 23, 24, 23},
+    },
+    {
+        {23, 24, 23, 24},
+        {24, 23, 24, 23},
+        {23, 24, 23, 24},
+        {24, 24, 24, 23},
+    },
+    {
+        {23, 24, 23, 24},
+        {24, 23, 24, 24},
+        {23, 24, 23, 24},
+        {24, 24, 24, 24},
+    },
+    {
+        {23, 24, 23, 24},
+        {24, 24, 24, 24},
+        {24, 24, 23, 24},
+        {24, 24, 24, 24},
+    },
+    {
+        {23, 24, 24, 24},
+        {24, 24, 24, 24},
+        {24, 24, 24, 24},
+        {24, 24, 24, 24},
+    },
+    {
+        {24, 24, 24, 24},
+        {24, 24, 24, 24},
+        {24, 24, 24, 24},
+        {25, 24, 24, 24},
+    },
+    {
+        {24, 24, 24, 24},
+        {24, 24, 25, 24},
+        {24, 24, 24, 24},
+        {25, 24, 25, 24},
+    },
+    {
+        {24, 24, 24, 24},
+        {25, 24, 25, 24},
+        {24, 25, 24, 24},
+        {25, 24, 25, 24},
+    },
+    {
+        {24, 24, 24, 25},
+        {25, 24, 25, 24},
+        {24, 25, 24, 25},
+        {25, 24, 25, 24},
+    },
+    {
+        {24, 25, 24, 25},
+        {25, 24, 25, 24},
+        {24, 25, 24, 25},
+        {25, 25, 25, 24},
+    },
+    {
+        {24, 25, 24, 25},
+        {25, 24, 25, 25},
+        {24, 25, 24, 25},
+        {25, 25, 25, 25},
+    },
+    {
+        {24, 25, 24, 25},
+        {25, 25, 25, 25},
+        {25, 25, 24, 25},
+        {25, 25, 25, 25},
+    },
+    {
+        {24, 25, 25, 25},
+        {25, 25, 25, 25},
+        {25, 25, 25, 25},
+        {25, 25, 25, 25},
+    },
+    {
+        {25, 25, 25, 25},
+        {25, 25, 25, 25},
+        {25, 25, 25, 25},
+        {26, 25, 25, 25},
+    },
+    {
+        {25, 25, 25, 25},
+        {25, 25, 26, 25},
+        {25, 25, 25, 25},
+        {26, 25, 26, 25},
+    },
+    {
+        {25, 25, 25, 25},
+        {26, 25, 26, 25},
+        {25, 25, 25, 25},
+        {26, 25, 26, 25},
+    },
+    {
+        {25, 25, 25, 26},
+        {26, 25, 26, 25},
+        {25, 26, 25, 25},
+        {26, 25, 26, 25},
+    },
+    {
+        {25, 26, 25, 26},
+        {26, 25, 26, 25},
+        {25, 26, 25, 26},
+        {26, 25, 26, 25},
+    },
+    {
+        {25, 26, 25, 26},
+        {26, 25, 26, 26},
+        {25, 26, 25, 26},
+        {26, 26, 26, 25},
+    },
+    {
+        {25, 26, 25, 26},
+        {26, 26, 26, 26},
+        {25, 26, 25, 26},
+        {26, 26, 26, 26},
+    },
+    {
+        {25, 26, 26, 26},
+        {26, 26, 26, 26},
+        {26, 26, 25, 26},
+        {26, 26, 26, 26},
+    },
+    {
+        {26, 26, 26, 26},
+        {26, 26, 26, 26},
+        {26, 26, 26, 26},
+        {26, 26, 26, 26},
+    },
+    {
+        {26, 26, 26, 26},
+        {26, 26, 27, 26},
+        {26, 26, 26, 26},
+        {27, 26, 26, 26},
+    },
+    {
+        {26, 26, 26, 26},
+        {27, 26, 27, 26},
+        {26, 26, 26, 26},
+        {27, 26, 27, 26},
+    },
+    {
+        {26, 26, 26, 27},
+        {27, 26, 27, 26},
+        {26, 27, 26, 26},
+        {27, 26, 27, 26},
+    },
+    {
+        {26, 27, 26, 27},
+        {27, 26, 27, 26},
+        {26, 27, 26, 27},
+        {27, 26, 27, 26},
+    },
+    {
+        {26, 27, 26, 27},
+        {27, 26, 27, 27},
+        {26, 27, 26, 27},
+        {27, 27, 27, 26},
+    },
+    {
+        {26, 27, 26, 27},
+        {27, 27, 27, 27},
+        {26, 27, 26, 27},
+        {27, 27, 27, 27},
+    },
+    {
+        {26, 27, 27, 27},
+        {27, 27, 27, 27},
+        {27, 27, 26, 27},
+        {27, 27, 27, 27},
+    },
+    {
+        {27, 27, 27, 27},
+        {27, 27, 27, 27},
+        {27, 27, 27, 27},
+        {27, 27, 27, 27},
+    },
+    {
+        {27, 27, 27, 27},
+        {27, 27, 28, 27},
+        {27, 27, 27, 27},
+        {28, 27, 27, 27},
+    },
+    {
+        {27, 27, 27, 27},
+        {27, 27, 28, 27},
+        {27, 27, 27, 27},
+        {28, 27, 28, 27},
+    },
+    {
+        {27, 27, 27, 27},
+        {28, 27, 28, 27},
+        {27, 28, 27, 27},
+        {28, 27, 28, 27},
+    },
+    {
+        {27, 27, 27, 28},
+        {28, 27, 28, 27},
+        {27, 28, 27, 28},
+        {28, 27, 28, 27},
+    },
+    {
+        {27, 28, 27, 28},
+        {28, 27, 28, 27},
+        {27, 28, 27, 28},
+        {28, 28, 28, 27},
+    },
+    {
+        {27, 28, 27, 28},
+        {28, 27, 28, 28},
+        {27, 28, 27, 28},
+        {28, 28, 28, 28},
+    },
+    {
+        {27, 28, 27, 28},
+        {28, 28, 28, 28},
+        {28, 28, 27, 28},
+        {28, 28, 28, 28},
+    },
+    {
+        {27, 28, 28, 28},
+        {28, 28, 28, 28},
+        {28, 28, 28, 28},
+        {28, 28, 28, 28},
+    },
+    {
+        {28, 28, 28, 28},
+        {28, 28, 28, 28},
+        {28, 28, 28, 28},
+        {29, 28, 28, 28},
+    },
+    {
+        {28, 28, 28, 28},
+        {28, 28, 29, 28},
+        {28, 28, 28, 28},
+        {29, 28, 29, 28},
+    },
+    {
+        {28, 28, 28, 28},
+        {29, 28, 29, 28},
+        {28, 29, 28, 28},
+        {29, 28, 29, 28},
+    },
+    {
+        {28, 28, 28, 29},
+        {29, 28, 29, 28},
+        {28, 29, 28, 29},
+        {29, 28, 29, 28},
+    },
+    {
+        {28, 29, 28, 29},
+        {29, 28, 29, 28},
+        {28, 29, 28, 29},
+        {29, 29, 29, 28},
+    },
+    {
+        {28, 29, 28, 29},
+        {29, 28, 29, 29},
+        {28, 29, 28, 29},
+        {29, 29, 29, 29},
+    },
+    {
+        {28, 29, 28, 29},
+        {29, 29, 29, 29},
+        {29, 29, 28, 29},
+        {29, 29, 29, 29},
+    },
+    {
+        {28, 29, 29, 29},
+        {29, 29, 29, 29},
+        {29, 29, 29, 29},
+        {29, 29, 29, 29},
+    },
+    {
+        {29, 29, 29, 29},
+        {29, 29, 29, 29},
+        {29, 29, 29, 29},
+        {30, 29, 29, 29},
+    },
+    {
+        {29, 29, 29, 29},
+        {29, 29, 30, 29},
+        {29, 29, 29, 29},
+        {30, 29, 29, 29},
+    },
+    {
+        {29, 29, 29, 29},
+        {30, 29, 30, 29},
+        {29, 29, 29, 29},
+        {30, 29, 30, 29},
+    },
+    {
+        {29, 29, 29, 30},
+        {30, 29, 30, 29},
+        {29, 30, 29, 29},
+        {30, 29, 30, 29},
+    },
+    {
+        {29, 30, 29, 30},
+        {30, 29, 30, 29},
+        {29, 30, 29, 30},
+        {30, 29, 30, 29},
+    },
+    {
+        {29, 30, 29, 30},
+        {30, 29, 30, 30},
+        {29, 30, 29, 30},
+        {30, 30, 30, 29},
+    },
+    {
+        {29, 30, 29, 30},
+        {30, 30, 30, 30},
+        {29, 30, 29, 30},
+        {30, 30, 30, 30},
+    },
+    {
+        {29, 30, 30, 30},
+        {30, 30, 30, 30},
+        {30, 30, 29, 30},
+        {30, 30, 30, 30},
+    },
+    {
+        {30, 30, 30, 30},
+        {30, 30, 30, 30},
+        {30, 30, 30, 30},
+        {30, 30, 30, 30},
+    },
+    {
+        {30, 30, 30, 30},
+        {30, 30, 31, 30},
+        {30, 30, 30, 30},
+        {31, 30, 30, 30},
+    },
+    {
+        {30, 30, 30, 30},
+        {31, 30, 31, 30},
+        {30, 30, 30, 30},
+        {31, 30, 31, 30},
+    },
+    {
+        {30, 30, 30, 31},
+        {31, 30, 31, 30},
+        {30, 31, 30, 30},
+        {31, 30, 31, 30},
+    },
+    {
+        {30, 31, 30, 31},
+        {31, 30, 31, 30},
+        {30, 31, 30, 31},
+        {31, 30, 31, 30},
+    },
+    {
+        {30, 31, 30, 31},
+        {31, 30, 31, 31},
+        {30, 31, 30, 31},
+        {31, 31, 31, 30},
+    },
+    {
+        {30, 31, 30, 31},
+        {31, 31, 31, 31},
+        {30, 31, 30, 31},
+        {31, 31, 31, 31},
+    },
+    {
+        {30, 31, 31, 31},
+        {31, 31, 31, 31},
+        {31, 31, 30, 31},
+        {31, 31, 31, 31},
+    },
+    {
+        {31, 31, 31, 31},
+        {31, 31, 31, 31},
+        {31, 31, 31, 31},
+        {31, 31, 31, 31},
+    },
 };
 
-static const uint8_t dither_g[256][4][4] =
-{
-	{
-		{0, 0, 0, 0},
-		{0, 0, 0, 0},
-		{0, 0, 0, 0},
-		{0, 0, 0, 0},
-	},
-	{
-		{0, 0, 0, 0},
-		{1, 0, 1, 0},
-		{0, 0, 0, 0},
-		{1, 0, 1, 0},
-	},
-	{
-		{0, 1, 0, 1},
-		{1, 0, 1, 0},
-		{0, 1, 0, 1},
-		{1, 0, 1, 0},
-	},
-	{
-		{0, 1, 0, 1},
-		{1, 1, 1, 1},
-		{0, 1, 0, 1},
-		{1, 1, 1, 1},
-	},
-	{
-		{1, 1, 1, 1},
-		{1, 1, 1, 1},
-		{1, 1, 1, 1},
-		{1, 1, 1, 1},
-	},
-	{
-		{1, 1, 1, 1},
-		{2, 1, 2, 1},
-		{1, 1, 1, 1},
-		{2, 1, 2, 1},
-	},
-	{
-		{1, 2, 1, 2},
-		{2, 1, 2, 1},
-		{1, 2, 1, 2},
-		{2, 1, 2, 1},
-	},
-	{
-		{1, 2, 1, 2},
-		{2, 2, 2, 2},
-		{1, 2, 1, 2},
-		{2, 2, 2, 2},
-	},
-	{
-		{2, 2, 2, 2},
-		{2, 2, 2, 2},
-		{2, 2, 2, 2},
-		{2, 2, 2, 2},
-	},
-	{
-		{2, 2, 2, 2},
-		{3, 2, 3, 2},
-		{2, 2, 2, 2},
-		{3, 2, 3, 2},
-	},
-	{
-		{2, 3, 2, 3},
-		{3, 2, 3, 2},
-		{2, 3, 2, 3},
-		{3, 2, 3, 2},
-	},
-	{
-		{2, 3, 2, 3},
-		{3, 3, 3, 3},
-		{2, 3, 2, 3},
-		{3, 3, 3, 3},
-	},
-	{
-		{3, 3, 3, 3},
-		{3, 3, 3, 3},
-		{3, 3, 3, 3},
-		{3, 3, 3, 3},
-	},
-	{
-		{3, 3, 3, 3},
-		{4, 3, 4, 3},
-		{3, 3, 3, 3},
-		{4, 3, 4, 3},
-	},
-	{
-		{3, 4, 3, 4},
-		{4, 3, 4, 3},
-		{3, 4, 3, 4},
-		{4, 3, 4, 3},
-	},
-	{
-		{3, 4, 3, 4},
-		{4, 4, 4, 4},
-		{3, 4, 3, 4},
-		{4, 4, 4, 4},
-	},
-	{
-		{3, 4, 4, 4},
-		{4, 4, 4, 4},
-		{4, 4, 4, 4},
-		{4, 4, 4, 4},
-	},
-	{
-		{4, 4, 4, 4},
-		{4, 4, 5, 4},
-		{4, 4, 4, 4},
-		{5, 4, 5, 4},
-	},
-	{
-		{4, 4, 4, 5},
-		{5, 4, 5, 4},
-		{4, 5, 4, 5},
-		{5, 4, 5, 4},
-	},
-	{
-		{4, 5, 4, 5},
-		{5, 4, 5, 5},
-		{4, 5, 4, 5},
-		{5, 5, 5, 5},
-	},
-	{
-		{4, 5, 5, 5},
-		{5, 5, 5, 5},
-		{5, 5, 5, 5},
-		{5, 5, 5, 5},
-	},
-	{
-		{5, 5, 5, 5},
-		{5, 5, 6, 5},
-		{5, 5, 5, 5},
-		{6, 5, 6, 5},
-	},
-	{
-		{5, 5, 5, 6},
-		{6, 5, 6, 5},
-		{5, 6, 5, 6},
-		{6, 5, 6, 5},
-	},
-	{
-		{5, 6, 5, 6},
-		{6, 5, 6, 6},
-		{5, 6, 5, 6},
-		{6, 6, 6, 6},
-	},
-	{
-		{5, 6, 6, 6},
-		{6, 6, 6, 6},
-		{6, 6, 6, 6},
-		{6, 6, 6, 6},
-	},
-	{
-		{6, 6, 6, 6},
-		{6, 6, 7, 6},
-		{6, 6, 6, 6},
-		{7, 6, 7, 6},
-	},
-	{
-		{6, 6, 6, 7},
-		{7, 6, 7, 6},
-		{6, 7, 6, 7},
-		{7, 6, 7, 6},
-	},
-	{
-		{6, 7, 6, 7},
-		{7, 6, 7, 7},
-		{6, 7, 6, 7},
-		{7, 7, 7, 7},
-	},
-	{
-		{6, 7, 7, 7},
-		{7, 7, 7, 7},
-		{7, 7, 7, 7},
-		{7, 7, 7, 7},
-	},
-	{
-		{7, 7, 7, 7},
-		{7, 7, 8, 7},
-		{7, 7, 7, 7},
-		{8, 7, 8, 7},
-	},
-	{
-		{7, 7, 7, 8},
-		{8, 7, 8, 7},
-		{7, 8, 7, 8},
-		{8, 7, 8, 7},
-	},
-	{
-		{7, 8, 7, 8},
-		{8, 7, 8, 8},
-		{7, 8, 7, 8},
-		{8, 8, 8, 8},
-	},
-	{
-		{7, 8, 8, 8},
-		{8, 8, 8, 8},
-		{8, 8, 7, 8},
-		{8, 8, 8, 8},
-	},
-	{
-		{8, 8, 8, 8},
-		{8, 8, 9, 8},
-		{8, 8, 8, 8},
-		{9, 8, 8, 8},
-	},
-	{
-		{8, 8, 8, 9},
-		{9, 8, 9, 8},
-		{8, 9, 8, 8},
-		{9, 8, 9, 8},
-	},
-	{
-		{8, 9, 8, 9},
-		{9, 8, 9, 9},
-		{8, 9, 8, 9},
-		{9, 9, 9, 8},
-	},
-	{
-		{8, 9, 9, 9},
-		{9, 9, 9, 9},
-		{9, 9, 8, 9},
-		{9, 9, 9, 9},
-	},
-	{
-		{9, 9, 9, 9},
-		{9, 9, 10, 9},
-		{9, 9, 9, 9},
-		{10, 9, 9, 9},
-	},
-	{
-		{9, 9, 9, 10},
-		{10, 9, 10, 9},
-		{9, 10, 9, 9},
-		{10, 9, 10, 9},
-	},
-	{
-		{9, 10, 9, 10},
-		{10, 9, 10, 10},
-		{9, 10, 9, 10},
-		{10, 10, 10, 9},
-	},
-	{
-		{9, 10, 10, 10},
-		{10, 10, 10, 10},
-		{10, 10, 9, 10},
-		{10, 10, 10, 10},
-	},
-	{
-		{10, 10, 10, 10},
-		{10, 10, 11, 10},
-		{10, 10, 10, 10},
-		{11, 10, 10, 10},
-	},
-	{
-		{10, 10, 10, 11},
-		{11, 10, 11, 10},
-		{10, 11, 10, 10},
-		{11, 10, 11, 10},
-	},
-	{
-		{10, 11, 10, 11},
-		{11, 10, 11, 11},
-		{10, 11, 10, 11},
-		{11, 11, 11, 10},
-	},
-	{
-		{10, 11, 11, 11},
-		{11, 11, 11, 11},
-		{11, 11, 10, 11},
-		{11, 11, 11, 11},
-	},
-	{
-		{11, 11, 11, 11},
-		{11, 11, 12, 11},
-		{11, 11, 11, 11},
-		{12, 11, 11, 11},
-	},
-	{
-		{11, 11, 11, 12},
-		{12, 11, 12, 11},
-		{11, 12, 11, 11},
-		{12, 11, 12, 11},
-	},
-	{
-		{11, 12, 11, 12},
-		{12, 11, 12, 12},
-		{11, 12, 11, 12},
-		{12, 12, 12, 11},
-	},
-	{
-		{11, 12, 11, 12},
-		{12, 12, 12, 12},
-		{12, 12, 11, 12},
-		{12, 12, 12, 12},
-	},
-	{
-		{12, 12, 12, 12},
-		{12, 12, 12, 12},
-		{12, 12, 12, 12},
-		{13, 12, 12, 12},
-	},
-	{
-		{12, 12, 12, 12},
-		{13, 12, 13, 12},
-		{12, 13, 12, 12},
-		{13, 12, 13, 12},
-	},
-	{
-		{12, 13, 12, 13},
-		{13, 12, 13, 12},
-		{12, 13, 12, 13},
-		{13, 13, 13, 12},
-	},
-	{
-		{12, 13, 12, 13},
-		{13, 13, 13, 13},
-		{13, 13, 12, 13},
-		{13, 13, 13, 13},
-	},
-	{
-		{13, 13, 13, 13},
-		{13, 13, 13, 13},
-		{13, 13, 13, 13},
-		{14, 13, 13, 13},
-	},
-	{
-		{13, 13, 13, 13},
-		{14, 13, 14, 13},
-		{13, 14, 13, 13},
-		{14, 13, 14, 13},
-	},
-	{
-		{13, 14, 13, 14},
-		{14, 13, 14, 13},
-		{13, 14, 13, 14},
-		{14, 14, 14, 13},
-	},
-	{
-		{13, 14, 13, 14},
-		{14, 14, 14, 14},
-		{14, 14, 13, 14},
-		{14, 14, 14, 14},
-	},
-	{
-		{14, 14, 14, 14},
-		{14, 14, 14, 14},
-		{14, 14, 14, 14},
-		{15, 14, 14, 14},
-	},
-	{
-		{14, 14, 14, 14},
-		{15, 14, 15, 14},
-		{14, 15, 14, 14},
-		{15, 14, 15, 14},
-	},
-	{
-		{14, 15, 14, 15},
-		{15, 14, 15, 14},
-		{14, 15, 14, 15},
-		{15, 15, 15, 14},
-	},
-	{
-		{14, 15, 14, 15},
-		{15, 15, 15, 15},
-		{15, 15, 14, 15},
-		{15, 15, 15, 15},
-	},
-	{
-		{15, 15, 15, 15},
-		{15, 15, 15, 15},
-		{15, 15, 15, 15},
-		{16, 15, 15, 15},
-	},
-	{
-		{15, 15, 15, 15},
-		{16, 15, 16, 15},
-		{15, 16, 15, 15},
-		{16, 15, 16, 15},
-	},
-	{
-		{15, 16, 15, 16},
-		{16, 15, 16, 15},
-		{15, 16, 15, 16},
-		{16, 16, 16, 15},
-	},
-	{
-		{15, 16, 15, 16},
-		{16, 16, 16, 16},
-		{16, 16, 15, 16},
-		{16, 16, 16, 16},
-	},
-	{
-		{16, 16, 16, 16},
-		{16, 16, 16, 16},
-		{16, 16, 16, 16},
-		{17, 16, 16, 16},
-	},
-	{
-		{16, 16, 16, 16},
-		{17, 16, 17, 16},
-		{16, 17, 16, 16},
-		{17, 16, 17, 16},
-	},
-	{
-		{16, 17, 16, 17},
-		{17, 16, 17, 16},
-		{16, 17, 16, 17},
-		{17, 17, 17, 16},
-	},
-	{
-		{16, 17, 16, 17},
-		{17, 17, 17, 17},
-		{17, 17, 16, 17},
-		{17, 17, 17, 17},
-	},
-	{
-		{17, 17, 17, 17},
-		{17, 17, 17, 17},
-		{17, 17, 17, 17},
-		{18, 17, 17, 17},
-	},
-	{
-		{17, 17, 17, 17},
-		{18, 17, 18, 17},
-		{17, 18, 17, 17},
-		{18, 17, 18, 17},
-	},
-	{
-		{17, 18, 17, 18},
-		{18, 17, 18, 17},
-		{17, 18, 17, 18},
-		{18, 18, 18, 17},
-	},
-	{
-		{17, 18, 17, 18},
-		{18, 18, 18, 18},
-		{18, 18, 17, 18},
-		{18, 18, 18, 18},
-	},
-	{
-		{18, 18, 18, 18},
-		{18, 18, 18, 18},
-		{18, 18, 18, 18},
-		{19, 18, 18, 18},
-	},
-	{
-		{18, 18, 18, 18},
-		{19, 18, 19, 18},
-		{18, 19, 18, 18},
-		{19, 18, 19, 18},
-	},
-	{
-		{18, 19, 18, 19},
-		{19, 18, 19, 18},
-		{18, 19, 18, 19},
-		{19, 19, 19, 18},
-	},
-	{
-		{18, 19, 18, 19},
-		{19, 19, 19, 19},
-		{19, 19, 18, 19},
-		{19, 19, 19, 19},
-	},
-	{
-		{19, 19, 19, 19},
-		{19, 19, 19, 19},
-		{19, 19, 19, 19},
-		{20, 19, 19, 19},
-	},
-	{
-		{19, 19, 19, 19},
-		{20, 19, 20, 19},
-		{19, 20, 19, 19},
-		{20, 19, 20, 19},
-	},
-	{
-		{19, 20, 19, 20},
-		{20, 19, 20, 19},
-		{19, 20, 19, 20},
-		{20, 20, 20, 19},
-	},
-	{
-		{19, 20, 19, 20},
-		{20, 20, 20, 20},
-		{19, 20, 19, 20},
-		{20, 20, 20, 20},
-	},
-	{
-		{20, 20, 20, 20},
-		{20, 20, 20, 20},
-		{20, 20, 20, 20},
-		{20, 20, 20, 20},
-	},
-	{
-		{20, 20, 20, 20},
-		{21, 20, 21, 20},
-		{20, 20, 20, 20},
-		{21, 20, 21, 20},
-	},
-	{
-		{20, 21, 20, 21},
-		{21, 20, 21, 20},
-		{20, 21, 20, 21},
-		{21, 20, 21, 20},
-	},
-	{
-		{20, 21, 20, 21},
-		{21, 21, 21, 21},
-		{20, 21, 20, 21},
-		{21, 21, 21, 21},
-	},
-	{
-		{21, 21, 21, 21},
-		{21, 21, 21, 21},
-		{21, 21, 21, 21},
-		{21, 21, 21, 21},
-	},
-	{
-		{21, 21, 21, 21},
-		{22, 21, 22, 21},
-		{21, 21, 21, 21},
-		{22, 21, 22, 21},
-	},
-	{
-		{21, 22, 21, 22},
-		{22, 21, 22, 21},
-		{21, 22, 21, 22},
-		{22, 21, 22, 21},
-	},
-	{
-		{21, 22, 21, 22},
-		{22, 22, 22, 22},
-		{21, 22, 21, 22},
-		{22, 22, 22, 22},
-	},
-	{
-		{22, 22, 22, 22},
-		{22, 22, 22, 22},
-		{22, 22, 22, 22},
-		{22, 22, 22, 22},
-	},
-	{
-		{22, 22, 22, 22},
-		{23, 22, 23, 22},
-		{22, 22, 22, 22},
-		{23, 22, 23, 22},
-	},
-	{
-		{22, 23, 22, 23},
-		{23, 22, 23, 22},
-		{22, 23, 22, 23},
-		{23, 22, 23, 22},
-	},
-	{
-		{22, 23, 22, 23},
-		{23, 23, 23, 23},
-		{22, 23, 22, 23},
-		{23, 23, 23, 23},
-	},
-	{
-		{23, 23, 23, 23},
-		{23, 23, 23, 23},
-		{23, 23, 23, 23},
-		{23, 23, 23, 23},
-	},
-	{
-		{23, 23, 23, 23},
-		{24, 23, 24, 23},
-		{23, 23, 23, 23},
-		{24, 23, 24, 23},
-	},
-	{
-		{23, 24, 23, 24},
-		{24, 23, 24, 23},
-		{23, 24, 23, 24},
-		{24, 23, 24, 23},
-	},
-	{
-		{23, 24, 23, 24},
-		{24, 23, 24, 24},
-		{23, 24, 23, 24},
-		{24, 24, 24, 24},
-	},
-	{
-		{23, 24, 24, 24},
-		{24, 24, 24, 24},
-		{24, 24, 24, 24},
-		{24, 24, 24, 24},
-	},
-	{
-		{24, 24, 24, 24},
-		{24, 24, 25, 24},
-		{24, 24, 24, 24},
-		{25, 24, 25, 24},
-	},
-	{
-		{24, 24, 24, 25},
-		{25, 24, 25, 24},
-		{24, 25, 24, 25},
-		{25, 24, 25, 24},
-	},
-	{
-		{24, 25, 24, 25},
-		{25, 24, 25, 25},
-		{24, 25, 24, 25},
-		{25, 25, 25, 25},
-	},
-	{
-		{24, 25, 25, 25},
-		{25, 25, 25, 25},
-		{25, 25, 25, 25},
-		{25, 25, 25, 25},
-	},
-	{
-		{25, 25, 25, 25},
-		{25, 25, 26, 25},
-		{25, 25, 25, 25},
-		{26, 25, 26, 25},
-	},
-	{
-		{25, 25, 25, 26},
-		{26, 25, 26, 25},
-		{25, 26, 25, 26},
-		{26, 25, 26, 25},
-	},
-	{
-		{25, 26, 25, 26},
-		{26, 25, 26, 26},
-		{25, 26, 25, 26},
-		{26, 26, 26, 26},
-	},
-	{
-		{25, 26, 26, 26},
-		{26, 26, 26, 26},
-		{26, 26, 26, 26},
-		{26, 26, 26, 26},
-	},
-	{
-		{26, 26, 26, 26},
-		{26, 26, 27, 26},
-		{26, 26, 26, 26},
-		{27, 26, 27, 26},
-	},
-	{
-		{26, 26, 26, 27},
-		{27, 26, 27, 26},
-		{26, 27, 26, 27},
-		{27, 26, 27, 26},
-	},
-	{
-		{26, 27, 26, 27},
-		{27, 26, 27, 27},
-		{26, 27, 26, 27},
-		{27, 27, 27, 27},
-	},
-	{
-		{26, 27, 27, 27},
-		{27, 27, 27, 27},
-		{27, 27, 27, 27},
-		{27, 27, 27, 27},
-	},
-	{
-		{27, 27, 27, 27},
-		{27, 27, 28, 27},
-		{27, 27, 27, 27},
-		{28, 27, 28, 27},
-	},
-	{
-		{27, 27, 27, 28},
-		{28, 27, 28, 27},
-		{27, 28, 27, 28},
-		{28, 27, 28, 27},
-	},
-	{
-		{27, 28, 27, 28},
-		{28, 27, 28, 28},
-		{27, 28, 27, 28},
-		{28, 28, 28, 27},
-	},
-	{
-		{27, 28, 28, 28},
-		{28, 28, 28, 28},
-		{28, 28, 27, 28},
-		{28, 28, 28, 28},
-	},
-	{
-		{28, 28, 28, 28},
-		{28, 28, 29, 28},
-		{28, 28, 28, 28},
-		{29, 28, 28, 28},
-	},
-	{
-		{28, 28, 28, 29},
-		{29, 28, 29, 28},
-		{28, 29, 28, 28},
-		{29, 28, 29, 28},
-	},
-	{
-		{28, 29, 28, 29},
-		{29, 28, 29, 29},
-		{28, 29, 28, 29},
-		{29, 29, 29, 28},
-	},
-	{
-		{28, 29, 29, 29},
-		{29, 29, 29, 29},
-		{29, 29, 28, 29},
-		{29, 29, 29, 29},
-	},
-	{
-		{29, 29, 29, 29},
-		{29, 29, 30, 29},
-		{29, 29, 29, 29},
-		{30, 29, 29, 29},
-	},
-	{
-		{29, 29, 29, 30},
-		{30, 29, 30, 29},
-		{29, 30, 29, 29},
-		{30, 29, 30, 29},
-	},
-	{
-		{29, 30, 29, 30},
-		{30, 29, 30, 30},
-		{29, 30, 29, 30},
-		{30, 30, 30, 29},
-	},
-	{
-		{29, 30, 30, 30},
-		{30, 30, 30, 30},
-		{30, 30, 29, 30},
-		{30, 30, 30, 30},
-	},
-	{
-		{30, 30, 30, 30},
-		{30, 30, 31, 30},
-		{30, 30, 30, 30},
-		{31, 30, 30, 30},
-	},
-	{
-		{30, 30, 30, 31},
-		{31, 30, 31, 30},
-		{30, 31, 30, 30},
-		{31, 30, 31, 30},
-	},
-	{
-		{30, 31, 30, 31},
-		{31, 30, 31, 31},
-		{30, 31, 30, 31},
-		{31, 31, 31, 30},
-	},
-	{
-		{30, 31, 31, 31},
-		{31, 31, 31, 31},
-		{31, 31, 30, 31},
-		{31, 31, 31, 31},
-	},
-	{
-		{31, 31, 31, 31},
-		{31, 31, 32, 31},
-		{31, 31, 31, 31},
-		{32, 31, 31, 31},
-	},
-	{
-		{31, 31, 31, 32},
-		{32, 31, 32, 31},
-		{31, 32, 31, 31},
-		{32, 31, 32, 31},
-	},
-	{
-		{31, 32, 31, 32},
-		{32, 31, 32, 32},
-		{31, 32, 31, 32},
-		{32, 32, 32, 31},
-	},
-	{
-		{31, 32, 32, 32},
-		{32, 32, 32, 32},
-		{32, 32, 31, 32},
-		{32, 32, 32, 32},
-	},
-	{
-		{32, 32, 32, 32},
-		{32, 32, 33, 32},
-		{32, 32, 32, 32},
-		{33, 32, 32, 32},
-	},
-	{
-		{32, 32, 32, 33},
-		{33, 32, 33, 32},
-		{32, 33, 32, 32},
-		{33, 32, 33, 32},
-	},
-	{
-		{32, 33, 32, 33},
-		{33, 32, 33, 33},
-		{32, 33, 32, 33},
-		{33, 33, 33, 32},
-	},
-	{
-		{32, 33, 33, 33},
-		{33, 33, 33, 33},
-		{33, 33, 32, 33},
-		{33, 33, 33, 33},
-	},
-	{
-		{33, 33, 33, 33},
-		{33, 33, 34, 33},
-		{33, 33, 33, 33},
-		{34, 33, 33, 33},
-	},
-	{
-		{33, 33, 33, 34},
-		{34, 33, 34, 33},
-		{33, 34, 33, 33},
-		{34, 33, 34, 33},
-	},
-	{
-		{33, 34, 33, 34},
-		{34, 33, 34, 34},
-		{33, 34, 33, 34},
-		{34, 34, 34, 33},
-	},
-	{
-		{33, 34, 34, 34},
-		{34, 34, 34, 34},
-		{34, 34, 33, 34},
-		{34, 34, 34, 34},
-	},
-	{
-		{34, 34, 34, 34},
-		{34, 34, 35, 34},
-		{34, 34, 34, 34},
-		{35, 34, 34, 34},
-	},
-	{
-		{34, 34, 34, 35},
-		{35, 34, 35, 34},
-		{34, 35, 34, 34},
-		{35, 34, 35, 34},
-	},
-	{
-		{34, 35, 34, 35},
-		{35, 34, 35, 35},
-		{34, 35, 34, 35},
-		{35, 35, 35, 34},
-	},
-	{
-		{34, 35, 35, 35},
-		{35, 35, 35, 35},
-		{35, 35, 34, 35},
-		{35, 35, 35, 35},
-	},
-	{
-		{35, 35, 35, 35},
-		{35, 35, 36, 35},
-		{35, 35, 35, 35},
-		{36, 35, 35, 35},
-	},
-	{
-		{35, 35, 35, 36},
-		{36, 35, 36, 35},
-		{35, 36, 35, 35},
-		{36, 35, 36, 35},
-	},
-	{
-		{35, 36, 35, 36},
-		{36, 35, 36, 35},
-		{35, 36, 35, 36},
-		{36, 36, 36, 35},
-	},
-	{
-		{35, 36, 35, 36},
-		{36, 36, 36, 36},
-		{36, 36, 35, 36},
-		{36, 36, 36, 36},
-	},
-	{
-		{36, 36, 36, 36},
-		{36, 36, 36, 36},
-		{36, 36, 36, 36},
-		{37, 36, 36, 36},
-	},
-	{
-		{36, 36, 36, 36},
-		{37, 36, 37, 36},
-		{36, 37, 36, 36},
-		{37, 36, 37, 36},
-	},
-	{
-		{36, 37, 36, 37},
-		{37, 36, 37, 36},
-		{36, 37, 36, 37},
-		{37, 37, 37, 36},
-	},
-	{
-		{36, 37, 36, 37},
-		{37, 37, 37, 37},
-		{37, 37, 36, 37},
-		{37, 37, 37, 37},
-	},
-	{
-		{37, 37, 37, 37},
-		{37, 37, 37, 37},
-		{37, 37, 37, 37},
-		{38, 37, 37, 37},
-	},
-	{
-		{37, 37, 37, 37},
-		{38, 37, 38, 37},
-		{37, 38, 37, 37},
-		{38, 37, 38, 37},
-	},
-	{
-		{37, 38, 37, 38},
-		{38, 37, 38, 37},
-		{37, 38, 37, 38},
-		{38, 38, 38, 37},
-	},
-	{
-		{37, 38, 37, 38},
-		{38, 38, 38, 38},
-		{38, 38, 37, 38},
-		{38, 38, 38, 38},
-	},
-	{
-		{38, 38, 38, 38},
-		{38, 38, 38, 38},
-		{38, 38, 38, 38},
-		{39, 38, 38, 38},
-	},
-	{
-		{38, 38, 38, 38},
-		{39, 38, 39, 38},
-		{38, 39, 38, 38},
-		{39, 38, 39, 38},
-	},
-	{
-		{38, 39, 38, 39},
-		{39, 38, 39, 38},
-		{38, 39, 38, 39},
-		{39, 39, 39, 38},
-	},
-	{
-		{38, 39, 38, 39},
-		{39, 39, 39, 39},
-		{39, 39, 38, 39},
-		{39, 39, 39, 39},
-	},
-	{
-		{39, 39, 39, 39},
-		{39, 39, 39, 39},
-		{39, 39, 39, 39},
-		{40, 39, 39, 39},
-	},
-	{
-		{39, 39, 39, 39},
-		{40, 39, 40, 39},
-		{39, 40, 39, 39},
-		{40, 39, 40, 39},
-	},
-	{
-		{39, 40, 39, 40},
-		{40, 39, 40, 39},
-		{39, 40, 39, 40},
-		{40, 39, 40, 39},
-	},
-	{
-		{39, 40, 39, 40},
-		{40, 40, 40, 40},
-		{39, 40, 39, 40},
-		{40, 40, 40, 40},
-	},
-	{
-		{40, 40, 40, 40},
-		{40, 40, 40, 40},
-		{40, 40, 40, 40},
-		{40, 40, 40, 40},
-	},
-	{
-		{40, 40, 40, 40},
-		{41, 40, 41, 40},
-		{40, 40, 40, 40},
-		{41, 40, 41, 40},
-	},
-	{
-		{40, 41, 40, 41},
-		{41, 40, 41, 40},
-		{40, 41, 40, 41},
-		{41, 40, 41, 40},
-	},
-	{
-		{40, 41, 40, 41},
-		{41, 41, 41, 41},
-		{40, 41, 40, 41},
-		{41, 41, 41, 41},
-	},
-	{
-		{41, 41, 41, 41},
-		{41, 41, 41, 41},
-		{41, 41, 41, 41},
-		{41, 41, 41, 41},
-	},
-	{
-		{41, 41, 41, 41},
-		{42, 41, 42, 41},
-		{41, 41, 41, 41},
-		{42, 41, 42, 41},
-	},
-	{
-		{41, 42, 41, 42},
-		{42, 41, 42, 41},
-		{41, 42, 41, 42},
-		{42, 41, 42, 41},
-	},
-	{
-		{41, 42, 41, 42},
-		{42, 42, 42, 42},
-		{41, 42, 41, 42},
-		{42, 42, 42, 42},
-	},
-	{
-		{42, 42, 42, 42},
-		{42, 42, 42, 42},
-		{42, 42, 42, 42},
-		{42, 42, 42, 42},
-	},
-	{
-		{42, 42, 42, 42},
-		{43, 42, 43, 42},
-		{42, 42, 42, 42},
-		{43, 42, 43, 42},
-	},
-	{
-		{42, 43, 42, 43},
-		{43, 42, 43, 42},
-		{42, 43, 42, 43},
-		{43, 42, 43, 42},
-	},
-	{
-		{42, 43, 42, 43},
-		{43, 43, 43, 43},
-		{42, 43, 42, 43},
-		{43, 43, 43, 43},
-	},
-	{
-		{43, 43, 43, 43},
-		{43, 43, 43, 43},
-		{43, 43, 43, 43},
-		{43, 43, 43, 43},
-	},
-	{
-		{43, 43, 43, 43},
-		{44, 43, 44, 43},
-		{43, 43, 43, 43},
-		{44, 43, 44, 43},
-	},
-	{
-		{43, 43, 43, 44},
-		{44, 43, 44, 43},
-		{43, 44, 43, 44},
-		{44, 43, 44, 43},
-	},
-	{
-		{43, 44, 43, 44},
-		{44, 43, 44, 44},
-		{43, 44, 43, 44},
-		{44, 44, 44, 44},
-	},
-	{
-		{43, 44, 44, 44},
-		{44, 44, 44, 44},
-		{44, 44, 44, 44},
-		{44, 44, 44, 44},
-	},
-	{
-		{44, 44, 44, 44},
-		{44, 44, 45, 44},
-		{44, 44, 44, 44},
-		{45, 44, 45, 44},
-	},
-	{
-		{44, 44, 44, 45},
-		{45, 44, 45, 44},
-		{44, 45, 44, 45},
-		{45, 44, 45, 44},
-	},
-	{
-		{44, 45, 44, 45},
-		{45, 44, 45, 45},
-		{44, 45, 44, 45},
-		{45, 45, 45, 45},
-	},
-	{
-		{44, 45, 45, 45},
-		{45, 45, 45, 45},
-		{45, 45, 45, 45},
-		{45, 45, 45, 45},
-	},
-	{
-		{45, 45, 45, 45},
-		{45, 45, 46, 45},
-		{45, 45, 45, 45},
-		{46, 45, 46, 45},
-	},
-	{
-		{45, 45, 45, 46},
-		{46, 45, 46, 45},
-		{45, 46, 45, 46},
-		{46, 45, 46, 45},
-	},
-	{
-		{45, 46, 45, 46},
-		{46, 45, 46, 46},
-		{45, 46, 45, 46},
-		{46, 46, 46, 46},
-	},
-	{
-		{45, 46, 46, 46},
-		{46, 46, 46, 46},
-		{46, 46, 46, 46},
-		{46, 46, 46, 46},
-	},
-	{
-		{46, 46, 46, 46},
-		{46, 46, 47, 46},
-		{46, 46, 46, 46},
-		{47, 46, 47, 46},
-	},
-	{
-		{46, 46, 46, 47},
-		{47, 46, 47, 46},
-		{46, 47, 46, 47},
-		{47, 46, 47, 46},
-	},
-	{
-		{46, 47, 46, 47},
-		{47, 46, 47, 47},
-		{46, 47, 46, 47},
-		{47, 47, 47, 47},
-	},
-	{
-		{46, 47, 47, 47},
-		{47, 47, 47, 47},
-		{47, 47, 47, 47},
-		{47, 47, 47, 47},
-	},
-	{
-		{47, 47, 47, 47},
-		{47, 47, 48, 47},
-		{47, 47, 47, 47},
-		{48, 47, 48, 47},
-	},
-	{
-		{47, 47, 47, 48},
-		{48, 47, 48, 47},
-		{47, 48, 47, 48},
-		{48, 47, 48, 47},
-	},
-	{
-		{47, 48, 47, 48},
-		{48, 47, 48, 48},
-		{47, 48, 47, 48},
-		{48, 48, 48, 48},
-	},
-	{
-		{47, 48, 48, 48},
-		{48, 48, 48, 48},
-		{48, 48, 48, 48},
-		{48, 48, 48, 48},
-	},
-	{
-		{48, 48, 48, 48},
-		{48, 48, 49, 48},
-		{48, 48, 48, 48},
-		{49, 48, 49, 48},
-	},
-	{
-		{48, 48, 48, 49},
-		{49, 48, 49, 48},
-		{48, 49, 48, 49},
-		{49, 48, 49, 48},
-	},
-	{
-		{48, 49, 48, 49},
-		{49, 48, 49, 49},
-		{48, 49, 48, 49},
-		{49, 49, 49, 49},
-	},
-	{
-		{48, 49, 49, 49},
-		{49, 49, 49, 49},
-		{49, 49, 49, 49},
-		{49, 49, 49, 49},
-	},
-	{
-		{49, 49, 49, 49},
-		{49, 49, 50, 49},
-		{49, 49, 49, 49},
-		{50, 49, 50, 49},
-	},
-	{
-		{49, 49, 49, 50},
-		{50, 49, 50, 49},
-		{49, 50, 49, 50},
-		{50, 49, 50, 49},
-	},
-	{
-		{49, 50, 49, 50},
-		{50, 49, 50, 50},
-		{49, 50, 49, 50},
-		{50, 50, 50, 50},
-	},
-	{
-		{49, 50, 50, 50},
-		{50, 50, 50, 50},
-		{50, 50, 50, 50},
-		{50, 50, 50, 50},
-	},
-	{
-		{50, 50, 50, 50},
-		{50, 50, 51, 50},
-		{50, 50, 50, 50},
-		{51, 50, 51, 50},
-	},
-	{
-		{50, 50, 50, 51},
-		{51, 50, 51, 50},
-		{50, 51, 50, 51},
-		{51, 50, 51, 50},
-	},
-	{
-		{50, 51, 50, 51},
-		{51, 50, 51, 51},
-		{50, 51, 50, 51},
-		{51, 51, 51, 51},
-	},
-	{
-		{50, 51, 51, 51},
-		{51, 51, 51, 51},
-		{51, 51, 51, 51},
-		{51, 51, 51, 51},
-	},
-	{
-		{51, 51, 51, 51},
-		{51, 51, 52, 51},
-		{51, 51, 51, 51},
-		{52, 51, 52, 51},
-	},
-	{
-		{51, 51, 51, 52},
-		{52, 51, 52, 51},
-		{51, 52, 51, 51},
-		{52, 51, 52, 51},
-	},
-	{
-		{51, 52, 51, 52},
-		{52, 51, 52, 52},
-		{51, 52, 51, 52},
-		{52, 52, 52, 51},
-	},
-	{
-		{51, 52, 52, 52},
-		{52, 52, 52, 52},
-		{52, 52, 51, 52},
-		{52, 52, 52, 52},
-	},
-	{
-		{52, 52, 52, 52},
-		{52, 52, 53, 52},
-		{52, 52, 52, 52},
-		{53, 52, 52, 52},
-	},
-	{
-		{52, 52, 52, 53},
-		{53, 52, 53, 52},
-		{52, 53, 52, 52},
-		{53, 52, 53, 52},
-	},
-	{
-		{52, 53, 52, 53},
-		{53, 52, 53, 53},
-		{52, 53, 52, 53},
-		{53, 53, 53, 52},
-	},
-	{
-		{52, 53, 53, 53},
-		{53, 53, 53, 53},
-		{53, 53, 52, 53},
-		{53, 53, 53, 53},
-	},
-	{
-		{53, 53, 53, 53},
-		{53, 53, 54, 53},
-		{53, 53, 53, 53},
-		{54, 53, 53, 53},
-	},
-	{
-		{53, 53, 53, 54},
-		{54, 53, 54, 53},
-		{53, 54, 53, 53},
-		{54, 53, 54, 53},
-	},
-	{
-		{53, 54, 53, 54},
-		{54, 53, 54, 54},
-		{53, 54, 53, 54},
-		{54, 54, 54, 53},
-	},
-	{
-		{53, 54, 54, 54},
-		{54, 54, 54, 54},
-		{54, 54, 53, 54},
-		{54, 54, 54, 54},
-	},
-	{
-		{54, 54, 54, 54},
-		{54, 54, 55, 54},
-		{54, 54, 54, 54},
-		{55, 54, 54, 54},
-	},
-	{
-		{54, 54, 54, 55},
-		{55, 54, 55, 54},
-		{54, 55, 54, 54},
-		{55, 54, 55, 54},
-	},
-	{
-		{54, 55, 54, 55},
-		{55, 54, 55, 55},
-		{54, 55, 54, 55},
-		{55, 55, 55, 54},
-	},
-	{
-		{54, 55, 55, 55},
-		{55, 55, 55, 55},
-		{55, 55, 54, 55},
-		{55, 55, 55, 55},
-	},
-	{
-		{55, 55, 55, 55},
-		{55, 55, 56, 55},
-		{55, 55, 55, 55},
-		{56, 55, 55, 55},
-	},
-	{
-		{55, 55, 55, 55},
-		{56, 55, 56, 55},
-		{55, 56, 55, 55},
-		{56, 55, 56, 55},
-	},
-	{
-		{55, 56, 55, 56},
-		{56, 55, 56, 55},
-		{55, 56, 55, 56},
-		{56, 56, 56, 55},
-	},
-	{
-		{55, 56, 55, 56},
-		{56, 56, 56, 56},
-		{56, 56, 55, 56},
-		{56, 56, 56, 56},
-	},
-	{
-		{56, 56, 56, 56},
-		{56, 56, 56, 56},
-		{56, 56, 56, 56},
-		{57, 56, 56, 56},
-	},
-	{
-		{56, 56, 56, 56},
-		{57, 56, 57, 56},
-		{56, 57, 56, 56},
-		{57, 56, 57, 56},
-	},
-	{
-		{56, 57, 56, 57},
-		{57, 56, 57, 56},
-		{56, 57, 56, 57},
-		{57, 57, 57, 56},
-	},
-	{
-		{56, 57, 56, 57},
-		{57, 57, 57, 57},
-		{57, 57, 56, 57},
-		{57, 57, 57, 57},
-	},
-	{
-		{57, 57, 57, 57},
-		{57, 57, 57, 57},
-		{57, 57, 57, 57},
-		{58, 57, 57, 57},
-	},
-	{
-		{57, 57, 57, 57},
-		{58, 57, 58, 57},
-		{57, 58, 57, 57},
-		{58, 57, 58, 57},
-	},
-	{
-		{57, 58, 57, 58},
-		{58, 57, 58, 57},
-		{57, 58, 57, 58},
-		{58, 58, 58, 57},
-	},
-	{
-		{57, 58, 57, 58},
-		{58, 58, 58, 58},
-		{58, 58, 57, 58},
-		{58, 58, 58, 58},
-	},
-	{
-		{58, 58, 58, 58},
-		{58, 58, 58, 58},
-		{58, 58, 58, 58},
-		{59, 58, 58, 58},
-	},
-	{
-		{58, 58, 58, 58},
-		{59, 58, 59, 58},
-		{58, 59, 58, 58},
-		{59, 58, 59, 58},
-	},
-	{
-		{58, 59, 58, 59},
-		{59, 58, 59, 58},
-		{58, 59, 58, 59},
-		{59, 59, 59, 58},
-	},
-	{
-		{58, 59, 58, 59},
-		{59, 59, 59, 59},
-		{59, 59, 58, 59},
-		{59, 59, 59, 59},
-	},
-	{
-		{59, 59, 59, 59},
-		{59, 59, 59, 59},
-		{59, 59, 59, 59},
-		{60, 59, 59, 59},
-	},
-	{
-		{59, 59, 59, 59},
-		{60, 59, 60, 59},
-		{59, 59, 59, 59},
-		{60, 59, 60, 59},
-	},
-	{
-		{59, 60, 59, 60},
-		{60, 59, 60, 59},
-		{59, 60, 59, 60},
-		{60, 59, 60, 59},
-	},
-	{
-		{59, 60, 59, 60},
-		{60, 60, 60, 60},
-		{59, 60, 59, 60},
-		{60, 60, 60, 60},
-	},
-	{
-		{60, 60, 60, 60},
-		{60, 60, 60, 60},
-		{60, 60, 60, 60},
-		{60, 60, 60, 60},
-	},
-	{
-		{60, 60, 60, 60},
-		{61, 60, 61, 60},
-		{60, 60, 60, 60},
-		{61, 60, 61, 60},
-	},
-	{
-		{60, 61, 60, 61},
-		{61, 60, 61, 60},
-		{60, 61, 60, 61},
-		{61, 60, 61, 60},
-	},
-	{
-		{60, 61, 60, 61},
-		{61, 61, 61, 61},
-		{60, 61, 60, 61},
-		{61, 61, 61, 61},
-	},
-	{
-		{61, 61, 61, 61},
-		{61, 61, 61, 61},
-		{61, 61, 61, 61},
-		{61, 61, 61, 61},
-	},
-	{
-		{61, 61, 61, 61},
-		{62, 61, 62, 61},
-		{61, 61, 61, 61},
-		{62, 61, 62, 61},
-	},
-	{
-		{61, 62, 61, 62},
-		{62, 61, 62, 61},
-		{61, 62, 61, 62},
-		{62, 61, 62, 61},
-	},
-	{
-		{61, 62, 61, 62},
-		{62, 62, 62, 62},
-		{61, 62, 61, 62},
-		{62, 62, 62, 62},
-	},
-	{
-		{62, 62, 62, 62},
-		{62, 62, 62, 62},
-		{62, 62, 62, 62},
-		{62, 62, 62, 62},
-	},
-	{
-		{62, 62, 62, 62},
-		{63, 62, 63, 62},
-		{62, 62, 62, 62},
-		{63, 62, 63, 62},
-	},
-	{
-		{62, 63, 62, 63},
-		{63, 62, 63, 62},
-		{62, 63, 62, 63},
-		{63, 62, 63, 62},
-	},
-	{
-		{62, 63, 62, 63},
-		{63, 63, 63, 63},
-		{62, 63, 62, 63},
-		{63, 63, 63, 63},
-	},
-	{
-		{63, 63, 63, 63},
-		{63, 63, 63, 63},
-		{63, 63, 63, 63},
-		{63, 63, 63, 63},
-	},
+static const uint8_t dither_g[256][4][4] = {
+    {
+        {0, 0, 0, 0},
+        {0, 0, 0, 0},
+        {0, 0, 0, 0},
+        {0, 0, 0, 0},
+    },
+    {
+        {0, 0, 0, 0},
+        {1, 0, 1, 0},
+        {0, 0, 0, 0},
+        {1, 0, 1, 0},
+    },
+    {
+        {0, 1, 0, 1},
+        {1, 0, 1, 0},
+        {0, 1, 0, 1},
+        {1, 0, 1, 0},
+    },
+    {
+        {0, 1, 0, 1},
+        {1, 1, 1, 1},
+        {0, 1, 0, 1},
+        {1, 1, 1, 1},
+    },
+    {
+        {1, 1, 1, 1},
+        {1, 1, 1, 1},
+        {1, 1, 1, 1},
+        {1, 1, 1, 1},
+    },
+    {
+        {1, 1, 1, 1},
+        {2, 1, 2, 1},
+        {1, 1, 1, 1},
+        {2, 1, 2, 1},
+    },
+    {
+        {1, 2, 1, 2},
+        {2, 1, 2, 1},
+        {1, 2, 1, 2},
+        {2, 1, 2, 1},
+    },
+    {
+        {1, 2, 1, 2},
+        {2, 2, 2, 2},
+        {1, 2, 1, 2},
+        {2, 2, 2, 2},
+    },
+    {
+        {2, 2, 2, 2},
+        {2, 2, 2, 2},
+        {2, 2, 2, 2},
+        {2, 2, 2, 2},
+    },
+    {
+        {2, 2, 2, 2},
+        {3, 2, 3, 2},
+        {2, 2, 2, 2},
+        {3, 2, 3, 2},
+    },
+    {
+        {2, 3, 2, 3},
+        {3, 2, 3, 2},
+        {2, 3, 2, 3},
+        {3, 2, 3, 2},
+    },
+    {
+        {2, 3, 2, 3},
+        {3, 3, 3, 3},
+        {2, 3, 2, 3},
+        {3, 3, 3, 3},
+    },
+    {
+        {3, 3, 3, 3},
+        {3, 3, 3, 3},
+        {3, 3, 3, 3},
+        {3, 3, 3, 3},
+    },
+    {
+        {3, 3, 3, 3},
+        {4, 3, 4, 3},
+        {3, 3, 3, 3},
+        {4, 3, 4, 3},
+    },
+    {
+        {3, 4, 3, 4},
+        {4, 3, 4, 3},
+        {3, 4, 3, 4},
+        {4, 3, 4, 3},
+    },
+    {
+        {3, 4, 3, 4},
+        {4, 4, 4, 4},
+        {3, 4, 3, 4},
+        {4, 4, 4, 4},
+    },
+    {
+        {3, 4, 4, 4},
+        {4, 4, 4, 4},
+        {4, 4, 4, 4},
+        {4, 4, 4, 4},
+    },
+    {
+        {4, 4, 4, 4},
+        {4, 4, 5, 4},
+        {4, 4, 4, 4},
+        {5, 4, 5, 4},
+    },
+    {
+        {4, 4, 4, 5},
+        {5, 4, 5, 4},
+        {4, 5, 4, 5},
+        {5, 4, 5, 4},
+    },
+    {
+        {4, 5, 4, 5},
+        {5, 4, 5, 5},
+        {4, 5, 4, 5},
+        {5, 5, 5, 5},
+    },
+    {
+        {4, 5, 5, 5},
+        {5, 5, 5, 5},
+        {5, 5, 5, 5},
+        {5, 5, 5, 5},
+    },
+    {
+        {5, 5, 5, 5},
+        {5, 5, 6, 5},
+        {5, 5, 5, 5},
+        {6, 5, 6, 5},
+    },
+    {
+        {5, 5, 5, 6},
+        {6, 5, 6, 5},
+        {5, 6, 5, 6},
+        {6, 5, 6, 5},
+    },
+    {
+        {5, 6, 5, 6},
+        {6, 5, 6, 6},
+        {5, 6, 5, 6},
+        {6, 6, 6, 6},
+    },
+    {
+        {5, 6, 6, 6},
+        {6, 6, 6, 6},
+        {6, 6, 6, 6},
+        {6, 6, 6, 6},
+    },
+    {
+        {6, 6, 6, 6},
+        {6, 6, 7, 6},
+        {6, 6, 6, 6},
+        {7, 6, 7, 6},
+    },
+    {
+        {6, 6, 6, 7},
+        {7, 6, 7, 6},
+        {6, 7, 6, 7},
+        {7, 6, 7, 6},
+    },
+    {
+        {6, 7, 6, 7},
+        {7, 6, 7, 7},
+        {6, 7, 6, 7},
+        {7, 7, 7, 7},
+    },
+    {
+        {6, 7, 7, 7},
+        {7, 7, 7, 7},
+        {7, 7, 7, 7},
+        {7, 7, 7, 7},
+    },
+    {
+        {7, 7, 7, 7},
+        {7, 7, 8, 7},
+        {7, 7, 7, 7},
+        {8, 7, 8, 7},
+    },
+    {
+        {7, 7, 7, 8},
+        {8, 7, 8, 7},
+        {7, 8, 7, 8},
+        {8, 7, 8, 7},
+    },
+    {
+        {7, 8, 7, 8},
+        {8, 7, 8, 8},
+        {7, 8, 7, 8},
+        {8, 8, 8, 8},
+    },
+    {
+        {7, 8, 8, 8},
+        {8, 8, 8, 8},
+        {8, 8, 7, 8},
+        {8, 8, 8, 8},
+    },
+    {
+        {8, 8, 8, 8},
+        {8, 8, 9, 8},
+        {8, 8, 8, 8},
+        {9, 8, 8, 8},
+    },
+    {
+        {8, 8, 8, 9},
+        {9, 8, 9, 8},
+        {8, 9, 8, 8},
+        {9, 8, 9, 8},
+    },
+    {
+        {8, 9, 8, 9},
+        {9, 8, 9, 9},
+        {8, 9, 8, 9},
+        {9, 9, 9, 8},
+    },
+    {
+        {8, 9, 9, 9},
+        {9, 9, 9, 9},
+        {9, 9, 8, 9},
+        {9, 9, 9, 9},
+    },
+    {
+        {9, 9, 9, 9},
+        {9, 9, 10, 9},
+        {9, 9, 9, 9},
+        {10, 9, 9, 9},
+    },
+    {
+        {9, 9, 9, 10},
+        {10, 9, 10, 9},
+        {9, 10, 9, 9},
+        {10, 9, 10, 9},
+    },
+    {
+        {9, 10, 9, 10},
+        {10, 9, 10, 10},
+        {9, 10, 9, 10},
+        {10, 10, 10, 9},
+    },
+    {
+        {9, 10, 10, 10},
+        {10, 10, 10, 10},
+        {10, 10, 9, 10},
+        {10, 10, 10, 10},
+    },
+    {
+        {10, 10, 10, 10},
+        {10, 10, 11, 10},
+        {10, 10, 10, 10},
+        {11, 10, 10, 10},
+    },
+    {
+        {10, 10, 10, 11},
+        {11, 10, 11, 10},
+        {10, 11, 10, 10},
+        {11, 10, 11, 10},
+    },
+    {
+        {10, 11, 10, 11},
+        {11, 10, 11, 11},
+        {10, 11, 10, 11},
+        {11, 11, 11, 10},
+    },
+    {
+        {10, 11, 11, 11},
+        {11, 11, 11, 11},
+        {11, 11, 10, 11},
+        {11, 11, 11, 11},
+    },
+    {
+        {11, 11, 11, 11},
+        {11, 11, 12, 11},
+        {11, 11, 11, 11},
+        {12, 11, 11, 11},
+    },
+    {
+        {11, 11, 11, 12},
+        {12, 11, 12, 11},
+        {11, 12, 11, 11},
+        {12, 11, 12, 11},
+    },
+    {
+        {11, 12, 11, 12},
+        {12, 11, 12, 12},
+        {11, 12, 11, 12},
+        {12, 12, 12, 11},
+    },
+    {
+        {11, 12, 11, 12},
+        {12, 12, 12, 12},
+        {12, 12, 11, 12},
+        {12, 12, 12, 12},
+    },
+    {
+        {12, 12, 12, 12},
+        {12, 12, 12, 12},
+        {12, 12, 12, 12},
+        {13, 12, 12, 12},
+    },
+    {
+        {12, 12, 12, 12},
+        {13, 12, 13, 12},
+        {12, 13, 12, 12},
+        {13, 12, 13, 12},
+    },
+    {
+        {12, 13, 12, 13},
+        {13, 12, 13, 12},
+        {12, 13, 12, 13},
+        {13, 13, 13, 12},
+    },
+    {
+        {12, 13, 12, 13},
+        {13, 13, 13, 13},
+        {13, 13, 12, 13},
+        {13, 13, 13, 13},
+    },
+    {
+        {13, 13, 13, 13},
+        {13, 13, 13, 13},
+        {13, 13, 13, 13},
+        {14, 13, 13, 13},
+    },
+    {
+        {13, 13, 13, 13},
+        {14, 13, 14, 13},
+        {13, 14, 13, 13},
+        {14, 13, 14, 13},
+    },
+    {
+        {13, 14, 13, 14},
+        {14, 13, 14, 13},
+        {13, 14, 13, 14},
+        {14, 14, 14, 13},
+    },
+    {
+        {13, 14, 13, 14},
+        {14, 14, 14, 14},
+        {14, 14, 13, 14},
+        {14, 14, 14, 14},
+    },
+    {
+        {14, 14, 14, 14},
+        {14, 14, 14, 14},
+        {14, 14, 14, 14},
+        {15, 14, 14, 14},
+    },
+    {
+        {14, 14, 14, 14},
+        {15, 14, 15, 14},
+        {14, 15, 14, 14},
+        {15, 14, 15, 14},
+    },
+    {
+        {14, 15, 14, 15},
+        {15, 14, 15, 14},
+        {14, 15, 14, 15},
+        {15, 15, 15, 14},
+    },
+    {
+        {14, 15, 14, 15},
+        {15, 15, 15, 15},
+        {15, 15, 14, 15},
+        {15, 15, 15, 15},
+    },
+    {
+        {15, 15, 15, 15},
+        {15, 15, 15, 15},
+        {15, 15, 15, 15},
+        {16, 15, 15, 15},
+    },
+    {
+        {15, 15, 15, 15},
+        {16, 15, 16, 15},
+        {15, 16, 15, 15},
+        {16, 15, 16, 15},
+    },
+    {
+        {15, 16, 15, 16},
+        {16, 15, 16, 15},
+        {15, 16, 15, 16},
+        {16, 16, 16, 15},
+    },
+    {
+        {15, 16, 15, 16},
+        {16, 16, 16, 16},
+        {16, 16, 15, 16},
+        {16, 16, 16, 16},
+    },
+    {
+        {16, 16, 16, 16},
+        {16, 16, 16, 16},
+        {16, 16, 16, 16},
+        {17, 16, 16, 16},
+    },
+    {
+        {16, 16, 16, 16},
+        {17, 16, 17, 16},
+        {16, 17, 16, 16},
+        {17, 16, 17, 16},
+    },
+    {
+        {16, 17, 16, 17},
+        {17, 16, 17, 16},
+        {16, 17, 16, 17},
+        {17, 17, 17, 16},
+    },
+    {
+        {16, 17, 16, 17},
+        {17, 17, 17, 17},
+        {17, 17, 16, 17},
+        {17, 17, 17, 17},
+    },
+    {
+        {17, 17, 17, 17},
+        {17, 17, 17, 17},
+        {17, 17, 17, 17},
+        {18, 17, 17, 17},
+    },
+    {
+        {17, 17, 17, 17},
+        {18, 17, 18, 17},
+        {17, 18, 17, 17},
+        {18, 17, 18, 17},
+    },
+    {
+        {17, 18, 17, 18},
+        {18, 17, 18, 17},
+        {17, 18, 17, 18},
+        {18, 18, 18, 17},
+    },
+    {
+        {17, 18, 17, 18},
+        {18, 18, 18, 18},
+        {18, 18, 17, 18},
+        {18, 18, 18, 18},
+    },
+    {
+        {18, 18, 18, 18},
+        {18, 18, 18, 18},
+        {18, 18, 18, 18},
+        {19, 18, 18, 18},
+    },
+    {
+        {18, 18, 18, 18},
+        {19, 18, 19, 18},
+        {18, 19, 18, 18},
+        {19, 18, 19, 18},
+    },
+    {
+        {18, 19, 18, 19},
+        {19, 18, 19, 18},
+        {18, 19, 18, 19},
+        {19, 19, 19, 18},
+    },
+    {
+        {18, 19, 18, 19},
+        {19, 19, 19, 19},
+        {19, 19, 18, 19},
+        {19, 19, 19, 19},
+    },
+    {
+        {19, 19, 19, 19},
+        {19, 19, 19, 19},
+        {19, 19, 19, 19},
+        {20, 19, 19, 19},
+    },
+    {
+        {19, 19, 19, 19},
+        {20, 19, 20, 19},
+        {19, 20, 19, 19},
+        {20, 19, 20, 19},
+    },
+    {
+        {19, 20, 19, 20},
+        {20, 19, 20, 19},
+        {19, 20, 19, 20},
+        {20, 20, 20, 19},
+    },
+    {
+        {19, 20, 19, 20},
+        {20, 20, 20, 20},
+        {19, 20, 19, 20},
+        {20, 20, 20, 20},
+    },
+    {
+        {20, 20, 20, 20},
+        {20, 20, 20, 20},
+        {20, 20, 20, 20},
+        {20, 20, 20, 20},
+    },
+    {
+        {20, 20, 20, 20},
+        {21, 20, 21, 20},
+        {20, 20, 20, 20},
+        {21, 20, 21, 20},
+    },
+    {
+        {20, 21, 20, 21},
+        {21, 20, 21, 20},
+        {20, 21, 20, 21},
+        {21, 20, 21, 20},
+    },
+    {
+        {20, 21, 20, 21},
+        {21, 21, 21, 21},
+        {20, 21, 20, 21},
+        {21, 21, 21, 21},
+    },
+    {
+        {21, 21, 21, 21},
+        {21, 21, 21, 21},
+        {21, 21, 21, 21},
+        {21, 21, 21, 21},
+    },
+    {
+        {21, 21, 21, 21},
+        {22, 21, 22, 21},
+        {21, 21, 21, 21},
+        {22, 21, 22, 21},
+    },
+    {
+        {21, 22, 21, 22},
+        {22, 21, 22, 21},
+        {21, 22, 21, 22},
+        {22, 21, 22, 21},
+    },
+    {
+        {21, 22, 21, 22},
+        {22, 22, 22, 22},
+        {21, 22, 21, 22},
+        {22, 22, 22, 22},
+    },
+    {
+        {22, 22, 22, 22},
+        {22, 22, 22, 22},
+        {22, 22, 22, 22},
+        {22, 22, 22, 22},
+    },
+    {
+        {22, 22, 22, 22},
+        {23, 22, 23, 22},
+        {22, 22, 22, 22},
+        {23, 22, 23, 22},
+    },
+    {
+        {22, 23, 22, 23},
+        {23, 22, 23, 22},
+        {22, 23, 22, 23},
+        {23, 22, 23, 22},
+    },
+    {
+        {22, 23, 22, 23},
+        {23, 23, 23, 23},
+        {22, 23, 22, 23},
+        {23, 23, 23, 23},
+    },
+    {
+        {23, 23, 23, 23},
+        {23, 23, 23, 23},
+        {23, 23, 23, 23},
+        {23, 23, 23, 23},
+    },
+    {
+        {23, 23, 23, 23},
+        {24, 23, 24, 23},
+        {23, 23, 23, 23},
+        {24, 23, 24, 23},
+    },
+    {
+        {23, 24, 23, 24},
+        {24, 23, 24, 23},
+        {23, 24, 23, 24},
+        {24, 23, 24, 23},
+    },
+    {
+        {23, 24, 23, 24},
+        {24, 23, 24, 24},
+        {23, 24, 23, 24},
+        {24, 24, 24, 24},
+    },
+    {
+        {23, 24, 24, 24},
+        {24, 24, 24, 24},
+        {24, 24, 24, 24},
+        {24, 24, 24, 24},
+    },
+    {
+        {24, 24, 24, 24},
+        {24, 24, 25, 24},
+        {24, 24, 24, 24},
+        {25, 24, 25, 24},
+    },
+    {
+        {24, 24, 24, 25},
+        {25, 24, 25, 24},
+        {24, 25, 24, 25},
+        {25, 24, 25, 24},
+    },
+    {
+        {24, 25, 24, 25},
+        {25, 24, 25, 25},
+        {24, 25, 24, 25},
+        {25, 25, 25, 25},
+    },
+    {
+        {24, 25, 25, 25},
+        {25, 25, 25, 25},
+        {25, 25, 25, 25},
+        {25, 25, 25, 25},
+    },
+    {
+        {25, 25, 25, 25},
+        {25, 25, 26, 25},
+        {25, 25, 25, 25},
+        {26, 25, 26, 25},
+    },
+    {
+        {25, 25, 25, 26},
+        {26, 25, 26, 25},
+        {25, 26, 25, 26},
+        {26, 25, 26, 25},
+    },
+    {
+        {25, 26, 25, 26},
+        {26, 25, 26, 26},
+        {25, 26, 25, 26},
+        {26, 26, 26, 26},
+    },
+    {
+        {25, 26, 26, 26},
+        {26, 26, 26, 26},
+        {26, 26, 26, 26},
+        {26, 26, 26, 26},
+    },
+    {
+        {26, 26, 26, 26},
+        {26, 26, 27, 26},
+        {26, 26, 26, 26},
+        {27, 26, 27, 26},
+    },
+    {
+        {26, 26, 26, 27},
+        {27, 26, 27, 26},
+        {26, 27, 26, 27},
+        {27, 26, 27, 26},
+    },
+    {
+        {26, 27, 26, 27},
+        {27, 26, 27, 27},
+        {26, 27, 26, 27},
+        {27, 27, 27, 27},
+    },
+    {
+        {26, 27, 27, 27},
+        {27, 27, 27, 27},
+        {27, 27, 27, 27},
+        {27, 27, 27, 27},
+    },
+    {
+        {27, 27, 27, 27},
+        {27, 27, 28, 27},
+        {27, 27, 27, 27},
+        {28, 27, 28, 27},
+    },
+    {
+        {27, 27, 27, 28},
+        {28, 27, 28, 27},
+        {27, 28, 27, 28},
+        {28, 27, 28, 27},
+    },
+    {
+        {27, 28, 27, 28},
+        {28, 27, 28, 28},
+        {27, 28, 27, 28},
+        {28, 28, 28, 27},
+    },
+    {
+        {27, 28, 28, 28},
+        {28, 28, 28, 28},
+        {28, 28, 27, 28},
+        {28, 28, 28, 28},
+    },
+    {
+        {28, 28, 28, 28},
+        {28, 28, 29, 28},
+        {28, 28, 28, 28},
+        {29, 28, 28, 28},
+    },
+    {
+        {28, 28, 28, 29},
+        {29, 28, 29, 28},
+        {28, 29, 28, 28},
+        {29, 28, 29, 28},
+    },
+    {
+        {28, 29, 28, 29},
+        {29, 28, 29, 29},
+        {28, 29, 28, 29},
+        {29, 29, 29, 28},
+    },
+    {
+        {28, 29, 29, 29},
+        {29, 29, 29, 29},
+        {29, 29, 28, 29},
+        {29, 29, 29, 29},
+    },
+    {
+        {29, 29, 29, 29},
+        {29, 29, 30, 29},
+        {29, 29, 29, 29},
+        {30, 29, 29, 29},
+    },
+    {
+        {29, 29, 29, 30},
+        {30, 29, 30, 29},
+        {29, 30, 29, 29},
+        {30, 29, 30, 29},
+    },
+    {
+        {29, 30, 29, 30},
+        {30, 29, 30, 30},
+        {29, 30, 29, 30},
+        {30, 30, 30, 29},
+    },
+    {
+        {29, 30, 30, 30},
+        {30, 30, 30, 30},
+        {30, 30, 29, 30},
+        {30, 30, 30, 30},
+    },
+    {
+        {30, 30, 30, 30},
+        {30, 30, 31, 30},
+        {30, 30, 30, 30},
+        {31, 30, 30, 30},
+    },
+    {
+        {30, 30, 30, 31},
+        {31, 30, 31, 30},
+        {30, 31, 30, 30},
+        {31, 30, 31, 30},
+    },
+    {
+        {30, 31, 30, 31},
+        {31, 30, 31, 31},
+        {30, 31, 30, 31},
+        {31, 31, 31, 30},
+    },
+    {
+        {30, 31, 31, 31},
+        {31, 31, 31, 31},
+        {31, 31, 30, 31},
+        {31, 31, 31, 31},
+    },
+    {
+        {31, 31, 31, 31},
+        {31, 31, 32, 31},
+        {31, 31, 31, 31},
+        {32, 31, 31, 31},
+    },
+    {
+        {31, 31, 31, 32},
+        {32, 31, 32, 31},
+        {31, 32, 31, 31},
+        {32, 31, 32, 31},
+    },
+    {
+        {31, 32, 31, 32},
+        {32, 31, 32, 32},
+        {31, 32, 31, 32},
+        {32, 32, 32, 31},
+    },
+    {
+        {31, 32, 32, 32},
+        {32, 32, 32, 32},
+        {32, 32, 31, 32},
+        {32, 32, 32, 32},
+    },
+    {
+        {32, 32, 32, 32},
+        {32, 32, 33, 32},
+        {32, 32, 32, 32},
+        {33, 32, 32, 32},
+    },
+    {
+        {32, 32, 32, 33},
+        {33, 32, 33, 32},
+        {32, 33, 32, 32},
+        {33, 32, 33, 32},
+    },
+    {
+        {32, 33, 32, 33},
+        {33, 32, 33, 33},
+        {32, 33, 32, 33},
+        {33, 33, 33, 32},
+    },
+    {
+        {32, 33, 33, 33},
+        {33, 33, 33, 33},
+        {33, 33, 32, 33},
+        {33, 33, 33, 33},
+    },
+    {
+        {33, 33, 33, 33},
+        {33, 33, 34, 33},
+        {33, 33, 33, 33},
+        {34, 33, 33, 33},
+    },
+    {
+        {33, 33, 33, 34},
+        {34, 33, 34, 33},
+        {33, 34, 33, 33},
+        {34, 33, 34, 33},
+    },
+    {
+        {33, 34, 33, 34},
+        {34, 33, 34, 34},
+        {33, 34, 33, 34},
+        {34, 34, 34, 33},
+    },
+    {
+        {33, 34, 34, 34},
+        {34, 34, 34, 34},
+        {34, 34, 33, 34},
+        {34, 34, 34, 34},
+    },
+    {
+        {34, 34, 34, 34},
+        {34, 34, 35, 34},
+        {34, 34, 34, 34},
+        {35, 34, 34, 34},
+    },
+    {
+        {34, 34, 34, 35},
+        {35, 34, 35, 34},
+        {34, 35, 34, 34},
+        {35, 34, 35, 34},
+    },
+    {
+        {34, 35, 34, 35},
+        {35, 34, 35, 35},
+        {34, 35, 34, 35},
+        {35, 35, 35, 34},
+    },
+    {
+        {34, 35, 35, 35},
+        {35, 35, 35, 35},
+        {35, 35, 34, 35},
+        {35, 35, 35, 35},
+    },
+    {
+        {35, 35, 35, 35},
+        {35, 35, 36, 35},
+        {35, 35, 35, 35},
+        {36, 35, 35, 35},
+    },
+    {
+        {35, 35, 35, 36},
+        {36, 35, 36, 35},
+        {35, 36, 35, 35},
+        {36, 35, 36, 35},
+    },
+    {
+        {35, 36, 35, 36},
+        {36, 35, 36, 35},
+        {35, 36, 35, 36},
+        {36, 36, 36, 35},
+    },
+    {
+        {35, 36, 35, 36},
+        {36, 36, 36, 36},
+        {36, 36, 35, 36},
+        {36, 36, 36, 36},
+    },
+    {
+        {36, 36, 36, 36},
+        {36, 36, 36, 36},
+        {36, 36, 36, 36},
+        {37, 36, 36, 36},
+    },
+    {
+        {36, 36, 36, 36},
+        {37, 36, 37, 36},
+        {36, 37, 36, 36},
+        {37, 36, 37, 36},
+    },
+    {
+        {36, 37, 36, 37},
+        {37, 36, 37, 36},
+        {36, 37, 36, 37},
+        {37, 37, 37, 36},
+    },
+    {
+        {36, 37, 36, 37},
+        {37, 37, 37, 37},
+        {37, 37, 36, 37},
+        {37, 37, 37, 37},
+    },
+    {
+        {37, 37, 37, 37},
+        {37, 37, 37, 37},
+        {37, 37, 37, 37},
+        {38, 37, 37, 37},
+    },
+    {
+        {37, 37, 37, 37},
+        {38, 37, 38, 37},
+        {37, 38, 37, 37},
+        {38, 37, 38, 37},
+    },
+    {
+        {37, 38, 37, 38},
+        {38, 37, 38, 37},
+        {37, 38, 37, 38},
+        {38, 38, 38, 37},
+    },
+    {
+        {37, 38, 37, 38},
+        {38, 38, 38, 38},
+        {38, 38, 37, 38},
+        {38, 38, 38, 38},
+    },
+    {
+        {38, 38, 38, 38},
+        {38, 38, 38, 38},
+        {38, 38, 38, 38},
+        {39, 38, 38, 38},
+    },
+    {
+        {38, 38, 38, 38},
+        {39, 38, 39, 38},
+        {38, 39, 38, 38},
+        {39, 38, 39, 38},
+    },
+    {
+        {38, 39, 38, 39},
+        {39, 38, 39, 38},
+        {38, 39, 38, 39},
+        {39, 39, 39, 38},
+    },
+    {
+        {38, 39, 38, 39},
+        {39, 39, 39, 39},
+        {39, 39, 38, 39},
+        {39, 39, 39, 39},
+    },
+    {
+        {39, 39, 39, 39},
+        {39, 39, 39, 39},
+        {39, 39, 39, 39},
+        {40, 39, 39, 39},
+    },
+    {
+        {39, 39, 39, 39},
+        {40, 39, 40, 39},
+        {39, 40, 39, 39},
+        {40, 39, 40, 39},
+    },
+    {
+        {39, 40, 39, 40},
+        {40, 39, 40, 39},
+        {39, 40, 39, 40},
+        {40, 39, 40, 39},
+    },
+    {
+        {39, 40, 39, 40},
+        {40, 40, 40, 40},
+        {39, 40, 39, 40},
+        {40, 40, 40, 40},
+    },
+    {
+        {40, 40, 40, 40},
+        {40, 40, 40, 40},
+        {40, 40, 40, 40},
+        {40, 40, 40, 40},
+    },
+    {
+        {40, 40, 40, 40},
+        {41, 40, 41, 40},
+        {40, 40, 40, 40},
+        {41, 40, 41, 40},
+    },
+    {
+        {40, 41, 40, 41},
+        {41, 40, 41, 40},
+        {40, 41, 40, 41},
+        {41, 40, 41, 40},
+    },
+    {
+        {40, 41, 40, 41},
+        {41, 41, 41, 41},
+        {40, 41, 40, 41},
+        {41, 41, 41, 41},
+    },
+    {
+        {41, 41, 41, 41},
+        {41, 41, 41, 41},
+        {41, 41, 41, 41},
+        {41, 41, 41, 41},
+    },
+    {
+        {41, 41, 41, 41},
+        {42, 41, 42, 41},
+        {41, 41, 41, 41},
+        {42, 41, 42, 41},
+    },
+    {
+        {41, 42, 41, 42},
+        {42, 41, 42, 41},
+        {41, 42, 41, 42},
+        {42, 41, 42, 41},
+    },
+    {
+        {41, 42, 41, 42},
+        {42, 42, 42, 42},
+        {41, 42, 41, 42},
+        {42, 42, 42, 42},
+    },
+    {
+        {42, 42, 42, 42},
+        {42, 42, 42, 42},
+        {42, 42, 42, 42},
+        {42, 42, 42, 42},
+    },
+    {
+        {42, 42, 42, 42},
+        {43, 42, 43, 42},
+        {42, 42, 42, 42},
+        {43, 42, 43, 42},
+    },
+    {
+        {42, 43, 42, 43},
+        {43, 42, 43, 42},
+        {42, 43, 42, 43},
+        {43, 42, 43, 42},
+    },
+    {
+        {42, 43, 42, 43},
+        {43, 43, 43, 43},
+        {42, 43, 42, 43},
+        {43, 43, 43, 43},
+    },
+    {
+        {43, 43, 43, 43},
+        {43, 43, 43, 43},
+        {43, 43, 43, 43},
+        {43, 43, 43, 43},
+    },
+    {
+        {43, 43, 43, 43},
+        {44, 43, 44, 43},
+        {43, 43, 43, 43},
+        {44, 43, 44, 43},
+    },
+    {
+        {43, 43, 43, 44},
+        {44, 43, 44, 43},
+        {43, 44, 43, 44},
+        {44, 43, 44, 43},
+    },
+    {
+        {43, 44, 43, 44},
+        {44, 43, 44, 44},
+        {43, 44, 43, 44},
+        {44, 44, 44, 44},
+    },
+    {
+        {43, 44, 44, 44},
+        {44, 44, 44, 44},
+        {44, 44, 44, 44},
+        {44, 44, 44, 44},
+    },
+    {
+        {44, 44, 44, 44},
+        {44, 44, 45, 44},
+        {44, 44, 44, 44},
+        {45, 44, 45, 44},
+    },
+    {
+        {44, 44, 44, 45},
+        {45, 44, 45, 44},
+        {44, 45, 44, 45},
+        {45, 44, 45, 44},
+    },
+    {
+        {44, 45, 44, 45},
+        {45, 44, 45, 45},
+        {44, 45, 44, 45},
+        {45, 45, 45, 45},
+    },
+    {
+        {44, 45, 45, 45},
+        {45, 45, 45, 45},
+        {45, 45, 45, 45},
+        {45, 45, 45, 45},
+    },
+    {
+        {45, 45, 45, 45},
+        {45, 45, 46, 45},
+        {45, 45, 45, 45},
+        {46, 45, 46, 45},
+    },
+    {
+        {45, 45, 45, 46},
+        {46, 45, 46, 45},
+        {45, 46, 45, 46},
+        {46, 45, 46, 45},
+    },
+    {
+        {45, 46, 45, 46},
+        {46, 45, 46, 46},
+        {45, 46, 45, 46},
+        {46, 46, 46, 46},
+    },
+    {
+        {45, 46, 46, 46},
+        {46, 46, 46, 46},
+        {46, 46, 46, 46},
+        {46, 46, 46, 46},
+    },
+    {
+        {46, 46, 46, 46},
+        {46, 46, 47, 46},
+        {46, 46, 46, 46},
+        {47, 46, 47, 46},
+    },
+    {
+        {46, 46, 46, 47},
+        {47, 46, 47, 46},
+        {46, 47, 46, 47},
+        {47, 46, 47, 46},
+    },
+    {
+        {46, 47, 46, 47},
+        {47, 46, 47, 47},
+        {46, 47, 46, 47},
+        {47, 47, 47, 47},
+    },
+    {
+        {46, 47, 47, 47},
+        {47, 47, 47, 47},
+        {47, 47, 47, 47},
+        {47, 47, 47, 47},
+    },
+    {
+        {47, 47, 47, 47},
+        {47, 47, 48, 47},
+        {47, 47, 47, 47},
+        {48, 47, 48, 47},
+    },
+    {
+        {47, 47, 47, 48},
+        {48, 47, 48, 47},
+        {47, 48, 47, 48},
+        {48, 47, 48, 47},
+    },
+    {
+        {47, 48, 47, 48},
+        {48, 47, 48, 48},
+        {47, 48, 47, 48},
+        {48, 48, 48, 48},
+    },
+    {
+        {47, 48, 48, 48},
+        {48, 48, 48, 48},
+        {48, 48, 48, 48},
+        {48, 48, 48, 48},
+    },
+    {
+        {48, 48, 48, 48},
+        {48, 48, 49, 48},
+        {48, 48, 48, 48},
+        {49, 48, 49, 48},
+    },
+    {
+        {48, 48, 48, 49},
+        {49, 48, 49, 48},
+        {48, 49, 48, 49},
+        {49, 48, 49, 48},
+    },
+    {
+        {48, 49, 48, 49},
+        {49, 48, 49, 49},
+        {48, 49, 48, 49},
+        {49, 49, 49, 49},
+    },
+    {
+        {48, 49, 49, 49},
+        {49, 49, 49, 49},
+        {49, 49, 49, 49},
+        {49, 49, 49, 49},
+    },
+    {
+        {49, 49, 49, 49},
+        {49, 49, 50, 49},
+        {49, 49, 49, 49},
+        {50, 49, 50, 49},
+    },
+    {
+        {49, 49, 49, 50},
+        {50, 49, 50, 49},
+        {49, 50, 49, 50},
+        {50, 49, 50, 49},
+    },
+    {
+        {49, 50, 49, 50},
+        {50, 49, 50, 50},
+        {49, 50, 49, 50},
+        {50, 50, 50, 50},
+    },
+    {
+        {49, 50, 50, 50},
+        {50, 50, 50, 50},
+        {50, 50, 50, 50},
+        {50, 50, 50, 50},
+    },
+    {
+        {50, 50, 50, 50},
+        {50, 50, 51, 50},
+        {50, 50, 50, 50},
+        {51, 50, 51, 50},
+    },
+    {
+        {50, 50, 50, 51},
+        {51, 50, 51, 50},
+        {50, 51, 50, 51},
+        {51, 50, 51, 50},
+    },
+    {
+        {50, 51, 50, 51},
+        {51, 50, 51, 51},
+        {50, 51, 50, 51},
+        {51, 51, 51, 51},
+    },
+    {
+        {50, 51, 51, 51},
+        {51, 51, 51, 51},
+        {51, 51, 51, 51},
+        {51, 51, 51, 51},
+    },
+    {
+        {51, 51, 51, 51},
+        {51, 51, 52, 51},
+        {51, 51, 51, 51},
+        {52, 51, 52, 51},
+    },
+    {
+        {51, 51, 51, 52},
+        {52, 51, 52, 51},
+        {51, 52, 51, 51},
+        {52, 51, 52, 51},
+    },
+    {
+        {51, 52, 51, 52},
+        {52, 51, 52, 52},
+        {51, 52, 51, 52},
+        {52, 52, 52, 51},
+    },
+    {
+        {51, 52, 52, 52},
+        {52, 52, 52, 52},
+        {52, 52, 51, 52},
+        {52, 52, 52, 52},
+    },
+    {
+        {52, 52, 52, 52},
+        {52, 52, 53, 52},
+        {52, 52, 52, 52},
+        {53, 52, 52, 52},
+    },
+    {
+        {52, 52, 52, 53},
+        {53, 52, 53, 52},
+        {52, 53, 52, 52},
+        {53, 52, 53, 52},
+    },
+    {
+        {52, 53, 52, 53},
+        {53, 52, 53, 53},
+        {52, 53, 52, 53},
+        {53, 53, 53, 52},
+    },
+    {
+        {52, 53, 53, 53},
+        {53, 53, 53, 53},
+        {53, 53, 52, 53},
+        {53, 53, 53, 53},
+    },
+    {
+        {53, 53, 53, 53},
+        {53, 53, 54, 53},
+        {53, 53, 53, 53},
+        {54, 53, 53, 53},
+    },
+    {
+        {53, 53, 53, 54},
+        {54, 53, 54, 53},
+        {53, 54, 53, 53},
+        {54, 53, 54, 53},
+    },
+    {
+        {53, 54, 53, 54},
+        {54, 53, 54, 54},
+        {53, 54, 53, 54},
+        {54, 54, 54, 53},
+    },
+    {
+        {53, 54, 54, 54},
+        {54, 54, 54, 54},
+        {54, 54, 53, 54},
+        {54, 54, 54, 54},
+    },
+    {
+        {54, 54, 54, 54},
+        {54, 54, 55, 54},
+        {54, 54, 54, 54},
+        {55, 54, 54, 54},
+    },
+    {
+        {54, 54, 54, 55},
+        {55, 54, 55, 54},
+        {54, 55, 54, 54},
+        {55, 54, 55, 54},
+    },
+    {
+        {54, 55, 54, 55},
+        {55, 54, 55, 55},
+        {54, 55, 54, 55},
+        {55, 55, 55, 54},
+    },
+    {
+        {54, 55, 55, 55},
+        {55, 55, 55, 55},
+        {55, 55, 54, 55},
+        {55, 55, 55, 55},
+    },
+    {
+        {55, 55, 55, 55},
+        {55, 55, 56, 55},
+        {55, 55, 55, 55},
+        {56, 55, 55, 55},
+    },
+    {
+        {55, 55, 55, 55},
+        {56, 55, 56, 55},
+        {55, 56, 55, 55},
+        {56, 55, 56, 55},
+    },
+    {
+        {55, 56, 55, 56},
+        {56, 55, 56, 55},
+        {55, 56, 55, 56},
+        {56, 56, 56, 55},
+    },
+    {
+        {55, 56, 55, 56},
+        {56, 56, 56, 56},
+        {56, 56, 55, 56},
+        {56, 56, 56, 56},
+    },
+    {
+        {56, 56, 56, 56},
+        {56, 56, 56, 56},
+        {56, 56, 56, 56},
+        {57, 56, 56, 56},
+    },
+    {
+        {56, 56, 56, 56},
+        {57, 56, 57, 56},
+        {56, 57, 56, 56},
+        {57, 56, 57, 56},
+    },
+    {
+        {56, 57, 56, 57},
+        {57, 56, 57, 56},
+        {56, 57, 56, 57},
+        {57, 57, 57, 56},
+    },
+    {
+        {56, 57, 56, 57},
+        {57, 57, 57, 57},
+        {57, 57, 56, 57},
+        {57, 57, 57, 57},
+    },
+    {
+        {57, 57, 57, 57},
+        {57, 57, 57, 57},
+        {57, 57, 57, 57},
+        {58, 57, 57, 57},
+    },
+    {
+        {57, 57, 57, 57},
+        {58, 57, 58, 57},
+        {57, 58, 57, 57},
+        {58, 57, 58, 57},
+    },
+    {
+        {57, 58, 57, 58},
+        {58, 57, 58, 57},
+        {57, 58, 57, 58},
+        {58, 58, 58, 57},
+    },
+    {
+        {57, 58, 57, 58},
+        {58, 58, 58, 58},
+        {58, 58, 57, 58},
+        {58, 58, 58, 58},
+    },
+    {
+        {58, 58, 58, 58},
+        {58, 58, 58, 58},
+        {58, 58, 58, 58},
+        {59, 58, 58, 58},
+    },
+    {
+        {58, 58, 58, 58},
+        {59, 58, 59, 58},
+        {58, 59, 58, 58},
+        {59, 58, 59, 58},
+    },
+    {
+        {58, 59, 58, 59},
+        {59, 58, 59, 58},
+        {58, 59, 58, 59},
+        {59, 59, 59, 58},
+    },
+    {
+        {58, 59, 58, 59},
+        {59, 59, 59, 59},
+        {59, 59, 58, 59},
+        {59, 59, 59, 59},
+    },
+    {
+        {59, 59, 59, 59},
+        {59, 59, 59, 59},
+        {59, 59, 59, 59},
+        {60, 59, 59, 59},
+    },
+    {
+        {59, 59, 59, 59},
+        {60, 59, 60, 59},
+        {59, 59, 59, 59},
+        {60, 59, 60, 59},
+    },
+    {
+        {59, 60, 59, 60},
+        {60, 59, 60, 59},
+        {59, 60, 59, 60},
+        {60, 59, 60, 59},
+    },
+    {
+        {59, 60, 59, 60},
+        {60, 60, 60, 60},
+        {59, 60, 59, 60},
+        {60, 60, 60, 60},
+    },
+    {
+        {60, 60, 60, 60},
+        {60, 60, 60, 60},
+        {60, 60, 60, 60},
+        {60, 60, 60, 60},
+    },
+    {
+        {60, 60, 60, 60},
+        {61, 60, 61, 60},
+        {60, 60, 60, 60},
+        {61, 60, 61, 60},
+    },
+    {
+        {60, 61, 60, 61},
+        {61, 60, 61, 60},
+        {60, 61, 60, 61},
+        {61, 60, 61, 60},
+    },
+    {
+        {60, 61, 60, 61},
+        {61, 61, 61, 61},
+        {60, 61, 60, 61},
+        {61, 61, 61, 61},
+    },
+    {
+        {61, 61, 61, 61},
+        {61, 61, 61, 61},
+        {61, 61, 61, 61},
+        {61, 61, 61, 61},
+    },
+    {
+        {61, 61, 61, 61},
+        {62, 61, 62, 61},
+        {61, 61, 61, 61},
+        {62, 61, 62, 61},
+    },
+    {
+        {61, 62, 61, 62},
+        {62, 61, 62, 61},
+        {61, 62, 61, 62},
+        {62, 61, 62, 61},
+    },
+    {
+        {61, 62, 61, 62},
+        {62, 62, 62, 62},
+        {61, 62, 61, 62},
+        {62, 62, 62, 62},
+    },
+    {
+        {62, 62, 62, 62},
+        {62, 62, 62, 62},
+        {62, 62, 62, 62},
+        {62, 62, 62, 62},
+    },
+    {
+        {62, 62, 62, 62},
+        {63, 62, 63, 62},
+        {62, 62, 62, 62},
+        {63, 62, 63, 62},
+    },
+    {
+        {62, 63, 62, 63},
+        {63, 62, 63, 62},
+        {62, 63, 62, 63},
+        {63, 62, 63, 62},
+    },
+    {
+        {62, 63, 62, 63},
+        {63, 63, 63, 63},
+        {62, 63, 62, 63},
+        {63, 63, 63, 63},
+    },
+    {
+        {63, 63, 63, 63},
+        {63, 63, 63, 63},
+        {63, 63, 63, 63},
+        {63, 63, 63, 63},
+    },
 };
 
-static const uint8_t dither_rb2x2[256][2][2] =
-{
-	{
-		{0, 0},
-		{0, 0},
-	},
-	{
-		{0, 0},
-		{1, 0},
-	},
-	{
-		{0, 0},
-		{1, 0},
-	},
-	{
-		{0, 1},
-		{1, 0},
-	},
-	{
-		{0, 1},
-		{1, 0},
-	},
-	{
-		{0, 1},
-		{1, 1},
-	},
-	{
-		{0, 1},
-		{1, 1},
-	},
-	{
-		{1, 1},
-		{1, 1},
-	},
-	{
-		{1, 1},
-		{1, 1},
-	},
-	{
-		{1, 1},
-		{2, 1},
-	},
-	{
-		{1, 1},
-		{2, 1},
-	},
-	{
-		{1, 2},
-		{2, 1},
-	},
-	{
-		{1, 2},
-		{2, 1},
-	},
-	{
-		{1, 2},
-		{2, 2},
-	},
-	{
-		{1, 2},
-		{2, 2},
-	},
-	{
-		{2, 2},
-		{2, 2},
-	},
-	{
-		{2, 2},
-		{2, 2},
-	},
-	{
-		{2, 2},
-		{2, 2},
-	},
-	{
-		{2, 2},
-		{3, 2},
-	},
-	{
-		{2, 2},
-		{3, 2},
-	},
-	{
-		{2, 3},
-		{3, 2},
-	},
-	{
-		{2, 3},
-		{3, 2},
-	},
-	{
-		{2, 3},
-		{3, 3},
-	},
-	{
-		{2, 3},
-		{3, 3},
-	},
-	{
-		{3, 3},
-		{3, 3},
-	},
-	{
-		{3, 3},
-		{3, 3},
-	},
-	{
-		{3, 3},
-		{4, 3},
-	},
-	{
-		{3, 3},
-		{4, 3},
-	},
-	{
-		{3, 4},
-		{4, 3},
-	},
-	{
-		{3, 4},
-		{4, 3},
-	},
-	{
-		{3, 4},
-		{4, 4},
-	},
-	{
-		{3, 4},
-		{4, 4},
-	},
-	{
-		{4, 4},
-		{4, 4},
-	},
-	{
-		{4, 4},
-		{4, 4},
-	},
-	{
-		{4, 4},
-		{5, 4},
-	},
-	{
-		{4, 4},
-		{5, 4},
-	},
-	{
-		{4, 5},
-		{5, 4},
-	},
-	{
-		{4, 5},
-		{5, 4},
-	},
-	{
-		{4, 5},
-		{5, 5},
-	},
-	{
-		{4, 5},
-		{5, 5},
-	},
-	{
-		{5, 5},
-		{5, 5},
-	},
-	{
-		{5, 5},
-		{5, 5},
-	},
-	{
-		{5, 5},
-		{6, 5},
-	},
-	{
-		{5, 5},
-		{6, 5},
-	},
-	{
-		{5, 6},
-		{6, 5},
-	},
-	{
-		{5, 6},
-		{6, 5},
-	},
-	{
-		{5, 6},
-		{6, 6},
-	},
-	{
-		{5, 6},
-		{6, 6},
-	},
-	{
-		{5, 6},
-		{6, 6},
-	},
-	{
-		{6, 6},
-		{6, 6},
-	},
-	{
-		{6, 6},
-		{6, 6},
-	},
-	{
-		{6, 6},
-		{7, 6},
-	},
-	{
-		{6, 6},
-		{7, 6},
-	},
-	{
-		{6, 7},
-		{7, 6},
-	},
-	{
-		{6, 7},
-		{7, 6},
-	},
-	{
-		{6, 7},
-		{7, 7},
-	},
-	{
-		{6, 7},
-		{7, 7},
-	},
-	{
-		{7, 7},
-		{7, 7},
-	},
-	{
-		{7, 7},
-		{7, 7},
-	},
-	{
-		{7, 7},
-		{8, 7},
-	},
-	{
-		{7, 7},
-		{8, 7},
-	},
-	{
-		{7, 8},
-		{8, 7},
-	},
-	{
-		{7, 8},
-		{8, 7},
-	},
-	{
-		{7, 8},
-		{8, 8},
-	},
-	{
-		{7, 8},
-		{8, 8},
-	},
-	{
-		{8, 8},
-		{8, 8},
-	},
-	{
-		{8, 8},
-		{8, 8},
-	},
-	{
-		{8, 8},
-		{9, 8},
-	},
-	{
-		{8, 8},
-		{9, 8},
-	},
-	{
-		{8, 9},
-		{9, 8},
-	},
-	{
-		{8, 9},
-		{9, 8},
-	},
-	{
-		{8, 9},
-		{9, 9},
-	},
-	{
-		{8, 9},
-		{9, 9},
-	},
-	{
-		{9, 9},
-		{9, 9},
-	},
-	{
-		{9, 9},
-		{9, 9},
-	},
-	{
-		{9, 9},
-		{10, 9},
-	},
-	{
-		{9, 9},
-		{10, 9},
-	},
-	{
-		{9, 10},
-		{10, 9},
-	},
-	{
-		{9, 10},
-		{10, 9},
-	},
-	{
-		{9, 10},
-		{10, 10},
-	},
-	{
-		{9, 10},
-		{10, 10},
-	},
-	{
-		{9, 10},
-		{10, 10},
-	},
-	{
-		{10, 10},
-		{10, 10},
-	},
-	{
-		{10, 10},
-		{10, 10},
-	},
-	{
-		{10, 10},
-		{11, 10},
-	},
-	{
-		{10, 10},
-		{11, 10},
-	},
-	{
-		{10, 11},
-		{11, 10},
-	},
-	{
-		{10, 11},
-		{11, 10},
-	},
-	{
-		{10, 11},
-		{11, 11},
-	},
-	{
-		{10, 11},
-		{11, 11},
-	},
-	{
-		{11, 11},
-		{11, 11},
-	},
-	{
-		{11, 11},
-		{11, 11},
-	},
-	{
-		{11, 11},
-		{12, 11},
-	},
-	{
-		{11, 11},
-		{12, 11},
-	},
-	{
-		{11, 12},
-		{12, 11},
-	},
-	{
-		{11, 12},
-		{12, 11},
-	},
-	{
-		{11, 12},
-		{12, 12},
-	},
-	{
-		{11, 12},
-		{12, 12},
-	},
-	{
-		{12, 12},
-		{12, 12},
-	},
-	{
-		{12, 12},
-		{12, 12},
-	},
-	{
-		{12, 12},
-		{13, 12},
-	},
-	{
-		{12, 12},
-		{13, 12},
-	},
-	{
-		{12, 13},
-		{13, 12},
-	},
-	{
-		{12, 13},
-		{13, 12},
-	},
-	{
-		{12, 13},
-		{13, 13},
-	},
-	{
-		{12, 13},
-		{13, 13},
-	},
-	{
-		{13, 13},
-		{13, 13},
-	},
-	{
-		{13, 13},
-		{13, 13},
-	},
-	{
-		{13, 13},
-		{14, 13},
-	},
-	{
-		{13, 13},
-		{14, 13},
-	},
-	{
-		{13, 14},
-		{14, 13},
-	},
-	{
-		{13, 14},
-		{14, 13},
-	},
-	{
-		{13, 14},
-		{14, 13},
-	},
-	{
-		{13, 14},
-		{14, 14},
-	},
-	{
-		{13, 14},
-		{14, 14},
-	},
-	{
-		{14, 14},
-		{14, 14},
-	},
-	{
-		{14, 14},
-		{14, 14},
-	},
-	{
-		{14, 14},
-		{15, 14},
-	},
-	{
-		{14, 14},
-		{15, 14},
-	},
-	{
-		{14, 15},
-		{15, 14},
-	},
-	{
-		{14, 15},
-		{15, 14},
-	},
-	{
-		{14, 15},
-		{15, 15},
-	},
-	{
-		{14, 15},
-		{15, 15},
-	},
-	{
-		{15, 15},
-		{15, 15},
-	},
-	{
-		{15, 15},
-		{15, 15},
-	},
-	{
-		{15, 15},
-		{16, 15},
-	},
-	{
-		{15, 15},
-		{16, 15},
-	},
-	{
-		{15, 16},
-		{16, 15},
-	},
-	{
-		{15, 16},
-		{16, 15},
-	},
-	{
-		{15, 16},
-		{16, 16},
-	},
-	{
-		{15, 16},
-		{16, 16},
-	},
-	{
-		{16, 16},
-		{16, 16},
-	},
-	{
-		{16, 16},
-		{16, 16},
-	},
-	{
-		{16, 16},
-		{17, 16},
-	},
-	{
-		{16, 16},
-		{17, 16},
-	},
-	{
-		{16, 17},
-		{17, 16},
-	},
-	{
-		{16, 17},
-		{17, 16},
-	},
-	{
-		{16, 17},
-		{17, 17},
-	},
-	{
-		{16, 17},
-		{17, 17},
-	},
-	{
-		{17, 17},
-		{17, 17},
-	},
-	{
-		{17, 17},
-		{17, 17},
-	},
-	{
-		{17, 17},
-		{18, 17},
-	},
-	{
-		{17, 17},
-		{18, 17},
-	},
-	{
-		{17, 18},
-		{18, 17},
-	},
-	{
-		{17, 18},
-		{18, 17},
-	},
-	{
-		{17, 18},
-		{18, 18},
-	},
-	{
-		{17, 18},
-		{18, 18},
-	},
-	{
-		{18, 18},
-		{18, 18},
-	},
-	{
-		{18, 18},
-		{18, 18},
-	},
-	{
-		{18, 18},
-		{19, 18},
-	},
-	{
-		{18, 18},
-		{19, 18},
-	},
-	{
-		{18, 19},
-		{19, 18},
-	},
-	{
-		{18, 19},
-		{19, 18},
-	},
-	{
-		{18, 19},
-		{19, 19},
-	},
-	{
-		{18, 19},
-		{19, 19},
-	},
-	{
-		{19, 19},
-		{19, 19},
-	},
-	{
-		{19, 19},
-		{19, 19},
-	},
-	{
-		{19, 19},
-		{20, 19},
-	},
-	{
-		{19, 19},
-		{20, 19},
-	},
-	{
-		{19, 20},
-		{20, 19},
-	},
-	{
-		{19, 20},
-		{20, 19},
-	},
-	{
-		{19, 20},
-		{20, 19},
-	},
-	{
-		{19, 20},
-		{20, 20},
-	},
-	{
-		{19, 20},
-		{20, 20},
-	},
-	{
-		{20, 20},
-		{20, 20},
-	},
-	{
-		{20, 20},
-		{20, 20},
-	},
-	{
-		{20, 20},
-		{21, 20},
-	},
-	{
-		{20, 20},
-		{21, 20},
-	},
-	{
-		{20, 21},
-		{21, 20},
-	},
-	{
-		{20, 21},
-		{21, 20},
-	},
-	{
-		{20, 21},
-		{21, 21},
-	},
-	{
-		{20, 21},
-		{21, 21},
-	},
-	{
-		{21, 21},
-		{21, 21},
-	},
-	{
-		{21, 21},
-		{21, 21},
-	},
-	{
-		{21, 21},
-		{22, 21},
-	},
-	{
-		{21, 21},
-		{22, 21},
-	},
-	{
-		{21, 22},
-		{22, 21},
-	},
-	{
-		{21, 22},
-		{22, 21},
-	},
-	{
-		{21, 22},
-		{22, 22},
-	},
-	{
-		{21, 22},
-		{22, 22},
-	},
-	{
-		{22, 22},
-		{22, 22},
-	},
-	{
-		{22, 22},
-		{22, 22},
-	},
-	{
-		{22, 22},
-		{23, 22},
-	},
-	{
-		{22, 22},
-		{23, 22},
-	},
-	{
-		{22, 23},
-		{23, 22},
-	},
-	{
-		{22, 23},
-		{23, 22},
-	},
-	{
-		{22, 23},
-		{23, 23},
-	},
-	{
-		{22, 23},
-		{23, 23},
-	},
-	{
-		{23, 23},
-		{23, 23},
-	},
-	{
-		{23, 23},
-		{23, 23},
-	},
-	{
-		{23, 23},
-		{24, 23},
-	},
-	{
-		{23, 23},
-		{24, 23},
-	},
-	{
-		{23, 23},
-		{24, 23},
-	},
-	{
-		{23, 24},
-		{24, 23},
-	},
-	{
-		{23, 24},
-		{24, 23},
-	},
-	{
-		{23, 24},
-		{24, 24},
-	},
-	{
-		{23, 24},
-		{24, 24},
-	},
-	{
-		{24, 24},
-		{24, 24},
-	},
-	{
-		{24, 24},
-		{24, 24},
-	},
-	{
-		{24, 24},
-		{25, 24},
-	},
-	{
-		{24, 24},
-		{25, 24},
-	},
-	{
-		{24, 25},
-		{25, 24},
-	},
-	{
-		{24, 25},
-		{25, 24},
-	},
-	{
-		{24, 25},
-		{25, 25},
-	},
-	{
-		{24, 25},
-		{25, 25},
-	},
-	{
-		{25, 25},
-		{25, 25},
-	},
-	{
-		{25, 25},
-		{25, 25},
-	},
-	{
-		{25, 25},
-		{26, 25},
-	},
-	{
-		{25, 25},
-		{26, 25},
-	},
-	{
-		{25, 26},
-		{26, 25},
-	},
-	{
-		{25, 26},
-		{26, 25},
-	},
-	{
-		{25, 26},
-		{26, 26},
-	},
-	{
-		{25, 26},
-		{26, 26},
-	},
-	{
-		{26, 26},
-		{26, 26},
-	},
-	{
-		{26, 26},
-		{26, 26},
-	},
-	{
-		{26, 26},
-		{27, 26},
-	},
-	{
-		{26, 26},
-		{27, 26},
-	},
-	{
-		{26, 27},
-		{27, 26},
-	},
-	{
-		{26, 27},
-		{27, 26},
-	},
-	{
-		{26, 27},
-		{27, 27},
-	},
-	{
-		{26, 27},
-		{27, 27},
-	},
-	{
-		{27, 27},
-		{27, 27},
-	},
-	{
-		{27, 27},
-		{27, 27},
-	},
-	{
-		{27, 27},
-		{28, 27},
-	},
-	{
-		{27, 27},
-		{28, 27},
-	},
-	{
-		{27, 27},
-		{28, 27},
-	},
-	{
-		{27, 28},
-		{28, 27},
-	},
-	{
-		{27, 28},
-		{28, 27},
-	},
-	{
-		{27, 28},
-		{28, 28},
-	},
-	{
-		{27, 28},
-		{28, 28},
-	},
-	{
-		{28, 28},
-		{28, 28},
-	},
-	{
-		{28, 28},
-		{28, 28},
-	},
-	{
-		{28, 28},
-		{29, 28},
-	},
-	{
-		{28, 28},
-		{29, 28},
-	},
-	{
-		{28, 29},
-		{29, 28},
-	},
-	{
-		{28, 29},
-		{29, 28},
-	},
-	{
-		{28, 29},
-		{29, 29},
-	},
-	{
-		{28, 29},
-		{29, 29},
-	},
-	{
-		{29, 29},
-		{29, 29},
-	},
-	{
-		{29, 29},
-		{29, 29},
-	},
-	{
-		{29, 29},
-		{30, 29},
-	},
-	{
-		{29, 29},
-		{30, 29},
-	},
-	{
-		{29, 30},
-		{30, 29},
-	},
-	{
-		{29, 30},
-		{30, 29},
-	},
-	{
-		{29, 30},
-		{30, 30},
-	},
-	{
-		{29, 30},
-		{30, 30},
-	},
-	{
-		{30, 30},
-		{30, 30},
-	},
-	{
-		{30, 30},
-		{30, 30},
-	},
-	{
-		{30, 30},
-		{31, 30},
-	},
-	{
-		{30, 30},
-		{31, 30},
-	},
-	{
-		{30, 31},
-		{31, 30},
-	},
-	{
-		{30, 31},
-		{31, 30},
-	},
-	{
-		{30, 31},
-		{31, 31},
-	},
-	{
-		{30, 31},
-		{31, 31},
-	},
-	{
-		{31, 31},
-		{31, 31},
-	},
-	{
-		{31, 31},
-		{31, 31},
-	},
+static const uint8_t dither_rb2x2[256][2][2] = {
+    {
+        {0, 0},
+        {0, 0},
+    },
+    {
+        {0, 0},
+        {1, 0},
+    },
+    {
+        {0, 0},
+        {1, 0},
+    },
+    {
+        {0, 1},
+        {1, 0},
+    },
+    {
+        {0, 1},
+        {1, 0},
+    },
+    {
+        {0, 1},
+        {1, 1},
+    },
+    {
+        {0, 1},
+        {1, 1},
+    },
+    {
+        {1, 1},
+        {1, 1},
+    },
+    {
+        {1, 1},
+        {1, 1},
+    },
+    {
+        {1, 1},
+        {2, 1},
+    },
+    {
+        {1, 1},
+        {2, 1},
+    },
+    {
+        {1, 2},
+        {2, 1},
+    },
+    {
+        {1, 2},
+        {2, 1},
+    },
+    {
+        {1, 2},
+        {2, 2},
+    },
+    {
+        {1, 2},
+        {2, 2},
+    },
+    {
+        {2, 2},
+        {2, 2},
+    },
+    {
+        {2, 2},
+        {2, 2},
+    },
+    {
+        {2, 2},
+        {2, 2},
+    },
+    {
+        {2, 2},
+        {3, 2},
+    },
+    {
+        {2, 2},
+        {3, 2},
+    },
+    {
+        {2, 3},
+        {3, 2},
+    },
+    {
+        {2, 3},
+        {3, 2},
+    },
+    {
+        {2, 3},
+        {3, 3},
+    },
+    {
+        {2, 3},
+        {3, 3},
+    },
+    {
+        {3, 3},
+        {3, 3},
+    },
+    {
+        {3, 3},
+        {3, 3},
+    },
+    {
+        {3, 3},
+        {4, 3},
+    },
+    {
+        {3, 3},
+        {4, 3},
+    },
+    {
+        {3, 4},
+        {4, 3},
+    },
+    {
+        {3, 4},
+        {4, 3},
+    },
+    {
+        {3, 4},
+        {4, 4},
+    },
+    {
+        {3, 4},
+        {4, 4},
+    },
+    {
+        {4, 4},
+        {4, 4},
+    },
+    {
+        {4, 4},
+        {4, 4},
+    },
+    {
+        {4, 4},
+        {5, 4},
+    },
+    {
+        {4, 4},
+        {5, 4},
+    },
+    {
+        {4, 5},
+        {5, 4},
+    },
+    {
+        {4, 5},
+        {5, 4},
+    },
+    {
+        {4, 5},
+        {5, 5},
+    },
+    {
+        {4, 5},
+        {5, 5},
+    },
+    {
+        {5, 5},
+        {5, 5},
+    },
+    {
+        {5, 5},
+        {5, 5},
+    },
+    {
+        {5, 5},
+        {6, 5},
+    },
+    {
+        {5, 5},
+        {6, 5},
+    },
+    {
+        {5, 6},
+        {6, 5},
+    },
+    {
+        {5, 6},
+        {6, 5},
+    },
+    {
+        {5, 6},
+        {6, 6},
+    },
+    {
+        {5, 6},
+        {6, 6},
+    },
+    {
+        {5, 6},
+        {6, 6},
+    },
+    {
+        {6, 6},
+        {6, 6},
+    },
+    {
+        {6, 6},
+        {6, 6},
+    },
+    {
+        {6, 6},
+        {7, 6},
+    },
+    {
+        {6, 6},
+        {7, 6},
+    },
+    {
+        {6, 7},
+        {7, 6},
+    },
+    {
+        {6, 7},
+        {7, 6},
+    },
+    {
+        {6, 7},
+        {7, 7},
+    },
+    {
+        {6, 7},
+        {7, 7},
+    },
+    {
+        {7, 7},
+        {7, 7},
+    },
+    {
+        {7, 7},
+        {7, 7},
+    },
+    {
+        {7, 7},
+        {8, 7},
+    },
+    {
+        {7, 7},
+        {8, 7},
+    },
+    {
+        {7, 8},
+        {8, 7},
+    },
+    {
+        {7, 8},
+        {8, 7},
+    },
+    {
+        {7, 8},
+        {8, 8},
+    },
+    {
+        {7, 8},
+        {8, 8},
+    },
+    {
+        {8, 8},
+        {8, 8},
+    },
+    {
+        {8, 8},
+        {8, 8},
+    },
+    {
+        {8, 8},
+        {9, 8},
+    },
+    {
+        {8, 8},
+        {9, 8},
+    },
+    {
+        {8, 9},
+        {9, 8},
+    },
+    {
+        {8, 9},
+        {9, 8},
+    },
+    {
+        {8, 9},
+        {9, 9},
+    },
+    {
+        {8, 9},
+        {9, 9},
+    },
+    {
+        {9, 9},
+        {9, 9},
+    },
+    {
+        {9, 9},
+        {9, 9},
+    },
+    {
+        {9, 9},
+        {10, 9},
+    },
+    {
+        {9, 9},
+        {10, 9},
+    },
+    {
+        {9, 10},
+        {10, 9},
+    },
+    {
+        {9, 10},
+        {10, 9},
+    },
+    {
+        {9, 10},
+        {10, 10},
+    },
+    {
+        {9, 10},
+        {10, 10},
+    },
+    {
+        {9, 10},
+        {10, 10},
+    },
+    {
+        {10, 10},
+        {10, 10},
+    },
+    {
+        {10, 10},
+        {10, 10},
+    },
+    {
+        {10, 10},
+        {11, 10},
+    },
+    {
+        {10, 10},
+        {11, 10},
+    },
+    {
+        {10, 11},
+        {11, 10},
+    },
+    {
+        {10, 11},
+        {11, 10},
+    },
+    {
+        {10, 11},
+        {11, 11},
+    },
+    {
+        {10, 11},
+        {11, 11},
+    },
+    {
+        {11, 11},
+        {11, 11},
+    },
+    {
+        {11, 11},
+        {11, 11},
+    },
+    {
+        {11, 11},
+        {12, 11},
+    },
+    {
+        {11, 11},
+        {12, 11},
+    },
+    {
+        {11, 12},
+        {12, 11},
+    },
+    {
+        {11, 12},
+        {12, 11},
+    },
+    {
+        {11, 12},
+        {12, 12},
+    },
+    {
+        {11, 12},
+        {12, 12},
+    },
+    {
+        {12, 12},
+        {12, 12},
+    },
+    {
+        {12, 12},
+        {12, 12},
+    },
+    {
+        {12, 12},
+        {13, 12},
+    },
+    {
+        {12, 12},
+        {13, 12},
+    },
+    {
+        {12, 13},
+        {13, 12},
+    },
+    {
+        {12, 13},
+        {13, 12},
+    },
+    {
+        {12, 13},
+        {13, 13},
+    },
+    {
+        {12, 13},
+        {13, 13},
+    },
+    {
+        {13, 13},
+        {13, 13},
+    },
+    {
+        {13, 13},
+        {13, 13},
+    },
+    {
+        {13, 13},
+        {14, 13},
+    },
+    {
+        {13, 13},
+        {14, 13},
+    },
+    {
+        {13, 14},
+        {14, 13},
+    },
+    {
+        {13, 14},
+        {14, 13},
+    },
+    {
+        {13, 14},
+        {14, 13},
+    },
+    {
+        {13, 14},
+        {14, 14},
+    },
+    {
+        {13, 14},
+        {14, 14},
+    },
+    {
+        {14, 14},
+        {14, 14},
+    },
+    {
+        {14, 14},
+        {14, 14},
+    },
+    {
+        {14, 14},
+        {15, 14},
+    },
+    {
+        {14, 14},
+        {15, 14},
+    },
+    {
+        {14, 15},
+        {15, 14},
+    },
+    {
+        {14, 15},
+        {15, 14},
+    },
+    {
+        {14, 15},
+        {15, 15},
+    },
+    {
+        {14, 15},
+        {15, 15},
+    },
+    {
+        {15, 15},
+        {15, 15},
+    },
+    {
+        {15, 15},
+        {15, 15},
+    },
+    {
+        {15, 15},
+        {16, 15},
+    },
+    {
+        {15, 15},
+        {16, 15},
+    },
+    {
+        {15, 16},
+        {16, 15},
+    },
+    {
+        {15, 16},
+        {16, 15},
+    },
+    {
+        {15, 16},
+        {16, 16},
+    },
+    {
+        {15, 16},
+        {16, 16},
+    },
+    {
+        {16, 16},
+        {16, 16},
+    },
+    {
+        {16, 16},
+        {16, 16},
+    },
+    {
+        {16, 16},
+        {17, 16},
+    },
+    {
+        {16, 16},
+        {17, 16},
+    },
+    {
+        {16, 17},
+        {17, 16},
+    },
+    {
+        {16, 17},
+        {17, 16},
+    },
+    {
+        {16, 17},
+        {17, 17},
+    },
+    {
+        {16, 17},
+        {17, 17},
+    },
+    {
+        {17, 17},
+        {17, 17},
+    },
+    {
+        {17, 17},
+        {17, 17},
+    },
+    {
+        {17, 17},
+        {18, 17},
+    },
+    {
+        {17, 17},
+        {18, 17},
+    },
+    {
+        {17, 18},
+        {18, 17},
+    },
+    {
+        {17, 18},
+        {18, 17},
+    },
+    {
+        {17, 18},
+        {18, 18},
+    },
+    {
+        {17, 18},
+        {18, 18},
+    },
+    {
+        {18, 18},
+        {18, 18},
+    },
+    {
+        {18, 18},
+        {18, 18},
+    },
+    {
+        {18, 18},
+        {19, 18},
+    },
+    {
+        {18, 18},
+        {19, 18},
+    },
+    {
+        {18, 19},
+        {19, 18},
+    },
+    {
+        {18, 19},
+        {19, 18},
+    },
+    {
+        {18, 19},
+        {19, 19},
+    },
+    {
+        {18, 19},
+        {19, 19},
+    },
+    {
+        {19, 19},
+        {19, 19},
+    },
+    {
+        {19, 19},
+        {19, 19},
+    },
+    {
+        {19, 19},
+        {20, 19},
+    },
+    {
+        {19, 19},
+        {20, 19},
+    },
+    {
+        {19, 20},
+        {20, 19},
+    },
+    {
+        {19, 20},
+        {20, 19},
+    },
+    {
+        {19, 20},
+        {20, 19},
+    },
+    {
+        {19, 20},
+        {20, 20},
+    },
+    {
+        {19, 20},
+        {20, 20},
+    },
+    {
+        {20, 20},
+        {20, 20},
+    },
+    {
+        {20, 20},
+        {20, 20},
+    },
+    {
+        {20, 20},
+        {21, 20},
+    },
+    {
+        {20, 20},
+        {21, 20},
+    },
+    {
+        {20, 21},
+        {21, 20},
+    },
+    {
+        {20, 21},
+        {21, 20},
+    },
+    {
+        {20, 21},
+        {21, 21},
+    },
+    {
+        {20, 21},
+        {21, 21},
+    },
+    {
+        {21, 21},
+        {21, 21},
+    },
+    {
+        {21, 21},
+        {21, 21},
+    },
+    {
+        {21, 21},
+        {22, 21},
+    },
+    {
+        {21, 21},
+        {22, 21},
+    },
+    {
+        {21, 22},
+        {22, 21},
+    },
+    {
+        {21, 22},
+        {22, 21},
+    },
+    {
+        {21, 22},
+        {22, 22},
+    },
+    {
+        {21, 22},
+        {22, 22},
+    },
+    {
+        {22, 22},
+        {22, 22},
+    },
+    {
+        {22, 22},
+        {22, 22},
+    },
+    {
+        {22, 22},
+        {23, 22},
+    },
+    {
+        {22, 22},
+        {23, 22},
+    },
+    {
+        {22, 23},
+        {23, 22},
+    },
+    {
+        {22, 23},
+        {23, 22},
+    },
+    {
+        {22, 23},
+        {23, 23},
+    },
+    {
+        {22, 23},
+        {23, 23},
+    },
+    {
+        {23, 23},
+        {23, 23},
+    },
+    {
+        {23, 23},
+        {23, 23},
+    },
+    {
+        {23, 23},
+        {24, 23},
+    },
+    {
+        {23, 23},
+        {24, 23},
+    },
+    {
+        {23, 23},
+        {24, 23},
+    },
+    {
+        {23, 24},
+        {24, 23},
+    },
+    {
+        {23, 24},
+        {24, 23},
+    },
+    {
+        {23, 24},
+        {24, 24},
+    },
+    {
+        {23, 24},
+        {24, 24},
+    },
+    {
+        {24, 24},
+        {24, 24},
+    },
+    {
+        {24, 24},
+        {24, 24},
+    },
+    {
+        {24, 24},
+        {25, 24},
+    },
+    {
+        {24, 24},
+        {25, 24},
+    },
+    {
+        {24, 25},
+        {25, 24},
+    },
+    {
+        {24, 25},
+        {25, 24},
+    },
+    {
+        {24, 25},
+        {25, 25},
+    },
+    {
+        {24, 25},
+        {25, 25},
+    },
+    {
+        {25, 25},
+        {25, 25},
+    },
+    {
+        {25, 25},
+        {25, 25},
+    },
+    {
+        {25, 25},
+        {26, 25},
+    },
+    {
+        {25, 25},
+        {26, 25},
+    },
+    {
+        {25, 26},
+        {26, 25},
+    },
+    {
+        {25, 26},
+        {26, 25},
+    },
+    {
+        {25, 26},
+        {26, 26},
+    },
+    {
+        {25, 26},
+        {26, 26},
+    },
+    {
+        {26, 26},
+        {26, 26},
+    },
+    {
+        {26, 26},
+        {26, 26},
+    },
+    {
+        {26, 26},
+        {27, 26},
+    },
+    {
+        {26, 26},
+        {27, 26},
+    },
+    {
+        {26, 27},
+        {27, 26},
+    },
+    {
+        {26, 27},
+        {27, 26},
+    },
+    {
+        {26, 27},
+        {27, 27},
+    },
+    {
+        {26, 27},
+        {27, 27},
+    },
+    {
+        {27, 27},
+        {27, 27},
+    },
+    {
+        {27, 27},
+        {27, 27},
+    },
+    {
+        {27, 27},
+        {28, 27},
+    },
+    {
+        {27, 27},
+        {28, 27},
+    },
+    {
+        {27, 27},
+        {28, 27},
+    },
+    {
+        {27, 28},
+        {28, 27},
+    },
+    {
+        {27, 28},
+        {28, 27},
+    },
+    {
+        {27, 28},
+        {28, 28},
+    },
+    {
+        {27, 28},
+        {28, 28},
+    },
+    {
+        {28, 28},
+        {28, 28},
+    },
+    {
+        {28, 28},
+        {28, 28},
+    },
+    {
+        {28, 28},
+        {29, 28},
+    },
+    {
+        {28, 28},
+        {29, 28},
+    },
+    {
+        {28, 29},
+        {29, 28},
+    },
+    {
+        {28, 29},
+        {29, 28},
+    },
+    {
+        {28, 29},
+        {29, 29},
+    },
+    {
+        {28, 29},
+        {29, 29},
+    },
+    {
+        {29, 29},
+        {29, 29},
+    },
+    {
+        {29, 29},
+        {29, 29},
+    },
+    {
+        {29, 29},
+        {30, 29},
+    },
+    {
+        {29, 29},
+        {30, 29},
+    },
+    {
+        {29, 30},
+        {30, 29},
+    },
+    {
+        {29, 30},
+        {30, 29},
+    },
+    {
+        {29, 30},
+        {30, 30},
+    },
+    {
+        {29, 30},
+        {30, 30},
+    },
+    {
+        {30, 30},
+        {30, 30},
+    },
+    {
+        {30, 30},
+        {30, 30},
+    },
+    {
+        {30, 30},
+        {31, 30},
+    },
+    {
+        {30, 30},
+        {31, 30},
+    },
+    {
+        {30, 31},
+        {31, 30},
+    },
+    {
+        {30, 31},
+        {31, 30},
+    },
+    {
+        {30, 31},
+        {31, 31},
+    },
+    {
+        {30, 31},
+        {31, 31},
+    },
+    {
+        {31, 31},
+        {31, 31},
+    },
+    {
+        {31, 31},
+        {31, 31},
+    },
 };
 
-static const uint8_t dither_g2x2[256][2][2] =
-{
-	{
-		{0, 0},
-		{0, 0},
-	},
-	{
-		{0, 0},
-		{1, 0},
-	},
-	{
-		{0, 1},
-		{1, 0},
-	},
-	{
-		{0, 1},
-		{1, 1},
-	},
-	{
-		{1, 1},
-		{1, 1},
-	},
-	{
-		{1, 1},
-		{2, 1},
-	},
-	{
-		{1, 2},
-		{2, 1},
-	},
-	{
-		{1, 2},
-		{2, 2},
-	},
-	{
-		{2, 2},
-		{2, 2},
-	},
-	{
-		{2, 2},
-		{3, 2},
-	},
-	{
-		{2, 3},
-		{3, 2},
-	},
-	{
-		{2, 3},
-		{3, 3},
-	},
-	{
-		{3, 3},
-		{3, 3},
-	},
-	{
-		{3, 3},
-		{4, 3},
-	},
-	{
-		{3, 4},
-		{4, 3},
-	},
-	{
-		{3, 4},
-		{4, 4},
-	},
-	{
-		{4, 4},
-		{4, 4},
-	},
-	{
-		{4, 4},
-		{5, 4},
-	},
-	{
-		{4, 5},
-		{5, 4},
-	},
-	{
-		{4, 5},
-		{5, 5},
-	},
-	{
-		{5, 5},
-		{5, 5},
-	},
-	{
-		{5, 5},
-		{6, 5},
-	},
-	{
-		{5, 6},
-		{6, 5},
-	},
-	{
-		{5, 6},
-		{6, 6},
-	},
-	{
-		{6, 6},
-		{6, 6},
-	},
-	{
-		{6, 6},
-		{7, 6},
-	},
-	{
-		{6, 7},
-		{7, 6},
-	},
-	{
-		{6, 7},
-		{7, 7},
-	},
-	{
-		{7, 7},
-		{7, 7},
-	},
-	{
-		{7, 7},
-		{8, 7},
-	},
-	{
-		{7, 8},
-		{8, 7},
-	},
-	{
-		{7, 8},
-		{8, 8},
-	},
-	{
-		{8, 8},
-		{8, 8},
-	},
-	{
-		{8, 8},
-		{9, 8},
-	},
-	{
-		{8, 9},
-		{9, 8},
-	},
-	{
-		{8, 9},
-		{9, 9},
-	},
-	{
-		{9, 9},
-		{9, 9},
-	},
-	{
-		{9, 9},
-		{10, 9},
-	},
-	{
-		{9, 10},
-		{10, 9},
-	},
-	{
-		{9, 10},
-		{10, 10},
-	},
-	{
-		{10, 10},
-		{10, 10},
-	},
-	{
-		{10, 10},
-		{11, 10},
-	},
-	{
-		{10, 11},
-		{11, 10},
-	},
-	{
-		{10, 11},
-		{11, 11},
-	},
-	{
-		{11, 11},
-		{11, 11},
-	},
-	{
-		{11, 11},
-		{12, 11},
-	},
-	{
-		{11, 12},
-		{12, 11},
-	},
-	{
-		{11, 12},
-		{12, 12},
-	},
-	{
-		{11, 12},
-		{12, 12},
-	},
-	{
-		{12, 12},
-		{12, 12},
-	},
-	{
-		{12, 12},
-		{13, 12},
-	},
-	{
-		{12, 13},
-		{13, 12},
-	},
-	{
-		{12, 13},
-		{13, 13},
-	},
-	{
-		{13, 13},
-		{13, 13},
-	},
-	{
-		{13, 13},
-		{14, 13},
-	},
-	{
-		{13, 14},
-		{14, 13},
-	},
-	{
-		{13, 14},
-		{14, 14},
-	},
-	{
-		{14, 14},
-		{14, 14},
-	},
-	{
-		{14, 14},
-		{15, 14},
-	},
-	{
-		{14, 15},
-		{15, 14},
-	},
-	{
-		{14, 15},
-		{15, 15},
-	},
-	{
-		{15, 15},
-		{15, 15},
-	},
-	{
-		{15, 15},
-		{16, 15},
-	},
-	{
-		{15, 16},
-		{16, 15},
-	},
-	{
-		{15, 16},
-		{16, 16},
-	},
-	{
-		{16, 16},
-		{16, 16},
-	},
-	{
-		{16, 16},
-		{17, 16},
-	},
-	{
-		{16, 17},
-		{17, 16},
-	},
-	{
-		{16, 17},
-		{17, 17},
-	},
-	{
-		{17, 17},
-		{17, 17},
-	},
-	{
-		{17, 17},
-		{18, 17},
-	},
-	{
-		{17, 18},
-		{18, 17},
-	},
-	{
-		{17, 18},
-		{18, 18},
-	},
-	{
-		{18, 18},
-		{18, 18},
-	},
-	{
-		{18, 18},
-		{19, 18},
-	},
-	{
-		{18, 19},
-		{19, 18},
-	},
-	{
-		{18, 19},
-		{19, 19},
-	},
-	{
-		{19, 19},
-		{19, 19},
-	},
-	{
-		{19, 19},
-		{20, 19},
-	},
-	{
-		{19, 20},
-		{20, 19},
-	},
-	{
-		{19, 20},
-		{20, 20},
-	},
-	{
-		{20, 20},
-		{20, 20},
-	},
-	{
-		{20, 20},
-		{21, 20},
-	},
-	{
-		{20, 21},
-		{21, 20},
-	},
-	{
-		{20, 21},
-		{21, 21},
-	},
-	{
-		{21, 21},
-		{21, 21},
-	},
-	{
-		{21, 21},
-		{22, 21},
-	},
-	{
-		{21, 22},
-		{22, 21},
-	},
-	{
-		{21, 22},
-		{22, 22},
-	},
-	{
-		{22, 22},
-		{22, 22},
-	},
-	{
-		{22, 22},
-		{23, 22},
-	},
-	{
-		{22, 23},
-		{23, 22},
-	},
-	{
-		{22, 23},
-		{23, 23},
-	},
-	{
-		{23, 23},
-		{23, 23},
-	},
-	{
-		{23, 23},
-		{24, 23},
-	},
-	{
-		{23, 24},
-		{24, 23},
-	},
-	{
-		{23, 24},
-		{24, 24},
-	},
-	{
-		{24, 24},
-		{24, 24},
-	},
-	{
-		{24, 24},
-		{25, 24},
-	},
-	{
-		{24, 25},
-		{25, 24},
-	},
-	{
-		{24, 25},
-		{25, 25},
-	},
-	{
-		{25, 25},
-		{25, 25},
-	},
-	{
-		{25, 25},
-		{26, 25},
-	},
-	{
-		{25, 26},
-		{26, 25},
-	},
-	{
-		{25, 26},
-		{26, 26},
-	},
-	{
-		{26, 26},
-		{26, 26},
-	},
-	{
-		{26, 26},
-		{27, 26},
-	},
-	{
-		{26, 27},
-		{27, 26},
-	},
-	{
-		{26, 27},
-		{27, 27},
-	},
-	{
-		{27, 27},
-		{27, 27},
-	},
-	{
-		{27, 27},
-		{28, 27},
-	},
-	{
-		{27, 28},
-		{28, 27},
-	},
-	{
-		{27, 28},
-		{28, 28},
-	},
-	{
-		{28, 28},
-		{28, 28},
-	},
-	{
-		{28, 28},
-		{29, 28},
-	},
-	{
-		{28, 29},
-		{29, 28},
-	},
-	{
-		{28, 29},
-		{29, 29},
-	},
-	{
-		{29, 29},
-		{29, 29},
-	},
-	{
-		{29, 29},
-		{30, 29},
-	},
-	{
-		{29, 30},
-		{30, 29},
-	},
-	{
-		{29, 30},
-		{30, 30},
-	},
-	{
-		{30, 30},
-		{30, 30},
-	},
-	{
-		{30, 30},
-		{31, 30},
-	},
-	{
-		{30, 31},
-		{31, 30},
-	},
-	{
-		{30, 31},
-		{31, 31},
-	},
-	{
-		{31, 31},
-		{31, 31},
-	},
-	{
-		{31, 31},
-		{32, 31},
-	},
-	{
-		{31, 32},
-		{32, 31},
-	},
-	{
-		{31, 32},
-		{32, 32},
-	},
-	{
-		{32, 32},
-		{32, 32},
-	},
-	{
-		{32, 32},
-		{33, 32},
-	},
-	{
-		{32, 33},
-		{33, 32},
-	},
-	{
-		{32, 33},
-		{33, 33},
-	},
-	{
-		{33, 33},
-		{33, 33},
-	},
-	{
-		{33, 33},
-		{34, 33},
-	},
-	{
-		{33, 34},
-		{34, 33},
-	},
-	{
-		{33, 34},
-		{34, 34},
-	},
-	{
-		{34, 34},
-		{34, 34},
-	},
-	{
-		{34, 34},
-		{35, 34},
-	},
-	{
-		{34, 35},
-		{35, 34},
-	},
-	{
-		{34, 35},
-		{35, 35},
-	},
-	{
-		{35, 35},
-		{35, 35},
-	},
-	{
-		{35, 35},
-		{36, 35},
-	},
-	{
-		{35, 36},
-		{36, 35},
-	},
-	{
-		{35, 36},
-		{36, 35},
-	},
-	{
-		{35, 36},
-		{36, 36},
-	},
-	{
-		{36, 36},
-		{36, 36},
-	},
-	{
-		{36, 36},
-		{37, 36},
-	},
-	{
-		{36, 37},
-		{37, 36},
-	},
-	{
-		{36, 37},
-		{37, 37},
-	},
-	{
-		{37, 37},
-		{37, 37},
-	},
-	{
-		{37, 37},
-		{38, 37},
-	},
-	{
-		{37, 38},
-		{38, 37},
-	},
-	{
-		{37, 38},
-		{38, 38},
-	},
-	{
-		{38, 38},
-		{38, 38},
-	},
-	{
-		{38, 38},
-		{39, 38},
-	},
-	{
-		{38, 39},
-		{39, 38},
-	},
-	{
-		{38, 39},
-		{39, 39},
-	},
-	{
-		{39, 39},
-		{39, 39},
-	},
-	{
-		{39, 39},
-		{40, 39},
-	},
-	{
-		{39, 40},
-		{40, 39},
-	},
-	{
-		{39, 40},
-		{40, 40},
-	},
-	{
-		{40, 40},
-		{40, 40},
-	},
-	{
-		{40, 40},
-		{41, 40},
-	},
-	{
-		{40, 41},
-		{41, 40},
-	},
-	{
-		{40, 41},
-		{41, 41},
-	},
-	{
-		{41, 41},
-		{41, 41},
-	},
-	{
-		{41, 41},
-		{42, 41},
-	},
-	{
-		{41, 42},
-		{42, 41},
-	},
-	{
-		{41, 42},
-		{42, 42},
-	},
-	{
-		{42, 42},
-		{42, 42},
-	},
-	{
-		{42, 42},
-		{43, 42},
-	},
-	{
-		{42, 43},
-		{43, 42},
-	},
-	{
-		{42, 43},
-		{43, 43},
-	},
-	{
-		{43, 43},
-		{43, 43},
-	},
-	{
-		{43, 43},
-		{44, 43},
-	},
-	{
-		{43, 44},
-		{44, 43},
-	},
-	{
-		{43, 44},
-		{44, 44},
-	},
-	{
-		{44, 44},
-		{44, 44},
-	},
-	{
-		{44, 44},
-		{45, 44},
-	},
-	{
-		{44, 45},
-		{45, 44},
-	},
-	{
-		{44, 45},
-		{45, 45},
-	},
-	{
-		{45, 45},
-		{45, 45},
-	},
-	{
-		{45, 45},
-		{46, 45},
-	},
-	{
-		{45, 46},
-		{46, 45},
-	},
-	{
-		{45, 46},
-		{46, 46},
-	},
-	{
-		{46, 46},
-		{46, 46},
-	},
-	{
-		{46, 46},
-		{47, 46},
-	},
-	{
-		{46, 47},
-		{47, 46},
-	},
-	{
-		{46, 47},
-		{47, 47},
-	},
-	{
-		{47, 47},
-		{47, 47},
-	},
-	{
-		{47, 47},
-		{48, 47},
-	},
-	{
-		{47, 48},
-		{48, 47},
-	},
-	{
-		{47, 48},
-		{48, 48},
-	},
-	{
-		{48, 48},
-		{48, 48},
-	},
-	{
-		{48, 48},
-		{49, 48},
-	},
-	{
-		{48, 49},
-		{49, 48},
-	},
-	{
-		{48, 49},
-		{49, 49},
-	},
-	{
-		{49, 49},
-		{49, 49},
-	},
-	{
-		{49, 49},
-		{50, 49},
-	},
-	{
-		{49, 50},
-		{50, 49},
-	},
-	{
-		{49, 50},
-		{50, 50},
-	},
-	{
-		{50, 50},
-		{50, 50},
-	},
-	{
-		{50, 50},
-		{51, 50},
-	},
-	{
-		{50, 51},
-		{51, 50},
-	},
-	{
-		{50, 51},
-		{51, 51},
-	},
-	{
-		{51, 51},
-		{51, 51},
-	},
-	{
-		{51, 51},
-		{52, 51},
-	},
-	{
-		{51, 52},
-		{52, 51},
-	},
-	{
-		{51, 52},
-		{52, 52},
-	},
-	{
-		{52, 52},
-		{52, 52},
-	},
-	{
-		{52, 52},
-		{53, 52},
-	},
-	{
-		{52, 53},
-		{53, 52},
-	},
-	{
-		{52, 53},
-		{53, 53},
-	},
-	{
-		{53, 53},
-		{53, 53},
-	},
-	{
-		{53, 53},
-		{54, 53},
-	},
-	{
-		{53, 54},
-		{54, 53},
-	},
-	{
-		{53, 54},
-		{54, 54},
-	},
-	{
-		{54, 54},
-		{54, 54},
-	},
-	{
-		{54, 54},
-		{55, 54},
-	},
-	{
-		{54, 55},
-		{55, 54},
-	},
-	{
-		{54, 55},
-		{55, 55},
-	},
-	{
-		{55, 55},
-		{55, 55},
-	},
-	{
-		{55, 55},
-		{56, 55},
-	},
-	{
-		{55, 55},
-		{56, 55},
-	},
-	{
-		{55, 56},
-		{56, 55},
-	},
-	{
-		{55, 56},
-		{56, 56},
-	},
-	{
-		{56, 56},
-		{56, 56},
-	},
-	{
-		{56, 56},
-		{57, 56},
-	},
-	{
-		{56, 57},
-		{57, 56},
-	},
-	{
-		{56, 57},
-		{57, 57},
-	},
-	{
-		{57, 57},
-		{57, 57},
-	},
-	{
-		{57, 57},
-		{58, 57},
-	},
-	{
-		{57, 58},
-		{58, 57},
-	},
-	{
-		{57, 58},
-		{58, 58},
-	},
-	{
-		{58, 58},
-		{58, 58},
-	},
-	{
-		{58, 58},
-		{59, 58},
-	},
-	{
-		{58, 59},
-		{59, 58},
-	},
-	{
-		{58, 59},
-		{59, 59},
-	},
-	{
-		{59, 59},
-		{59, 59},
-	},
-	{
-		{59, 59},
-		{60, 59},
-	},
-	{
-		{59, 60},
-		{60, 59},
-	},
-	{
-		{59, 60},
-		{60, 60},
-	},
-	{
-		{60, 60},
-		{60, 60},
-	},
-	{
-		{60, 60},
-		{61, 60},
-	},
-	{
-		{60, 61},
-		{61, 60},
-	},
-	{
-		{60, 61},
-		{61, 61},
-	},
-	{
-		{61, 61},
-		{61, 61},
-	},
-	{
-		{61, 61},
-		{62, 61},
-	},
-	{
-		{61, 62},
-		{62, 61},
-	},
-	{
-		{61, 62},
-		{62, 62},
-	},
-	{
-		{62, 62},
-		{62, 62},
-	},
-	{
-		{62, 62},
-		{63, 62},
-	},
-	{
-		{62, 63},
-		{63, 62},
-	},
-	{
-		{62, 63},
-		{63, 63},
-	},
-	{
-		{63, 63},
-		{63, 63},
-	},
+static const uint8_t dither_g2x2[256][2][2] = {
+    {
+        {0, 0},
+        {0, 0},
+    },
+    {
+        {0, 0},
+        {1, 0},
+    },
+    {
+        {0, 1},
+        {1, 0},
+    },
+    {
+        {0, 1},
+        {1, 1},
+    },
+    {
+        {1, 1},
+        {1, 1},
+    },
+    {
+        {1, 1},
+        {2, 1},
+    },
+    {
+        {1, 2},
+        {2, 1},
+    },
+    {
+        {1, 2},
+        {2, 2},
+    },
+    {
+        {2, 2},
+        {2, 2},
+    },
+    {
+        {2, 2},
+        {3, 2},
+    },
+    {
+        {2, 3},
+        {3, 2},
+    },
+    {
+        {2, 3},
+        {3, 3},
+    },
+    {
+        {3, 3},
+        {3, 3},
+    },
+    {
+        {3, 3},
+        {4, 3},
+    },
+    {
+        {3, 4},
+        {4, 3},
+    },
+    {
+        {3, 4},
+        {4, 4},
+    },
+    {
+        {4, 4},
+        {4, 4},
+    },
+    {
+        {4, 4},
+        {5, 4},
+    },
+    {
+        {4, 5},
+        {5, 4},
+    },
+    {
+        {4, 5},
+        {5, 5},
+    },
+    {
+        {5, 5},
+        {5, 5},
+    },
+    {
+        {5, 5},
+        {6, 5},
+    },
+    {
+        {5, 6},
+        {6, 5},
+    },
+    {
+        {5, 6},
+        {6, 6},
+    },
+    {
+        {6, 6},
+        {6, 6},
+    },
+    {
+        {6, 6},
+        {7, 6},
+    },
+    {
+        {6, 7},
+        {7, 6},
+    },
+    {
+        {6, 7},
+        {7, 7},
+    },
+    {
+        {7, 7},
+        {7, 7},
+    },
+    {
+        {7, 7},
+        {8, 7},
+    },
+    {
+        {7, 8},
+        {8, 7},
+    },
+    {
+        {7, 8},
+        {8, 8},
+    },
+    {
+        {8, 8},
+        {8, 8},
+    },
+    {
+        {8, 8},
+        {9, 8},
+    },
+    {
+        {8, 9},
+        {9, 8},
+    },
+    {
+        {8, 9},
+        {9, 9},
+    },
+    {
+        {9, 9},
+        {9, 9},
+    },
+    {
+        {9, 9},
+        {10, 9},
+    },
+    {
+        {9, 10},
+        {10, 9},
+    },
+    {
+        {9, 10},
+        {10, 10},
+    },
+    {
+        {10, 10},
+        {10, 10},
+    },
+    {
+        {10, 10},
+        {11, 10},
+    },
+    {
+        {10, 11},
+        {11, 10},
+    },
+    {
+        {10, 11},
+        {11, 11},
+    },
+    {
+        {11, 11},
+        {11, 11},
+    },
+    {
+        {11, 11},
+        {12, 11},
+    },
+    {
+        {11, 12},
+        {12, 11},
+    },
+    {
+        {11, 12},
+        {12, 12},
+    },
+    {
+        {11, 12},
+        {12, 12},
+    },
+    {
+        {12, 12},
+        {12, 12},
+    },
+    {
+        {12, 12},
+        {13, 12},
+    },
+    {
+        {12, 13},
+        {13, 12},
+    },
+    {
+        {12, 13},
+        {13, 13},
+    },
+    {
+        {13, 13},
+        {13, 13},
+    },
+    {
+        {13, 13},
+        {14, 13},
+    },
+    {
+        {13, 14},
+        {14, 13},
+    },
+    {
+        {13, 14},
+        {14, 14},
+    },
+    {
+        {14, 14},
+        {14, 14},
+    },
+    {
+        {14, 14},
+        {15, 14},
+    },
+    {
+        {14, 15},
+        {15, 14},
+    },
+    {
+        {14, 15},
+        {15, 15},
+    },
+    {
+        {15, 15},
+        {15, 15},
+    },
+    {
+        {15, 15},
+        {16, 15},
+    },
+    {
+        {15, 16},
+        {16, 15},
+    },
+    {
+        {15, 16},
+        {16, 16},
+    },
+    {
+        {16, 16},
+        {16, 16},
+    },
+    {
+        {16, 16},
+        {17, 16},
+    },
+    {
+        {16, 17},
+        {17, 16},
+    },
+    {
+        {16, 17},
+        {17, 17},
+    },
+    {
+        {17, 17},
+        {17, 17},
+    },
+    {
+        {17, 17},
+        {18, 17},
+    },
+    {
+        {17, 18},
+        {18, 17},
+    },
+    {
+        {17, 18},
+        {18, 18},
+    },
+    {
+        {18, 18},
+        {18, 18},
+    },
+    {
+        {18, 18},
+        {19, 18},
+    },
+    {
+        {18, 19},
+        {19, 18},
+    },
+    {
+        {18, 19},
+        {19, 19},
+    },
+    {
+        {19, 19},
+        {19, 19},
+    },
+    {
+        {19, 19},
+        {20, 19},
+    },
+    {
+        {19, 20},
+        {20, 19},
+    },
+    {
+        {19, 20},
+        {20, 20},
+    },
+    {
+        {20, 20},
+        {20, 20},
+    },
+    {
+        {20, 20},
+        {21, 20},
+    },
+    {
+        {20, 21},
+        {21, 20},
+    },
+    {
+        {20, 21},
+        {21, 21},
+    },
+    {
+        {21, 21},
+        {21, 21},
+    },
+    {
+        {21, 21},
+        {22, 21},
+    },
+    {
+        {21, 22},
+        {22, 21},
+    },
+    {
+        {21, 22},
+        {22, 22},
+    },
+    {
+        {22, 22},
+        {22, 22},
+    },
+    {
+        {22, 22},
+        {23, 22},
+    },
+    {
+        {22, 23},
+        {23, 22},
+    },
+    {
+        {22, 23},
+        {23, 23},
+    },
+    {
+        {23, 23},
+        {23, 23},
+    },
+    {
+        {23, 23},
+        {24, 23},
+    },
+    {
+        {23, 24},
+        {24, 23},
+    },
+    {
+        {23, 24},
+        {24, 24},
+    },
+    {
+        {24, 24},
+        {24, 24},
+    },
+    {
+        {24, 24},
+        {25, 24},
+    },
+    {
+        {24, 25},
+        {25, 24},
+    },
+    {
+        {24, 25},
+        {25, 25},
+    },
+    {
+        {25, 25},
+        {25, 25},
+    },
+    {
+        {25, 25},
+        {26, 25},
+    },
+    {
+        {25, 26},
+        {26, 25},
+    },
+    {
+        {25, 26},
+        {26, 26},
+    },
+    {
+        {26, 26},
+        {26, 26},
+    },
+    {
+        {26, 26},
+        {27, 26},
+    },
+    {
+        {26, 27},
+        {27, 26},
+    },
+    {
+        {26, 27},
+        {27, 27},
+    },
+    {
+        {27, 27},
+        {27, 27},
+    },
+    {
+        {27, 27},
+        {28, 27},
+    },
+    {
+        {27, 28},
+        {28, 27},
+    },
+    {
+        {27, 28},
+        {28, 28},
+    },
+    {
+        {28, 28},
+        {28, 28},
+    },
+    {
+        {28, 28},
+        {29, 28},
+    },
+    {
+        {28, 29},
+        {29, 28},
+    },
+    {
+        {28, 29},
+        {29, 29},
+    },
+    {
+        {29, 29},
+        {29, 29},
+    },
+    {
+        {29, 29},
+        {30, 29},
+    },
+    {
+        {29, 30},
+        {30, 29},
+    },
+    {
+        {29, 30},
+        {30, 30},
+    },
+    {
+        {30, 30},
+        {30, 30},
+    },
+    {
+        {30, 30},
+        {31, 30},
+    },
+    {
+        {30, 31},
+        {31, 30},
+    },
+    {
+        {30, 31},
+        {31, 31},
+    },
+    {
+        {31, 31},
+        {31, 31},
+    },
+    {
+        {31, 31},
+        {32, 31},
+    },
+    {
+        {31, 32},
+        {32, 31},
+    },
+    {
+        {31, 32},
+        {32, 32},
+    },
+    {
+        {32, 32},
+        {32, 32},
+    },
+    {
+        {32, 32},
+        {33, 32},
+    },
+    {
+        {32, 33},
+        {33, 32},
+    },
+    {
+        {32, 33},
+        {33, 33},
+    },
+    {
+        {33, 33},
+        {33, 33},
+    },
+    {
+        {33, 33},
+        {34, 33},
+    },
+    {
+        {33, 34},
+        {34, 33},
+    },
+    {
+        {33, 34},
+        {34, 34},
+    },
+    {
+        {34, 34},
+        {34, 34},
+    },
+    {
+        {34, 34},
+        {35, 34},
+    },
+    {
+        {34, 35},
+        {35, 34},
+    },
+    {
+        {34, 35},
+        {35, 35},
+    },
+    {
+        {35, 35},
+        {35, 35},
+    },
+    {
+        {35, 35},
+        {36, 35},
+    },
+    {
+        {35, 36},
+        {36, 35},
+    },
+    {
+        {35, 36},
+        {36, 35},
+    },
+    {
+        {35, 36},
+        {36, 36},
+    },
+    {
+        {36, 36},
+        {36, 36},
+    },
+    {
+        {36, 36},
+        {37, 36},
+    },
+    {
+        {36, 37},
+        {37, 36},
+    },
+    {
+        {36, 37},
+        {37, 37},
+    },
+    {
+        {37, 37},
+        {37, 37},
+    },
+    {
+        {37, 37},
+        {38, 37},
+    },
+    {
+        {37, 38},
+        {38, 37},
+    },
+    {
+        {37, 38},
+        {38, 38},
+    },
+    {
+        {38, 38},
+        {38, 38},
+    },
+    {
+        {38, 38},
+        {39, 38},
+    },
+    {
+        {38, 39},
+        {39, 38},
+    },
+    {
+        {38, 39},
+        {39, 39},
+    },
+    {
+        {39, 39},
+        {39, 39},
+    },
+    {
+        {39, 39},
+        {40, 39},
+    },
+    {
+        {39, 40},
+        {40, 39},
+    },
+    {
+        {39, 40},
+        {40, 40},
+    },
+    {
+        {40, 40},
+        {40, 40},
+    },
+    {
+        {40, 40},
+        {41, 40},
+    },
+    {
+        {40, 41},
+        {41, 40},
+    },
+    {
+        {40, 41},
+        {41, 41},
+    },
+    {
+        {41, 41},
+        {41, 41},
+    },
+    {
+        {41, 41},
+        {42, 41},
+    },
+    {
+        {41, 42},
+        {42, 41},
+    },
+    {
+        {41, 42},
+        {42, 42},
+    },
+    {
+        {42, 42},
+        {42, 42},
+    },
+    {
+        {42, 42},
+        {43, 42},
+    },
+    {
+        {42, 43},
+        {43, 42},
+    },
+    {
+        {42, 43},
+        {43, 43},
+    },
+    {
+        {43, 43},
+        {43, 43},
+    },
+    {
+        {43, 43},
+        {44, 43},
+    },
+    {
+        {43, 44},
+        {44, 43},
+    },
+    {
+        {43, 44},
+        {44, 44},
+    },
+    {
+        {44, 44},
+        {44, 44},
+    },
+    {
+        {44, 44},
+        {45, 44},
+    },
+    {
+        {44, 45},
+        {45, 44},
+    },
+    {
+        {44, 45},
+        {45, 45},
+    },
+    {
+        {45, 45},
+        {45, 45},
+    },
+    {
+        {45, 45},
+        {46, 45},
+    },
+    {
+        {45, 46},
+        {46, 45},
+    },
+    {
+        {45, 46},
+        {46, 46},
+    },
+    {
+        {46, 46},
+        {46, 46},
+    },
+    {
+        {46, 46},
+        {47, 46},
+    },
+    {
+        {46, 47},
+        {47, 46},
+    },
+    {
+        {46, 47},
+        {47, 47},
+    },
+    {
+        {47, 47},
+        {47, 47},
+    },
+    {
+        {47, 47},
+        {48, 47},
+    },
+    {
+        {47, 48},
+        {48, 47},
+    },
+    {
+        {47, 48},
+        {48, 48},
+    },
+    {
+        {48, 48},
+        {48, 48},
+    },
+    {
+        {48, 48},
+        {49, 48},
+    },
+    {
+        {48, 49},
+        {49, 48},
+    },
+    {
+        {48, 49},
+        {49, 49},
+    },
+    {
+        {49, 49},
+        {49, 49},
+    },
+    {
+        {49, 49},
+        {50, 49},
+    },
+    {
+        {49, 50},
+        {50, 49},
+    },
+    {
+        {49, 50},
+        {50, 50},
+    },
+    {
+        {50, 50},
+        {50, 50},
+    },
+    {
+        {50, 50},
+        {51, 50},
+    },
+    {
+        {50, 51},
+        {51, 50},
+    },
+    {
+        {50, 51},
+        {51, 51},
+    },
+    {
+        {51, 51},
+        {51, 51},
+    },
+    {
+        {51, 51},
+        {52, 51},
+    },
+    {
+        {51, 52},
+        {52, 51},
+    },
+    {
+        {51, 52},
+        {52, 52},
+    },
+    {
+        {52, 52},
+        {52, 52},
+    },
+    {
+        {52, 52},
+        {53, 52},
+    },
+    {
+        {52, 53},
+        {53, 52},
+    },
+    {
+        {52, 53},
+        {53, 53},
+    },
+    {
+        {53, 53},
+        {53, 53},
+    },
+    {
+        {53, 53},
+        {54, 53},
+    },
+    {
+        {53, 54},
+        {54, 53},
+    },
+    {
+        {53, 54},
+        {54, 54},
+    },
+    {
+        {54, 54},
+        {54, 54},
+    },
+    {
+        {54, 54},
+        {55, 54},
+    },
+    {
+        {54, 55},
+        {55, 54},
+    },
+    {
+        {54, 55},
+        {55, 55},
+    },
+    {
+        {55, 55},
+        {55, 55},
+    },
+    {
+        {55, 55},
+        {56, 55},
+    },
+    {
+        {55, 55},
+        {56, 55},
+    },
+    {
+        {55, 56},
+        {56, 55},
+    },
+    {
+        {55, 56},
+        {56, 56},
+    },
+    {
+        {56, 56},
+        {56, 56},
+    },
+    {
+        {56, 56},
+        {57, 56},
+    },
+    {
+        {56, 57},
+        {57, 56},
+    },
+    {
+        {56, 57},
+        {57, 57},
+    },
+    {
+        {57, 57},
+        {57, 57},
+    },
+    {
+        {57, 57},
+        {58, 57},
+    },
+    {
+        {57, 58},
+        {58, 57},
+    },
+    {
+        {57, 58},
+        {58, 58},
+    },
+    {
+        {58, 58},
+        {58, 58},
+    },
+    {
+        {58, 58},
+        {59, 58},
+    },
+    {
+        {58, 59},
+        {59, 58},
+    },
+    {
+        {58, 59},
+        {59, 59},
+    },
+    {
+        {59, 59},
+        {59, 59},
+    },
+    {
+        {59, 59},
+        {60, 59},
+    },
+    {
+        {59, 60},
+        {60, 59},
+    },
+    {
+        {59, 60},
+        {60, 60},
+    },
+    {
+        {60, 60},
+        {60, 60},
+    },
+    {
+        {60, 60},
+        {61, 60},
+    },
+    {
+        {60, 61},
+        {61, 60},
+    },
+    {
+        {60, 61},
+        {61, 61},
+    },
+    {
+        {61, 61},
+        {61, 61},
+    },
+    {
+        {61, 61},
+        {62, 61},
+    },
+    {
+        {61, 62},
+        {62, 61},
+    },
+    {
+        {61, 62},
+        {62, 62},
+    },
+    {
+        {62, 62},
+        {62, 62},
+    },
+    {
+        {62, 62},
+        {63, 62},
+    },
+    {
+        {62, 63},
+        {63, 62},
+    },
+    {
+        {62, 63},
+        {63, 63},
+    },
+    {
+        {63, 63},
+        {63, 63},
+    },
 };
 
 /* Dither subtraction */
-static const uint8_t dithersub_rb[256][4][4] =
-{
+static const uint8_t dithersub_rb[256][4][4] = {
       {
             {0, 0, 0, 0},
             {0, 0, 0, 0},
@@ -6696,8 +6691,7 @@ static const uint8_t dithersub_rb[256][4][4] =
       },
 };
 
-static const uint8_t dithersub_g[256][4][4] =
-{
+static const uint8_t dithersub_g[256][4][4] = {
       {
             {0, 0, 0, 0},
             {0, 0, 0, 0},
@@ -8236,8 +8230,7 @@ static const uint8_t dithersub_g[256][4][4] =
       },
 };
 
-static const uint8_t dithersub_g2x2[256][2][2] =
-{
+static const uint8_t dithersub_g2x2[256][2][2] = {
       {
             {0, 0},
             {0, 0},
@@ -9264,8 +9257,7 @@ static const uint8_t dithersub_g2x2[256][2][2] =
       },
 };
 
-static const uint8_t dithersub_rb2x2[256][2][2] =
-{
+static const uint8_t dithersub_rb2x2[256][2][2] = {
       {
             {0, 0},
             {0, 0},
diff --git a/src/include/86box/video.h b/src/include/86box/video.h
index bc76d60fd..2f89f10b3 100644
--- a/src/include/86box/video.h
+++ b/src/include/86box/video.h
@@ -152,7 +152,7 @@ extern int changeframecount;
 
 extern volatile int screenshots;
 #if 0
-extern bitmap_t	*buffer32;
+extern bitmap_t *buffer32;
 #endif
 #define buffer32             (monitors[monitor_index_global].target_buffer)
 #define pal_lookup           (monitors[monitor_index_global].mon_pal_lookup)
@@ -179,7 +179,7 @@ extern bitmap_t	*buffer32;
 extern PALETTE      cgapal;
 extern PALETTE      cgapal_mono[6];
 #if 0
-extern uint32_t	    pal_lookup[256];
+extern uint32_t     pal_lookup[256];
 #endif
 extern int          video_fullscreen;
 extern int          video_fullscreen_scale;
@@ -352,6 +352,7 @@ extern const device_t gd5429_vlb_device;
 extern const device_t gd5430_diamond_speedstar_pro_se_a8_vlb_device;
 extern const device_t gd5430_vlb_device;
 extern const device_t gd5430_pci_device;
+extern const device_t gd5430_onboard_pci_device;
 extern const device_t gd5434_isa_device;
 extern const device_t gd5434_diamond_speedstar_64_a3_isa_device;
 extern const device_t gd5434_onboard_pci_device;
diff --git a/src/machine/m_amstrad.c b/src/machine/m_amstrad.c
index a64561cf2..091642287 100644
--- a/src/machine/m_amstrad.c
+++ b/src/machine/m_amstrad.c
@@ -1299,7 +1299,7 @@ lcdm_poll(amsvid_t *vid)
                 drawcursor = ((mda->ma == ca) && mda->con && mda->cursoron);
                 blink      = ((mda->blink & 16) && (mda->ctrl & 0x20) && (attr & 0x80) && !drawcursor);
 
-                lcd_draw_char_80(vid, &((buffer32->line[mda->displine]))[x * 8], chr, attr, drawcursor, blink, mda->sc, 0, mda->ctrl);
+                lcd_draw_char_80(vid, &(buffer32->line[mda->displine])[x * 8], chr, attr, drawcursor, blink, mda->sc, 0, mda->ctrl);
                 mda->ma++;
             }
         }
@@ -2005,10 +2005,8 @@ const device_t vid_pc3086_device = {
 };
 
 static void
-ms_write(uint16_t addr, UNUSED(uint8_t val), void *priv)
+ms_write(uint16_t addr, UNUSED(uint8_t val), UNUSED(void *priv))
 {
-    amstrad_t *ams = (amstrad_t *) priv;
-
     if ((addr == 0x78) || (addr == 0x79))
         mouse_clear_x();
     else
@@ -2016,11 +2014,10 @@ ms_write(uint16_t addr, UNUSED(uint8_t val), void *priv)
 }
 
 static uint8_t
-ms_read(uint16_t addr, void *priv)
+ms_read(uint16_t addr, UNUSED(void *priv))
 {
-    amstrad_t *ams = (amstrad_t *) priv;
-    uint8_t    ret;
-    int delta = 0;
+    uint8_t ret;
+    int     delta = 0;
 
     if ((addr == 0x78) || (addr == 0x79)) {
         mouse_subtract_x(&delta, NULL, -128, 127, 0);
diff --git a/src/machine/m_at_286_386sx.c b/src/machine/m_at_286_386sx.c
index fb87c9976..c7b1acb0c 100644
--- a/src/machine/m_at_286_386sx.c
+++ b/src/machine/m_at_286_386sx.c
@@ -10,11 +10,9 @@
  *
  *
  *
- * Authors: Sarah Walker, <https://pcem-emulator.co.uk/>
- *          Miran Grca, <mgrca8@gmail.com>
+ * Authors: Miran Grca, <mgrca8@gmail.com>
  *          EngiNerd <webmaster.crrc@yahoo.it>
  *
- *          Copyright 2010-2019 Sarah Walker.
  *          Copyright 2016-2019 Miran Grca.
  *          Copyright 2020 EngiNerd.
  */
diff --git a/src/machine/m_at_386dx_486.c b/src/machine/m_at_386dx_486.c
index 57f65811b..ffd06bacd 100644
--- a/src/machine/m_at_386dx_486.c
+++ b/src/machine/m_at_386dx_486.c
@@ -10,10 +10,8 @@
  *
  *
  *
- * Authors: Sarah Walker, <https://pcem-emulator.co.uk/>
- *          Miran Grca, <mgrca8@gmail.com>
+ * Authors: Miran Grca, <mgrca8@gmail.com>
  *
- *          Copyright 2010-2020 Sarah Walker.
  *          Copyright 2016-2020 Miran Grca.
  */
 #include <stdarg.h>
@@ -632,16 +630,24 @@ machine_at_pc330_6573_init(const machine_t *model) /* doesn't like every CPU oth
     if (bios_only || !ret)
         return ret;
 
-    machine_at_common_init(model);
+    machine_at_common_init_ex(model, 2);
     device_add(&ide_vlb_2ch_device);
 
     pci_init(PCI_CONFIG_TYPE_1);
-    pci_register_slot(0x10, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
-    pci_register_slot(0x11, PCI_CARD_NORMAL,      1, 2, 3, 4);
-    pci_register_slot(0x12, PCI_CARD_NORMAL,      2, 3, 4, 1);
-    pci_register_slot(0x13, PCI_CARD_NORMAL,      3, 4, 1, 2);
+    pci_register_slot(0x10, PCI_CARD_NORTHBRIDGE,  0,  0,  0,  0);
+    pci_register_slot(0x0B, PCI_CARD_NORMAL,       1,  2,  3,  4);
+    pci_register_slot(0x0C, PCI_CARD_NORMAL,       5,  6,  7,  8);
+    pci_register_slot(0x0D, PCI_CARD_NORMAL,       9, 10, 11, 12);
+    /* This is a guess because the BIOS always gives it a video BIOS
+       and never gives it an IRQ, so it is impossible to known for
+       certain until we obtain PCI readouts from the real machine. */
+    pci_register_slot(0x0E, PCI_CARD_VIDEO,       13, 14, 15, 16);
 
-    device_add(&opti802g_pci_device);
+    if (gfxcard[0] == VID_INTERNAL)
+        device_add(&gd5430_onboard_pci_device);
+
+    device_add(&opti602_device);
+    device_add(&opti802g_device);
     device_add(&opti822_device);
     device_add(&keyboard_ps2_ami_device);
     device_add(&fdc37c665_ide_device);
@@ -1568,7 +1574,7 @@ machine_at_ecs486_init(const machine_t *model)
     device_add(&ide_cmd640_pci_legacy_only_device);
     device_add(&fdc37c665_device);
     device_add(&intel_flash_bxt_device);
-    device_add(&keyboard_at_ami_device);
+    device_add(&keyboard_ps2_ami_device);
 
     return ret;
 }
@@ -1717,7 +1723,7 @@ machine_at_spc7700plw_init(const machine_t *model)
     device_add(&umc_8886af_device);
     device_add(&fdc37c665_device);
     device_add(&intel_flash_bxt_device);
-    device_add(&keyboard_at_ami_device);
+    device_add(&keyboard_ps2_ami_device);
 
     return ret;
 }
diff --git a/src/machine/m_at_compaq.c b/src/machine/m_at_compaq.c
index 3e342a950..fe1236ed8 100644
--- a/src/machine/m_at_compaq.c
+++ b/src/machine/m_at_compaq.c
@@ -705,8 +705,8 @@ const device_config_t compaq_plasma_config[] = {
   // clang-format off
     {
         .name = "rgb_type",
-		.description = "RGB type",
-		.type = CONFIG_SELECTION,
+        .description = "RGB type",
+        .type = CONFIG_SELECTION,
         .default_string = "",
         .default_int = 0,
         .file_filter = "",
diff --git a/src/machine/m_at_socket4.c b/src/machine/m_at_socket4.c
index 6d8611684..ad6d2c995 100644
--- a/src/machine/m_at_socket4.c
+++ b/src/machine/m_at_socket4.c
@@ -10,10 +10,8 @@
  *
  *
  *
- * Authors: Sarah Walker, <https://pcem-emulator.co.uk/>
- *          Miran Grca, <mgrca8@gmail.com>
+ * Authors: Miran Grca, <mgrca8@gmail.com>
  *
- *          Copyright 2010-2019 Sarah Walker.
  *          Copyright 2016-2019 Miran Grca.
  */
 #include <stdio.h>
diff --git a/src/machine/m_at_socket5.c b/src/machine/m_at_socket5.c
index 9a45e71bf..a75d87a96 100644
--- a/src/machine/m_at_socket5.c
+++ b/src/machine/m_at_socket5.c
@@ -10,10 +10,8 @@
  *
  *
  *
- * Authors: Sarah Walker, <https://pcem-emulator.co.uk/>
- *          Miran Grca, <mgrca8@gmail.com>
+ * Authors: Miran Grca, <mgrca8@gmail.com>
  *
- *          Copyright 2010-2019 Sarah Walker.
  *          Copyright 2016-2019 Miran Grca.
  */
 #include <stdio.h>
@@ -172,7 +170,7 @@ machine_at_zappa_init(const machine_t *model)
     if (bios_only || !ret)
         return ret;
 
-    machine_at_common_init(model);
+    machine_at_common_init_ex(model, 2);
 
     pci_init(PCI_CONFIG_TYPE_1);
     pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
diff --git a/src/machine/m_at_socket7.c b/src/machine/m_at_socket7.c
index 3c0f0481a..1fee61b88 100644
--- a/src/machine/m_at_socket7.c
+++ b/src/machine/m_at_socket7.c
@@ -10,11 +10,8 @@
  *
  *
  *
- * Authors: Sarah Walker, <https://pcem-emulator.co.uk/>
- *          Miran Grca, <mgrca8@gmail.com>
- *          Melissa Goad, <mszoopers@protonmail.com>
+ * Authors: Miran Grca, <mgrca8@gmail.com>
  *
- *          Copyright 2010-2020 Sarah Walker.
  *          Copyright 2016-2020 Miran Grca.
  *
  */
@@ -189,7 +186,7 @@ machine_at_tc430hx_init(const machine_t *model)
     if (bios_only || !ret)
         return ret;
 
-    machine_at_common_init(model);
+    machine_at_common_init_ex(model, 2);
 
     pci_init(PCI_CONFIG_TYPE_1);
     pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
@@ -224,7 +221,7 @@ machine_at_infinia7200_init(const machine_t *model)
     if (bios_only || !ret)
         return ret;
 
-    machine_at_common_init(model);
+    machine_at_common_init_ex(model, 2);
 
     pci_init(PCI_CONFIG_TYPE_1);
     pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
@@ -260,7 +257,7 @@ machine_at_equium5200_init(const machine_t *model)
     if (bios_only || !ret)
         return ret;
 
-    machine_at_common_init(model);
+    machine_at_common_init_ex(model, 2);
 
     pci_init(PCI_CONFIG_TYPE_1);
     pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
@@ -294,7 +291,7 @@ machine_at_pcv90_init(const machine_t *model)
     if (bios_only || !ret)
         return ret;
 
-    machine_at_common_init(model);
+    machine_at_common_init_ex(model, 2);
 
     pci_init(PCI_CONFIG_TYPE_1);
     pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
@@ -550,7 +547,7 @@ machine_at_pb680_init(const machine_t *model)
     if (bios_only || !ret)
         return ret;
 
-    machine_at_common_init(model);
+    machine_at_common_init_ex(model, 2);
 
     pci_init(PCI_CONFIG_TYPE_1);
     pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
diff --git a/src/machine/m_at_socket7_3v.c b/src/machine/m_at_socket7_3v.c
index 852ce0a55..c9fb65e58 100644
--- a/src/machine/m_at_socket7_3v.c
+++ b/src/machine/m_at_socket7_3v.c
@@ -10,11 +10,8 @@
  *
  *
  *
- * Authors: Sarah Walker, <https://pcem-emulator.co.uk/>
- *          Miran Grca, <mgrca8@gmail.com>
- *          Melissa Goad, <mszoopers@protonmail.com>
+ * Authors: Miran Grca, <mgrca8@gmail.com>
  *
- *          Copyright 2010-2020 Sarah Walker.
  *          Copyright 2016-2020 Miran Grca.
  */
 #include <stdio.h>
@@ -47,7 +44,7 @@
 static void
 machine_at_thor_common_init(const machine_t *model, int mr)
 {
-    machine_at_common_init_ex(model, mr);
+    machine_at_common_init_ex(model, 2);
 
     pci_init(PCI_CONFIG_TYPE_1);
     pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
@@ -61,9 +58,6 @@ machine_at_thor_common_init(const machine_t *model, int mr)
     if (gfxcard[0] == VID_INTERNAL)
         device_add(&s3_phoenix_trio64vplus_onboard_pci_device);
 
-#if 0
-    device_add(&keyboard_ps2_ami_pci_device);
-#endif
     device_add(&keyboard_ps2_intel_ami_pci_device);
     device_add(&i430fx_device);
     device_add(&piix_device);
@@ -213,7 +207,7 @@ machine_at_endeavor_init(const machine_t *model)
     if (bios_only || !ret)
         return ret;
 
-    machine_at_common_init(model);
+    machine_at_common_init_ex(model, 2);
 
     pci_init(PCI_CONFIG_TYPE_1);
     pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
@@ -276,7 +270,7 @@ machine_at_pb640_init(const machine_t *model)
     if (bios_only || !ret)
         return ret;
 
-    machine_at_common_init(model);
+    machine_at_common_init_ex(model, 2);
 
     pci_init(PCI_CONFIG_TYPE_1);
     pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
@@ -458,7 +452,7 @@ machine_at_p55t2s_init(const machine_t *model)
     if (bios_only || !ret)
         return ret;
 
-    machine_at_common_init(model);
+    machine_at_common_init_ex(model, 2);
 
     pci_init(PCI_CONFIG_TYPE_1);
     pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
diff --git a/src/machine/m_at_sockets7.c b/src/machine/m_at_sockets7.c
index dab544707..382a4f327 100644
--- a/src/machine/m_at_sockets7.c
+++ b/src/machine/m_at_sockets7.c
@@ -10,13 +10,9 @@
  *
  *
  *
- * Authors: Sarah Walker, <https://pcem-emulator.co.uk/>
- *          Miran Grca, <mgrca8@gmail.com>
- *          Melissa Goad, <mszoopers@protonmail.com>
+ * Authors: Miran Grca, <mgrca8@gmail.com>
  *
- *          Copyright 2010-2020 Sarah Walker.
  *          Copyright 2016-2020 Miran Grca.
- *          Copyright 2020 Melissa Goad.
  */
 #include <stdio.h>
 #include <stdint.h>
diff --git a/src/machine/m_at_t3100e.c b/src/machine/m_at_t3100e.c
index a84845982..e3e24cf2c 100644
--- a/src/machine/m_at_t3100e.c
+++ b/src/machine/m_at_t3100e.c
@@ -121,11 +121,11 @@
  *
  * Authors: Fred N. van Kempen, <decwiz@yahoo.com>
  *          Miran Grca, <mgrca8@gmail.com>
- *          Sarah Walker, <https://pcem-emulator.co.uk/>
+ *          John Elliott, <jce@seasip.info>
  *
  *          Copyright 2017-2018 Fred N. van Kempen.
  *          Copyright 2016-2018 Miran Grca.
- *          Copyright 2008-2018 Sarah Walker.
+ *          Copyright 2008-2018 John Elliott.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/machine/m_at_t3100e_vid.c b/src/machine/m_at_t3100e_vid.c
index 57b0641a6..50c9ec05a 100644
--- a/src/machine/m_at_t3100e_vid.c
+++ b/src/machine/m_at_t3100e_vid.c
@@ -26,11 +26,11 @@
  *
  * Authors: Fred N. van Kempen, <decwiz@yahoo.com>
  *          Miran Grca, <mgrca8@gmail.com>
- *          Sarah Walker, <https://pcem-emulator.co.uk/>
+ *          John Elliott, <jce@seasip.info>
  *
  *          Copyright 2017-2019 Fred N. van Kempen.
  *          Copyright 2016-2019 Miran Grca.
- *          Copyright 2008-2019 Sarah Walker.
+ *          Copyright 2008-2019 John Elliott.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/machine/m_xt_olivetti.c b/src/machine/m_xt_olivetti.c
index fa9afc321..e5afae885 100644
--- a/src/machine/m_xt_olivetti.c
+++ b/src/machine/m_xt_olivetti.c
@@ -1504,7 +1504,7 @@ m19_vid_init(m19_vid_t *vid)
 #endif
 
     /* OGC emulation part begin */
-    loadfont_ex("roms/machines/m19/BIOS.BIN", 1, 90);
+    loadfont("roms/machines/m19/MBM2764-30 8514 107 AB PCF3.BIN", 7);
     /* composite is not working yet */
     vid->ogc.cga.composite    = 0; // (display_type != CGA_RGB);
     vid->ogc.cga.revision     = device_get_config_int("composite_type");
@@ -1916,6 +1916,7 @@ machine_xt_m19_init(const machine_t *model)
 
     ret = bios_load_linear("roms/machines/m19/BIOS.BIN",
                            0x000fc000, 16384, 0);
+    ret &= rom_present("roms/machines/m19/MBM2764-30 8514 107 AB PCF3.BIN");
 
     if (bios_only || !ret)
         return ret;
diff --git a/src/machine/m_xt_t1000.c b/src/machine/m_xt_t1000.c
index 2880f4201..1b7cdab91 100644
--- a/src/machine/m_xt_t1000.c
+++ b/src/machine/m_xt_t1000.c
@@ -55,11 +55,11 @@
  *
  * Authors: Fred N. van Kempen, <decwiz@yahoo.com>
  *          Miran Grca, <mgrca8@gmail.com>
- *          Sarah Walker, <https://pcem-emulator.co.uk/>
+ *          John Elliott, <jce@seasip.info>
  *
  *          Copyright 2018-2019 Fred N. van Kempen.
  *          Copyright 2018-2019 Miran Grca.
- *          Copyright 2018-2019 Sarah Walker.
+ *          Copyright 2018-2019 John Elliott.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/machine/m_xt_t1000_vid.c b/src/machine/m_xt_t1000_vid.c
index 006698869..4ec13b5c4 100644
--- a/src/machine/m_xt_t1000_vid.c
+++ b/src/machine/m_xt_t1000_vid.c
@@ -13,11 +13,11 @@
  *
  * Authors: Fred N. van Kempen, <decwiz@yahoo.com>
  *          Miran Grca, <mgrca8@gmail.com>
- *          Sarah Walker, <https://pcem-emulator.co.uk/>
+ *          John Elliott, <jce@seasip.info>
  *
  *          Copyright 2018-2019 Fred N. van Kempen.
  *          Copyright 2018-2019 Miran Grca.
- *          Copyright 2018-2019 Sarah Walker.
+ *          Copyright 2018-2019 John Elliott.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/machine/m_xt_zenith.c b/src/machine/m_xt_zenith.c
index 628b98e8b..5525b36ce 100644
--- a/src/machine/m_xt_zenith.c
+++ b/src/machine/m_xt_zenith.c
@@ -11,12 +11,12 @@
  *
  *
  *
- * Authors: Sarah Walker, <https://pcem-emulator.co.uk/>
+ * Authors: Tux,
  *          Miran Grca, <mgrca8@gmail.com>
  *          TheCollector1995, <mariogplayer@gmail.com>
  *          EngiNerd <webmaster.crrc@yahoo.it>
  *
- *          Copyright 2008-2019 Sarah Walker.
+ *          Copyright 2016-2019 Tux.
  *          Copyright 2016-2019 Miran Grca.
  *          Copyright 2020 EngiNerd.
  */
diff --git a/src/machine/machine.c b/src/machine/machine.c
index 70228390d..61aa9914d 100644
--- a/src/machine/machine.c
+++ b/src/machine/machine.c
@@ -10,11 +10,9 @@
  *
  *
  *
- * Authors: Sarah Walker, <https://pcem-emulator.co.uk/>
- *          Miran Grca, <mgrca8@gmail.com>
+ * Authors: Miran Grca, <mgrca8@gmail.com>
  *          Fred N. van Kempen, <decwiz@yahoo.com>
  *
- *          Copyright 2008-2020 Sarah Walker.
  *          Copyright 2016-2020 Miran Grca.
  *          Copyright 2017-2020 Fred N. van Kempen.
  */
@@ -168,7 +166,7 @@ machine_common_init(UNUSED(const machine_t *model))
 
     int pit_type = IS_AT(machine) ? PIT_8254 : PIT_8253;
     /* Select fast PIT if needed */
-    if ((pit_mode == -1 && is486) || pit_mode == 1)
+    if (((pit_mode == -1) && is486) || (pit_mode == 1))
         pit_type += 2;
 
     pit_common_init(pit_type, pit_irq0_timer, NULL);
diff --git a/src/machine/machine_table.c b/src/machine/machine_table.c
index 56adf6ef9..c0a4bdc3d 100644
--- a/src/machine/machine_table.c
+++ b/src/machine/machine_table.c
@@ -13,11 +13,9 @@
  *
  *
  *
- * Authors: Sarah Walker, <https://pcem-emulator.co.uk/>
- *          Miran Grca, <mgrca8@gmail.com>
+ * Authors: Miran Grca, <mgrca8@gmail.com>
  *          Fred N. van Kempen, <decwiz@yahoo.com>
  *
- *          Copyright 2008-2020 Sarah Walker.
  *          Copyright 2016-2020 Miran Grca.
  *          Copyright 2017-2020 Fred N. van Kempen.
  */
@@ -6486,17 +6484,17 @@ const machine_t machines[] = {
             .max_multi = 3.0
         },
         .bus_flags = MACHINE_PS2_PCI,
-        .flags = MACHINE_IDE | MACHINE_APM,
+        .flags = MACHINE_IDE | MACHINE_VIDEO | MACHINE_APM,
         .ram = {
             .min = 1024,
             .max = 65536,
             .step = 1024
         },
-        .nvrmask = 127,
+        .nvrmask = 255,
         .kbc_device = NULL,
         .kbc_p1 = 0,
         .gpio = 0,
-        .device = NULL,
+        .device = &gd5430_onboard_pci_device,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -7073,7 +7071,7 @@ const machine_t machines[] = {
             .min_multi = 0,
             .max_multi = 0
         },
-        .bus_flags = MACHINE_PCI,
+        .bus_flags = MACHINE_PCI | MACHINE_BUS_PS2_LATCH,
         .flags = MACHINE_IDE_DUAL | MACHINE_APM,
         .ram = {
             .min = 1024,
@@ -8284,7 +8282,7 @@ const machine_t machines[] = {
             .max = 131072,
             .step = 8192
         },
-        .nvrmask = 127,
+        .nvrmask = 255,
         .kbc_device = NULL,
         .kbc_p1 = 0,
         .gpio = 0,
@@ -8725,7 +8723,7 @@ const machine_t machines[] = {
             .max = 131072,
             .step = 8192
         },
-        .nvrmask = 127,
+        .nvrmask = 255,
         .kbc_device = NULL,
         .kbc_p1 = 0,
         .gpio = 0,
@@ -8806,7 +8804,7 @@ const machine_t machines[] = {
             .max = 131072,
             .step = 8192
         },
-        .nvrmask = 127,
+        .nvrmask = 255,
         .kbc_device = NULL,
         .kbc_p1 = 0,
         .gpio = 0,
@@ -8847,7 +8845,7 @@ const machine_t machines[] = {
             .max = 131072,
             .step = 8192
         },
-        .nvrmask = 127,
+        .nvrmask = 255,
         .kbc_device = NULL,
         .kbc_p1 = 0,
         .gpio = 0,
@@ -8888,7 +8886,7 @@ const machine_t machines[] = {
             .max = 131072,
             .step = 8192
         },
-        .nvrmask = 127,
+        .nvrmask = 255,
         .kbc_device = NULL,
         .kbc_p1 = 0,
         .gpio = 0,
@@ -8967,7 +8965,7 @@ const machine_t machines[] = {
             .max = 131072,
             .step = 8192
         },
-        .nvrmask = 127,
+        .nvrmask = 255,
         .kbc_device = NULL,
         .kbc_p1 = 0,
         .gpio = 0,
@@ -9206,7 +9204,7 @@ const machine_t machines[] = {
             .max = 786432,
             .step = 8192
         },
-        .nvrmask = 127,
+        .nvrmask = 255,
         .kbc_device = NULL,
         .kbc_p1 = 0,
         .gpio = 0,
@@ -9610,7 +9608,7 @@ const machine_t machines[] = {
             .max = 196608,
             .step = 8192
         },
-        .nvrmask = 127,
+        .nvrmask = 255,
         .kbc_device = NULL,
         .kbc_p1 = 0,
         .gpio = 0,
@@ -9652,7 +9650,7 @@ const machine_t machines[] = {
             .max = 196608,
             .step = 8192
         },
-        .nvrmask = 127,
+        .nvrmask = 255,
         .kbc_device = NULL,
         .kbc_p1 = 0,
         .gpio = 0,
@@ -10048,7 +10046,7 @@ const machine_t machines[] = {
             .max = 131072,
             .step = 8192
         },
-        .nvrmask = 127,
+        .nvrmask = 255,
         .kbc_device = NULL,
         .kbc_p1 = 0,
         .gpio = 0,
diff --git a/src/mem/mmu_2386.c b/src/mem/mmu_2386.c
index af7d8192c..4fd709f14 100644
--- a/src/mem/mmu_2386.c
+++ b/src/mem/mmu_2386.c
@@ -132,6 +132,7 @@ readmembl_2386(uint32_t addr)
 {
     mem_mapping_t *map;
     uint64_t a;
+    uint8_t ret = 0xff;
 
     GDBSTUB_MEM_ACCESS(addr, GDBSTUB_MEM_READ, 1);
 
@@ -145,15 +146,15 @@ readmembl_2386(uint32_t addr)
 	addr64 = (uint32_t) a;
 
 	if (a > 0xffffffffULL)
-		return 0xff;
+            return 0xff;
     }
     addr = (uint32_t) (addr64 & rammask);
 
     map = read_mapping[addr >> MEM_GRANULARITY_BITS];
     if (map && map->read_b)
-	return map->read_b(addr, map->priv);
+	ret = map->read_b(addr, map->priv);
 
-    return 0xff;
+    return ret;
 }
 
 
@@ -190,6 +191,7 @@ uint8_t
 readmembl_no_mmut_2386(uint32_t addr, uint32_t a64)
 {
     mem_mapping_t *map;
+    uint8_t ret = 0xff;
 
     GDBSTUB_MEM_ACCESS(addr, GDBSTUB_MEM_READ, 1);
 
@@ -205,9 +207,9 @@ readmembl_no_mmut_2386(uint32_t addr, uint32_t a64)
 
     map = read_mapping[addr >> MEM_GRANULARITY_BITS];
     if (map && map->read_b)
-	return map->read_b(addr, map->priv);
+	ret = map->read_b(addr, map->priv);
 
-    return 0xff;
+    return ret;
 }
 
 
@@ -241,6 +243,7 @@ readmemwl_2386(uint32_t addr)
     mem_mapping_t *map;
     int i;
     uint64_t a;
+    uint16_t ret = 0xffff;
 
     addr64a[0] = addr;
     addr64a[1] = addr + 1;
@@ -283,14 +286,13 @@ readmemwl_2386(uint32_t addr)
     map = read_mapping[addr >> MEM_GRANULARITY_BITS];
 
     if (map && map->read_w)
-	return map->read_w(addr, map->priv);
-
-    if (map && map->read_b) {
-	return map->read_b(addr, map->priv) |
-	       ((uint16_t) (map->read_b(addr + 1, map->priv)) << 8);
+	ret = map->read_w(addr, map->priv);
+    else if (map && map->read_b) {
+	ret = map->read_b(addr, map->priv) |
+	      ((uint16_t) (map->read_b(addr + 1, map->priv)) << 8);
     }
 
-    return 0xffff;
+    return ret;
 }
 
 
@@ -361,6 +363,7 @@ uint16_t
 readmemwl_no_mmut_2386(uint32_t addr, uint32_t *a64)
 {
     mem_mapping_t *map;
+    uint16_t ret = 0xffff;
 
     GDBSTUB_MEM_ACCESS(addr, GDBSTUB_MEM_READ, 2);
 
@@ -391,14 +394,13 @@ readmemwl_no_mmut_2386(uint32_t addr, uint32_t *a64)
     map = read_mapping[addr >> MEM_GRANULARITY_BITS];
 
     if (map && map->read_w)
-	return map->read_w(addr, map->priv);
-
-    if (map && map->read_b) {
-	return map->read_b(addr, map->priv) |
-	       ((uint16_t) (map->read_b(addr + 1, map->priv)) << 8);
+	ret = map->read_w(addr, map->priv);
+    else if (map && map->read_b) {
+	ret = map->read_b(addr, map->priv) |
+	      ((uint16_t) (map->read_b(addr + 1, map->priv)) << 8);
     }
 
-    return 0xffff;
+    return ret;
 }
 
 
diff --git a/src/mem/sst_flash.c b/src/mem/sst_flash.c
index 22b147933..0f73f1596 100644
--- a/src/mem/sst_flash.c
+++ b/src/mem/sst_flash.c
@@ -10,14 +10,10 @@
  *
  *
  *
- * Authors: Sarah Walker, <https://pcem-emulator.co.uk/>
- *          Miran Grca, <mgrca8@gmail.com>
- *          Melissa Goad, <mszoopers@protonmail.com>
+ * Authors: Miran Grca, <mgrca8@gmail.com>
  *          Jasmine Iwanek, <jriwanek@gmail.com>
  *
- *          Copyright 2008-2020 Sarah Walker.
  *          Copyright 2016-2020 Miran Grca.
- *          Copyright 2020      Melody Goad.
  *          Copyright 2022-2023 Jasmine Iwanek.
  */
 #include <stdio.h>
diff --git a/src/nvr_at.c b/src/nvr_at.c
index 704cabc23..1514f374c 100644
--- a/src/nvr_at.c
+++ b/src/nvr_at.c
@@ -194,11 +194,10 @@
  * Authors: Fred N. van Kempen, <decwiz@yahoo.com>
  *          Miran Grca, <mgrca8@gmail.com>
  *          Mahod,
- *          Sarah Walker, <https://pcem-emulator.co.uk/>
  *
  *          Copyright 2017-2020 Fred N. van Kempen.
  *          Copyright 2016-2020 Miran Grca.
- *          Copyright 2008-2020 Sarah Walker.
+ *          Copyright 2016-2020 Mahod.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -296,6 +295,7 @@
 #define FLAG_AMI_1995_HACK 0x08
 #define FLAG_P6RP4_HACK    0x10
 #define FLAG_PIIX4         0x20
+#define FLAG_MULTI_BANK    0x40
 
 typedef struct local_t {
     int8_t stat;
@@ -560,6 +560,8 @@ timer_tick(nvr_t *nvr)
 static void
 nvr_reg_common_write(uint16_t reg, uint8_t val, nvr_t *nvr, local_t *local)
 {
+    if (local->lock[reg])
+        return;
     if ((reg == 0x2c) && (local->flags & FLAG_AMI_1994_HACK))
         nvr->is_new = 0;
     if ((reg == 0x2d) && (local->flags & FLAG_AMI_1992_HACK))
@@ -570,8 +572,6 @@ nvr_reg_common_write(uint16_t reg, uint8_t val, nvr_t *nvr, local_t *local)
         return;
     if ((reg >= 0xb8) && (reg <= 0xbf) && local->wp[1])
         return;
-    if (local->lock[reg])
-        return;
     if (nvr->regs[reg] != val) {
         nvr->regs[reg] = val;
         nvr_dosave     = 1;
@@ -665,9 +665,12 @@ nvr_write(uint16_t addr, uint8_t val, void *priv)
     } else {
         local->addr[addr_id] = (val & (nvr->size - 1));
         /* Some chipsets use a 256 byte NVRAM but ports 70h and 71h always access only 128 bytes. */
-        if (addr_id == 0x0)
+        if (addr_id == 0x0) {
             local->addr[addr_id] &= 0x7f;
-        else if ((addr_id == 0x1) && (local->flags & FLAG_PIIX4))
+            /* Needed for OPTi 82C601/82C602 and NSC PC87306. */
+            if (local->flags & FLAG_MULTI_BANK)
+                local->addr[addr_id] |= (0x80 * local->bank[addr_id]);
+        } else if ((addr_id == 0x1) && (local->flags & FLAG_PIIX4))
             local->addr[addr_id] = (local->addr[addr_id] & 0x7f) | 0x80;
         if (local->bank[addr_id] > 0)
             local->addr[addr_id] = (local->addr[addr_id] & 0x7f) | (0x80 * local->bank[addr_id]);
@@ -1081,6 +1084,12 @@ nvr_at_init(const device_t *info)
             break;
     }
 
+    if (info->local & 0x20)
+        local->def = 0x00;
+
+    if (info->local & 0x40)
+        local->flags |= FLAG_MULTI_BANK;
+
     local->read_addr = 1;
 
     /* Set up any local handlers here. */
@@ -1175,6 +1184,20 @@ const device_t at_nvr_device = {
     .config        = NULL
 };
 
+const device_t at_mb_nvr_device = {
+    .name          = "PC/AT NVRAM",
+    .internal_name = "at_nvr",
+    .flags         = DEVICE_ISA | DEVICE_AT,
+    .local         = 0x40 | 0x20 | 1,
+    .init          = nvr_at_init,
+    .close         = nvr_at_close,
+    .reset         = nvr_at_reset,
+    { .available = NULL },
+    .speed_changed = nvr_at_speed_changed,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
 const device_t ps_nvr_device = {
     .name          = "PS/1 or PS/2 NVRAM",
     .internal_name = "ps_nvr",
diff --git a/src/qt/languages/cs-CZ.po b/src/qt/languages/cs-CZ.po
index 7c82b6f4d..bb7fd342e 100644
--- a/src/qt/languages/cs-CZ.po
+++ b/src/qt/languages/cs-CZ.po
@@ -656,7 +656,7 @@ msgid "(empty)"
 msgstr "(prázdné)"
 
 msgid "All files"
-msgstr "All files"
+msgstr "Všechny soubory"
 
 msgid "Turbo"
 msgstr "Turbo"
@@ -932,10 +932,10 @@ msgid "Cartridge images"
 msgstr "Obrazy cartridge"
 
 msgid "Error initializing renderer"
-msgstr "Error initializing renderer"
+msgstr "Chyba při inicializaci vykreslovače"
 
 msgid "OpenGL (3.0 Core) renderer could not be initialized. Use another renderer."
-msgstr "OpenGL (3.0 Core) renderer could not be initialized. Use another renderer."
+msgstr "Vykreslovač OpenGL (3.0 Core) se nepodařilo inicializovat. Použijte jiný renderer."
 
 msgid "Resume execution"
 msgstr "Obnovit"
@@ -1196,8 +1196,19 @@ msgid "(System Default)"
 msgstr "(Výchozí nastavení systému)"
 
 msgid "Failed to initialize network driver"
-msgstr "Failed to initialize network driver"
+msgstr "Nepodařilo se inicializovat síťový ovladač"
 
 msgid "The network configuration will be switched to the null driver"
-msgstr "The network configuration will be switched to the null driver"
+msgstr "Konfigurace sítě bude přepnuta na nulový ovladač"
 
+msgid "PIT mode:"
+msgstr "Režim PIT:"
+
+msgid "Auto"
+msgstr "Automatický"
+
+msgid "Slow"
+msgstr "Pomalý"
+
+msgid "Fast"
+msgstr "Rychlý"
diff --git a/src/qt/languages/de-DE.po b/src/qt/languages/de-DE.po
index 0caf925b5..e494d4910 100644
--- a/src/qt/languages/de-DE.po
+++ b/src/qt/languages/de-DE.po
@@ -98,7 +98,7 @@ msgid "Filter method"
 msgstr "Filteringmethode"
 
 msgid "&Nearest"
-msgstr "&Nearest"
+msgstr "&Nächst"
 
 msgid "&Linear"
 msgstr "&Linear"
@@ -1196,8 +1196,20 @@ msgid "(System Default)"
 msgstr "(Systemstandard)"
 
 msgid "Failed to initialize network driver"
-msgstr "Failed to initialize network driver"
+msgstr "Netzwerktreiber konnte nicht initialisiert werden"
 
 msgid "The network configuration will be switched to the null driver"
-msgstr "The network configuration will be switched to the null driver"
+msgstr "Die Netzwerkkonfiguration wird auf den Nulltreiber umgestellt"
+
+msgid "PIT mode:"
+msgstr "PIT-Modus:"
+
+msgid "Auto"
+msgstr "Auto"
+
+msgid "Slow"
+msgstr "Langsam"
+
+msgid "Fast"
+msgstr "Schnell"
 
diff --git a/src/qt/languages/en-GB.po b/src/qt/languages/en-GB.po
index 6a33f9bed..d696a7ae2 100644
--- a/src/qt/languages/en-GB.po
+++ b/src/qt/languages/en-GB.po
@@ -1201,3 +1201,15 @@ msgstr "Failed to initialize network driver"
 msgid "The network configuration will be switched to the null driver"
 msgstr "The network configuration will be switched to the null driver"
 
+msgid "PIT mode:"
+msgstr "PIT mode:"
+
+msgid "Auto"
+msgstr "Auto"
+
+msgid "Slow"
+msgstr "Slow"
+
+msgid "Fast"
+msgstr "Fast"
+
diff --git a/src/qt/languages/en-US.po b/src/qt/languages/en-US.po
index 5e3afdc27..8e8663566 100644
--- a/src/qt/languages/en-US.po
+++ b/src/qt/languages/en-US.po
@@ -1201,3 +1201,15 @@ msgstr "Failed to initialize network driver"
 msgid "The network configuration will be switched to the null driver"
 msgstr "The network configuration will be switched to the null driver"
 
+msgid "PIT mode:"
+msgstr "PIT mode:"
+
+msgid "Auto"
+msgstr "Auto"
+
+msgid "Slow"
+msgstr "Slow"
+
+msgid "Fast"
+msgstr "Fast"
+
diff --git a/src/qt/languages/es-ES.po b/src/qt/languages/es-ES.po
index f864dce0d..c9cd2bb6a 100644
--- a/src/qt/languages/es-ES.po
+++ b/src/qt/languages/es-ES.po
@@ -932,28 +932,28 @@ msgid "Cartridge images"
 msgstr "Imágenes de Cartucho"
 
 msgid "Error initializing renderer"
-msgstr "Error initializing renderer"
+msgstr "Error al inicializar el renderizador"
 
 msgid "OpenGL (3.0 Core) renderer could not be initialized. Use another renderer."
-msgstr "OpenGL (3.0 Core) renderer could not be initialized. Use another renderer."
+msgstr "No se ha podido inicializar el renderizador OpenGL (3.0 Core). Utilice otro renderizador."
 
 msgid "Resume execution"
-msgstr "Resume execution"
+msgstr "Retomar la ejecución"
 
 msgid "Pause execution"
-msgstr "Pause execution"
+msgstr "Pausar la ejecución"
 
 msgid "Press Ctrl+Alt+Del"
-msgstr "Press Ctrl+Alt+Del"
+msgstr "Pulsar Ctrl+Alt+Supr"
 
 msgid "Press Ctrl+Alt+Esc"
-msgstr "Press Ctrl+Alt+Esc"
+msgstr "Pulsar Ctrl+Alt+Esc"
 
 msgid "Hard reset"
 msgstr "Hard reset"
 
 msgid "ACPI shutdown"
-msgstr "ACPI shutdown"
+msgstr "Parada ACPI"
 
 msgid "Hard disk (%s)"
 msgstr "Disco duro (%s)"
@@ -1196,8 +1196,20 @@ msgid "(System Default)"
 msgstr "(Por defecto del sistema)"
 
 msgid "Failed to initialize network driver"
-msgstr "Failed to initialize network driver"
+msgstr "Error al inicializar el controlador de red"
 
 msgid "The network configuration will be switched to the null driver"
-msgstr "The network configuration will be switched to the null driver"
+msgstr "La configuración de red se cambiará al controlador nulo"
+
+msgid "PIT mode:"
+msgstr "Modalidad PIT:"
+
+msgid "Auto"
+msgstr "Automática"
+
+msgid "Slow"
+msgstr "Lenta"
+
+msgid "Fast"
+msgstr "Rápida"
 
diff --git a/src/qt/languages/fi-FI.po b/src/qt/languages/fi-FI.po
index 97ecf79d5..c67ce81ca 100644
--- a/src/qt/languages/fi-FI.po
+++ b/src/qt/languages/fi-FI.po
@@ -1196,8 +1196,20 @@ msgid "(System Default)"
 msgstr "(Järjestelmän oletus)"
 
 msgid "Failed to initialize network driver"
-msgstr "Failed to initialize network driver"
+msgstr "Verkkoajurin alustaminen epäonnistui"
 
 msgid "The network configuration will be switched to the null driver"
-msgstr "The network configuration will be switched to the null driver"
+msgstr "Verkkokokoonpano vaihtuu nolla-ajuriin"
+
+msgid "PIT mode:"
+msgstr "PIT-tila:"
+
+msgid "Auto"
+msgstr "Automaattinen"
+
+msgid "Slow"
+msgstr "Hidas"
+
+msgid "Fast"
+msgstr "Nopea"
 
diff --git a/src/qt/languages/fr-FR.po b/src/qt/languages/fr-FR.po
index 1fbff4001..e9be3aeb9 100644
--- a/src/qt/languages/fr-FR.po
+++ b/src/qt/languages/fr-FR.po
@@ -932,28 +932,28 @@ msgid "Cartridge images"
 msgstr "Images cartouche"
 
 msgid "Error initializing renderer"
-msgstr "Error initializing renderer"
+msgstr "Erreur d'initialisation du moteur de rendu"
 
 msgid "OpenGL (3.0 Core) renderer could not be initialized. Use another renderer."
-msgstr "OpenGL (3.0 Core) renderer could not be initialized. Use another renderer."
+msgstr "Le moteur de rendu OpenGL (3.0 Core) n'a pas pu être initialisé. Utilisez un autre moteur de rendu."
 
 msgid "Resume execution"
-msgstr "Resume execution"
+msgstr "Reprendre l'exécution"
 
 msgid "Pause execution"
-msgstr "Pause execution"
+msgstr "Pause de l'exécution"
 
 msgid "Press Ctrl+Alt+Del"
-msgstr "Press Ctrl+Alt+Del"
+msgstr "Appuyer sur Ctrl+Alt+Suppr."
 
 msgid "Press Ctrl+Alt+Esc"
-msgstr "Press Ctrl+Alt+Esc"
+msgstr "Appuyer sur Ctrl+Alt+Esc"
 
 msgid "Hard reset"
 msgstr "Hard reset"
 
 msgid "ACPI shutdown"
-msgstr "ACPI shutdown"
+msgstr "Arrêt ACPI"
 
 msgid "Hard disk (%s)"
 msgstr "Disque dur (%s)"
@@ -1196,8 +1196,20 @@ msgid "(System Default)"
 msgstr "(Défaut du système)"
 
 msgid "Failed to initialize network driver"
-msgstr "Failed to initialize network driver"
+msgstr "Échec de l'initialisation du pilote réseau"
 
 msgid "The network configuration will be switched to the null driver"
-msgstr "The network configuration will be switched to the null driver"
+msgstr "La configuration du réseau passera au pilote nul"
+
+msgid "PIT mode:"
+msgstr "Mode PIT:"
+
+msgid "Auto"
+msgstr "Auto"
+
+msgid "Slow"
+msgstr "Lent"
+
+msgid "Fast"
+msgstr "Rapide"
 
diff --git a/src/qt/languages/hr-HR.po b/src/qt/languages/hr-HR.po
index 43f01d5de..7b14f99c1 100644
--- a/src/qt/languages/hr-HR.po
+++ b/src/qt/languages/hr-HR.po
@@ -1196,8 +1196,20 @@ msgid "(System Default)"
 msgstr "(Zadana postavka operativnog sustava)"
 
 msgid "Failed to initialize network driver"
-msgstr "Failed to initialize network driver"
+msgstr "Neuspješno pokretanje mrežnog upravljačkog programa"
 
 msgid "The network configuration will be switched to the null driver"
-msgstr "The network configuration will be switched to the null driver"
+msgstr "Konfiguracija mreže bit će prebačena na nulti upravljački program"
+
+msgid "PIT mode:"
+msgstr "PIT način:"
+
+msgid "Auto"
+msgstr "Auto"
+
+msgid "Slow"
+msgstr "Spori"
+
+msgid "Fast"
+msgstr "Brzi"
 
diff --git a/src/qt/languages/hu-HU.po b/src/qt/languages/hu-HU.po
index bf4796ebb..e2547cb43 100644
--- a/src/qt/languages/hu-HU.po
+++ b/src/qt/languages/hu-HU.po
@@ -938,22 +938,22 @@ msgid "OpenGL (3.0 Core) renderer could not be initialized. Use another renderer
 msgstr "Az OpenGL (3.0 Core) megjelenítő-motort nem sikerült inicializálni. Kérem használjon másik renderelőt."
 
 msgid "Resume execution"
-msgstr "Resume execution"
+msgstr "Folytassa a végrehajtást"
 
 msgid "Pause execution"
-msgstr "Pause execution"
+msgstr "Kivitelezés szüneteltetése"
 
 msgid "Press Ctrl+Alt+Del"
-msgstr "Press Ctrl+Alt+Del"
+msgstr "Nyomja meg a Ctrl+Alt+Del"
 
 msgid "Press Ctrl+Alt+Esc"
-msgstr "Press Ctrl+Alt+Esc"
+msgstr "Nyomja meg a Ctrl+Alt+Esc"
 
 msgid "Hard reset"
-msgstr "Hard reset"
+msgstr "Hardveres újraindítás"
 
 msgid "ACPI shutdown"
-msgstr "ACPI shutdown"
+msgstr "ACPI leállítás"
 
 msgid "Hard disk (%s)"
 msgstr "Merevlemez (%s)"
@@ -1196,8 +1196,20 @@ msgid "(System Default)"
 msgstr "(A rendszer nyelve)"
 
 msgid "Failed to initialize network driver"
-msgstr "Failed to initialize network driver"
+msgstr "Nem sikerült inicializálni a hálózati illesztőprogramot"
 
 msgid "The network configuration will be switched to the null driver"
-msgstr "The network configuration will be switched to the null driver"
+msgstr "A hálózati konfiguráció átvált a null illesztőprogramra"
+
+msgid "PIT mode:"
+msgstr "PIT üzemmód:"
+
+msgid "Auto"
+msgstr "Automatikus"
+
+msgid "Slow"
+msgstr "Lassú"
+
+msgid "Fast"
+msgstr "Gyors"
 
diff --git a/src/qt/languages/it-IT.po b/src/qt/languages/it-IT.po
index 6c6d5f65f..39b19d4cf 100644
--- a/src/qt/languages/it-IT.po
+++ b/src/qt/languages/it-IT.po
@@ -866,7 +866,7 @@ msgid "libpcap"
 msgstr "libpcap"
 
 msgid "Make sure libpcap is installed and that you are on a libpcap-compatible network connection."
-msgstr "Controlla se libpcap è installato e che tu sia connesso ad una connessione libpcap compatibile."
+msgstr "Controllare se libpcap è installato e che tu sia connesso ad una connessione libpcap compatibile."
 
 msgid "Invalid configuration"
 msgstr "Configurazione invalida"
@@ -932,28 +932,28 @@ msgid "Cartridge images"
 msgstr "Immagini cartuccia"
 
 msgid "Error initializing renderer"
-msgstr "Error initializing renderer"
+msgstr "Errore nell'inizializzazione del renderer"
 
 msgid "OpenGL (3.0 Core) renderer could not be initialized. Use another renderer."
-msgstr "OpenGL (3.0 Core) renderer could not be initialized. Use another renderer."
+msgstr "Non è stato possibile inizializzare il renderer OpenGL (3.0 Core). Utilizzare un altro renderer."
 
 msgid "Resume execution"
-msgstr "Resume execution"
+msgstr "Riprendere l'esecuzione"
 
 msgid "Pause execution"
-msgstr "Pause execution"
+msgstr "Sospendere l'esecuzione"
 
 msgid "Press Ctrl+Alt+Del"
-msgstr "Press Ctrl+Alt+Del"
+msgstr "Premere Ctrl+Alt+Canc"
 
 msgid "Press Ctrl+Alt+Esc"
-msgstr "Press Ctrl+Alt+Esc"
+msgstr "Premere Ctrl+Alt+Esc"
 
 msgid "Hard reset"
-msgstr "Hard reset"
+msgstr "Riavvia"
 
 msgid "ACPI shutdown"
-msgstr "ACPI shutdown"
+msgstr "Arresto ACPI"
 
 msgid "Hard disk (%s)"
 msgstr "Hard disk (%s)"
@@ -1196,8 +1196,20 @@ msgid "(System Default)"
 msgstr "(Predefinito del sistema)"
 
 msgid "Failed to initialize network driver"
-msgstr "Failed to initialize network driver"
+msgstr "Impossibile inizializzare il driver di rete"
 
 msgid "The network configuration will be switched to the null driver"
-msgstr "The network configuration will be switched to the null driver"
+msgstr "La configurazione di rete verrà commutata sul driver nullo"
+
+msgid "PIT mode:"
+msgstr "Modalità PIT:"
+
+msgid "Auto"
+msgstr "Automatica"
+
+msgid "Slow"
+msgstr "Lenta"
+
+msgid "Fast"
+msgstr "Veloce"
 
diff --git a/src/qt/languages/ja-JP.po b/src/qt/languages/ja-JP.po
index b35fa429e..c854ec4dc 100644
--- a/src/qt/languages/ja-JP.po
+++ b/src/qt/languages/ja-JP.po
@@ -1196,8 +1196,20 @@ msgid "(System Default)"
 msgstr "(システム既定値)"
 
 msgid "Failed to initialize network driver"
-msgstr "Failed to initialize network driver"
+msgstr "ネットワークドライバの初期化に失敗しました"
 
 msgid "The network configuration will be switched to the null driver"
-msgstr "The network configuration will be switched to the null driver"
+msgstr "ネットワーク設定がヌル・ドライバに切り替わる"
+
+msgid "PIT mode:"
+msgstr "PITモード:"
+
+msgid "Auto"
+msgstr "オート"
+
+msgid "Slow"
+msgstr "遅い"
+
+msgid "Fast"
+msgstr "速い"
 
diff --git a/src/qt/languages/ko-KR.po b/src/qt/languages/ko-KR.po
index bf9325675..a3654af49 100644
--- a/src/qt/languages/ko-KR.po
+++ b/src/qt/languages/ko-KR.po
@@ -1196,8 +1196,20 @@ msgid "(System Default)"
 msgstr "(시스템 기본값)"
 
 msgid "Failed to initialize network driver"
-msgstr "Failed to initialize network driver"
+msgstr "네트워크 드라이버를 초기화하지 못했습니다"
 
 msgid "The network configuration will be switched to the null driver"
-msgstr "The network configuration will be switched to the null driver"
+msgstr "네트워크 구성이 널 드라이버로 전환됩니다"
+
+msgid "PIT mode:"
+msgstr "PIT 모드:"
+
+msgid "Auto"
+msgstr "자동"
+
+msgid "Slow"
+msgstr "느린"
+
+msgid "Fast"
+msgstr "빠른"
 
diff --git a/src/qt/languages/pl-PL.po b/src/qt/languages/pl-PL.po
index 6b017dfb5..5e05aa0bd 100644
--- a/src/qt/languages/pl-PL.po
+++ b/src/qt/languages/pl-PL.po
@@ -1196,8 +1196,20 @@ msgid "(System Default)"
 msgstr "(Domyślne ustawienie systemowe)"
 
 msgid "Failed to initialize network driver"
-msgstr "Failed to initialize network driver"
+msgstr "Nie udało się zainicjować sterownika sieciowego"
 
 msgid "The network configuration will be switched to the null driver"
-msgstr "The network configuration will be switched to the null driver"
+msgstr "Konfiguracja sieci zostanie przełączona na sterownik null"
+
+msgid "PIT mode:"
+msgstr "Tryb PIT:"
+
+msgid "Auto"
+msgstr "Automatyczny"
+
+msgid "Slow"
+msgstr "Powolny"
+
+msgid "Fast"
+msgstr "Szybki"
 
diff --git a/src/qt/languages/pt-BR.po b/src/qt/languages/pt-BR.po
index 1771c1f4a..e4a28e9d0 100644
--- a/src/qt/languages/pt-BR.po
+++ b/src/qt/languages/pt-BR.po
@@ -1201,3 +1201,15 @@ msgstr "Falha ao inicializar o driver de rede"
 msgid "The network configuration will be switched to the null driver"
 msgstr "A configuração de rede será alterada para o driver nulo"
 
+msgid "PIT mode:"
+msgstr "Modo PIT:"
+
+msgid "Auto"
+msgstr "Automático"
+
+msgid "Slow"
+msgstr "Lento"
+
+msgid "Fast"
+msgstr "Rápido"
+
diff --git a/src/qt/languages/pt-PT.po b/src/qt/languages/pt-PT.po
index a45aa78c5..f1dd128a2 100644
--- a/src/qt/languages/pt-PT.po
+++ b/src/qt/languages/pt-PT.po
@@ -1196,8 +1196,20 @@ msgid "(System Default)"
 msgstr "(Padrão do sistema)"
 
 msgid "Failed to initialize network driver"
-msgstr "Failed to initialize network driver"
+msgstr "Falha ao inicializar o driver de rede"
 
 msgid "The network configuration will be switched to the null driver"
-msgstr "The network configuration will be switched to the null driver"
+msgstr "A configuração da rede será alterada para o controlador nulo"
+
+msgid "PIT mode:"
+msgstr "Modo PIT:"
+
+msgid "Auto"
+msgstr "Automático"
+
+msgid "Slow"
+msgstr "Lento"
+
+msgid "Fast"
+msgstr "Rápido"
 
diff --git a/src/qt/languages/ru-RU.po b/src/qt/languages/ru-RU.po
index cb14c193d..198e3fe42 100644
--- a/src/qt/languages/ru-RU.po
+++ b/src/qt/languages/ru-RU.po
@@ -1196,8 +1196,20 @@ msgid "(System Default)"
 msgstr "(Системный)"
 
 msgid "Failed to initialize network driver"
-msgstr "Failed to initialize network driver"
+msgstr "Не удалось инициализировать сетевой драйвер"
 
 msgid "The network configuration will be switched to the null driver"
-msgstr "The network configuration will be switched to the null driver"
+msgstr "Сетевая конфигурация будет переключена на нулевой драйвер"
+
+msgid "PIT mode:"
+msgstr "Режим PIT:"
+
+msgid "Auto"
+msgstr "Авто"
+
+msgid "Slow"
+msgstr "Медленный"
+
+msgid "Fast"
+msgstr "Быстрый"
 
diff --git a/src/qt/languages/sl-SI.po b/src/qt/languages/sl-SI.po
index 83b0d6774..558990f83 100644
--- a/src/qt/languages/sl-SI.po
+++ b/src/qt/languages/sl-SI.po
@@ -944,10 +944,10 @@ msgid "Pause execution"
 msgstr "Prekini izvajanje"
 
 msgid "Press Ctrl+Alt+Del"
-msgstr "Press Ctrl+Alt+Del"
+msgstr "Pritisni Ctrl+Alt+Del"
 
 msgid "Press Ctrl+Alt+Esc"
-msgstr "Press Ctrl+Alt+Esc"
+msgstr "Pritisni Ctrl+Alt+Esc"
 
 msgid "Hard reset"
 msgstr "Ponovni zagon"
@@ -1196,8 +1196,20 @@ msgid "(System Default)"
 msgstr "(Sistemsko privzeto)"
 
 msgid "Failed to initialize network driver"
-msgstr "Failed to initialize network driver"
+msgstr "Ni uspelo inicializirati omrežnega gonilnika"
 
 msgid "The network configuration will be switched to the null driver"
-msgstr "The network configuration will be switched to the null driver"
+msgstr "Omrežne nastavitve bodo preklopljene na ničelni gonilnik"
+
+msgid "PIT mode:"
+msgstr "Način PIT:"
+
+msgid "Auto"
+msgstr "Samodejni"
+
+msgid "Slow"
+msgstr "Počasni"
+
+msgid "Fast"
+msgstr "Hitri"
 
diff --git a/src/qt/languages/tr-TR.po b/src/qt/languages/tr-TR.po
index 551764016..e607c70a3 100644
--- a/src/qt/languages/tr-TR.po
+++ b/src/qt/languages/tr-TR.po
@@ -1196,8 +1196,20 @@ msgid "(System Default)"
 msgstr "(Sistem Varsayılanı)"
 
 msgid "Failed to initialize network driver"
-msgstr "Failed to initialize network driver"
+msgstr "Ağ sürücüsü başlatılamadı"
 
 msgid "The network configuration will be switched to the null driver"
-msgstr "The network configuration will be switched to the null driver"
+msgstr "Ağ yapılandırması null sürücüye geçirilecektir"
+
+msgid "PIT mode:"
+msgstr "PIT modu:"
+
+msgid "Auto"
+msgstr "Otomatik"
+
+msgid "Slow"
+msgstr "Yavaş"
+
+msgid "Fast"
+msgstr "Hızlı"
 
diff --git a/src/qt/languages/uk-UA.po b/src/qt/languages/uk-UA.po
index 394a2905d..a1ba15357 100644
--- a/src/qt/languages/uk-UA.po
+++ b/src/qt/languages/uk-UA.po
@@ -1196,8 +1196,20 @@ msgid "(System Default)"
 msgstr "(Системний)"
 
 msgid "Failed to initialize network driver"
-msgstr "Failed to initialize network driver"
+msgstr "Не вдалося ініціалізувати мережевий драйвер"
 
 msgid "The network configuration will be switched to the null driver"
-msgstr "The network configuration will be switched to the null driver"
+msgstr "Конфігурацію мережі буде змінено на нульовий драйвер"
+
+msgid "PIT mode:"
+msgstr "Режим PIT:"
+
+msgid "Auto"
+msgstr "Авто"
+
+msgid "Slow"
+msgstr "Повільний"
+
+msgid "Fast"
+msgstr "Швидкий"
 
diff --git a/src/qt/languages/zh-CN.po b/src/qt/languages/zh-CN.po
index 5858b5ec3..7151a28dd 100644
--- a/src/qt/languages/zh-CN.po
+++ b/src/qt/languages/zh-CN.po
@@ -1196,8 +1196,20 @@ msgid "(System Default)"
 msgstr "(系统默认)"
 
 msgid "Failed to initialize network driver"
-msgstr "Failed to initialize network driver"
+msgstr "网络驱动程序初始化失败"
 
 msgid "The network configuration will be switched to the null driver"
-msgstr "The network configuration will be switched to the null driver"
+msgstr "网络配置将切换为空驱动程序"
+
+msgid "PIT mode:"
+msgstr "PIT 模式:"
+
+msgid "Auto"
+msgstr "汽车"
+
+msgid "Slow"
+msgstr "慢"
+
+msgid "Fast"
+msgstr "快速"
 
diff --git a/src/qt/languages/zh-TW.po b/src/qt/languages/zh-TW.po
index 94b0a7553..86e83e1e4 100644
--- a/src/qt/languages/zh-TW.po
+++ b/src/qt/languages/zh-TW.po
@@ -1196,8 +1196,20 @@ msgid "(System Default)"
 msgstr "(系統預設)"
 
 msgid "Failed to initialize network driver"
-msgstr "Failed to initialize network driver"
+msgstr "初始化網絡驅動程序失敗"
 
 msgid "The network configuration will be switched to the null driver"
-msgstr "The network configuration will be switched to the null driver"
+msgstr "網絡配置將切換為空驅動程序"
+
+msgid "PIT mode:"
+msgstr "點模式:"
+
+msgid "Auto"
+msgstr "汽車"
+
+msgid "Slow"
+msgstr "慢的"
+
+msgid "Fast"
+msgstr "快速地"
 
diff --git a/src/qt/qt_cdrom.c b/src/qt/qt_cdrom.c
index 6e28966b0..1facae486 100644
--- a/src/qt/qt_cdrom.c
+++ b/src/qt/qt_cdrom.c
@@ -10,8 +10,7 @@
  *
  *
  *
- * Authors: Sarah Walker, <https://pcem-emulator.co.uk/>
- *          Miran Grca, <mgrca8@gmail.com>
+ * Authors: Miran Grca, <mgrca8@gmail.com>
  *          Fred N. van Kempen, <decwiz@yahoo.com>
  *
  *          Copyright 2016-2018 Miran Grca.
diff --git a/src/qt/qt_harddiskdialog.cpp b/src/qt/qt_harddiskdialog.cpp
index b640c086e..2a07db482 100644
--- a/src/qt/qt_harddiskdialog.cpp
+++ b/src/qt/qt_harddiskdialog.cpp
@@ -321,16 +321,16 @@ HarddiskDialog::onCreateNewFile()
 
     ui->progressBar->setEnabled(true);
     setResult(QDialog::Rejected);
-    quint64 size = ui->lineEditSize->text().toULongLong() << 20U;
+    uint32_t sector_size = 512;
+    quint64  size        = (static_cast<uint64_t>(cylinders_) * static_cast<uint64_t>(heads_) * static_cast<uint64_t>(sectors_) * static_cast<uint64_t>(sector_size));
     if (size > 0x1FFFFFFE00LL) {
         QMessageBox::critical(this, tr("Disk image too large"), tr("Disk images cannot be larger than 127 GB."));
         return;
     }
 
-    int      img_format  = ui->comboBoxFormat->currentIndex();
-    uint32_t zero        = 0;
-    uint32_t base        = 0x1000;
-    uint32_t sector_size = 512;
+    int      img_format = ui->comboBoxFormat->currentIndex();
+    uint32_t zero       = 0;
+    uint32_t base       = 0x1000;
 
     auto    fileName = ui->fileField->fileName();
     QString expectedSuffix;
diff --git a/src/qt/qt_mainwindow.ui b/src/qt/qt_mainwindow.ui
index b61a974c6..6db17aaa9 100644
--- a/src/qt/qt_mainwindow.ui
+++ b/src/qt/qt_mainwindow.ui
@@ -72,12 +72,13 @@
     <addaction name="actionRight_CTRL_is_left_ALT"/>
     <addaction name="menuTablet_tool"/>
     <addaction name="separator"/>
-    <addaction name="actionHard_Reset"/>
-    <addaction name="actionCtrl_Alt_Del"/>
-    <addaction name="separator"/>
+    <addaction name="actionPause"/>
     <addaction name="actionCtrl_Alt_Esc"/>
     <addaction name="separator"/>
-    <addaction name="actionPause"/>
+    <addaction name="actionACPI_Shutdown"/>
+    <addaction name="separator"/>
+    <addaction name="actionHard_Reset"/>
+    <addaction name="actionCtrl_Alt_Del"/>
     <addaction name="separator"/>
     <addaction name="actionExit"/>
    </widget>
@@ -254,11 +255,12 @@
     <bool>false</bool>
    </attribute>
    <addaction name="actionPause"/>
-   <addaction name="actionHard_Reset"/>
+   <addaction name="actionCtrl_Alt_Esc"/>
+   <addaction name="separator"/>
    <addaction name="actionACPI_Shutdown"/>
    <addaction name="separator"/>
+   <addaction name="actionHard_Reset"/>
    <addaction name="actionCtrl_Alt_Del"/>
-   <addaction name="actionCtrl_Alt_Esc"/>
    <addaction name="separator"/>
    <addaction name="actionSettings"/>
   </widget>
@@ -760,6 +762,9 @@
    <property name="visible">
     <bool>true</bool>
    </property>
+   <property name="iconVisibleInMenu">
+    <bool>false</bool>
+   </property>
   </action>
   <action name="actionBegin_trace">
    <property name="text">
diff --git a/src/qt/qt_rendererstack.cpp b/src/qt/qt_rendererstack.cpp
index 55ab814c2..6b0f98885 100644
--- a/src/qt/qt_rendererstack.cpp
+++ b/src/qt/qt_rendererstack.cpp
@@ -57,9 +57,6 @@ extern "C" {
 struct mouseinputdata {
     atomic_bool         mouse_tablet_in_proximity;
 
-    std::atomic<double> x_abs;
-    std::atomic<double> y_abs;
-
     char                *mouse_type;
 };
 static mouseinputdata mousedata;
@@ -143,32 +140,6 @@ qt_mouse_capture(int on)
     return;
 }
 
-void
-RendererStack::mousePoll()
-{
-    if (m_monitor_index >= 1) {
-        if (mouse_mode >= 1) {
-            mouse_x_abs       = mousedata.x_abs;
-            mouse_y_abs       = mousedata.y_abs;
-            if (!mouse_tablet_in_proximity)
-                mouse_tablet_in_proximity = mousedata.mouse_tablet_in_proximity;
-        }
-        return;
-    }
-
-#ifdef Q_OS_WINDOWS
-    if (mouse_mode == 0) {
-        mouse_x_abs           = mousedata.x_abs;
-        mouse_y_abs           = mousedata.y_abs;
-        return;
-    }
-#endif
-
-    mouse_x_abs               = mousedata.x_abs;
-    mouse_y_abs               = mousedata.y_abs;
-    mouse_tablet_in_proximity = mousedata.mouse_tablet_in_proximity;
-}
-
 int ignoreNextMouseEvent = 1;
 void
 RendererStack::mouseReleaseEvent(QMouseEvent *event)
@@ -269,7 +240,6 @@ RendererStack::mouseMoveEvent(QMouseEvent *event)
 #endif
 }
 
-
 void
 #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
 RendererStack::enterEvent(QEnterEvent *event)
@@ -556,11 +526,30 @@ RendererStack::event(QEvent* event)
 {
     if (event->type() == QEvent::MouseMove) {
         QMouseEvent* mouse_event = (QMouseEvent*)event;
-        if (mouse_mode >= 1) {
-            mousedata.x_abs = (mouse_event->localPos().x()) / (long double)width();
-            mousedata.y_abs = (mouse_event->localPos().y()) / (long double)height();
+
+        if (m_monitor_index >= 1) {
+            if (mouse_mode >= 1) {
+                mouse_x_abs       = (mouse_event->localPos().x()) / (long double)width();
+                mouse_y_abs       = (mouse_event->localPos().y()) / (long double)height();
+                if (!mouse_tablet_in_proximity)
+                    mouse_tablet_in_proximity = mousedata.mouse_tablet_in_proximity;
+            }
+            return QStackedWidget::event(event);
         }
+
+#ifdef Q_OS_WINDOWS
+        if (mouse_mode == 0) {
+            mouse_x_abs           = (mouse_event->localPos().x()) / (long double)width();
+            mouse_y_abs           = (mouse_event->localPos().y()) / (long double)height();
+            return QStackedWidget::event(event);
+        }
+#endif
+
+        mouse_x_abs               = (mouse_event->localPos().x()) / (long double)width();
+        mouse_y_abs               = (mouse_event->localPos().y()) / (long double)height();
+        mouse_tablet_in_proximity = mousedata.mouse_tablet_in_proximity;
     }
+
     return QStackedWidget::event(event);
 }
 
diff --git a/src/qt/qt_rendererstack.hpp b/src/qt/qt_rendererstack.hpp
index f59849dda..c9d90869b 100644
--- a/src/qt/qt_rendererstack.hpp
+++ b/src/qt/qt_rendererstack.hpp
@@ -88,7 +88,6 @@ public slots:
     void blitCommon(int x, int y, int w, int h);
     void blitRenderer(int x, int y, int w, int h);
     void blitDummy(int x, int y, int w, int h);
-    void mousePoll();
 
 private:
     void createRenderer(Renderer renderer);
diff --git a/src/qt/qt_settingsfloppycdrom.cpp b/src/qt/qt_settingsfloppycdrom.cpp
index 4d2f6e9f9..9aab398c4 100644
--- a/src/qt/qt_settingsfloppycdrom.cpp
+++ b/src/qt/qt_settingsfloppycdrom.cpp
@@ -45,13 +45,12 @@ static void
 setFloppyType(QAbstractItemModel *model, const QModelIndex &idx, int type)
 {
     QIcon icon;
-    if (type == 0) {
+    if (type == 0)
         icon = ProgSettings::loadIcon("/floppy_disabled.ico");
-    } else if (type >= 1 && type <= 6) {
+    else if (type >= 1 && type <= 6)
         icon = ProgSettings::loadIcon("/floppy_525.ico");
-    } else {
+    else
         icon = ProgSettings::loadIcon("/floppy_35.ico");
-    }
 
     model->setData(idx, QObject::tr(fdd_getname(type)));
     model->setData(idx, type, Qt::UserRole);
@@ -62,6 +61,7 @@ static void
 setCDROMBus(QAbstractItemModel *model, const QModelIndex &idx, uint8_t bus, uint8_t channel)
 {
     QIcon icon;
+
     switch (bus) {
         case CDROM_BUS_DISABLED:
             icon = ProgSettings::loadIcon("/cdrom_disabled.ico");
@@ -94,11 +94,10 @@ static void
 setCDROMType(QAbstractItemModel *model, const QModelIndex &idx, int type)
 {
     auto i = idx.siblingAtColumn(2);
-    if (idx.siblingAtColumn(0).data(Qt::UserRole).toUInt() == CDROM_BUS_DISABLED) {
+    if (idx.siblingAtColumn(0).data(Qt::UserRole).toUInt() == CDROM_BUS_DISABLED)
         model->setData(i, QCoreApplication::translate("", "None"));
-    } else if (idx.siblingAtColumn(0).data(Qt::UserRole).toUInt() != CDROM_BUS_MITSUMI) {
+    else if (idx.siblingAtColumn(0).data(Qt::UserRole).toUInt() != CDROM_BUS_MITSUMI)
         model->setData(i, QObject::tr(cdrom_getname(type)));
-    }
     model->setData(i, type, Qt::UserRole);
 }
 
@@ -112,9 +111,8 @@ SettingsFloppyCDROM::SettingsFloppyCDROM(QWidget *parent)
     int   i     = 0;
     while (true) {
         QString name = tr(fdd_getname(i));
-        if (name.isEmpty()) {
+        if (name.isEmpty())
             break;
-        }
 
         Models::AddEntry(model, name, i);
         ++i;
@@ -139,26 +137,27 @@ SettingsFloppyCDROM::SettingsFloppyCDROM(QWidget *parent)
     ui->tableViewFloppy->resizeColumnsToContents();
     ui->tableViewFloppy->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Stretch);
 
-    connect(ui->tableViewFloppy->selectionModel(), &QItemSelectionModel::currentRowChanged, this, &SettingsFloppyCDROM::onFloppyRowChanged);
+    connect(ui->tableViewFloppy->selectionModel(), &QItemSelectionModel::currentRowChanged,
+            this, &SettingsFloppyCDROM::onFloppyRowChanged);
     ui->tableViewFloppy->setCurrentIndex(model->index(0, 0));
 
     Harddrives::populateRemovableBuses(ui->comboBoxBus->model());
     model = ui->comboBoxSpeed->model();
-    for (int i = 0; i < 72; i++) {
+    for (int i = 0; i < 72; i++)
         Models::AddEntry(model, QString("%1x").arg(i + 1), i + 1);
-    }
 
+#if 0
     model = ui->comboBoxCDROMType->model();
     i = 0;
     while (true) {
         QString name = tr(cdrom_getname(i));
-        if (name.isEmpty()) {
+        if (name.isEmpty())
             break;
-        }
 
         Models::AddEntry(model, name, i);
         ++i;
     }
+#endif
 
     model = new QStandardItemModel(0, 3, this);
     ui->tableViewCDROM->setModel(model);
@@ -175,15 +174,43 @@ SettingsFloppyCDROM::SettingsFloppyCDROM(QWidget *parent)
         if (cdrom[i].bus_type == CDROM_BUS_ATAPI)
             Harddrives::busTrackClass->device_track(1, DEV_CDROM, cdrom[i].bus_type, cdrom[i].ide_channel);
         else if (cdrom[i].bus_type == CDROM_BUS_SCSI)
-            Harddrives::busTrackClass->device_track(1, DEV_CDROM, cdrom[i].bus_type, cdrom[i].scsi_device_id);
+            Harddrives::busTrackClass->device_track(1, DEV_CDROM, cdrom[i].bus_type,
+                                                    cdrom[i].scsi_device_id);
         else if (cdrom[i].bus_type == CDROM_BUS_MITSUMI)
             Harddrives::busTrackClass->device_track(1, DEV_CDROM, cdrom[i].bus_type, 0);
     }
     ui->tableViewCDROM->resizeColumnsToContents();
     ui->tableViewCDROM->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Stretch);
 
-    connect(ui->tableViewCDROM->selectionModel(), &QItemSelectionModel::currentRowChanged, this, &SettingsFloppyCDROM::onCDROMRowChanged);
+    connect(ui->tableViewCDROM->selectionModel(), &QItemSelectionModel::currentRowChanged,
+            this, &SettingsFloppyCDROM::onCDROMRowChanged);
     ui->tableViewCDROM->setCurrentIndex(model->index(0, 0));
+
+    uint8_t bus_type = ui->comboBoxBus->currentData().toUInt();
+    int cdromIdx     = ui->tableViewCDROM->selectionModel()->currentIndex().data().toInt();
+
+    auto *modelType  = ui->comboBoxCDROMType->model();
+    int   removeRows = modelType->rowCount();
+
+    int j                    = 0;
+    int selectedTypeRow      = 0;
+    int eligibleRows         = 0;
+    while (cdrom_drive_types[j].bus_type != BUS_TYPE_NONE) {
+        if (((bus_type == CDROM_BUS_ATAPI) || (bus_type == CDROM_BUS_SCSI)) &&
+            ((cdrom_drive_types[j].bus_type == bus_type) ||
+             (cdrom_drive_types[j].bus_type == BUS_TYPE_BOTH))) {
+            QString name = tr(cdrom_getname(j));
+            Models::AddEntry(modelType, name, j);
+            if ((cdrom[cdromIdx].bus_type == bus_type) && (cdrom[cdromIdx].type == j))
+                selectedTypeRow = eligibleRows;
+            ++eligibleRows;
+        }
+        ++j;
+    }
+    modelType->removeRows(0, removeRows);
+    ui->comboBoxCDROMType->setEnabled(eligibleRows > 1);
+    ui->comboBoxCDROMType->setCurrentIndex(-1);
+    ui->comboBoxCDROMType->setCurrentIndex(selectedTypeRow);
 }
 
 SettingsFloppyCDROM::~SettingsFloppyCDROM()
@@ -234,20 +261,18 @@ SettingsFloppyCDROM::onCDROMRowChanged(const QModelIndex &current)
     uint8_t bus     = current.siblingAtColumn(0).data(Qt::UserRole).toUInt();
     uint8_t channel = current.siblingAtColumn(0).data(Qt::UserRole + 1).toUInt();
     uint8_t speed   = current.siblingAtColumn(1).data(Qt::UserRole).toUInt();
-    int type 		= current.siblingAtColumn(2).data(Qt::UserRole).toInt();
+    int type        = current.siblingAtColumn(2).data(Qt::UserRole).toInt();
 
     ui->comboBoxBus->setCurrentIndex(-1);
     auto* model = ui->comboBoxBus->model();
     auto match = model->match(model->index(0, 0), Qt::UserRole, bus);
-    if (! match.isEmpty()) {
+    if (! match.isEmpty())
         ui->comboBoxBus->setCurrentIndex(match.first().row());
-    }
 
     model = ui->comboBoxChannel->model();
     match = model->match(model->index(0, 0), Qt::UserRole, channel);
-    if (!match.isEmpty()) {
+    if (!match.isEmpty())
         ui->comboBoxChannel->setCurrentIndex(match.first().row());
-    }
 
     ui->comboBoxSpeed->setCurrentIndex(speed == 0 ? 7 : speed - 1);
     ui->comboBoxCDROMType->setCurrentIndex(type);
@@ -257,36 +282,37 @@ void
 SettingsFloppyCDROM::on_checkBoxTurboTimings_stateChanged(int arg1)
 {
     auto idx = ui->tableViewFloppy->selectionModel()->currentIndex();
-    ui->tableViewFloppy->model()->setData(idx.siblingAtColumn(1), arg1 == Qt::Checked ? tr("On") : tr("Off"));
+    ui->tableViewFloppy->model()->setData(idx.siblingAtColumn(1), arg1 == Qt::Checked ?
+                                          tr("On") : tr("Off"));
 }
 
 void
 SettingsFloppyCDROM::on_checkBoxCheckBPB_stateChanged(int arg1)
 {
     auto idx = ui->tableViewFloppy->selectionModel()->currentIndex();
-    ui->tableViewFloppy->model()->setData(idx.siblingAtColumn(2), arg1 == Qt::Checked ? tr("On") : tr("Off"));
+    ui->tableViewFloppy->model()->setData(idx.siblingAtColumn(2), arg1 == Qt::Checked ?
+                                          tr("On") : tr("Off"));
 }
 
 void
 SettingsFloppyCDROM::on_comboBoxFloppyType_activated(int index)
 {
-    setFloppyType(ui->tableViewFloppy->model(), ui->tableViewFloppy->selectionModel()->currentIndex(), index);
+    setFloppyType(ui->tableViewFloppy->model(),
+                  ui->tableViewFloppy->selectionModel()->currentIndex(), index);
 }
 
 void
 SettingsFloppyCDROM::on_comboBoxBus_currentIndexChanged(int index)
 {
-    if (index < 0) {
-        return;
+    if (index >= 0) {
+        int  bus     = ui->comboBoxBus->currentData().toInt();
+        bool enabled = (bus != CDROM_BUS_DISABLED);
+        ui->comboBoxChannel->setEnabled((bus == CDROM_BUS_MITSUMI) ? 0 : enabled);
+        ui->comboBoxSpeed->setEnabled((bus == CDROM_BUS_MITSUMI) ? 0 : enabled);
+        ui->comboBoxCDROMType->setEnabled((bus == CDROM_BUS_MITSUMI) ? 0 : enabled);
+
+        Harddrives::populateBusChannels(ui->comboBoxChannel->model(), bus);
     }
-
-    int  bus     = ui->comboBoxBus->currentData().toInt();
-    bool enabled = (bus != CDROM_BUS_DISABLED);
-    ui->comboBoxChannel->setEnabled((bus == CDROM_BUS_MITSUMI) ? 0 : enabled);
-    ui->comboBoxSpeed->setEnabled((bus == CDROM_BUS_MITSUMI) ? 0 : enabled);
-    ui->comboBoxCDROMType->setEnabled((bus == CDROM_BUS_MITSUMI) ? 0 : enabled);
-
-    Harddrives::populateBusChannels(ui->comboBoxChannel->model(), bus);
 }
 
 void
@@ -299,10 +325,13 @@ SettingsFloppyCDROM::on_comboBoxSpeed_activated(int index)
 void
 SettingsFloppyCDROM::on_comboBoxBus_activated(int)
 {
-    auto i 			 = ui->tableViewCDROM->selectionModel()->currentIndex().siblingAtColumn(0);
-	uint8_t bus_type = ui->comboBoxBus->currentData().toUInt();
+    auto i = ui->tableViewCDROM->selectionModel()->currentIndex().siblingAtColumn(0);
+    uint8_t bus_type = ui->comboBoxBus->currentData().toUInt();
+    int cdromIdx     = ui->tableViewCDROM->selectionModel()->currentIndex().data().toInt();
 
-    Harddrives::busTrackClass->device_track(0, DEV_CDROM, ui->tableViewCDROM->model()->data(i, Qt::UserRole).toInt(), ui->tableViewCDROM->model()->data(i, Qt::UserRole + 1).toInt());
+    Harddrives::busTrackClass->device_track(0, DEV_CDROM, ui->tableViewCDROM->model()->data(i,
+                                            Qt::UserRole).toInt(), ui->tableViewCDROM->model()->data(i,
+                                            Qt::UserRole + 1).toInt());
     if (bus_type == CDROM_BUS_ATAPI)
         ui->comboBoxChannel->setCurrentIndex(Harddrives::busTrackClass->next_free_ide_channel());
     else if (bus_type == CDROM_BUS_SCSI)
@@ -310,38 +339,64 @@ SettingsFloppyCDROM::on_comboBoxBus_activated(int)
     else if (bus_type == CDROM_BUS_MITSUMI)
         ui->comboBoxChannel->setCurrentIndex(0);
 
-    setCDROMBus(
-        ui->tableViewCDROM->model(),
-        ui->tableViewCDROM->selectionModel()->currentIndex(),
-        bus_type,
-        ui->comboBoxChannel->currentData().toUInt());
-    setCDROMType(
-        ui->tableViewCDROM->model(),
-        ui->tableViewCDROM->selectionModel()->currentIndex(),
-        ui->comboBoxCDROMType->currentData().toUInt());
-    Harddrives::busTrackClass->device_track(1, DEV_CDROM, ui->tableViewCDROM->model()->data(i, Qt::UserRole).toInt(), ui->tableViewCDROM->model()->data(i, Qt::UserRole + 1).toInt());
+    setCDROMBus(ui->tableViewCDROM->model(),
+                ui->tableViewCDROM->selectionModel()->currentIndex(),
+                bus_type,
+                ui->comboBoxChannel->currentData().toUInt());
+    Harddrives::busTrackClass->device_track(1, DEV_CDROM, ui->tableViewCDROM->model()->data(i,
+                                            Qt::UserRole).toInt(), ui->tableViewCDROM->model()->data(i,
+                                            Qt::UserRole + 1).toInt());
+
+    auto *modelType  = ui->comboBoxCDROMType->model();
+    int   removeRows = modelType->rowCount();
+
+    int j                    = 0;
+    int selectedTypeRow      = 0;
+    int eligibleRows         = 0;
+    while (cdrom_drive_types[j].bus_type != BUS_TYPE_NONE) {
+        if (((bus_type == CDROM_BUS_ATAPI) || (bus_type == CDROM_BUS_SCSI)) &&
+            ((cdrom_drive_types[j].bus_type == bus_type) ||
+             (cdrom_drive_types[j].bus_type == BUS_TYPE_BOTH))) {
+            QString name = tr(cdrom_getname(j));
+            Models::AddEntry(modelType, name, j);
+            if ((cdrom[cdromIdx].bus_type == bus_type) && (cdrom[cdromIdx].type == j))
+                selectedTypeRow = eligibleRows;
+            ++eligibleRows;
+        }
+        ++j;
+    }
+    modelType->removeRows(0, removeRows);
+    ui->comboBoxCDROMType->setEnabled(eligibleRows > 1);
+    ui->comboBoxCDROMType->setCurrentIndex(-1);
+    ui->comboBoxCDROMType->setCurrentIndex(selectedTypeRow);
+
+    setCDROMType(ui->tableViewCDROM->model(),
+                 ui->tableViewCDROM->selectionModel()->currentIndex(),
+                 ui->comboBoxCDROMType->currentData().toUInt());
 }
 
 void
 SettingsFloppyCDROM::on_comboBoxChannel_activated(int)
 {
     auto i = ui->tableViewCDROM->selectionModel()->currentIndex().siblingAtColumn(0);
-    Harddrives::busTrackClass->device_track(0, DEV_CDROM, ui->tableViewCDROM->model()->data(i, Qt::UserRole).toInt(), ui->tableViewCDROM->model()->data(i, Qt::UserRole + 1).toInt());
-    setCDROMBus(
-        ui->tableViewCDROM->model(),
-        ui->tableViewCDROM->selectionModel()->currentIndex(),
-        ui->comboBoxBus->currentData().toUInt(),
-        ui->comboBoxChannel->currentData().toUInt());
-    Harddrives::busTrackClass->device_track(1, DEV_CDROM, ui->tableViewCDROM->model()->data(i, Qt::UserRole).toInt(), ui->tableViewCDROM->model()->data(i, Qt::UserRole + 1).toInt());
+    Harddrives::busTrackClass->device_track(0, DEV_CDROM, ui->tableViewCDROM->model()->data(i,
+                                            Qt::UserRole).toInt(), ui->tableViewCDROM->model()->data(i,
+                                            Qt::UserRole + 1).toInt());
+    setCDROMBus(ui->tableViewCDROM->model(),
+                ui->tableViewCDROM->selectionModel()->currentIndex(),
+                ui->comboBoxBus->currentData().toUInt(),
+                ui->comboBoxChannel->currentData().toUInt());
+    Harddrives::busTrackClass->device_track(1, DEV_CDROM, ui->tableViewCDROM->model()->data(i,
+                                            Qt::UserRole).toInt(), ui->tableViewCDROM->model()->data(i,
+                                            Qt::UserRole + 1).toInt());
 }
 
 void
 SettingsFloppyCDROM::on_comboBoxCDROMType_activated(int)
 {
-    setCDROMType(
-        ui->tableViewCDROM->model(),
-        ui->tableViewCDROM->selectionModel()->currentIndex(),
-        ui->comboBoxCDROMType->currentData().toUInt());
+    setCDROMType(ui->tableViewCDROM->model(),
+                 ui->tableViewCDROM->selectionModel()->currentIndex(),
+                 ui->comboBoxCDROMType->currentData().toUInt());
     ui->tableViewCDROM->resizeColumnsToContents();
     ui->tableViewCDROM->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Stretch);
 }
diff --git a/src/qt/qt_settingsinput.cpp b/src/qt/qt_settingsinput.cpp
index 630fc705d..66d6e3de0 100644
--- a/src/qt/qt_settingsinput.cpp
+++ b/src/qt/qt_settingsinput.cpp
@@ -87,9 +87,9 @@ SettingsInput::onCurrentMachineChanged(int machineId)
     mouseModel->removeRows(0, removeRows);
     ui->comboBoxMouse->setCurrentIndex(selectedRow);
 
-    int   i             = 0;
-    char *joyName       = joystick_get_name(i);
-    auto *joystickModel = ui->comboBoxJoystick->model();
+    int         i             = 0;
+    const char *joyName       = joystick_get_name(i);
+    auto       *joystickModel = ui->comboBoxJoystick->model();
     removeRows          = joystickModel->rowCount();
     selectedRow         = 0;
     while (joyName) {
@@ -116,7 +116,7 @@ void
 SettingsInput::on_comboBoxJoystick_currentIndexChanged(int index)
 {
     int joystickId = ui->comboBoxJoystick->currentData().toInt();
-    for (int i = 0; i < 4; ++i) {
+    for (int i = 0; i < MAX_JOYSTICKS; ++i) {
         auto *btn = findChild<QPushButton *>(QString("pushButtonJoystick%1").arg(i + 1));
         if (btn == nullptr) {
             continue;
diff --git a/src/qt/qt_settingsmachine.cpp b/src/qt/qt_settingsmachine.cpp
index 569d1f6c3..0a170ccae 100644
--- a/src/qt/qt_settingsmachine.cpp
+++ b/src/qt/qt_settingsmachine.cpp
@@ -72,6 +72,21 @@ SettingsMachine::SettingsMachine(QWidget *parent)
         waitStatesModel->setData(idx, i + 1, Qt::UserRole);
     }
 
+    auto *pitModeModel = ui->comboBoxPitMode->model();
+    pitModeModel->insertRows(0, 3);
+    idx = pitModeModel->index(0, 0);
+    pitModeModel->setData(idx, tr("Auto"), Qt::DisplayRole);
+    pitModeModel->setData(idx, -1, Qt::UserRole);
+    idx = pitModeModel->index(1, 0);
+    pitModeModel->setData(idx, tr("Slow"), Qt::DisplayRole);
+    pitModeModel->setData(idx, 0, Qt::UserRole);
+    idx = pitModeModel->index(2, 0);
+    pitModeModel->setData(idx, tr("Fast"), Qt::DisplayRole);
+    pitModeModel->setData(idx, 1, Qt::UserRole);
+
+    ui->comboBoxPitMode->setCurrentIndex(-1);
+    ui->comboBoxPitMode->setCurrentIndex(pit_mode + 1);
+
     int   selectedMachineType = 0;
     auto *machineTypesModel   = ui->comboBoxMachineType->model();
     for (int i = 1; i < MACHINE_TYPE_MAX; ++i) {
@@ -79,9 +94,8 @@ SettingsMachine::SettingsMachine(QWidget *parent)
         while (machine_get_internal_name_ex(j) != nullptr) {
             if (machine_available(j) && (machine_get_type(j) == i)) {
                 int row = Models::AddEntry(machineTypesModel, machine_types[i].name, machine_types[i].id);
-                if (machine_types[i].id == machine_get_type(machine)) {
+                if (machine_types[i].id == machine_get_type(machine))
                     selectedMachineType = row;
-                }
                 break;
             }
             j++;
@@ -113,202 +127,191 @@ SettingsMachine::save()
     fpu_softfloat   = ui->checkBoxFPUSoftfloat->isChecked() ? 1 : 0;
 
     int64_t temp_mem_size;
-    if (machine_get_ram_granularity(machine) < 1024) {
+    if (machine_get_ram_granularity(machine) < 1024)
         temp_mem_size = ui->spinBoxRAM->value();
-    } else {
+    else
         temp_mem_size = ui->spinBoxRAM->value() * 1024;
-    }
 
     temp_mem_size &= ~(machine_get_ram_granularity(machine) - 1);
-    if (temp_mem_size < machine_get_min_ram(machine)) {
+    if (temp_mem_size < machine_get_min_ram(machine))
         temp_mem_size = machine_get_min_ram(machine);
-    } else if (temp_mem_size > machine_get_max_ram(machine)) {
+    else if (temp_mem_size > machine_get_max_ram(machine))
         temp_mem_size = machine_get_max_ram(machine);
-    }
     mem_size = static_cast<uint32_t>(temp_mem_size);
 
-    if (ui->comboBoxWaitStates->isEnabled()) {
+    if (ui->comboBoxWaitStates->isEnabled())
         cpu_waitstates = ui->comboBoxWaitStates->currentData().toInt();
-    } else {
+    else
         cpu_waitstates = 0;
-    }
+
+    pit_mode = ui->comboBoxPitMode->currentData().toInt();
 
     time_sync = 0;
-    if (ui->radioButtonLocalTime->isChecked()) {
+    if (ui->radioButtonLocalTime->isChecked())
         time_sync = TIME_SYNC_ENABLED;
-    }
-    if (ui->radioButtonUTC->isChecked()) {
+    if (ui->radioButtonUTC->isChecked())
         time_sync = TIME_SYNC_ENABLED | TIME_SYNC_UTC;
-    }
 }
 
 void
 SettingsMachine::on_comboBoxMachineType_currentIndexChanged(int index)
 {
-    if (index < 0) {
-        return;
-    }
+    if (index >= 0) {
+        auto *model      = ui->comboBoxMachine->model();
+        int   removeRows = model->rowCount();
 
-    auto *model      = ui->comboBoxMachine->model();
-    int   removeRows = model->rowCount();
-
-    int selectedMachineRow = 0;
-    for (int i = 0; i < machine_count(); ++i) {
-        if ((machine_get_type(i) == ui->comboBoxMachineType->currentData().toInt()) && machine_available(i)) {
-            int row = Models::AddEntry(model, machines[i].name, i);
-            if (i == machine) {
-                selectedMachineRow = row - removeRows;
+        int selectedMachineRow = 0;
+        for (int i = 0; i < machine_count(); ++i) {
+            if ((machine_get_type(i) == ui->comboBoxMachineType->currentData().toInt()) &&
+                machine_available(i)) {
+                int row = Models::AddEntry(model, machines[i].name, i);
+                if (i == machine)
+                    selectedMachineRow = row - removeRows;
             }
         }
-    }
-    model->removeRows(0, removeRows);
+        model->removeRows(0, removeRows);
 
-    ui->comboBoxMachine->setCurrentIndex(-1);
-    ui->comboBoxMachine->setCurrentIndex(selectedMachineRow);
+        ui->comboBoxMachine->setCurrentIndex(-1);
+        ui->comboBoxMachine->setCurrentIndex(selectedMachineRow);
+    }
 }
 
 void
 SettingsMachine::on_comboBoxMachine_currentIndexChanged(int index)
 {
     // win_settings_machine_recalc_machine
-    if (index < 0) {
-        return;
-    }
+    if (index >= 0) {
+        int         machineId = ui->comboBoxMachine->currentData().toInt();
+        const auto *device    = machine_get_device(machineId);
+        ui->pushButtonConfigure->setEnabled((device != nullptr) && (device->config != nullptr));
 
-    int         machineId = ui->comboBoxMachine->currentData().toInt();
-    const auto *device    = machine_get_device(machineId);
-    ui->pushButtonConfigure->setEnabled((device != nullptr) && (device->config != nullptr));
+        auto *modelCpu   = ui->comboBoxCPU->model();
+        int   removeRows = modelCpu->rowCount();
 
-    auto *modelCpu   = ui->comboBoxCPU->model();
-    int   removeRows = modelCpu->rowCount();
-
-    int i                    = 0;
-    int eligibleRows         = 0;
-    int selectedCpuFamilyRow = 0;
-    while (cpu_families[i].package != 0) {
-        if (cpu_family_is_eligible(&cpu_families[i], machineId)) {
-            Models::AddEntry(modelCpu, QString("%1 %2").arg(cpu_families[i].manufacturer, cpu_families[i].name), i);
-            if (&cpu_families[i] == cpu_f) {
-                selectedCpuFamilyRow = eligibleRows;
+        int i                    = 0;
+        int eligibleRows         = 0;
+        int selectedCpuFamilyRow = 0;
+        while (cpu_families[i].package != 0) {
+            if (cpu_family_is_eligible(&cpu_families[i], machineId)) {
+                Models::AddEntry(modelCpu, QString("%1 %2").arg(cpu_families[i].manufacturer,
+                                 cpu_families[i].name), i);
+                if (&cpu_families[i] == cpu_f)
+                    selectedCpuFamilyRow = eligibleRows;
+                ++eligibleRows;
             }
-            ++eligibleRows;
+            ++i;
         }
-        ++i;
-    }
-    modelCpu->removeRows(0, removeRows);
-    ui->comboBoxCPU->setEnabled(eligibleRows > 1);
-    ui->comboBoxCPU->setCurrentIndex(-1);
-    ui->comboBoxCPU->setCurrentIndex(selectedCpuFamilyRow);
+        modelCpu->removeRows(0, removeRows);
+        ui->comboBoxCPU->setEnabled(eligibleRows > 1);
+        ui->comboBoxCPU->setCurrentIndex(-1);
+        ui->comboBoxCPU->setCurrentIndex(selectedCpuFamilyRow);
 
-    int divisor;
-    if (machine_get_ram_granularity(machineId) < 1024) {
-        divisor = 1;
-        ui->spinBoxRAM->setSuffix(QCoreApplication::translate("", "KB").prepend(' '));
-    } else {
-        divisor = 1024;
-        ui->spinBoxRAM->setSuffix(QCoreApplication::translate("", "MB").prepend(' '));
-    }
-    ui->spinBoxRAM->setMinimum(machine_get_min_ram(machineId) / divisor);
-    ui->spinBoxRAM->setMaximum(machine_get_max_ram(machineId) / divisor);
-    ui->spinBoxRAM->setSingleStep(machine_get_ram_granularity(machineId) / divisor);
-    ui->spinBoxRAM->setValue(mem_size / divisor);
-    ui->spinBoxRAM->setEnabled(machine_get_min_ram(machineId) != machine_get_max_ram(machineId));
+        int divisor;
+        if (machine_get_ram_granularity(machineId) < 1024) {
+            divisor = 1;
+            ui->spinBoxRAM->setSuffix(QCoreApplication::translate("", "KB").prepend(' '));
+        } else {
+            divisor = 1024;
+            ui->spinBoxRAM->setSuffix(QCoreApplication::translate("", "MB").prepend(' '));
+        }
+        ui->spinBoxRAM->setMinimum(machine_get_min_ram(machineId) / divisor);
+        ui->spinBoxRAM->setMaximum(machine_get_max_ram(machineId) / divisor);
+        ui->spinBoxRAM->setSingleStep(machine_get_ram_granularity(machineId) / divisor);
+        ui->spinBoxRAM->setValue(mem_size / divisor);
+        ui->spinBoxRAM->setEnabled(machine_get_min_ram(machineId) != machine_get_max_ram(machineId));
 
-    emit currentMachineChanged(machineId);
+        emit currentMachineChanged(machineId);
+    }
 }
 
 void
 SettingsMachine::on_comboBoxCPU_currentIndexChanged(int index)
 {
-    if (index < 0) {
-        return;
-    }
+    if (index >= 0) {
+        int         machineId   = ui->comboBoxMachine->currentData().toInt();
+        int         cpuFamilyId = ui->comboBoxCPU->currentData().toInt();
+        const auto *cpuFamily   = &cpu_families[cpuFamilyId];
 
-    int         machineId   = ui->comboBoxMachine->currentData().toInt();
-    int         cpuFamilyId = ui->comboBoxCPU->currentData().toInt();
-    const auto *cpuFamily   = &cpu_families[cpuFamilyId];
+        auto *modelSpeed = ui->comboBoxSpeed->model();
+        int   removeRows = modelSpeed->rowCount();
 
-    auto *modelSpeed = ui->comboBoxSpeed->model();
-    int   removeRows = modelSpeed->rowCount();
-
-    // win_settings_machine_recalc_cpu_m
-    int i                = 0;
-    int eligibleRows     = 0;
-    int selectedSpeedRow = 0;
-    while (cpuFamily->cpus[i].cpu_type != 0) {
-        if (cpu_is_eligible(cpuFamily, i, machineId)) {
-            Models::AddEntry(modelSpeed, QString("%1").arg(cpuFamily->cpus[i].name), i);
-            if (cpu == i) {
-                selectedSpeedRow = eligibleRows;
+        // win_settings_machine_recalc_cpu_m
+        int i                = 0;
+        int eligibleRows     = 0;
+        int selectedSpeedRow = 0;
+        while (cpuFamily->cpus[i].cpu_type != 0) {
+            if (cpu_is_eligible(cpuFamily, i, machineId)) {
+                Models::AddEntry(modelSpeed, QString("%1").arg(cpuFamily->cpus[i].name), i);
+                if (cpu == i)
+                    selectedSpeedRow = eligibleRows;
+                ++eligibleRows;
             }
-            ++eligibleRows;
+            ++i;
         }
-        ++i;
+        modelSpeed->removeRows(0, removeRows);
+        ui->comboBoxSpeed->setEnabled(eligibleRows > 1);
+        ui->comboBoxSpeed->setCurrentIndex(-1);
+        ui->comboBoxSpeed->setCurrentIndex(selectedSpeedRow);
     }
-    modelSpeed->removeRows(0, removeRows);
-    ui->comboBoxSpeed->setEnabled(eligibleRows > 1);
-    ui->comboBoxSpeed->setCurrentIndex(-1);
-    ui->comboBoxSpeed->setCurrentIndex(selectedSpeedRow);
 }
 
 void
 SettingsMachine::on_comboBoxSpeed_currentIndexChanged(int index)
 {
-    if (index < 0) {
-        return;
-    }
+    if (index >= 0) {
+        // win_settings_machine_recalc_cpu
+        int         cpuFamilyId = ui->comboBoxCPU->currentData().toInt();
+        const auto *cpuFamily   = &cpu_families[cpuFamilyId];
+        int         cpuId       = ui->comboBoxSpeed->currentData().toInt();
+        uint        cpuType     = cpuFamily->cpus[cpuId].cpu_type;
 
-    // win_settings_machine_recalc_cpu
-    int         cpuFamilyId = ui->comboBoxCPU->currentData().toInt();
-    const auto *cpuFamily   = &cpu_families[cpuFamilyId];
-    int         cpuId       = ui->comboBoxSpeed->currentData().toInt();
-    uint        cpuType     = cpuFamily->cpus[cpuId].cpu_type;
-
-    if ((cpuType >= CPU_286) && (cpuType <= CPU_386DX)) {
-        ui->comboBoxWaitStates->setEnabled(true);
-        ui->comboBoxWaitStates->setCurrentIndex(cpu_waitstates);
-    } else {
-        ui->comboBoxWaitStates->setCurrentIndex(0);
-        ui->comboBoxWaitStates->setEnabled(false);
-    }
+        if ((cpuType >= CPU_286) && (cpuType <= CPU_386DX)) {
+            ui->comboBoxWaitStates->setEnabled(true);
+            ui->comboBoxWaitStates->setCurrentIndex(cpu_waitstates);
+        } else {
+            ui->comboBoxWaitStates->setCurrentIndex(0);
+            ui->comboBoxWaitStates->setEnabled(false);
+        }
 
 #ifdef USE_DYNAREC
-    uint8_t flags = cpuFamily->cpus[cpuId].cpu_flags;
-    if (!(flags & CPU_SUPPORTS_DYNAREC)) {
-        ui->checkBoxDynamicRecompiler->setChecked(false);
-        ui->checkBoxDynamicRecompiler->setEnabled(false);
-    } else if (flags & CPU_REQUIRES_DYNAREC) {
-        ui->checkBoxDynamicRecompiler->setChecked(true);
-        ui->checkBoxDynamicRecompiler->setEnabled(false);
-    } else {
-        ui->checkBoxDynamicRecompiler->setChecked(cpu_use_dynarec);
-        ui->checkBoxDynamicRecompiler->setEnabled(true);
-    }
+        uint8_t flags = cpuFamily->cpus[cpuId].cpu_flags;
+        if (!(flags & CPU_SUPPORTS_DYNAREC)) {
+            ui->checkBoxDynamicRecompiler->setChecked(false);
+            ui->checkBoxDynamicRecompiler->setEnabled(false);
+        } else if (flags & CPU_REQUIRES_DYNAREC) {
+            ui->checkBoxDynamicRecompiler->setChecked(true);
+            ui->checkBoxDynamicRecompiler->setEnabled(false);
+        } else {
+            ui->checkBoxDynamicRecompiler->setChecked(cpu_use_dynarec);
+            ui->checkBoxDynamicRecompiler->setEnabled(true);
+        }
 #endif
 
-    // win_settings_machine_recalc_fpu
-    int   machineId  = ui->comboBoxMachine->currentData().toInt();
-    auto *modelFpu   = ui->comboBoxFPU->model();
-    int   removeRows = modelFpu->rowCount();
+        // win_settings_machine_recalc_fpu
+        int   machineId  = ui->comboBoxMachine->currentData().toInt();
+        auto *modelFpu   = ui->comboBoxFPU->model();
+        int   removeRows = modelFpu->rowCount();
 
-    int i              = 0;
-    int selectedFpuRow = 0;
-    for (const char *fpuName = fpu_get_name_from_index(cpuFamily, cpuId, i); fpuName != nullptr; fpuName = fpu_get_name_from_index(cpuFamily, cpuId, ++i)) {
-        auto fpuType = fpu_get_type_from_index(cpuFamily, cpuId, i);
-        Models::AddEntry(modelFpu, QString("%1").arg(fpuName), fpuType);
-        if (fpu_type == fpuType) {
-            selectedFpuRow = i;
+        int i              = 0;
+        int selectedFpuRow = 0;
+        for (const char *fpuName = fpu_get_name_from_index(cpuFamily, cpuId, i);
+             fpuName != nullptr; fpuName = fpu_get_name_from_index(cpuFamily, cpuId, ++i)) {
+            auto fpuType = fpu_get_type_from_index(cpuFamily, cpuId, i);
+            Models::AddEntry(modelFpu, QString("%1").arg(fpuName), fpuType);
+            if (fpu_type == fpuType)
+                selectedFpuRow = i;
         }
+
+        modelFpu->removeRows(0, removeRows);
+        ui->comboBoxFPU->setEnabled(modelFpu->rowCount() > 1);
+        ui->comboBoxFPU->setCurrentIndex(-1);
+        ui->comboBoxFPU->setCurrentIndex(selectedFpuRow);
+
+        ui->checkBoxFPUSoftfloat->setChecked(machine_has_flags(machineId, MACHINE_SOFTFLOAT_ONLY) ?
+                                             true : fpu_softfloat);
+        ui->checkBoxFPUSoftfloat->setEnabled(machine_has_flags(machineId, MACHINE_SOFTFLOAT_ONLY) ?
+                                             false : true);
     }
-
-    modelFpu->removeRows(0, removeRows);
-    ui->comboBoxFPU->setEnabled(modelFpu->rowCount() > 1);
-    ui->comboBoxFPU->setCurrentIndex(-1);
-    ui->comboBoxFPU->setCurrentIndex(selectedFpuRow);
-
-    ui->checkBoxFPUSoftfloat->setChecked(machine_has_flags(machineId, MACHINE_SOFTFLOAT_ONLY) ? true : fpu_softfloat);
-    ui->checkBoxFPUSoftfloat->setEnabled(machine_has_flags(machineId, MACHINE_SOFTFLOAT_ONLY) ? false : true);
-
 }
 
 void
diff --git a/src/qt/qt_settingsmachine.ui b/src/qt/qt_settingsmachine.ui
index ee8a048f4..5496deb14 100644
--- a/src/qt/qt_settingsmachine.ui
+++ b/src/qt/qt_settingsmachine.ui
@@ -41,6 +41,192 @@
       <property name="bottomMargin">
        <number>0</number>
       </property>
+      <item row="2" column="0">
+       <widget class="QLabel" name="label_3">
+        <property name="text">
+         <string>CPU type:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1">
+       <widget class="QWidget" name="widget_2" native="true">
+        <layout class="QHBoxLayout" name="horizontalLayout">
+         <property name="leftMargin">
+          <number>0</number>
+         </property>
+         <property name="topMargin">
+          <number>0</number>
+         </property>
+         <property name="rightMargin">
+          <number>0</number>
+         </property>
+         <property name="bottomMargin">
+          <number>0</number>
+         </property>
+         <item>
+          <widget class="QComboBox" name="comboBoxCPU">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLabel" name="label_7">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="text">
+            <string>Speed:</string>
+           </property>
+           <property name="alignment">
+            <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QComboBox" name="comboBoxSpeed">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </widget>
+      </item>
+      <item row="6" column="1">
+       <widget class="QWidget" name="widget_4" native="true">
+        <layout class="QHBoxLayout" name="horizontalLayout_3">
+         <property name="leftMargin">
+          <number>0</number>
+         </property>
+         <property name="topMargin">
+          <number>0</number>
+         </property>
+         <property name="rightMargin">
+          <number>0</number>
+         </property>
+         <property name="bottomMargin">
+          <number>0</number>
+         </property>
+         <item>
+          <widget class="QComboBox" name="comboBoxFPU">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLabel" name="label_5">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="text">
+            <string>Wait states:</string>
+           </property>
+           <property name="alignment">
+            <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QComboBox" name="comboBoxWaitStates">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </widget>
+      </item>
+      <item row="7" column="0">
+       <widget class="QLabel" name="label_8">
+        <property name="text">
+         <string>PIT mode:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="7" column="1">
+       <widget class="QWidget" name="widget_5" native="true">
+        <layout class="QHBoxLayout" name="horizontalLayout_4">
+         <property name="leftMargin">
+          <number>0</number>
+         </property>
+         <property name="topMargin">
+          <number>0</number>
+         </property>
+         <property name="rightMargin">
+          <number>0</number>
+         </property>
+         <property name="bottomMargin">
+          <number>0</number>
+         </property>
+         <item>
+          <widget class="QComboBox" name="comboBoxPitMode">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLabel" name="label_6">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="text">
+            <string>Memory:</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QSpinBox" name="spinBoxRAM">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="alignment">
+            <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="QComboBox" name="comboBoxMachineType"/>
+      </item>
+      <item row="6" column="0">
+       <widget class="QLabel" name="label_4">
+        <property name="text">
+         <string>FPU:</string>
+        </property>
+       </widget>
+      </item>
       <item row="0" column="0">
        <widget class="QLabel" name="label">
         <property name="text">
@@ -48,9 +234,6 @@
         </property>
        </widget>
       </item>
-      <item row="0" column="1">
-       <widget class="QComboBox" name="comboBoxMachineType"/>
-      </item>
       <item row="1" column="0">
        <widget class="QLabel" name="label_2">
         <property name="text">
@@ -92,125 +275,51 @@
         </layout>
        </widget>
       </item>
-      <item row="2" column="0">
-       <widget class="QLabel" name="label_3">
-        <property name="text">
-         <string>CPU type:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="1">
-       <widget class="QWidget" name="widget_2" native="true">
-        <layout class="QHBoxLayout" name="horizontalLayout">
-         <property name="leftMargin">
-          <number>0</number>
-         </property>
-         <property name="topMargin">
-          <number>0</number>
-         </property>
-         <property name="rightMargin">
-          <number>0</number>
-         </property>
-         <property name="bottomMargin">
-          <number>0</number>
-         </property>
-         <item>
-          <widget class="QComboBox" name="comboBoxCPU">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QLabel" name="label_7">
-           <property name="text">
-            <string>Speed:</string>
-           </property>
-           <property name="alignment">
-            <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QComboBox" name="comboBoxSpeed">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </widget>
-      </item>
-      <item row="3" column="0">
-       <widget class="QLabel" name="label_4">
-        <property name="text">
-         <string>FPU:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="1">
-       <widget class="QComboBox" name="comboBoxFPU"/>
-      </item>
-      <item row="4" column="0">
-       <widget class="QLabel" name="label_5">
-        <property name="text">
-         <string>Wait states:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="1">
-       <widget class="QComboBox" name="comboBoxWaitStates"/>
-      </item>
-      <item row="5" column="0">
-       <widget class="QLabel" name="label_6">
-        <property name="text">
-         <string>Memory:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="5" column="1">
-       <widget class="QSpinBox" name="spinBoxRAM">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-       </widget>
-      </item>
      </layout>
     </widget>
    </item>
    <item>
-    <widget class="QCheckBox" name="checkBoxDynamicRecompiler">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-       <horstretch>2</horstretch>
-       <verstretch>2</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string>Dynamic Recompiler</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QCheckBox" name="checkBoxFPUSoftfloat">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-       <horstretch>3</horstretch>
-       <verstretch>3</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string>Softfloat FPU</string>
-     </property>
+    <widget class="QWidget" name="widget_6" native="true">
+     <layout class="QHBoxLayout" name="horizontalLayout_5">
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
+      <item>
+       <widget class="QCheckBox" name="checkBoxDynamicRecompiler">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+          <horstretch>2</horstretch>
+          <verstretch>2</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string>Dynamic Recompiler</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QCheckBox" name="checkBoxFPUSoftfloat">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+          <horstretch>3</horstretch>
+          <verstretch>3</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string>SoftFloat FPU</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
     </widget>
    </item>
    <item>
diff --git a/src/qt/qt_settingsotherremovable.cpp b/src/qt/qt_settingsotherremovable.cpp
index bb77046d2..dea865543 100644
--- a/src/qt/qt_settingsotherremovable.cpp
+++ b/src/qt/qt_settingsotherremovable.cpp
@@ -36,7 +36,8 @@ extern "C" {
 static QString
 moDriveTypeName(int i)
 {
-    return QString("%1 %2 %3").arg(mo_drive_types[i].vendor, mo_drive_types[i].model, mo_drive_types[i].revision);
+    return QString("%1 %2 %3").arg(mo_drive_types[i].vendor, mo_drive_types[i].model,
+                                   mo_drive_types[i].revision);
 }
 
 static void
@@ -64,11 +65,10 @@ static void
 setMOType(QAbstractItemModel *model, const QModelIndex &idx, uint32_t type)
 {
     auto i = idx.siblingAtColumn(1);
-    if (idx.siblingAtColumn(0).data(Qt::UserRole).toUInt() == MO_BUS_DISABLED) {
+    if (idx.siblingAtColumn(0).data(Qt::UserRole).toUInt() == MO_BUS_DISABLED)
         model->setData(i, QCoreApplication::translate("", "None"));
-    } else {
+    else
         model->setData(i, moDriveTypeName(type));
-    }
     model->setData(i, type, Qt::UserRole);
 }
 
@@ -187,15 +187,13 @@ SettingsOtherRemovable::onMORowChanged(const QModelIndex &current)
     ui->comboBoxMOBus->setCurrentIndex(-1);
     auto *model = ui->comboBoxMOBus->model();
     auto  match = model->match(model->index(0, 0), Qt::UserRole, bus);
-    if (!match.isEmpty()) {
+    if (!match.isEmpty())
         ui->comboBoxMOBus->setCurrentIndex(match.first().row());
-    }
 
     model = ui->comboBoxMOChannel->model();
     match = model->match(model->index(0, 0), Qt::UserRole, channel);
-    if (!match.isEmpty()) {
+    if (!match.isEmpty())
         ui->comboBoxMOChannel->setCurrentIndex(match.first().row());
-    }
     ui->comboBoxMOType->setCurrentIndex(type);
 }
 
@@ -209,73 +207,75 @@ SettingsOtherRemovable::onZIPRowChanged(const QModelIndex &current)
     ui->comboBoxZIPBus->setCurrentIndex(-1);
     auto *model = ui->comboBoxZIPBus->model();
     auto  match = model->match(model->index(0, 0), Qt::UserRole, bus);
-    if (!match.isEmpty()) {
+    if (!match.isEmpty())
         ui->comboBoxZIPBus->setCurrentIndex(match.first().row());
-    }
 
     model = ui->comboBoxZIPChannel->model();
     match = model->match(model->index(0, 0), Qt::UserRole, channel);
-    if (!match.isEmpty()) {
+    if (!match.isEmpty())
         ui->comboBoxZIPChannel->setCurrentIndex(match.first().row());
-    }
     ui->checkBoxZIP250->setChecked(is250);
 }
 
 void
 SettingsOtherRemovable::on_comboBoxMOBus_currentIndexChanged(int index)
 {
-    if (index < 0) {
-        return;
+    if (index >= 0) {
+        int  bus     = ui->comboBoxMOBus->currentData().toInt();
+        bool enabled = (bus != MO_BUS_DISABLED);
+        ui->comboBoxMOChannel->setEnabled(enabled);
+        ui->comboBoxMOType->setEnabled(enabled);
+        Harddrives::populateBusChannels(ui->comboBoxMOChannel->model(), bus);
     }
-
-    int  bus     = ui->comboBoxMOBus->currentData().toInt();
-    bool enabled = (bus != MO_BUS_DISABLED);
-    ui->comboBoxMOChannel->setEnabled(enabled);
-    ui->comboBoxMOType->setEnabled(enabled);
-    Harddrives::populateBusChannels(ui->comboBoxMOChannel->model(), bus);
 }
 
 void
 SettingsOtherRemovable::on_comboBoxMOBus_activated(int)
 {
     auto i = ui->tableViewMO->selectionModel()->currentIndex().siblingAtColumn(0);
-    Harddrives::busTrackClass->device_track(0, DEV_MO, ui->tableViewMO->model()->data(i, Qt::UserRole).toInt(), ui->tableViewMO->model()->data(i, Qt::UserRole + 1).toInt());
-    ui->comboBoxMOChannel->setCurrentIndex(ui->comboBoxMOBus->currentData().toUInt() == MO_BUS_ATAPI ? Harddrives::busTrackClass->next_free_ide_channel() : Harddrives::busTrackClass->next_free_scsi_id());
+    Harddrives::busTrackClass->device_track(0, DEV_MO, ui->tableViewMO->model()->data(i,
+                                            Qt::UserRole).toInt(), ui->tableViewMO->model()->data(i,
+                                            Qt::UserRole + 1).toInt());
+    ui->comboBoxMOChannel->setCurrentIndex(ui->comboBoxMOBus->currentData().toUInt() ==
+        MO_BUS_ATAPI ? Harddrives::busTrackClass->next_free_ide_channel() :
+        Harddrives::busTrackClass->next_free_scsi_id());
     ui->tableViewMO->model()->data(i, Qt::UserRole + 1);
-    setMOBus(
-        ui->tableViewMO->model(),
-        ui->tableViewMO->selectionModel()->currentIndex(),
-        ui->comboBoxMOBus->currentData().toUInt(),
-        ui->comboBoxMOChannel->currentData().toUInt());
-    setMOType(
-        ui->tableViewMO->model(),
-        ui->tableViewMO->selectionModel()->currentIndex(),
-        ui->comboBoxMOType->currentData().toUInt());
+    setMOBus(ui->tableViewMO->model(),
+             ui->tableViewMO->selectionModel()->currentIndex(),
+             ui->comboBoxMOBus->currentData().toUInt(),
+             ui->comboBoxMOChannel->currentData().toUInt());
+    setMOType(ui->tableViewMO->model(),
+              ui->tableViewMO->selectionModel()->currentIndex(),
+              ui->comboBoxMOType->currentData().toUInt());
     ui->tableViewMO->resizeColumnsToContents();
     ui->tableViewMO->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Stretch);
-    Harddrives::busTrackClass->device_track(1, DEV_MO, ui->tableViewMO->model()->data(i, Qt::UserRole).toInt(), ui->tableViewMO->model()->data(i, Qt::UserRole + 1).toInt());
+    Harddrives::busTrackClass->device_track(1, DEV_MO, ui->tableViewMO->model()->data(i,
+                                            Qt::UserRole).toInt(), ui->tableViewMO->model()->data(i,
+                                            Qt::UserRole + 1).toInt());
 }
 
 void
 SettingsOtherRemovable::on_comboBoxMOChannel_activated(int)
 {
     auto i = ui->tableViewMO->selectionModel()->currentIndex().siblingAtColumn(0);
-    Harddrives::busTrackClass->device_track(0, DEV_MO, ui->tableViewMO->model()->data(i, Qt::UserRole).toInt(), ui->tableViewMO->model()->data(i, Qt::UserRole + 1).toInt());
-    setMOBus(
-        ui->tableViewMO->model(),
-        ui->tableViewMO->selectionModel()->currentIndex(),
-        ui->comboBoxMOBus->currentData().toUInt(),
-        ui->comboBoxMOChannel->currentData().toUInt());
-    Harddrives::busTrackClass->device_track(1, DEV_MO, ui->tableViewMO->model()->data(i, Qt::UserRole).toInt(), ui->tableViewMO->model()->data(i, Qt::UserRole + 1).toInt());
+    Harddrives::busTrackClass->device_track(0, DEV_MO, ui->tableViewMO->model()->data(i,
+                                            Qt::UserRole).toInt(), ui->tableViewMO->model()->data(i,
+                                            Qt::UserRole + 1).toInt());
+    setMOBus(ui->tableViewMO->model(),
+             ui->tableViewMO->selectionModel()->currentIndex(),
+             ui->comboBoxMOBus->currentData().toUInt(),
+             ui->comboBoxMOChannel->currentData().toUInt());
+    Harddrives::busTrackClass->device_track(1, DEV_MO, ui->tableViewMO->model()->data(i,
+                                            Qt::UserRole).toInt(), ui->tableViewMO->model()->data(i,
+                                            Qt::UserRole + 1).toInt());
 }
 
 void
 SettingsOtherRemovable::on_comboBoxMOType_activated(int)
 {
-    setMOType(
-        ui->tableViewMO->model(),
-        ui->tableViewMO->selectionModel()->currentIndex(),
-        ui->comboBoxMOType->currentData().toUInt());
+    setMOType(ui->tableViewMO->model(),
+              ui->tableViewMO->selectionModel()->currentIndex(),
+              ui->comboBoxMOType->currentData().toUInt());
     ui->tableViewMO->resizeColumnsToContents();
     ui->tableViewMO->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Stretch);
 }
@@ -283,49 +283,54 @@ SettingsOtherRemovable::on_comboBoxMOType_activated(int)
 void
 SettingsOtherRemovable::on_comboBoxZIPBus_currentIndexChanged(int index)
 {
-    if (index < 0) {
-        return;
+    if (index >= 0) {
+        int  bus     = ui->comboBoxZIPBus->currentData().toInt();
+        bool enabled = (bus != ZIP_BUS_DISABLED);
+        ui->comboBoxZIPChannel->setEnabled(enabled);
+        ui->checkBoxZIP250->setEnabled(enabled);
+        Harddrives::populateBusChannels(ui->comboBoxZIPChannel->model(), bus);
     }
-
-    int  bus     = ui->comboBoxZIPBus->currentData().toInt();
-    bool enabled = (bus != ZIP_BUS_DISABLED);
-    ui->comboBoxZIPChannel->setEnabled(enabled);
-    ui->checkBoxZIP250->setEnabled(enabled);
-    Harddrives::populateBusChannels(ui->comboBoxZIPChannel->model(), bus);
 }
 
 void
 SettingsOtherRemovable::on_comboBoxZIPBus_activated(int)
 {
     auto i = ui->tableViewZIP->selectionModel()->currentIndex().siblingAtColumn(0);
-    Harddrives::busTrackClass->device_track(0, DEV_ZIP, ui->tableViewZIP->model()->data(i, Qt::UserRole).toInt(), ui->tableViewZIP->model()->data(i, Qt::UserRole + 1).toInt());
-    ui->comboBoxZIPChannel->setCurrentIndex(ui->comboBoxZIPBus->currentData().toUInt() == ZIP_BUS_ATAPI ? Harddrives::busTrackClass->next_free_ide_channel() : Harddrives::busTrackClass->next_free_scsi_id());
-    setZIPBus(
-        ui->tableViewZIP->model(),
-        ui->tableViewZIP->selectionModel()->currentIndex(),
-        ui->comboBoxZIPBus->currentData().toUInt(),
-        ui->comboBoxZIPChannel->currentData().toUInt());
-    Harddrives::busTrackClass->device_track(1, DEV_ZIP, ui->tableViewZIP->model()->data(i, Qt::UserRole).toInt(), ui->tableViewZIP->model()->data(i, Qt::UserRole + 1).toInt());
+    Harddrives::busTrackClass->device_track(0, DEV_ZIP, ui->tableViewZIP->model()->data(i,
+                                            Qt::UserRole).toInt(), ui->tableViewZIP->model()->data(i,
+                                            Qt::UserRole + 1).toInt());
+    ui->comboBoxZIPChannel->setCurrentIndex(ui->comboBoxZIPBus->currentData().toUInt() == ZIP_BUS_ATAPI ?
+                                            Harddrives::busTrackClass->next_free_ide_channel() :
+                                            Harddrives::busTrackClass->next_free_scsi_id());
+    setZIPBus(ui->tableViewZIP->model(),
+              ui->tableViewZIP->selectionModel()->currentIndex(),
+              ui->comboBoxZIPBus->currentData().toUInt(),
+              ui->comboBoxZIPChannel->currentData().toUInt());
+    Harddrives::busTrackClass->device_track(1, DEV_ZIP, ui->tableViewZIP->model()->data(i,
+                                            Qt::UserRole).toInt(), ui->tableViewZIP->model()->data(i,
+                                            Qt::UserRole + 1).toInt());
 }
 
 void
 SettingsOtherRemovable::on_comboBoxZIPChannel_activated(int)
 {
     auto i = ui->tableViewZIP->selectionModel()->currentIndex().siblingAtColumn(0);
-    Harddrives::busTrackClass->device_track(0, DEV_ZIP, ui->tableViewZIP->model()->data(i, Qt::UserRole).toInt(), ui->tableViewZIP->model()->data(i, Qt::UserRole + 1).toInt());
-    setZIPBus(
-        ui->tableViewZIP->model(),
-        ui->tableViewZIP->selectionModel()->currentIndex(),
-        ui->comboBoxZIPBus->currentData().toUInt(),
-        ui->comboBoxZIPChannel->currentData().toUInt());
-    Harddrives::busTrackClass->device_track(1, DEV_ZIP, ui->tableViewZIP->model()->data(i, Qt::UserRole).toInt(), ui->tableViewZIP->model()->data(i, Qt::UserRole + 1).toInt());
+    Harddrives::busTrackClass->device_track(0, DEV_ZIP, ui->tableViewZIP->model()->data(i,
+                                            Qt::UserRole).toInt(), ui->tableViewZIP->model()->data(i,
+                                            Qt::UserRole + 1).toInt());
+    setZIPBus(ui->tableViewZIP->model(),
+              ui->tableViewZIP->selectionModel()->currentIndex(),
+              ui->comboBoxZIPBus->currentData().toUInt(),
+              ui->comboBoxZIPChannel->currentData().toUInt());
+    Harddrives::busTrackClass->device_track(1, DEV_ZIP, ui->tableViewZIP->model()->data(i,
+                                            Qt::UserRole).toInt(),
+                                            ui->tableViewZIP->model()->data(i, Qt::UserRole + 1).toInt());
 }
 
 void
 SettingsOtherRemovable::on_checkBoxZIP250_stateChanged(int state)
 {
-    setZIPType(
-        ui->tableViewZIP->model(),
-        ui->tableViewZIP->selectionModel()->currentIndex(),
-        state == Qt::Checked);
+    setZIPType(ui->tableViewZIP->model(),
+               ui->tableViewZIP->selectionModel()->currentIndex(),
+               state == Qt::Checked);
 }
diff --git a/src/qt/win_joystick_rawinput.c b/src/qt/win_joystick_rawinput.c
index 4d47fb309..7ee0e8227 100644
--- a/src/qt/win_joystick_rawinput.c
+++ b/src/qt/win_joystick_rawinput.c
@@ -10,13 +10,13 @@
  *
  *
  *
- * Authors: Sarah Walker, <https://pcem-emulator.co.uk/>
- *          Miran Grca, <mgrca8@gmail.com>
+ * Authors: Miran Grca, <mgrca8@gmail.com>
  *          GH Cao, <driver1998.ms@outlook.com>
+ *          Jasmine Iwanek,
  *
- *          Copyright 2008-2018 Sarah Walker.
  *          Copyright 2016-2018 Miran Grca.
  *          Copyright 2020 GH Cao.
+ *          Copyright 2021-2023 Jasmine Iwanek.
  */
 #include <windows.h>
 #include <windowsx.h>
@@ -445,7 +445,7 @@ joystick_process(void)
 {
     int d;
 
-    if (joystick_type == 0)
+    if (joystick_type == JS_TYPE_NONE)
         return;
 
     for (int c = 0; c < joystick_get_max_joysticks(joystick_type); c++) {
diff --git a/src/sio/sio_f82c710.c b/src/sio/sio_f82c710.c
index fc0eb2aae..07157dd0b 100644
--- a/src/sio/sio_f82c710.c
+++ b/src/sio/sio_f82c710.c
@@ -18,11 +18,9 @@
  *
  *
  *
- * Authors: Sarah Walker, <https://pcem-emulator.co.uk/>
- *          Eluan Costa Miranda <eluancm@gmail.com>
+ * Authors: Eluan Costa Miranda <eluancm@gmail.com>
  *          Lubomir Rintel <lkundrak@v3.sk>
  *
- *          Copyright 2020 Sarah Walker.
  *          Copyright 2020 Eluan Costa Miranda.
  *          Copyright 2021 Lubomir Rintel.
  */
diff --git a/src/sio/sio_fdc37c6xx.c b/src/sio/sio_fdc37c6xx.c
index 10eccf97c..24bb6bb09 100644
--- a/src/sio/sio_fdc37c6xx.c
+++ b/src/sio/sio_fdc37c6xx.c
@@ -11,10 +11,8 @@
  *
  *
  *
- * Authors: Sarah Walker, <https://pcem-emulator.co.uk/>
- *          Miran Grca, <mgrca8@gmail.com>
+ * Authors: Miran Grca, <mgrca8@gmail.com>
  *
- *          Copyright 2008-2020 Sarah Walker.
  *          Copyright 2016-2020 Miran Grca.
  */
 #include <stdio.h>
diff --git a/src/sio/sio_pc87306.c b/src/sio/sio_pc87306.c
index 656b36d92..63ab1777c 100644
--- a/src/sio/sio_pc87306.c
+++ b/src/sio/sio_pc87306.c
@@ -297,6 +297,16 @@ pc87306_write(uint16_t port, uint8_t val, void *priv)
                     lpt1_handler(dev);
             }
             break;
+        case 4:
+            if (valxor & 0x80)
+                nvr_lock_set(0x00, 256, !!(val & 0x80), dev->nvr);
+            break;
+        case 5:
+            if (valxor & 0x08)
+                nvr_at_handler(!!(val & 0x08), 0x0070, dev->nvr);
+            if (valxor & 0x20)
+                nvr_bank_set(0, !!(val & 0x20), dev->nvr);
+            break;
         case 9:
             if (valxor & 0x44) {
                 fdc_update_enh_mode(dev->fdc, (val & 4) ? 1 : 0);
@@ -308,6 +318,8 @@ pc87306_write(uint16_t port, uint8_t val, void *priv)
                 pc87306_gpio_init(dev);
             break;
         case 0x12:
+            if (valxor & 0x01)
+                nvr_wp_set(!!(val & 0x01), 0, dev->nvr);
             if (valxor & 0x30)
                 pc87306_gpio_init(dev);
             break;
@@ -368,8 +380,10 @@ pc87306_read(uint16_t port, void *priv)
 }
 
 void
-pc87306_reset(pc87306_t *dev)
+pc87306_reset(void *priv)
 {
+    pc87306_t *dev = (pc87306_t *) priv;
+
     memset(dev->regs, 0, 29);
 
     dev->regs[0x00] = 0x0B;
@@ -398,6 +412,10 @@ pc87306_reset(pc87306_t *dev)
     serial_handler(dev, 1);
     fdc_reset(dev->fdc);
     pc87306_gpio_init(dev);
+    nvr_lock_set(0x00, 256, 0, dev->nvr);
+    nvr_at_handler(1, 0x0070, dev->nvr);
+    nvr_bank_set(0, 0, dev->nvr);
+    nvr_wp_set(0, 0, dev->nvr);
 }
 
 static void
@@ -419,7 +437,7 @@ pc87306_init(UNUSED(const device_t *info))
     dev->uart[0] = device_add_inst(&ns16550_device, 1);
     dev->uart[1] = device_add_inst(&ns16550_device, 2);
 
-    // dev->nvr = device_add(&piix4_nvr_device);
+    dev->nvr = device_add(&at_mb_nvr_device);
 
     pc87306_reset(dev);
 
@@ -436,7 +454,7 @@ const device_t pc87306_device = {
     .local         = 0,
     .init          = pc87306_init,
     .close         = pc87306_close,
-    .reset         = NULL,
+    .reset         = pc87306_reset,
     { .available = NULL },
     .speed_changed = NULL,
     .force_redraw  = NULL,
diff --git a/src/sound/midi.c b/src/sound/midi.c
index 1a9c24657..9beccfd82 100644
--- a/src/sound/midi.c
+++ b/src/sound/midi.c
@@ -10,12 +10,10 @@
  *
  *
  *
- * Authors:  Sarah Walker, <https://pcem-emulator.co.uk/>
- *           Miran Grca, <mgrca8@gmail.com>
+ * Authors:  Miran Grca, <mgrca8@gmail.com>
  *           Bit,
  *           DOSBox Team,
  *
- *           Copyright 2008-2020 Sarah Walker.
  *           Copyright 2016-2020 Miran Grca.
  *           Copyright 2016-2020 Bit.
  *           Copyright 2008-2020 DOSBox Team.
diff --git a/src/sound/munt/CMakeLists.txt b/src/sound/munt/CMakeLists.txt
index 37d9e07cc..d0438aa5b 100644
--- a/src/sound/munt/CMakeLists.txt
+++ b/src/sound/munt/CMakeLists.txt
@@ -22,5 +22,5 @@ add_library(mt32emu STATIC Analog.cpp BReverbModel.cpp Display.cpp File.cpp File
     srchelper/srctools/src/LinearResampler.cpp
     srchelper/srctools/src/ResamplerModel.cpp
     srchelper/srctools/src/SincResampler.cpp
-    srchelper/InternalResampler.cpp	Synth.cpp Tables.cpp TVA.cpp TVF.cpp
+    srchelper/InternalResampler.cpp Synth.cpp Tables.cpp TVA.cpp TVF.cpp
     TVP.cpp sha1/sha1.cpp c_interface/c_interface.cpp)
\ No newline at end of file
diff --git a/src/sound/snd_mpu401.c b/src/sound/snd_mpu401.c
index d9e51df29..f4c12f2f6 100644
--- a/src/sound/snd_mpu401.c
+++ b/src/sound/snd_mpu401.c
@@ -10,14 +10,13 @@
  *
  *
  *
- * Authors:  Sarah Walker, <https://pcem-emulator.co.uk/>
- *           DOSBox Team,
+ * Authors:  DOSBox Team,
  *           Miran Grca, <mgrca8@gmail.com>
  *           TheCollector1995, <mariogplayer@gmail.com>
  *
- *           Copyright 2008-2020 Sarah Walker.
  *           Copyright 2008-2020 DOSBox Team.
  *           Copyright 2016-2020 Miran Grca.
+ *           Copyright 2016-2020 TheCollector1995.
  */
 #include <stdarg.h>
 #include <stdint.h>
diff --git a/src/timer.c b/src/timer.c
index e863c2f21..90ee3ca49 100644
--- a/src/timer.c
+++ b/src/timer.c
@@ -122,8 +122,11 @@ timer_process(void)
 
         if (timer->flags & TIMER_SPLIT)
             timer_advance_ex(timer, 0);   /* We're splitting a > 1 s period into multiple <= 1 s periods. */
-        else if (timer->callback != NULL) /* Make sure it's no NULL, so that we can have a NULL callback when no operation is needed. */
+        else if (timer->callback != NULL) {/* Make sure it's no NULL, so that we can have a NULL callback when no operation is needed. */
+            timer->flags |= TIMER_PROCESS;
             timer->callback(timer->priv);
+            timer->flags &= ~TIMER_PROCESS;
+        }
     }
 
     timer_target = timer_head->ts.ts32.integer;
@@ -232,7 +235,7 @@ timer_on_auto(pc_timer_t *timer, double period)
         return;
 
     if (period > 0.0)
-        timer_on(timer, period, (timer->period == 0.0));
+        timer_on(timer, period, !(timer->flags & TIMER_PROCESS) && (timer->period <= 0.0));
     else
         timer_stop(timer);
 }
diff --git a/src/unix/unix_cdrom.c b/src/unix/unix_cdrom.c
index 7ba247108..424f1a9a3 100644
--- a/src/unix/unix_cdrom.c
+++ b/src/unix/unix_cdrom.c
@@ -10,8 +10,7 @@
  *
  *
  *
- * Authors: Sarah Walker, <https://pcem-emulator.co.uk/>
- *          Miran Grca, <mgrca8@gmail.com>
+ * Authors: Miran Grca, <mgrca8@gmail.com>
  *          Fred N. van Kempen, <decwiz@yahoo.com>
  *
  *          Copyright 2016-2018 Miran Grca.
diff --git a/src/video/vid_8514a.c b/src/video/vid_8514a.c
index e24054b93..70561ede8 100644
--- a/src/video/vid_8514a.c
+++ b/src/video/vid_8514a.c
@@ -962,8 +962,8 @@ ibm8514_accel_out(uint16_t port, uint32_t val, svga_t *svga, int len)
                 if (!val)
                     break;
                 dev->accel.advfunc_cntl = val & 0x0f;
-                ibm8514_on              = val & 0x01;
-                vga_on                  = !ibm8514_on;
+                dev->on                 = val & 0x01;
+                vga_on                  = !dev->on;
                 ibm8514_log("IBM 8514/A: VGA ON = %i, val = %02x\n", vga_on, val);
                 svga_recalctimings(svga);
                 break;
@@ -4028,7 +4028,7 @@ ibm8514_poll(ibm8514_t *dev, svga_t *svga)
             dev->hwcursor_oddeven = 0;
         }
 
-        if ((dev->displine == (svga->hwcursor_latch.y + 1)) && dev->hwcursor_latch.ena && dev->interlace) {
+        if ((dev->displine == (dev->hwcursor_latch.y + 1)) && dev->hwcursor_latch.ena && dev->interlace) {
             dev->hwcursor_on      = dev->hwcursor_latch.cur_ysize - (dev->hwcursor_latch.yoff + 1);
             dev->hwcursor_oddeven = 1;
         }
@@ -4044,13 +4044,13 @@ ibm8514_poll(ibm8514_t *dev, svga_t *svga)
 
             if (dev->firstline == 2000) {
                 dev->firstline = dev->displine;
-                video_wait_for_buffer();
+                video_wait_for_buffer_monitor(svga->monitor_index);
             }
 
             if (dev->hwcursor_on)
                 dev->changedvram[dev->ma >> 12] = dev->changedvram[(dev->ma >> 12) + 1] = dev->interlace ? 3 : 2;
 
-            svga->render(svga);
+            svga->render8514(svga);
 
             svga->x_add = (overscan_x >> 1);
             ibm8514_render_overscan_left(dev, svga);
@@ -4136,7 +4136,7 @@ ibm8514_poll(ibm8514_t *dev, svga_t *svga)
 
             dev->oddeven ^= 1;
 
-            changeframecount = dev->interlace ? 3 : 2;
+            svga->monitor->mon_changeframecount = dev->interlace ? 3 : 2;
             svga->vslines    = 0;
 
             if (dev->interlace && dev->oddeven)
@@ -4166,7 +4166,7 @@ ibm8514_recalctimings(svga_t *svga)
 {
     ibm8514_t *dev = &svga->dev8514;
 
-    if (ibm8514_on) {
+    if (dev->on) {
         dev->h_disp      = (dev->hdisp + 1) << 3;
         dev->pitch       = (dev->accel.advfunc_cntl & 4) ? 1024 : 640;
         dev->h_total     = (dev->htotal + 1);
@@ -4223,7 +4223,7 @@ ibm8514_recalctimings(svga_t *svga)
 
             svga->clock = (cpuclock * (double) (1ULL << 32)) / 25175000.0;
         }
-        svga->render = ibm8514_render_8bpp;
+        svga->render8514 = ibm8514_render_8bpp;
         ibm8514_log("BPP=%d, Pitch = %d, rowoffset = %d, crtc13 = %02x, mode = %d, highres bit = %02x, has_vga? = %d.\n", dev->bpp, dev->pitch, dev->rowoffset, svga->crtc[0x13], dev->ibm_mode, dev->accel.advfunc_cntl & 4, ibm8514_has_vga);
     }
     ibm8514_log("8514 enabled, hdisp=%d, vtotal=%d, htotal=%d, dispend=%d, rowoffset=%d, split=%d, vsyncstart=%d, split=%08x\n", dev->hdisp, dev->vtotal, dev->htotal, dev->dispend, dev->rowoffset, dev->split, dev->vsyncstart, dev->split);
diff --git a/src/video/vid_ati68860_ramdac.c b/src/video/vid_ati68860_ramdac.c
index 4038e24d8..169199826 100644
--- a/src/video/vid_ati68860_ramdac.c
+++ b/src/video/vid_ati68860_ramdac.c
@@ -68,19 +68,20 @@ void
 ati68860_ramdac_out(uint16_t addr, uint8_t val, void *priv, svga_t *svga)
 {
     ati68860_ramdac_t *ramdac = (ati68860_ramdac_t *) priv;
+    const ibm8514_t   *dev    = &svga->dev8514;
 
     switch (addr) {
         case 0:
-            svga_out(ibm8514_on ? 0x2ec : 0x3c8, val, svga);
+            svga_out(dev->on ? 0x2ec : 0x3c8, val, svga);
             break;
         case 1:
-            svga_out(ibm8514_on ? 0x2ed : 0x3c9, val, svga);
+            svga_out(dev->on ? 0x2ed : 0x3c9, val, svga);
             break;
         case 2:
-            svga_out(ibm8514_on ? 0x2ea : 0x3c6, val, svga);
+            svga_out(dev->on ? 0x2ea : 0x3c6, val, svga);
             break;
         case 3:
-            svga_out(ibm8514_on ? 0x2eb : 0x3c7, val, svga);
+            svga_out(dev->on ? 0x2eb : 0x3c7, val, svga);
             break;
         default:
             ramdac->regs[addr & 0xf] = val;
@@ -171,20 +172,21 @@ uint8_t
 ati68860_ramdac_in(uint16_t addr, void *priv, svga_t *svga)
 {
     const ati68860_ramdac_t *ramdac = (ati68860_ramdac_t *) priv;
+    const ibm8514_t         *dev    = &svga->dev8514;
     uint8_t                  temp   = 0;
 
     switch (addr) {
         case 0:
-            temp = svga_in(ibm8514_on ? 0x2ec : 0x3c8, svga);
+            temp = svga_in(dev->on ? 0x2ec : 0x3c8, svga);
             break;
         case 1:
-            temp = svga_in(ibm8514_on ? 0x2ed : 0x3c9, svga);
+            temp = svga_in(dev->on ? 0x2ed : 0x3c9, svga);
             break;
         case 2:
-            temp = svga_in(ibm8514_on ? 0x2ea : 0x3c6, svga);
+            temp = svga_in(dev->on ? 0x2ea : 0x3c6, svga);
             break;
         case 3:
-            temp = svga_in(ibm8514_on ? 0x2eb : 0x3c7, svga);
+            temp = svga_in(dev->on ? 0x2eb : 0x3c7, svga);
             break;
         case 4:
         case 8:
diff --git a/src/video/vid_ati68875_ramdac.c b/src/video/vid_ati68875_ramdac.c
index 981b0c40b..447a8eca8 100644
--- a/src/video/vid_ati68875_ramdac.c
+++ b/src/video/vid_ati68875_ramdac.c
@@ -26,6 +26,7 @@
 #include <86box/video.h>
 #include <86box/vid_svga.h>
 #include <86box/vid_svga_render.h>
+#include <86box/plat_unused.h>
 
 typedef struct ati68875_ramdac_t {
     uint8_t gen_cntl;
@@ -36,24 +37,10 @@ typedef struct ati68875_ramdac_t {
     uint8_t test_reg;
 } ati68875_ramdac_t;
 
-static void
-ati68875_set_bpp(ati68875_ramdac_t *ramdac, svga_t *svga)
-{
-    if (ramdac->mux_cntl == 0xff)
-        return;
-
-    if (ramdac->mux_cntl & 0x20)
-        svga->bpp = 8;
-    else {
-        svga->bpp = 24;
-    }
-    svga_recalctimings(svga);
-}
-
 void
-ati68875_ramdac_out(uint16_t addr, int rs2, int rs3, uint8_t val, void *p, svga_t *svga)
+ati68875_ramdac_out(uint16_t addr, int rs2, int rs3, uint8_t val, void *priv, svga_t *svga)
 {
-    ati68875_ramdac_t *ramdac = (ati68875_ramdac_t *) p;
+    ati68875_ramdac_t *ramdac = (ati68875_ramdac_t *) priv;
     uint8_t rs = (addr & 0x03);
 
     rs |= (!!rs2 << 2);
@@ -77,7 +64,6 @@ ati68875_ramdac_out(uint16_t addr, int rs2, int rs3, uint8_t val, void *p, svga_
             break;
         case 0x0b: /* MUX Control Register (RS value = 1011) */
             ramdac->mux_cntl = val;
-            ati68875_set_bpp(ramdac, svga);
             break;
         case 0x0c: /* Palette Page Register (RS value = 1100) */
             ramdac->palette_page_sel = val;
@@ -87,8 +73,9 @@ ati68875_ramdac_out(uint16_t addr, int rs2, int rs3, uint8_t val, void *p, svga_
             break;
         case 0x0f: /* Reset State (RS value = 1111) */
             ramdac->mux_cntl = 0x2d;
-            svga->bpp = 8;
-            svga_recalctimings(svga);
+            break;
+
+        default:
             break;
     }
 
@@ -96,12 +83,11 @@ ati68875_ramdac_out(uint16_t addr, int rs2, int rs3, uint8_t val, void *p, svga_
 }
 
 uint8_t
-ati68875_ramdac_in(uint16_t addr, int rs2, int rs3, void *p, svga_t *svga)
+ati68875_ramdac_in(uint16_t addr, int rs2, int rs3, void *priv, svga_t *svga)
 {
-    ati68875_ramdac_t *ramdac = (ati68875_ramdac_t *) p;
-    ibm8514_t *dev = &svga->dev8514;
-    uint8_t rs = (addr & 0x03);
-    uint8_t temp = 0;
+    const ati68875_ramdac_t *ramdac = (ati68875_ramdac_t *) priv;
+    uint8_t                  rs = (addr & 0x03);
+    uint8_t                  temp = 0;
 
     rs |= (!!rs2 << 2);
     rs |= (!!rs3 << 3);
@@ -130,62 +116,24 @@ ati68875_ramdac_in(uint16_t addr, int rs2, int rs3, void *p, svga_t *svga)
             break;
         case 0x0e: /* Test Register (RS value = 1110) */
             switch (ramdac->test_reg & 0x07) {
-                case 0x00:
-                    temp = ibm8514_on ? dev->dac_r : svga->dac_r;
-                    break;
-                case 0x01:
-                    temp = ibm8514_on ? dev->dac_g : svga->dac_g;
-                    break;
-                case 0x02:
-                    temp = ibm8514_on ? dev->dac_b : svga->dac_b;
-                    break;
                 case 0x03:
                     temp = 0x75;
                     break;
-                case 0x04:
-                    if (ibm8514_on) {
-                        dev->dac_r++;
-                        temp = dev->dac_r;
-                    } else {
-                        svga->dac_r++;
-                        temp = svga->dac_r;
-                    }
-                    break;
-                case 0x05:
-                    if (ibm8514_on) {
-                        dev->dac_g++;
-                        temp = dev->dac_g;
-                    } else {
-                        svga->dac_g++;
-                        temp = svga->dac_g;
-                    }
-                    break;
-                case 0x06:
-                    if (ibm8514_on) {
-                        dev->dac_b++;
-                        temp = dev->dac_b;
-                    } else {
-                        svga->dac_b++;
-                        temp = svga->dac_b;
-                    }
-                    break;
-                case 0x07:
-                    if (ramdac->test_reg & 0x80)
-                        temp = ibm8514_on ? dev->dac_r : svga->dac_r;
-                    else if (ramdac->test_reg & 0x40)
-                        temp = ibm8514_on ? dev->dac_g : svga->dac_g;
-                    else if (ramdac->test_reg & 0x20)
-                        temp = ibm8514_on ? dev->dac_b : svga->dac_b;
+
+                default:
                     break;
             }
             break;
+
+        default:
+            break;
     }
 
     return temp;
 }
 
 static void *
-ati68875_ramdac_init(const device_t *info)
+ati68875_ramdac_init(UNUSED(const device_t *info))
 {
     ati68875_ramdac_t *ramdac = (ati68875_ramdac_t *) malloc(sizeof(ati68875_ramdac_t));
     memset(ramdac, 0, sizeof(ati68875_ramdac_t));
diff --git a/src/video/vid_ati_mach8.c b/src/video/vid_ati_mach8.c
index 012703bee..8df054060 100644
--- a/src/video/vid_ati_mach8.c
+++ b/src/video/vid_ati_mach8.c
@@ -116,8 +116,8 @@ typedef struct mach_t {
         uint16_t src_y;
         int16_t  bres_count;
         uint16_t clock_sel;
-        uint16_t crt_offset_lo;
-        uint16_t crt_offset_hi;
+        uint16_t crt_pitch;
+        uint16_t ge_pitch;
         uint16_t dest_cmp_fn;
         uint16_t dp_config;
         uint16_t ext_ge_config;
@@ -254,26 +254,26 @@ mach_log(const char *fmt, ...)
             temp |= (dev->vram[((dev->accel.cy * dev->pitch) + (cx) + (n + 1)) & dev->vram_mask] << 8); \
         } \
     } else if ((mach->accel.cmd_type == 2) || (mach->accel.cmd_type == 5)) { \
-        if (!dev->bpp) { \
+        if (dev->bpp) \
+            temp = vram_w[((dev->accel.dest) + (cx) + (n)) & (dev->vram_mask >> 1)];                           \
+        else { \
             temp = dev->vram[((dev->accel.dest) + (cx) + (n)) & dev->vram_mask];                           \
             temp |= (dev->vram[((dev->accel.dest) + (cx) + (n + 1)) & dev->vram_mask] << 8);               \
-        } else { \
-            temp = vram_w[((dev->accel.dest) + (cx) + (n)) & (dev->vram_mask >> 1)];                           \
         } \
     } else if ((mach->accel.cmd_type == 3) || (mach->accel.cmd_type == 4)) { \
-        if (!dev->bpp) { \
+        if (dev->bpp) \
+            temp = vram_w[((mach->accel.ge_offset << 1) + ((dev->accel.cy) * (dev->pitch)) + (cx) + (n)) & (dev->vram_mask >> 1)]; \
+        else { \
             temp = dev->vram[((mach->accel.ge_offset << 2) + ((dev->accel.cy) * (dev->pitch)) + (cx) + (n)) & dev->vram_mask]; \
             temp |= (dev->vram[((mach->accel.ge_offset << 2) + ((dev->accel.cy) * (dev->pitch)) + (cx) + (n + 1)) & dev->vram_mask] << 8); \
-        } else { \
-            temp = vram_w[((mach->accel.ge_offset << 1) + ((dev->accel.cy) * (dev->pitch)) + (cx) + (n)) & (dev->vram_mask >> 1)]; \
         } \
     }
 
 #define READ(addr, dat) \
-        if (!dev->bpp) \
-            dat = dev->vram[(addr) & (dev->vram_mask)]; \
+        if (dev->bpp) \
+            dat = vram_w[(addr) & (dev->vram_mask >> 1)]; \
         else \
-            dat = vram_w[(addr) & (dev->vram_mask >> 1)];
+            dat = dev->vram[(addr) & (dev->vram_mask)];
 
 #define MIX(mixmode, dest_dat, src_dat)                                                       \
     {                                                                                         \
@@ -379,12 +379,12 @@ mach_log(const char *fmt, ...)
 
 
 #define WRITE(addr, dat)                                         \
-    if (!dev->bpp) { \
-        dev->vram[((addr)) & (dev->vram_mask)]                = dat; \
-        dev->changedvram[(((addr)) & (dev->vram_mask)) >> 12] = changeframecount; \
-    } else { \
+    if (dev->bpp) { \
         vram_w[((addr)) & (dev->vram_mask >> 1)]                = dat; \
         dev->changedvram[(((addr)) & (dev->vram_mask >> 1)) >> 11] = changeframecount; \
+    } else { \
+        dev->vram[((addr)) & (dev->vram_mask)]                = dat; \
+        dev->changedvram[(((addr)) & (dev->vram_mask)) >> 12] = changeframecount; \
     }
 
 static int
@@ -408,7 +408,6 @@ mach_pixel_read(mach_t *mach)
 static void
 mach_accel_start(int cmd_type, int cpu_input, int count, uint32_t mix_dat, uint32_t cpu_dat, mach_t *mach, ibm8514_t *dev)
 {
-    const svga_t *svga = &mach->svga;
     int           compare_mode;
     int           poly_src     = 0;
     uint16_t      rd_mask      = dev->accel.rd_mask;
@@ -456,11 +455,11 @@ mach_accel_start(int cmd_type, int cpu_input, int count, uint32_t mix_dat, uint3
         }
     }
 
-    if ((svga->bpp == 8) || (svga->bpp == 15) || (svga->bpp == 16) || (svga->bpp == 24)) {
-        if (svga->bpp == 24)
+    if ((dev->accel_bpp == 8) || (dev->accel_bpp == 15) || (dev->accel_bpp == 16) || (dev->accel_bpp == 24)) {
+        if (dev->accel_bpp == 24)
             mach_log("24BPP: CMDType=%d, cwh(%d,%d,%d,%d), dpconfig=%04x\n", cmd_type, clip_l, clip_r, clip_t, clip_b, mach->accel.dp_config);
         else
-            mach_log("BPP=%d, CMDType = %d, offs=%08x, DPCONFIG = %04x, cnt = %d, input = %d, mono_src = %d, frgdsel = %d, dstx = %d, dstxend = %d, pitch = %d, extcrt = %d, rw = %x, monpattern = %x.\n", svga->bpp, cmd_type, mach->accel.ge_offset, mach->accel.dp_config, count, cpu_input, mono_src, frgd_sel, dev->accel.cur_x, mach->accel.dest_x_end, dev->ext_pitch, dev->ext_crt_pitch, mach->accel.dp_config & 1, mach->accel.mono_pattern_enable);
+            mach_log("BPP=%d, CMDType = %d, offs=%08x, DPCONFIG = %04x, cnt = %d, input = %d, mono_src = %d, frgdsel = %d, dstx = %d, dstxend = %d, pitch = %d, extcrt = %d, rw = %x, monpattern = %x.\n", dev->accel_bpp, cmd_type, mach->accel.ge_offset, mach->accel.dp_config, count, cpu_input, mono_src, frgd_sel, dev->accel.cur_x, mach->accel.dest_x_end, dev->ext_pitch, dev->ext_crt_pitch, mach->accel.dp_config & 1, mach->accel.mono_pattern_enable);
     }
 
     switch (cmd_type) {
@@ -972,10 +971,10 @@ mach_accel_start(int cmd_type, int cpu_input, int count, uint32_t mix_dat, uint3
                 dev->accel.sx                 = 0;
                 mach->accel.poly_fill         = 0;
                 mach->accel.color_pattern_idx = ((dev->accel.dx + (dev->accel.dy << 3)) & mach->accel.patt_len);
-                if ((svga->bpp == 24) && (mono_src != 1)) {
+                if ((dev->accel_bpp == 24) && (mono_src != 1)) {
                     if (mach->accel.color_pattern_idx == mach->accel.patt_len)
                         mach->accel.color_pattern_idx = mach->accel.patt_data_idx;
-                } else if ((svga->bpp == 24) && (frgd_sel == 5) && (mono_src == 1) && (mach->accel.patt_len_reg & 0x4000))
+                } else if ((dev->accel_bpp == 24) && (frgd_sel == 5) && (mono_src == 1) && (mach->accel.patt_len_reg & 0x4000))
                     mach->accel.color_pattern_idx = 0;
 
                 /*Height*/
@@ -1043,7 +1042,7 @@ mach_accel_start(int cmd_type, int cpu_input, int count, uint32_t mix_dat, uint3
                 else
                     dev->accel.src = (mach->accel.ge_offset << 2) + (dev->accel.cy * (dev->pitch));
 
-                if ((svga->bpp == 24) && (frgd_sel == 5)) {
+                if ((dev->accel_bpp == 24) && (frgd_sel == 5)) {
                     mach_log("BitBLT=%04x, WH(%d,%d), SRCWidth=%d, c(%d,%d), s(%d,%d).\n", mach->accel.dp_config, mach->accel.width, mach->accel.height, mach->accel.src_width, dev->accel.dx, dev->accel.dy, dev->accel.cx, dev->accel.cy);
                 } else
                     mach_log("BitBLT=%04x, Pitch=%d, C(%d,%d), SRCWidth=%d, WH(%d,%d), geoffset=%08x.\n", mach->accel.dp_config, dev->ext_pitch, dev->accel.cx, dev->accel.cy, mach->accel.src_width, mach->accel.width, mach->accel.height, (mach->accel.ge_offset << 2));
@@ -1096,7 +1095,7 @@ mach_accel_start(int cmd_type, int cpu_input, int count, uint32_t mix_dat, uint3
                         mach->accel.color_pattern_word[x + (mach->accel.color_pattern_idx & 1)] |= (mach->accel.patt_data[(x + 1) & mach->accel.patt_len] << 8);
                     }
                 } else {
-                    if ((svga->bpp == 24) && (mach->accel.patt_len < 3)) {
+                    if ((dev->accel_bpp == 24) && (mach->accel.patt_len < 3)) {
                         for (int x = 0; x <= mach->accel.patt_len; x++) {
                             mach->accel.color_pattern[x] = mach->accel.patt_data[x];
                             mach_log("BITBLT: Color Pattern 24bpp[%d]=%02x, dataidx=%d, pattlen=%d.\n", x, mach->accel.color_pattern[x], mach->accel.patt_data_idx, mach->accel.patt_len);
@@ -1141,7 +1140,7 @@ mach_accel_start(int cmd_type, int cpu_input, int count, uint32_t mix_dat, uint3
                         if (mach->accel.mono_pattern_enable) {
                             mix = mach->accel.mono_pattern[dev->accel.dy & 7][dev->accel.dx & 7];
                         } else {
-                            if ((svga->bpp == 24) && (frgd_sel == 5) && (mach->accel.patt_len_reg & 0x4000))
+                            if ((dev->accel_bpp == 24) && (frgd_sel == 5) && (mach->accel.patt_len_reg & 0x4000))
                                 mix = 1;
                             else {
                                 if (!dev->accel.temp_cnt) {
@@ -1224,7 +1223,7 @@ mach_accel_start(int cmd_type, int cpu_input, int count, uint32_t mix_dat, uint3
                         }
                     }
 
-                    if ((svga->bpp == 24) && (mono_src == 1) && (frgd_sel == 5) && (mach->accel.patt_len_reg & 0x4000)) {
+                    if ((dev->accel_bpp == 24) && (mono_src == 1) && (frgd_sel == 5) && (mach->accel.patt_len_reg & 0x4000)) {
                         if (dev->accel.sy & 1) {
                             READ(dev->accel.dest + dev->accel.dx - dev->ext_pitch, dest_dat);
                         } else {
@@ -1270,7 +1269,7 @@ mach_accel_start(int cmd_type, int cpu_input, int count, uint32_t mix_dat, uint3
                     }
 
                     if (mach->accel.dp_config & 0x10) {
-                        if ((svga->bpp == 24) && (mono_src == 1) && (frgd_sel == 5) && (mach->accel.patt_len_reg & 0x4000)) {
+                        if ((dev->accel_bpp == 24) && (mono_src == 1) && (frgd_sel == 5) && (mach->accel.patt_len_reg & 0x4000)) {
                             if (dev->accel.sy & 1) {
                                 WRITE(dev->accel.dest + dev->accel.dx - dev->ext_pitch, dest_dat);
                             } else {
@@ -1306,12 +1305,12 @@ mach_accel_start(int cmd_type, int cpu_input, int count, uint32_t mix_dat, uint3
 
                 dev->accel.dx += mach->accel.stepx;
 
-                if ((svga->bpp == 8) || ((svga->bpp == 24) && (mach->accel.patt_len >= 3) && (mono_src != 1)))
+                if ((dev->accel_bpp == 8) || ((dev->accel_bpp == 24) && (mach->accel.patt_len >= 3) && (mono_src != 1)))
                     mach->accel.color_pattern_idx = (mach->accel.color_pattern_idx + mach->accel.stepx) & mach->accel.patt_len;
 
-                if ((svga->bpp == 24) && (mach->accel.color_pattern_idx == mach->accel.patt_len) && (mach->accel.patt_len >= 3) && (mono_src != 1)) {
+                if ((dev->accel_bpp == 24) && (mach->accel.color_pattern_idx == mach->accel.patt_len) && (mach->accel.patt_len >= 3) && (mono_src != 1)) {
                     mach->accel.color_pattern_idx = mach->accel.patt_data_idx;
-                } else if ((svga->bpp == 24) && (mach->accel.patt_len < 3)) {
+                } else if ((dev->accel_bpp == 24) && (mach->accel.patt_len < 3)) {
                     if (mach->accel.patt_len == 2) {
                         mach->accel.color_pattern_idx++;
                         if (mach->accel.color_pattern_idx == 3)
@@ -1319,7 +1318,7 @@ mach_accel_start(int cmd_type, int cpu_input, int count, uint32_t mix_dat, uint3
                     } else {
                         mach->accel.color_pattern_idx = (mach->accel.color_pattern_idx + mach->accel.stepx) & mach->accel.patt_len;
                     }
-                } else if ((svga->bpp == 24) && (mach->accel.patt_len_reg & 0x4000) && (frgd_sel == 5)) {
+                } else if ((dev->accel_bpp == 24) && (mach->accel.patt_len_reg & 0x4000) && (frgd_sel == 5)) {
                     mach->accel.color_pattern_idx++;
                     if (mach->accel.color_pattern_idx == 3)
                         mach->accel.color_pattern_idx = 0;
@@ -1347,12 +1346,12 @@ mach_accel_start(int cmd_type, int cpu_input, int count, uint32_t mix_dat, uint3
                     else {
                         dev->accel.dest = (mach->accel.ge_offset << 2) + (dev->accel.dy * (dev->pitch));
                     }
-                    if ((mono_src == 1) && (svga->bpp == 24) && (frgd_sel == 5))
+                    if ((mono_src == 1) && (dev->accel_bpp == 24) && (frgd_sel == 5))
                         mach->accel.color_pattern_idx = 0;
                     else
                         mach->accel.color_pattern_idx = ((dev->accel.dx + (dev->accel.dy << 3)) & mach->accel.patt_len);
 
-                    if ((svga->bpp == 24) && (mach->accel.color_pattern_idx == mach->accel.patt_len) && (mono_src != 1))
+                    if ((dev->accel_bpp == 24) && (mach->accel.color_pattern_idx == mach->accel.patt_len) && (mono_src != 1))
                         mach->accel.color_pattern_idx = 0;
                     if ((mono_src == 1) && !mach->accel.mono_pattern_enable && !(mach->accel.patt_len_reg & 0x4000)) {
                         dev->accel.cur_x = dev->accel.dx;
@@ -1362,7 +1361,7 @@ mach_accel_start(int cmd_type, int cpu_input, int count, uint32_t mix_dat, uint3
                     if (dev->accel.sy >= mach->accel.height) {
                         if ((mono_src == 2) || (mono_src == 3) || (frgd_sel == 2) || (frgd_sel == 3) || (bkgd_sel == 2) || (bkgd_sel == 3))
                             return;
-                        if ((mono_src == 1) && (frgd_sel == 5) && (svga->bpp == 24) && (mach->accel.patt_len_reg & 0x4000))
+                        if ((mono_src == 1) && (frgd_sel == 5) && (dev->accel_bpp == 24) && (mach->accel.patt_len_reg & 0x4000))
                             return;
                         dev->accel.cur_x = dev->accel.dx;
                         dev->accel.cur_y = dev->accel.dy;
@@ -1953,7 +1952,7 @@ mach_accel_start(int cmd_type, int cpu_input, int count, uint32_t mix_dat, uint3
                 }
 
                 dev->accel.sx = 0;
-                if ((svga->bpp == 24) && (mach->accel.patt_len < 0x17))
+                if ((dev->accel_bpp == 24) && (mach->accel.patt_len < 0x17))
                     mach->accel.color_pattern_idx = 0;
 
                 /*Step Y*/
@@ -2014,7 +2013,7 @@ mach_accel_start(int cmd_type, int cpu_input, int count, uint32_t mix_dat, uint3
                 else
                     dev->accel.src = (mach->accel.ge_offset << 2) + (dev->accel.cy * (dev->pitch));
 
-                if ((svga->bpp == 24) && (frgd_sel == 5)) {
+                if ((dev->accel_bpp == 24) && (frgd_sel == 5)) {
                     if (mach->accel.patt_len == 0x17)
                         mach->accel.color_pattern_idx = 0;
                     dev->accel.x1 = dev->accel.dx + mach->accel.width;
@@ -2051,7 +2050,7 @@ mach_accel_start(int cmd_type, int cpu_input, int count, uint32_t mix_dat, uint3
             }
 
             if (frgd_sel == 5) {
-                if (svga->bpp != 24) {
+                if (dev->accel_bpp != 24) {
                     for (int x = 0; x <= mach->accel.patt_len; x++) {
                         mach->accel.color_pattern[x] = mach->accel.patt_data[x & mach->accel.patt_len];
                     }
@@ -2132,7 +2131,7 @@ mach_accel_start(int cmd_type, int cpu_input, int count, uint32_t mix_dat, uint3
                             break;
                         case 5:
                             if (mix) {
-                                if (svga->bpp == 24) {
+                                if (dev->accel_bpp == 24) {
                                     if (mach->accel.patt_len == 0x17)
                                         src_dat = mach->accel.color_pattern_full[mach->accel.color_pattern_idx];
                                     else
@@ -2210,7 +2209,7 @@ mach_accel_start(int cmd_type, int cpu_input, int count, uint32_t mix_dat, uint3
                 }
 
                 dev->accel.dx += mach->accel.stepx;
-                if ((svga->bpp == 24) && (mach->accel.patt_len == 0x17)) {
+                if ((dev->accel_bpp == 24) && (mach->accel.patt_len == 0x17)) {
                     mach->accel.color_pattern_idx++;
                     if (dev->accel.x3) {
                         if (mach->accel.color_pattern_idx == 9)
@@ -2219,7 +2218,7 @@ mach_accel_start(int cmd_type, int cpu_input, int count, uint32_t mix_dat, uint3
                         if (mach->accel.color_pattern_idx == 6)
                             mach->accel.color_pattern_idx = 0;
                     }
-                } else if ((svga->bpp == 24) && (mach->accel.patt_len < 3)) {
+                } else if ((dev->accel_bpp == 24) && (mach->accel.patt_len < 3)) {
                     mach->accel.color_pattern_idx++;
                     if (mach->accel.color_pattern_idx == 3)
                         mach->accel.color_pattern_idx = 0;
@@ -2249,7 +2248,7 @@ mach_accel_start(int cmd_type, int cpu_input, int count, uint32_t mix_dat, uint3
 }
 
 static void
-mach_accel_out_pixtrans(mach_t *mach, ibm8514_t *dev, UNUSED(uint16_t port), uint16_t val, UNUSED(uint16_t len))
+mach_accel_out_pixtrans(mach_t *mach, ibm8514_t *dev, uint16_t val)
 {
     int frgd_sel;
     int bkgd_sel;
@@ -2345,7 +2344,7 @@ mach_out(uint16_t addr, uint8_t val, void *priv)
                             mach->bank_r |= ((mach->regs[0xae] & 0x0c) << 2);
                             mach->bank_w |= ((mach->regs[0xae] & 3) << 4);
                         }
-                        if (ibm8514_on)
+                        if (dev->on)
                             mach_log("Separate B2Bank = %02x, AEbank = %02x.\n", mach->regs[0xb2], mach->regs[0xae]);
                     } else { /* Single bank mode */
                         mach->bank_w = ((mach->regs[0xb2] & 0x1e) >> 1);
@@ -2353,7 +2352,7 @@ mach_out(uint16_t addr, uint8_t val, void *priv)
                             mach->bank_w |= ((mach->regs[0xae] & 3) << 4);
                         }
                         mach->bank_r = mach->bank_w;
-                        if (ibm8514_on)
+                        if (dev->on)
                             mach_log("Single B2Bank = %02x, AEbank = %02x.\n", mach->regs[0xb2], mach->regs[0xae]);
                     }
                     svga->read_bank  = mach->bank_r << 16;
@@ -2373,7 +2372,7 @@ mach_out(uint16_t addr, uint8_t val, void *priv)
                     ati_eeprom_write(&mach->eeprom, val & 8, val & 2, val & 1);
                     break;
                 case 0xb6:
-                    if ((old ^ val) & 0x11)
+                    if ((old ^ val) & 0x10)
                         svga_recalctimings(svga);
                     break;
                 case 0xb8:
@@ -2461,17 +2460,6 @@ mach_out(uint16_t addr, uint8_t val, void *priv)
             }
             break;
 
-        case 0x46e8:
-            io_removehandler(0x03c0, 32, mach_in, NULL, NULL, mach_out, NULL, NULL, mach);
-            mem_mapping_disable(&svga->mapping);
-            mem_mapping_disable(&mach->mmio_linear_mapping);
-            if (val & 8) {
-                io_sethandler(0x03c0, 32, mach_in, NULL, NULL, mach_out, NULL, NULL, mach);
-                mem_mapping_enable(&svga->mapping);
-                mach32_updatemapping(mach);
-            }
-            break;
-
         default:
             break;
     }
@@ -2519,6 +2507,10 @@ mach_in(uint16_t addr, void *priv)
                         temp |= 8;
                     break;
 
+                case 0xbd:
+                    temp = mach->regs[0xbd] | 0x10;
+                    break;
+
                 default:
                     temp = mach->regs[mach->index];
                     break;
@@ -2577,7 +2569,7 @@ mach_recalctimings(svga_t *svga)
 {
     const mach_t *mach = (mach_t *) svga->priv;
     ibm8514_t    *dev  = &svga->dev8514;
-    int clock_sel;
+    int           clock_sel;
 
     clock_sel = ((svga->miscout >> 2) & 3) | ((mach->regs[0xbe] & 0x10) >> 1) | ((mach->regs[0xb9] & 2) << 1);
 
@@ -2602,59 +2594,13 @@ mach_recalctimings(svga_t *svga)
         svga->gdcreg[5] &= ~0x40;
     }
 
-    if (mach->regs[0xb0] & 0x20) {
+    if (mach->regs[0xb0] & 0x20)
         svga->gdcreg[5] |= 0x40;
-    }
 
-    if (!svga->scrblank && (svga->crtc[0x17] & 0x80) && svga->attr_palette_enable) {
-        if (((svga->gdcreg[6] & 1) || (svga->attrregs[0x10] & 1))) {
-            if (!ibm8514_on) {
-                mach_log("VGA ON.\n");
-                svga->clock = (cpuclock * (double) (1ULL << 32)) / svga->getclock(clock_sel, svga->clock_gen);
-                if (mach->regs[0xa7] & 0x80)
-                    svga->clock *= 3;
-            }
-            switch (svga->gdcreg[5] & 0x60) {
-                case 0x00:
-                    if (svga->seqregs[1] & 8) /*Low res (320)*/
-                        svga->render = svga_render_4bpp_lowres;
-                    else
-                        svga->render = svga_render_4bpp_highres;
-                    break;
-                case 0x20:                    /*4 colours*/
-                    if (svga->seqregs[1] & 8) /*Low res (320)*/
-                        svga->render = svga_render_2bpp_lowres;
-                    else
-                        svga->render = svga_render_2bpp_highres;
-                    break;
-                case 0x40:
-                case 0x60: /*256+ colours*/
-                    switch (svga->bpp) {
-                        case 8:
-                            svga->map8 = svga->pallook;
-                            if (svga->lowres)
-                                svga->render = svga_render_8bpp_lowres;
-                            else {
-                                svga->render = svga_render_8bpp_highres;
-                                svga->ma_latch <<= 1;
-                                svga->rowoffset <<= 1;
-                            }
-                            break;
-
-                        default:
-                            break;
-                    }
-                    break;
-
-                default:
-                    break;
-            }
-        }
-    }
-
-    if (dev->local >= 2) {
-        if (ibm8514_on) {
-            svga->clock = (cpuclock * (double) (1ULL << 32)) / svga->getclock((mach->accel.clock_sel >> 2) & 0x0f, svga->clock_gen);
+    if (dev->on) {
+        mach_log("8514/A ON.\n");
+        svga->clock = (cpuclock * (double) (1ULL << 32)) / svga->getclock((mach->accel.clock_sel >> 2) & 0x0f, svga->clock_gen);
+        if (dev->local >= 2) {
             dev->h_disp                     = (dev->hdisp + 1) << 3;
             dev->h_total                    = (dev->htotal + 1);
             dev->v_total                    = (dev->vtotal + 1);
@@ -2677,10 +2623,9 @@ mach_recalctimings(svga_t *svga)
                         dev->v_syncstart = 1536;
                     }
                 }
-                mach_log("1024x768 clock mode, hdisp = %d, htotal = %d, vtotal = %d, vsyncstart = %d, interlace = %02x\n", dev->h_disp, dev->h_total, dev->v_total, dev->v_syncstart, dev->interlace);
             } else {
                 if (mach->shadow_set & 1) {
-                    if ((dev->h_disp == 1024) && !dev->internal_pitch) {
+                    if (dev->h_disp == 1024) {
                         dev->h_disp = 640;
                         dev->dispend = 480;
                     }
@@ -2695,44 +2640,45 @@ mach_recalctimings(svga_t *svga)
                 dev->v_syncstart >>= 1;
                 dev->v_total >>= 1;
             }
+
             dev->pitch = dev->ext_pitch;
             dev->rowoffset = dev->ext_crt_pitch;
             if ((mach->accel.ext_ge_config & 0x800) || (!(mach->accel.ext_ge_config & 0x8000) && !(mach->accel.ext_ge_config & 0x800))) {
                 if ((mach->accel.ext_ge_config & 0x30) == 0x20) {
                     if ((mach->accel.ext_ge_config & 0xc0) == 0x40)
-                        svga->bpp = 16;
+                        dev->accel_bpp = 16;
                     else
-                        svga->bpp = 15;
+                        dev->accel_bpp = 15;
                 } else if ((mach->accel.ext_ge_config & 0x30) == 0x30) {
                     if (mach->accel.ext_ge_config & 0x200)
-                        svga->bpp = 32;
+                        dev->accel_bpp = 32;
                     else
-                        svga->bpp = 24;
+                        dev->accel_bpp = 24;
                 } else
-                    svga->bpp = 8;
+                    dev->accel_bpp = 8;
 
-                mach_log("hv(%d,%d), pitch=%d, rowoffset=%d, gextconfig=%03x.\n", dev->h_disp, dev->dispend, dev->pitch, dev->rowoffset, mach->accel.ext_ge_config & 0xcec0);
-                switch (svga->bpp) {
+                mach_log("hv(%d,%d), pitch=%d, rowoffset=%d, gextconfig=%03x, bpp=%d.\n", dev->h_disp, dev->dispend, dev->pitch, dev->ext_crt_pitch, mach->accel.ext_ge_config & 0xcec0, dev->accel_bpp);
+                switch (dev->accel_bpp) {
                     case 8:
-                        svga->render = ibm8514_render_8bpp;
+                        svga->render8514 = ibm8514_render_8bpp;
                         break;
                     case 15:
-                        svga->render = ibm8514_render_15bpp;
+                        svga->render8514 = ibm8514_render_15bpp;
                         break;
                     case 16:
-                        svga->render = ibm8514_render_16bpp;
+                        svga->render8514 = ibm8514_render_16bpp;
                         break;
                     case 24:
                         if (mach->accel.ext_ge_config & 0x400)
-                            svga->render = ibm8514_render_BGR;
+                            svga->render8514 = ibm8514_render_BGR;
                         else
-                            svga->render = ibm8514_render_24bpp;
+                            svga->render8514 = ibm8514_render_24bpp;
                         break;
                     case 32:
                         if (mach->accel.ext_ge_config & 0x400)
-                            svga->render = ibm8514_render_ABGR8888;
+                            svga->render8514 = ibm8514_render_ABGR8888;
                         else
-                            svga->render = ibm8514_render_RGBA8888;
+                            svga->render8514 = ibm8514_render_RGBA8888;
                         break;
 
                     default:
@@ -2753,16 +2699,13 @@ mach_recalctimings(svga_t *svga)
                 default:
                     break;
             }
-        }
-    } else {
-        if (ibm8514_on) {
-            svga->clock      = (cpuclock * (double) (1ULL << 32)) / svga->getclock((mach->accel.clock_sel >> 2) & 0x0f, svga->clock_gen);
-            dev->h_disp      = (dev->hdisp + 1) << 3;
-            dev->h_total     = (dev->htotal + 1);
-            dev->v_total     = (dev->vtotal + 1);
-            dev->v_syncstart = (dev->vsyncstart + 1);
-            dev->rowcount    = !!(dev->disp_cntl & 0x08);
-            dev->dispend     = ((dev->vdisp >> 1) + 1);
+        } else {
+            dev->h_disp                     = (dev->hdisp + 1) << 3;
+            dev->h_total                    = (dev->htotal + 1);
+            dev->v_total                    = (dev->vtotal + 1);
+            dev->v_syncstart                = (dev->vsyncstart + 1);
+            dev->rowcount                  = !!(dev->disp_cntl & 0x08);
+            dev->dispend                   = ((dev->vdisp >> 1) + 1);
 
             if (dev->dispend == 766)
                 dev->dispend += 2;
@@ -2781,7 +2724,7 @@ mach_recalctimings(svga_t *svga)
                 }
             } else {
                 if (mach->shadow_set & 1) {
-                    if ((dev->h_disp == 1024) && !dev->internal_pitch) {
+                    if (dev->h_disp == 1024) {
                         dev->h_disp = 640;
                         dev->dispend = 480;
                     }
@@ -2795,16 +2738,57 @@ mach_recalctimings(svga_t *svga)
                 dev->v_syncstart >>= 1;
                 dev->v_total >>= 1;
             }
-
             dev->pitch = dev->ext_pitch;
             dev->rowoffset = dev->ext_crt_pitch;
             mach_log("hv(%d,%d), pitch=%d, rowoffset=%d, gextconfig=%03x.\n", dev->h_disp, dev->dispend, dev->pitch, dev->rowoffset, mach->accel.ext_ge_config & 0xcec0);
             svga->map8 = dev->pallook;
-            svga->render = ibm8514_render_8bpp;
+            svga->render8514 = ibm8514_render_8bpp;
             if (mach->regs[0xb8] & 0x40)
                 svga->clock *= 2;
         }
     }
+
+    if (!svga->scrblank && (svga->crtc[0x17] & 0x80) && svga->attr_palette_enable) {
+        if (((svga->gdcreg[6] & 1) || (svga->attrregs[0x10] & 1))) {
+            svga->clock = (cpuclock * (double) (1ULL << 32)) / svga->getclock(clock_sel, svga->clock_gen);
+            if (mach->regs[0xa7] & 0x80)
+                svga->clock *= 3;
+            switch (svga->gdcreg[5] & 0x60) {
+                case 0x00:
+                    if (svga->seqregs[1] & 8) /*Low res (320)*/
+                        svga->render = svga_render_4bpp_lowres;
+                    else
+                        svga->render = svga_render_4bpp_highres;
+                    break;
+                case 0x20:                    /*4 colours*/
+                    if (svga->seqregs[1] & 8) /*Low res (320)*/
+                        svga->render = svga_render_2bpp_lowres;
+                    else
+                        svga->render = svga_render_2bpp_highres;
+                    break;
+                case 0x40:
+                case 0x60: /*256+ colours*/
+                    switch (svga->bpp) {
+                        default:
+                        case 8:
+                            svga->map8 = svga->pallook;
+                            if (svga->lowres)
+                                svga->render = svga_render_8bpp_lowres;
+                            else {
+                                svga->render = svga_render_8bpp_highres;
+                                svga->ma_latch <<= 1;
+                                svga->rowoffset <<= 1;
+                            }
+                            break;
+
+                    }
+                    break;
+
+                default:
+                    break;
+            }
+        }
+    }
 }
 
 static void
@@ -2941,7 +2925,6 @@ mach_accel_out_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, u
                         dev->accel.cmd_back = 0;
                 }
                 ibm8514_accel_start(-1, 0, -1, 0, svga, len);
-                svga_recalctimings(svga);
             }
             break;
         case 0x9ae9:
@@ -3028,7 +3011,7 @@ mach_accel_out_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, u
                         if (mach->accel.cmd_type >= 0) {
                             if (mach_pixel_read(mach))
                                 break;
-                            mach_accel_out_pixtrans(mach, dev, port, val, len);
+                            mach_accel_out_pixtrans(mach, dev, val);
                         } else {
                             if (ibm8514_cpu_dest(svga))
                                 break;
@@ -3113,7 +3096,7 @@ mach_accel_out_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, u
                         if (mach->accel.cmd_type >= 0) {
                             if (mach_pixel_read(mach))
                                 break;
-                            mach_accel_out_pixtrans(mach, dev, port, val, len);
+                            mach_accel_out_pixtrans(mach, dev, val);
                         } else {
                             if (ibm8514_cpu_dest(svga))
                                 break;
@@ -3247,10 +3230,11 @@ mach_accel_out_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, u
                 if ((dev->accel.multifunc_cntl >> 12) == 4) {
                     dev->accel.multifunc[4] = val & 0x7ff;
                 }
-                mach_log("CLIPBOTTOM=%d, CLIPRIGHT=%d, bpp=%d, pitch=%d.\n", dev->accel.multifunc[3], dev->accel.multifunc[4], svga->bpp, dev->pitch);
+                mach_log("CLIPBOTTOM=%d, CLIPRIGHT=%d, bpp=%d, pitch=%d.\n", dev->accel.multifunc[3], dev->accel.multifunc[4], dev->accel_bpp, dev->pitch);
                 if ((dev->accel.multifunc_cntl >> 12) == 5) {
-                    if (!dev->ext_crt_pitch || (dev->local < 2))
+                    if (dev->local < 2)
                         dev->ext_crt_pitch = 128;
+
                     svga_recalctimings(svga);
                 }
                 if (port == 0xfee8)
@@ -3271,8 +3255,9 @@ mach_accel_out_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, u
                     dev->accel.clip_left = dev->accel.multifunc_cntl & 0x7ff;
                 }
                 if ((dev->accel.multifunc_cntl >> 12) == 5) {
-                    if (!dev->ext_crt_pitch || (dev->local < 2))
+                    if (dev->local < 2)
                         dev->ext_crt_pitch = 128;
+
                     svga_recalctimings(svga);
                 }
                 if (port == 0xfee9)
@@ -3299,11 +3284,11 @@ mach_accel_out_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, u
                 else {
                     frgd_sel = (mach->accel.dp_config >> 13) & 7;
                     mono_src = (mach->accel.dp_config >> 5) & 3;
-                    if ((svga->bpp == 24) && (mach->accel.patt_len == 0x17) && (frgd_sel == 5)) {
+                    if ((dev->accel_bpp == 24) && (mach->accel.patt_len == 0x17) && (frgd_sel == 5)) {
                         mach->accel.patt_data_idx += 2;
                         dev->accel.y1 = 1;
                     } else {
-                        if (svga->bpp == 24)
+                        if (dev->accel_bpp == 24)
                             mach->accel.patt_data_idx += 2;
                         else
                             mach->accel.patt_data_idx = (mach->accel.patt_data_idx + 2) & mach->accel.patt_len;
@@ -3319,7 +3304,7 @@ mach_accel_out_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, u
                     mach->accel.patt_data_idx = (mach->accel.patt_data_idx + 2) & 7;
                 else {
                     frgd_sel = (mach->accel.dp_config >> 13) & 7;
-                    if ((svga->bpp == 24) && (mach->accel.patt_len == 0x17) && (frgd_sel == 5)) {
+                    if ((dev->accel_bpp == 24) && (mach->accel.patt_len == 0x17) && (frgd_sel == 5)) {
                         mach->accel.patt_data_idx += 2;
                         dev->accel.y1 = 1;
                     } else
@@ -3634,8 +3619,11 @@ mach_accel_out(uint16_t port, uint8_t val, mach_t *mach)
             svga_recalctimings(svga);
             break;
         case 0x6e8:
-            dev->hdisp = val;
-            mach_log("ATI 8514/A: H_DISP write 06E8 = %d\n", dev->hdisp + 1);
+        case 0x6e9:
+            if (!(port & 1)) {
+                dev->hdisp = val;
+                mach_log("ATI 8514/A: H_DISP write 06E8 = %d\n", dev->hdisp + 1);
+            }
             svga_recalctimings(svga);
             break;
 
@@ -3671,7 +3659,7 @@ mach_accel_out(uint16_t port, uint8_t val, mach_t *mach)
             break;
 
         case 0x1ee8:
-            dev->vsyncwidth = val;
+        case 0x1ee9:
             mach_log("ATI 8514/A: V_SYNC_WID write 1EE8 = %02x\n", val);
             svga_recalctimings(svga);
             break;
@@ -3679,8 +3667,8 @@ mach_accel_out(uint16_t port, uint8_t val, mach_t *mach)
         case 0x22e8:
             dev->disp_cntl = val & 0x7e;
             dev->interlace = !!(val & 0x10);
-            mach_log("ATI 8514/A: DISP_CNTL write 22E8 = %02x, SCANMODULOS = %d\n", dev->disp_cntl, dev->scanmodulos);
             svga_recalctimings(svga);
+            mach_log("ATI 8514/A: DISP_CNTL write 22E8 = %02x, SCANMODULOS = %d\n", dev->disp_cntl, dev->scanmodulos);
             break;
 
         case 0x42e8:
@@ -3691,19 +3679,17 @@ mach_accel_out(uint16_t port, uint8_t val, mach_t *mach)
             break;
 
         case 0x4ae8:
-            if (!val)
-                break;
-            if (!dev->ext_crt_pitch || (dev->local < 2))
-                dev->ext_crt_pitch = 128;
+        case 0x4ae9:
+            if (!(port & 1)) {
+                if (dev->local < 2)
+                    dev->ext_crt_pitch = 128;
 
-            dev->accel.advfunc_cntl = val & 0x0f;
-            ibm8514_on = val & 0x01;
-            if (!ibm8514_on && mach->old_mode) {
-                ibm8514_on = 1;
-                mach->old_mode = 0;
+                dev->accel.advfunc_cntl = val & 0x0f;
+            } else {
+                dev->on = (dev->accel.advfunc_cntl & 0x01);
+                vga_on = !dev->on;
+                mach_log("ATI 8514/A: (0x4ae8) val = %04x\n", val & 0x01);
             }
-            vga_on = !ibm8514_on;
-            mach_log("ATI 8514/A: VGA ON (0x4ae8) = %i, val = %02x, 8514 = %i, gdcreg6 = %02x\n", vga_on, val, ibm8514_on, svga->gdcreg[6] & 0x0c);
             svga_recalctimings(svga);
             break;
 
@@ -3769,23 +3755,17 @@ mach_accel_out(uint16_t port, uint8_t val, mach_t *mach)
             break;
 
         case 0x26ee:
-            mach_log("CRT Pitch = %d, original val = %d.\n", val << 3, val);
-            dev->ext_crt_pitch = val;
-            dev->internal_pitch = val;
-            if (svga->bpp > 8) {
-                if (svga->bpp == 24)
+        case 0x26ef:
+            WRITE8(port, mach->accel.crt_pitch, val);
+            dev->ext_crt_pitch = mach->accel.crt_pitch & 0xff;
+            if (dev->accel_bpp > 8) {
+                if (dev->accel_bpp == 24)
                     dev->ext_crt_pitch *= 3;
-                else if (svga->bpp == 32)
+                else if (dev->accel_bpp == 32)
                     dev->ext_crt_pitch <<= 2;
                 else
                     dev->ext_crt_pitch <<= 1;
             }
-            if (dev->local >= 2) {
-                if (!ibm8514_on) {
-                    ibm8514_on = 1;
-                    svga->adv_flags |= FLAG_ATI;
-                }
-            }
             svga_recalctimings(svga);
             break;
 
@@ -3831,19 +3811,12 @@ mach_accel_out(uint16_t port, uint8_t val, mach_t *mach)
 
         case 0x4aee:
         case 0x4aef:
-            if (!(port & 1))
-                mach->old_mode = mach->accel.clock_sel & 0x01;
-
             WRITE8(port, mach->accel.clock_sel, val);
-            ibm8514_on = mach->accel.clock_sel & 0x01;
-            vga_on = !ibm8514_on;
-            if (dev->local >= 2) {
-                if (ibm8514_on)
-                    svga->adv_flags |= FLAG_ATI;
-                else
-                    svga->adv_flags &= ~FLAG_ATI;
+            if (port & 1) {
+                mach_log("ATI 8514/A: (0x4aee) val = %04x\n", mach->accel.clock_sel & 0x01);
+                dev->on = mach->accel.clock_sel & 0x01;
+                vga_on = !dev->on;
             }
-            mach_log("ATI 8514/A: VGA ON (0x4aee) = %i, Ext = %i, val = %04x\n", vga_on, ibm8514_on, mach->accel.clock_sel);
             svga_recalctimings(svga);
             break;
 
@@ -3860,6 +3833,9 @@ mach_accel_out(uint16_t port, uint8_t val, mach_t *mach)
         case 0x5aee:
         case 0x5aef:
             WRITE8(port, mach->shadow_set, val);
+            if (port & 1)
+                mach_log("Shadow set = %02x.\n", mach->shadow_set & 0x03);
+
             svga_recalctimings(svga);
             break;
 
@@ -3899,9 +3875,9 @@ mach_accel_out(uint16_t port, uint8_t val, mach_t *mach)
             break;
 
         case 0x76ee:
-            mach_log("76EE write val=%d shifted, normal=%d.\n", val << 3, val);
-            dev->ext_pitch = val << 3;
-            mach->old_mode = 1;
+        case 0x76ef:
+            WRITE8(port, mach->accel.ge_pitch, val);
+            dev->ext_pitch = ((mach->accel.ge_pitch & 0xff) << 3);
             svga_recalctimings(svga);
             break;
 
@@ -3909,7 +3885,8 @@ mach_accel_out(uint16_t port, uint8_t val, mach_t *mach)
         case 0x7aef:
             WRITE8(port, mach->accel.ext_ge_config, val);
             if (dev->local >= 2) {
-                dev->ext_crt_pitch = dev->internal_pitch;
+                if (mach->accel.crt_pitch & 0xff)
+                    dev->ext_crt_pitch = mach->accel.crt_pitch & 0xff;
                 switch (mach->accel.ext_ge_config & 0x30) {
                     case 0:
                     case 0x10:
@@ -3931,10 +3908,9 @@ mach_accel_out(uint16_t port, uint8_t val, mach_t *mach)
                         break;
                 }
                 svga_set_ramdac_type(svga, !!(mach->accel.ext_ge_config & 0x4000));
-                mach_log("Passthrough override = %04x.\n", val & 0x1000);
-                svga_recalctimings(svga);
+                mach_log("7AEE write val = %04x.\n", mach->accel.ext_ge_config);
             }
-            mach_log("7AEE write val = %04x.\n", mach->accel.ext_ge_config);
+            svga_recalctimings(svga);
             break;
 
         case 0x7eee:
@@ -4064,7 +4040,7 @@ mach_accel_in_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, in
                         } else {
                             READ_PIXTRANS_WORD(dev->accel.dx, 0)
                         }
-                        mach_accel_out_pixtrans(mach, dev, port, temp, len);
+                        mach_accel_out_pixtrans(mach, dev, temp);
                     }
                 }
             } else {
@@ -4495,10 +4471,7 @@ mach_accel_in(uint16_t port, mach_t *mach)
         case 0x5eef:
             if (mach->pci_bus)
                 mach->memory_aperture = (mach->memory_aperture & ~0xfff0) | ((mach->linear_base >> 20) << 4);
-            if ((port & 1) && ibm8514_on) {
-                ibm8514_on = 0;
-                vga_on = 1;
-            }
+
             READ8(port, mach->memory_aperture);
             break;
 
@@ -4639,10 +4612,321 @@ mach_accel_inl(uint16_t port, void *priv)
     return temp;
 }
 
+static void
+mach32_write_linear(uint32_t addr, uint8_t val, void *priv)
+{
+    svga_t *svga = (svga_t *) priv;
+    ibm8514_t *dev = &svga->dev8514;
+    int     writemask2 = svga->writemask;
+    int     reset_wm   = 0;
+    latch_t vall;
+    uint8_t wm = svga->writemask;
+    uint8_t count;
+    uint8_t i;
+
+    cycles -= svga->monitor->mon_video_timing_write_b;
+
+    if (!(svga->gdcreg[6] & 1))
+        svga->fullchange = 2;
+
+    if (((svga->chain4 && (svga->packed_chain4 || svga->force_old_addr)) || svga->fb_only) && (svga->writemode < 4)) {
+        writemask2 = 1 << (addr & 3);
+        addr &= ~3;
+    } else if (svga->chain4 && (svga->writemode < 4)) {
+        writemask2 = 1 << (addr & 3);
+        addr = ((addr & 0xfffc) << 2) | ((addr & 0x30000) >> 14) | (addr & ~0x3ffff);
+    } else if (svga->chain2_write) {
+        writemask2 &= ~0xa;
+        if (addr & 1)
+            writemask2 <<= 1;
+        addr &= ~1;
+        addr &= dev->vram_mask;
+    } else {
+        writemask2 = 1 << (addr & 3);
+        addr &= ~3;
+        addr &= dev->vram_mask;
+    }
+    addr &= svga->decode_mask;
+
+    if (addr >= dev->vram_size)
+        return;
+
+    addr &= dev->vram_mask;
+
+    dev->changedvram[addr >> 12] = svga->monitor->mon_changeframecount;
+
+    count = 4;
+
+    switch (svga->writemode) {
+        case 0:
+            val = ((val >> (svga->gdcreg[3] & 7)) | (val << (8 - (svga->gdcreg[3] & 7))));
+            if ((svga->gdcreg[8] == 0xff) && !(svga->gdcreg[3] & 0x18) && (!svga->gdcreg[1] || svga->set_reset_disabled)) {
+                for (i = 0; i < count; i++) {
+                    if (writemask2 & (1 << i))
+                        dev->vram[addr | i] = val;
+                }
+                return;
+            } else {
+                for (i = 0; i < count; i++) {
+                    if (svga->gdcreg[1] & (1 << i))
+                        vall.b[i] = !!(svga->gdcreg[0] & (1 << i)) * 0xff;
+                    else
+                        vall.b[i] = val;
+                }
+            }
+            break;
+        case 1:
+            for (i = 0; i < count; i++) {
+                if (writemask2 & (1 << i))
+                    dev->vram[addr | i] = svga->latch.b[i];
+            }
+            return;
+        case 2:
+            for (i = 0; i < count; i++)
+                vall.b[i] = !!(val & (1 << i)) * 0xff;
+
+            if (!(svga->gdcreg[3] & 0x18) && (!svga->gdcreg[1] || svga->set_reset_disabled)) {
+                for (i = 0; i < count; i++) {
+                    if (writemask2 & (1 << i))
+                        dev->vram[addr | i] = (vall.b[i] & svga->gdcreg[8]) | (svga->latch.b[i] & ~svga->gdcreg[8]);
+                }
+                return;
+            }
+            break;
+        case 3:
+            val = ((val >> (svga->gdcreg[3] & 7)) | (val << (8 - (svga->gdcreg[3] & 7))));
+            wm  = svga->gdcreg[8];
+            svga->gdcreg[8] &= val;
+
+            for (i = 0; i < count; i++)
+                vall.b[i] = !!(svga->gdcreg[0] & (1 << i)) * 0xff;
+
+            reset_wm = 1;
+            break;
+        default:
+            break;
+    }
+
+    switch (svga->gdcreg[3] & 0x18) {
+        case 0x00: /* Set */
+            for (i = 0; i < count; i++) {
+                if (writemask2 & (1 << i))
+                    dev->vram[addr | i] = (vall.b[i] & svga->gdcreg[8]) | (svga->latch.b[i] & ~svga->gdcreg[8]);
+            }
+            break;
+        case 0x08: /* AND */
+            for (i = 0; i < count; i++) {
+                if (writemask2 & (1 << i))
+                    dev->vram[addr | i] = (vall.b[i] | ~svga->gdcreg[8]) & svga->latch.b[i];
+            }
+            break;
+        case 0x10: /* OR */
+            for (i = 0; i < count; i++) {
+                if (writemask2 & (1 << i))
+                    dev->vram[addr | i] = (vall.b[i] & svga->gdcreg[8]) | svga->latch.b[i];
+            }
+            break;
+        case 0x18: /* XOR */
+            for (i = 0; i < count; i++) {
+                if (writemask2 & (1 << i))
+                    dev->vram[addr | i] = (vall.b[i] & svga->gdcreg[8]) ^ svga->latch.b[i];
+            }
+            break;
+
+        default:
+            break;
+    }
+
+    if (reset_wm)
+        svga->gdcreg[8] = wm;
+}
+
+static void
+mach32_write(uint32_t addr, uint8_t val, void *priv)
+{
+    svga_t          *svga = (svga_t *) priv;
+    const ibm8514_t *dev  = &svga->dev8514;
+
+    if (!dev->on) {
+        svga_write(addr, val, svga);
+        return;
+    }
+
+    addr = (addr & svga->banked_mask) + svga->write_bank;
+    mach32_write_linear(addr, val, svga);
+}
+
+static void
+mach32_writew(uint32_t addr, uint16_t val, void *priv)
+{
+    svga_t          *svga = (svga_t *) priv;
+    const ibm8514_t *dev  = &svga->dev8514;
+
+    if (!dev->on) {
+        svga_writew(addr, val, svga);
+        return;
+    }
+
+    mach32_write(addr, val & 0xff, svga);
+    mach32_write(addr + 1, val >> 8, svga);
+}
+
+static void
+mach32_writel(uint32_t addr, uint32_t val, void *priv)
+{
+    svga_t          *svga = (svga_t *) priv;
+    const ibm8514_t *dev  = &svga->dev8514;
+
+    if (!dev->on) {
+        svga_writel(addr, val, svga);
+        return;
+    }
+
+    mach32_write(addr, val & 0xff, svga);
+    mach32_write(addr + 1, val >> 8, svga);
+    mach32_write(addr + 2, val >> 16, svga);
+    mach32_write(addr + 3, val >> 24, svga);
+}
+
+static uint8_t
+mach32_read_linear(uint32_t addr, void *priv)
+{
+    svga_t          *svga       = (svga_t *) priv;
+    const ibm8514_t *dev        = &svga->dev8514;
+    uint32_t         latch_addr = 0;
+    int              readplane  = svga->readplane;
+    uint8_t          count;
+    uint8_t          temp;
+    uint8_t          ret;
+
+    cycles -= svga->monitor->mon_video_timing_read_b;
+
+    count = 2;
+
+    latch_addr = (addr << count) & svga->decode_mask;
+    count      = (1 << count);
+
+    if ((svga->chain4 && (svga->packed_chain4 || svga->force_old_addr)) || svga->fb_only) {
+        addr &= svga->decode_mask;
+        if (addr >= dev->vram_size)
+            return 0xff;
+        latch_addr = (addr & dev->vram_mask) & ~3;
+        for (uint8_t i = 0; i < count; i++)
+            svga->latch.b[i] = dev->vram[latch_addr | i];
+        return dev->vram[addr & dev->vram_mask];
+    } else if (svga->chain4 && !svga->force_old_addr) {
+        readplane = addr & 3;
+        addr      = ((addr & 0xfffc) << 2) | ((addr & 0x30000) >> 14) | (addr & ~0x3ffff);
+    } else if (svga->chain2_read) {
+        readplane = (readplane & 2) | (addr & 1);
+        addr &= ~1;
+        addr &= dev->vram_mask;
+    } else {
+        addr &= svga->decode_mask;
+        if (addr >= dev->vram_size)
+            return 0xff;
+        latch_addr = (addr & dev->vram_mask) & ~3;
+        for (uint8_t i = 0; i < count; i++)
+            svga->latch.b[i] = dev->vram[latch_addr | i];
+        return dev->vram[addr & dev->vram_mask];
+    }
+
+    addr &= svga->decode_mask;
+
+    /* standard VGA latched access */
+    if (latch_addr >= dev->vram_size) {
+        for (uint8_t i = 0; i < count; i++)
+            svga->latch.b[i] = 0xff;
+    } else {
+        latch_addr &= dev->vram_mask;
+
+        for (uint8_t i = 0; i < count; i++)
+            svga->latch.b[i] = dev->vram[latch_addr | i];
+    }
+
+    if (addr >= dev->vram_size)
+        return 0xff;
+
+    addr &= dev->vram_mask;
+
+    if (svga->readmode) {
+        temp = 0xff;
+
+        for (uint8_t pixel = 0; pixel < 8; pixel++) {
+            for (uint8_t plane = 0; plane < count; plane++) {
+                if (svga->colournocare & (1 << plane)) {
+                    /* If we care about a plane, and the pixel has a mismatch on it, clear its bit. */
+                    if (((svga->latch.b[plane] >> pixel) & 1) != ((svga->colourcompare >> plane) & 1))
+                        temp &= ~(1 << pixel);
+                }
+            }
+        }
+
+        ret = temp;
+    } else
+        ret = dev->vram[addr | readplane];
+
+    return ret;
+}
+
+static uint8_t
+mach32_read(uint32_t addr, void *priv)
+{
+    svga_t          *svga = (svga_t *) priv;
+    const ibm8514_t *dev  = &svga->dev8514;
+    uint8_t          ret;
+
+    if (!dev->on) {
+        ret = svga_read(addr, svga);
+        return ret;
+    }
+
+    addr = (addr & svga->banked_mask) + svga->read_bank;
+    ret  = mach32_read_linear(addr, svga);
+    return ret;
+}
+
+static uint16_t
+mach32_readw(uint32_t addr, void *priv)
+{
+    svga_t          *svga = (svga_t *) priv;
+    const ibm8514_t *dev  = &svga->dev8514;
+    uint16_t         ret;
+
+    if (!dev->on) {
+        ret = svga_readw(addr, svga);
+        return ret;
+    }
+
+    ret  = mach32_read(addr, svga);
+    ret  |= (mach32_read(addr + 1, svga) << 8);
+    return ret;
+}
+
+static uint32_t
+mach32_readl(uint32_t addr, void *priv)
+{
+    svga_t          *svga = (svga_t *) priv;
+    const ibm8514_t *dev  = &svga->dev8514;
+    uint32_t         ret;
+
+    if (!dev->on) {
+        ret = svga_readl(addr, svga);
+        return ret;
+    }
+
+    ret  = mach32_read(addr, svga);
+    ret  |= (mach32_read(addr + 1, svga) << 8);
+    ret  |= (mach32_read(addr + 2, svga) << 16);
+    ret  |= (mach32_read(addr + 3, svga) << 24);
+    return ret;
+}
+
 static void
 mach32_ap_writeb(uint32_t addr, uint8_t val, void *priv)
 {
     mach_t *mach       = (mach_t *) priv;
+    svga_t *svga       = &mach->svga;
     uint8_t port_dword = addr & 0xfc;
 
     if (((mach->local_cntl & 0x20) || (mach->pci_cntl_reg & 0x80)) &&
@@ -4656,7 +4940,7 @@ mach32_ap_writeb(uint32_t addr, uint8_t val, void *priv)
         }
     } else {
         mach_log("Linear WORDB Write=%08x.\n", addr);
-        svga_write_linear(addr, val, &mach->svga);
+        mach32_write_linear(addr, val, svga);
     }
 }
 
@@ -4664,6 +4948,7 @@ static void
 mach32_ap_writew(uint32_t addr, uint16_t val, void *priv)
 {
     mach_t *mach       = (mach_t *) priv;
+    svga_t *svga       = &mach->svga;
     uint8_t port_dword = addr & 0xfc;
 
     if (((mach->local_cntl & 0x20) || (mach->pci_cntl_reg & 0x80)) &&
@@ -4677,7 +4962,8 @@ mach32_ap_writew(uint32_t addr, uint16_t val, void *priv)
         }
     } else {
         mach_log("Linear WORDW Write=%08x.\n", addr);
-        svga_writew_linear(addr, val, &mach->svga);
+        mach32_write_linear(addr, val & 0xff, svga);
+        mach32_write_linear(addr + 1, val >> 8, svga);
     }
 }
 
@@ -4685,6 +4971,7 @@ static void
 mach32_ap_writel(uint32_t addr, uint32_t val, void *priv)
 {
     mach_t *mach       = (mach_t *) priv;
+    svga_t *svga       = &mach->svga;
     uint8_t port_dword = addr & 0xfc;
 
     if (((mach->local_cntl & 0x20) || (mach->pci_cntl_reg & 0x80)) &&
@@ -4700,7 +4987,10 @@ mach32_ap_writel(uint32_t addr, uint32_t val, void *priv)
         }
     } else {
         mach_log("Linear WORDL Write=%08x, val=%08x, mode=%d, rop=%02x.\n", addr, val, mach->svga.writemode, mach->svga.gdcreg[3] & 0x18);
-        svga_writel_linear(addr, val, &mach->svga);
+        mach32_write_linear(addr, val & 0xff, svga);
+        mach32_write_linear(addr + 1, val >> 8, svga);
+        mach32_write_linear(addr + 2, val >> 16, svga);
+        mach32_write_linear(addr + 3, val >> 24, svga);
     }
 }
 
@@ -4708,6 +4998,7 @@ static uint8_t
 mach32_ap_readb(uint32_t addr, void *priv)
 {
     mach_t *mach = (mach_t *) priv;
+    svga_t *svga       = &mach->svga;
     uint8_t temp;
     uint8_t port_dword = addr & 0xfc;
 
@@ -4719,7 +5010,7 @@ mach32_ap_readb(uint32_t addr, void *priv)
             temp = mach_accel_inb(0x02e8 + (addr & 1) + (port_dword << 8), mach);
         }
     } else
-        temp = svga_read_linear(addr, &mach->svga);
+        temp = mach32_read_linear(addr, svga);
 
     return temp;
 }
@@ -4728,6 +5019,7 @@ static uint16_t
 mach32_ap_readw(uint32_t addr, void *priv)
 {
     mach_t  *mach = (mach_t *) priv;
+    svga_t *svga       = &mach->svga;
     uint16_t temp;
     uint8_t  port_dword = addr & 0xfc;
 
@@ -4738,8 +5030,10 @@ mach32_ap_readw(uint32_t addr, void *priv)
         } else {
             temp = mach_accel_inw(0x02e8 + (port_dword << 8), mach);
         }
-    } else
-        temp = svga_readw_linear(addr, &mach->svga);
+    } else {
+        temp  = mach32_read_linear(addr, svga);
+        temp  |= (mach32_read_linear(addr + 1, svga) << 8);
+    }
 
     return temp;
 }
@@ -4748,6 +5042,7 @@ static uint32_t
 mach32_ap_readl(uint32_t addr, void *priv)
 {
     mach_t  *mach = (mach_t *) priv;
+    svga_t *svga       = &mach->svga;
     uint32_t temp;
     uint8_t  port_dword = addr & 0xfc;
 
@@ -4760,8 +5055,12 @@ mach32_ap_readl(uint32_t addr, void *priv)
             temp = mach_accel_inw(0x02e8 + (port_dword << 8), mach);
             temp |= (mach_accel_inw(0x02e8 + (port_dword << 8) + 4, mach) << 8);
         }
-    } else
-        temp = svga_readl_linear(addr, &mach->svga);
+    } else {
+        temp  = mach32_read_linear(addr, svga);
+        temp  |= (mach32_read_linear(addr + 1, svga) << 8);
+        temp  |= (mach32_read_linear(addr + 2, svga) << 16);
+        temp  |= (mach32_read_linear(addr + 3, svga) << 24);
+    }
 
     return temp;
 }
@@ -4832,13 +5131,13 @@ mach32_hwcursor_draw(svga_t *svga, int displine)
     uint32_t      color0;
     uint32_t      color1;
 
-    if (svga->bpp == 8) {
+    if (dev->accel_bpp == 8) {
         color0 = dev->pallook[mach->cursor_col_0];
         color1 = dev->pallook[mach->cursor_col_1];
-    } else if (svga->bpp == 15) {
+    } else if (dev->accel_bpp == 15) {
         color0 = video_15to32[((mach->ext_cur_col_0_r << 16) | (mach->ext_cur_col_0_g << 8) | mach->cursor_col_0) & 0xffff];
         color1 = video_15to32[((mach->ext_cur_col_1_r << 16) | (mach->ext_cur_col_1_g << 8) | mach->cursor_col_1) & 0xffff];
-    } else if (svga->bpp == 16) {
+    } else if (dev->accel_bpp == 16) {
         color0 = video_16to32[((mach->ext_cur_col_0_r << 16) | (mach->ext_cur_col_0_g << 8) | mach->cursor_col_0) & 0xffff];
         color1 = video_16to32[((mach->ext_cur_col_1_r << 16) | (mach->ext_cur_col_1_g << 8) | mach->cursor_col_1) & 0xffff];
     } else {
@@ -4877,6 +5176,7 @@ mach32_hwcursor_draw(svga_t *svga, int displine)
         dev->hwcursor_latch.addr += 16;
 }
 
+#if 0
 static void
 mach_io_remove(mach_t *mach)
 {
@@ -4990,6 +5290,7 @@ mach_io_remove(mach_t *mach)
     io_removehandler(0xfaee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
     io_removehandler(0xfeee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
 }
+#endif
 
 static void
 mach_io_set(mach_t *mach)
@@ -5145,11 +5446,13 @@ static void
 mach_mca_reset(void *priv)
 {
     mach_t *mach = (mach_t *) priv;
+    svga_t    *svga = &mach->svga;
+    ibm8514_t *dev  = &svga->dev8514;
 
     mem_mapping_disable(&mach->bios_rom.mapping);
     mem_mapping_disable(&mach->bios_rom2.mapping);
     mach_log("MCA reset.\n");
-    ibm8514_on = 0;
+    dev->on = 0;
     vga_on = 1;
     mach_mca_write(0x102, 0, mach);
 }
@@ -5348,13 +5651,12 @@ mach8_init(const device_t *info)
                       mach_in, mach_out,
                       mach32_hwcursor_draw,
                       NULL);
+        dev->vram_size   = mach->memory << 10;
+        dev->vram        = calloc(dev->vram_size, 1);
+        dev->changedvram = calloc(dev->vram_size >> 12, 1);
+        dev->vram_mask   = dev->vram_size - 1;
         dev->hwcursor.cur_ysize = 64;
-        dev->vram_size   = svga->vram_max;
-        dev->vram        = svga->vram;
-        dev->changedvram = svga->changedvram;
-        dev->vram_mask   = svga->vram_mask;
         mach->config1 = 0x20;
-        mach->config2 = 0x08;
         if (mach->pci_bus && !mach->ramdac_type)
             svga->ramdac = device_add(&ati68860_ramdac_device);
         else
@@ -5390,6 +5692,7 @@ mach8_init(const device_t *info)
             mach->config1 |= 0x0400;
             svga->clock_gen = device_add(&ati18811_0_device);
         }
+        mem_mapping_set_handler(&svga->mapping, mach32_read, mach32_readw, mach32_readl, mach32_write, mach32_writew, mach32_writel);
         mem_mapping_add(&mach->mmio_linear_mapping, 0, 0, mach32_ap_readb, mach32_ap_readw, mach32_ap_readl, mach32_ap_writeb, mach32_ap_writew, mach32_ap_writel, NULL, MEM_MAPPING_EXTERNAL, mach);
         mem_mapping_disable(&mach->mmio_linear_mapping);
     } else {
@@ -5410,8 +5713,10 @@ mach8_init(const device_t *info)
     dev->bpp = 0;
     svga->getclock  = ics2494_getclock;
 
+    dev->on = 0;
     dev->ext_pitch = 1024;
     dev->ext_crt_pitch = 0x80;
+    dev->accel_bpp = 8;
     svga->force_old_addr = 1;
     svga->miscout = 1;
     svga->bpp = 8;
@@ -5420,7 +5725,6 @@ mach8_init(const device_t *info)
     io_sethandler(0x01ce, 2,  mach_in, NULL, NULL, mach_out, NULL, NULL, mach);
     io_sethandler(0x03c0, 32, mach_in, NULL, NULL, mach_out, NULL, NULL, mach);
     io_sethandler(0x02ea, 4,  mach_in, NULL, NULL, mach_out, NULL, NULL, mach);
-    io_sethandler(0x46e8, 1,  mach_in, NULL, NULL, mach_out, NULL, NULL, mach);
     mach_io_set(mach);
 
     if (dev->local >= 2) {
@@ -5494,7 +5798,7 @@ mach_close(void *priv)
     svga_t    *svga = &mach->svga;
     ibm8514_t *dev  = &svga->dev8514;
 
-    if (dev && (dev->local < 2)) {
+    if (dev) {
         free(dev->vram);
         free(dev->changedvram);
     }
diff --git a/src/video/vid_att20c49x_ramdac.c b/src/video/vid_att20c49x_ramdac.c
index 13b19af1e..f13740d34 100644
--- a/src/video/vid_att20c49x_ramdac.c
+++ b/src/video/vid_att20c49x_ramdac.c
@@ -10,10 +10,8 @@
  *
  *
  *
- * Authors: Sarah Walker, <https://pcem-emulator.co.uk/>
- *          Miran Grca, <mgrca8@gmail.com>
+ * Authors: Miran Grca, <mgrca8@gmail.com>
  *
- *          Copyright 2008-2018 Sarah Walker.
  *          Copyright 2016-2018 Miran Grca.
  */
 #include <stdio.h>
diff --git a/src/video/vid_att2xc498_ramdac.c b/src/video/vid_att2xc498_ramdac.c
index 42bf583a8..47eebccae 100644
--- a/src/video/vid_att2xc498_ramdac.c
+++ b/src/video/vid_att2xc498_ramdac.c
@@ -10,10 +10,8 @@
  *
  *
  *
- * Authors: Sarah Walker, <https://pcem-emulator.co.uk/>
- *          Miran Grca, <mgrca8@gmail.com>
+ * Authors: Miran Grca, <mgrca8@gmail.com>
  *
- *          Copyright 2008-2018 Sarah Walker.
  *          Copyright 2016-2018 Miran Grca.
  */
 #include <stdio.h>
diff --git a/src/video/vid_cl54xx.c b/src/video/vid_cl54xx.c
index 6afc719c1..2d89df10b 100644
--- a/src/video/vid_cl54xx.c
+++ b/src/video/vid_cl54xx.c
@@ -4067,9 +4067,9 @@ gd54xx_init(const device_t *info)
                 if (info->local & 0x200) {
                     romfn            = NULL;
                     gd54xx->has_bios = 0;
-                } else if (gd54xx->pci) {
+                } else if (gd54xx->pci)
                     romfn = BIOS_GD5430_PATH;
-                } else if ((gd54xx->vlb) && (info->local & 0x100))
+                else if ((gd54xx->vlb) && (info->local & 0x100))
                     romfn = BIOS_GD5430_ORCHID_VLB_PATH;
                 else
                     romfn = BIOS_GD5430_DIAMOND_A8_VLB_PATH;
@@ -4952,6 +4952,20 @@ const device_t gd5430_pci_device = {
     .config        = gd5429_config
 };
 
+const device_t gd5430_onboard_pci_device = {
+    .name          = "Cirrus Logic GD5430 (PCI) (On-Board)",
+    .internal_name = "cl_gd5430_onboard_pci",
+    .flags         = DEVICE_PCI,
+    .local         = CIRRUS_ID_CLGD5430 | 0x200,
+    .init          = gd54xx_init,
+    .close         = gd54xx_close,
+    .reset         = gd54xx_reset,
+    { .available = gd5430_available },
+    .speed_changed = gd54xx_speed_changed,
+    .force_redraw  = gd54xx_force_redraw,
+    .config        = gd5429_config
+};
+
 const device_t gd5434_isa_device = {
     .name          = "Cirrus Logic GD5434 (ISA)",
     .internal_name = "cl_gd5434_isa",
diff --git a/src/video/vid_f82c425.c b/src/video/vid_f82c425.c
index 400e6e1ec..ce1fa24d7 100644
--- a/src/video/vid_f82c425.c
+++ b/src/video/vid_f82c425.c
@@ -24,12 +24,12 @@
  *
  * Authors: Fred N. van Kempen, <decwiz@yahoo.com>
  *          Miran Grca, <mgrca8@gmail.com>
- *          Sarah Walker, <https://pcem-emulator.co.uk/>
+ *          John Elliott, <jce@seasip.info>
  *          Lubomir Rintel, <lkundrak@v3.sk>
  *
  *          Copyright 2018-2019 Fred N. van Kempen.
  *          Copyright 2018-2019 Miran Grca.
- *          Copyright 2018-2019 Sarah Walker.
+ *          Copyright 2018-2019 John Elliott.
  *          Copyright 2021      Lubomir Rintel.
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/video/vid_genius.c b/src/video/vid_genius.c
index 71534e432..084a51339 100644
--- a/src/video/vid_genius.c
+++ b/src/video/vid_genius.c
@@ -10,10 +10,10 @@
  *
  *
  *
- * Authors: Sarah Walker, <https://pcem-emulator.co.uk/>
+ * Authors: John Elliott, <jce@seasip.info>
  *          Miran Grca, <mgrca8@gmail.com>
  *
- *          Copyright 2008-2019 Sarah Walker.
+ *          Copyright 2008-2019 John Elliott.
  *          Copyright 2016-2019 Miran Grca.
  */
 #include <stdio.h>
diff --git a/src/video/vid_svga.c b/src/video/vid_svga.c
index 9e23a9871..68e71c88f 100644
--- a/src/video/vid_svga.c
+++ b/src/video/vid_svga.c
@@ -56,7 +56,6 @@ uint8_t svga_rotate[8][256];
   only SVGA device.*/
 static svga_t *svga_pri;
 int            vga_on;
-int            ibm8514_on;
 
 #ifdef ENABLE_SVGA_LOG
 int svga_do_log = ENABLE_SVGA_LOG;
@@ -211,7 +210,7 @@ svga_out(uint16_t addr, uint8_t val, void *priv)
             if (xga_enabled)
                 xga->on = (val & 0x01) ? 0 : 1;
             if (ibm8514_enabled)
-                ibm8514_on = (val & 0x01) ? 0 : 1;
+                dev->on = (val & 0x01) ? 0 : 1;
 
             vga_on = val & 0x01;
             break;
@@ -518,21 +517,20 @@ svga_set_ramdac_type(svga_t *svga, int type)
         svga->ramdac_type = type;
 
         for (int c = 0; c < 256; c++) {
-            if (ibm8514_on) {
+            if (ibm8514_enabled) {
                 if (svga->ramdac_type == RAMDAC_8BIT)
                     dev->pallook[c] = makecol32(svga->vgapal[c].r, svga->vgapal[c].g, svga->vgapal[c].b);
                 else
                     dev->pallook[c] = makecol32((svga->vgapal[c].r & 0x3f) * 4,
                                                  (svga->vgapal[c].g & 0x3f) * 4,
                                                  (svga->vgapal[c].b & 0x3f) * 4);
-            } else {
-                if (svga->ramdac_type == RAMDAC_8BIT)
-                    svga->pallook[c] = makecol32(svga->vgapal[c].r, svga->vgapal[c].g, svga->vgapal[c].b);
-                else
-                    svga->pallook[c] = makecol32((svga->vgapal[c].r & 0x3f) * 4,
-                                                 (svga->vgapal[c].g & 0x3f) * 4,
-                                                 (svga->vgapal[c].b & 0x3f) * 4);
             }
+            if (svga->ramdac_type == RAMDAC_8BIT)
+                svga->pallook[c] = makecol32(svga->vgapal[c].r, svga->vgapal[c].g, svga->vgapal[c].b);
+            else
+                svga->pallook[c] = makecol32((svga->vgapal[c].r & 0x3f) * 4,
+                                             (svga->vgapal[c].g & 0x3f) * 4,
+                                             (svga->vgapal[c].b & 0x3f) * 4);
         }
     }
 }
@@ -540,7 +538,7 @@ svga_set_ramdac_type(svga_t *svga, int type)
 void
 svga_recalctimings(svga_t *svga)
 {
-    const ibm8514_t *dev = &svga->dev8514;
+    ibm8514_t *dev = &svga->dev8514;
     double           crtcconst;
     double           _dispontime;
     double           _dispofftime;
@@ -727,13 +725,8 @@ svga_recalctimings(svga_t *svga)
 
     crtcconst = svga->clock * svga->char_width;
 
-    if (ibm8514_on) {
-        disptime    = dev->h_total;
-        _dispontime = dev->h_disp;
-    } else {
-        disptime    = svga->htotal;
-        _dispontime = svga->hdisp_time;
-    }
+    disptime    = svga->htotal;
+    _dispontime = svga->hdisp_time;
 
     if (svga->seqregs[1] & 8) {
         disptime *= 2;
@@ -822,10 +815,11 @@ svga_poll(void *priv)
     int        ret;
     int        old_ma;
 
-    if (ibm8514_enabled && ibm8514_on) {
+    if (ibm8514_enabled && dev->on) {
         ibm8514_poll(dev, svga);
         return;
-    } else if (xga_enabled && xga->on) {
+    }
+    if (xga_enabled && xga->on) {
         xga_poll(xga, svga);
         return;
     }
@@ -1283,18 +1277,10 @@ svga_write_common(uint32_t addr, uint8_t val, uint8_t linear, void *priv)
         if (addr & 1)
             writemask2 <<= 1;
         addr &= ~1;
-        if (linear && ibm8514_on && (svga->adv_flags & FLAG_ATI)) {
-            addr &= svga->vram_mask;
-        } else
-            addr <<= 2;
-    } else {
-        if (linear && ibm8514_on && (svga->adv_flags & FLAG_ATI)) {
-            writemask2 = 1 << (addr & 3);
-            addr &= ~3;
-            addr &= svga->vram_mask;
-        } else
-            addr <<= 2;
-    }
+        addr <<= 2;
+    } else
+        addr <<= 2;
+
     addr &= svga->decode_mask;
 
     if (svga->translate_address)
@@ -1504,22 +1490,10 @@ svga_read_common(uint32_t addr, uint8_t linear, void *priv)
     } else if (svga->chain2_read) {
         readplane = (readplane & 2) | (addr & 1);
         addr &= ~1;
-        if (linear && ibm8514_on && (svga->adv_flags & FLAG_ATI))
-            addr &= svga->vram_mask;
-        else
-            addr <<= 2;
-    } else {
-        if (linear && ibm8514_on && (svga->adv_flags & FLAG_ATI)) {
-            addr &= svga->decode_mask;
-            if (addr >= svga->vram_max)
-                return 0xff;
-            latch_addr = (addr & svga->vram_mask) & ~3;
-            for (uint8_t i = 0; i < count; i++)
-                svga->latch.b[i] = svga->vram[latch_addr | i];
-            return svga->vram[addr & svga->vram_mask];
-        } else
-            addr <<= 2;
-    }
+        addr <<= 2;
+    } else
+        addr <<= 2;
+
     addr &= svga->decode_mask;
 
     if (svga->translate_address) {
diff --git a/src/video/vid_tgui9440.c b/src/video/vid_tgui9440.c
index de900b27a..98f295e45 100644
--- a/src/video/vid_tgui9440.c
+++ b/src/video/vid_tgui9440.c
@@ -1357,8 +1357,6 @@ tgui_accel_command(int count, uint32_t cpu_dat, tgui_t *tgui)
     uint32_t  trans_col  = (tgui->accel.flags & TGUI_TRANSREV) ? tgui->accel.fg_col : tgui->accel.bg_col;
     uint16_t *vram_w     = (uint16_t *) svga->vram;
     uint32_t *vram_l     = (uint32_t *) svga->vram;
-    uint8_t   ger22lower = tgui->accel.ger22 & 0xff;
-    uint8_t   ger22upper = (tgui->accel.ger22 >> 8) & 0xff;
 
     if (tgui->accel.bpp == 0) {
         trans_col &= 0xff;
diff --git a/src/video/vid_xga.c b/src/video/vid_xga.c
index d7a69afdf..221087689 100644
--- a/src/video/vid_xga.c
+++ b/src/video/vid_xga.c
@@ -51,6 +51,24 @@ static uint16_t xga_readw(uint32_t addr, void *priv);
 
 int xga_has_vga = 0;
 
+#ifdef ENABLE_XGA_LOG
+int xga_do_log = ENABLE_XGA_LOG;
+
+static void
+xga_log(const char *fmt, ...)
+{
+    va_list ap;
+
+    if (xga_do_log) {
+        va_start(ap, fmt);
+        pclog_ex(fmt, ap);
+        va_end(ap);
+    }
+}
+#else
+#    define xga_log(fmt, ...)
+#endif
+
 void
 svga_xga_out(uint16_t addr, uint8_t val, void *priv)
 {
@@ -123,9 +141,11 @@ xga_updatemapping(svga_t *svga)
 {
     xga_t *xga = &svga->xga;
 
-#if 0
-    pclog("OpMode = %x, linear base = %08x, aperture cntl = %d, access mode = %x, map = %x, endian reverse = %d, a5test = %d, XGA on = %d.\n", xga->op_mode, xga->linear_base, xga->aperture_cntl, xga->access_mode, svga->gdcreg[6] & 0x0c, xga->linear_endian_reverse, xga->a5_test, xga->on);
-#endif
+    xga_log("OpMode = %x, linear base = %08x, aperture cntl = %d, access mode = %x, map = %x, "
+            "endian reverse = %d, a5test = %d, XGA on = %d.\n", xga->op_mode, xga->linear_base,
+            xga->aperture_cntl, xga->access_mode, svga->gdcreg[6] & 0x0c,
+            xga->linear_endian_reverse, xga->a5_test, xga->on);
+
     if (((xga->op_mode & 7) >= 4) || ((xga->op_mode & 7) == 0)) {
         if ((xga->aperture_cntl == 1) || (xga->aperture_cntl == 2)) {
             mem_mapping_disable(&svga->mapping);
@@ -157,13 +177,12 @@ xga_updatemapping(svga_t *svga)
                 vga_on  = !xga->on;
             }
         }
-#if 0
-        pclog("XGA opmode (extended) = %d, disp mode = %d, aperture = %d.\n", xga->op_mode & 7, xga->disp_cntl_2 & 7, xga->aperture_cntl);
-#endif
+
+        xga_log("XGA opmode (extended) = %d, disp mode = %d, aperture = %d.\n", xga->op_mode & 7,
+                xga->disp_cntl_2 & 7, xga->aperture_cntl);
     }
-#if 0
-    pclog("VGA on = %d.\n", vga_on);
-#endif
+
+    xga_log("VGA on = %d.\n", vga_on);
 }
 
 void
@@ -403,9 +422,9 @@ xga_ext_out_reg(xga_t *xga, svga_t *svga, uint8_t idx, uint8_t val)
                     xga->cursor_data_on = 0;
                 }
             }
-#if 0
-            pclog("Sprite POS = %d, data on = %d, idx = %d, apcntl = %d\n", xga->sprite_pos, xga->cursor_data_on, xga->sprite_pal_addr_idx, xga->aperture_cntl);
-#endif
+
+            xga_log("Sprite POS = %d, data on = %d, idx = %d, apcntl = %d\n", xga->sprite_pos,
+                    xga->cursor_data_on, xga->sprite_pal_addr_idx, xga->aperture_cntl);
             break;
 
         case 0x62:
@@ -484,9 +503,8 @@ xga_ext_outb(uint16_t addr, uint8_t val, void *priv)
     svga_t *svga = (svga_t *) priv;
     xga_t  *xga  = &svga->xga;
 
-#if 0
-    pclog("[%04X:%08X]: EXT OUTB = %02x, val = %02x\n", CS, cpu_state.pc, addr, val);
-#endif
+    xga_log("[%04X:%08X]: EXT OUTB = %02x, val = %02x\n", CS, cpu_state.pc, addr, val);
+
     switch (addr & 0x0f) {
         case 0:
             xga->op_mode = val;
@@ -502,9 +520,8 @@ xga_ext_outb(uint16_t addr, uint8_t val, void *priv)
             break;
         case 8:
             xga->ap_idx = val;
-#if 0
-            pclog("Aperture CNTL = %d, val = %02x, up to bit6 = %02x\n", xga->aperture_cntl, val, val & 0x3f);
-#endif
+            xga_log("Aperture CNTL = %d, val = %02x, up to bit6 = %02x\n", xga->aperture_cntl,
+                    val, val & 0x3f);
             if ((xga->op_mode & 7) < 4) {
                 xga->write_bank = xga->read_bank = 0;
             } else {
@@ -742,9 +759,8 @@ xga_ext_inb(uint16_t addr, void *priv)
                     break;
 
                 case 0x6a:
-#if 0
-                    pclog("Sprite POS Read = %d, addr idx = %04x\n", xga->sprite_pos, xga->sprite_pal_addr_idx_prefetch);
-#endif
+                    xga_log("Sprite POS Read = %d, addr idx = %04x\n", xga->sprite_pos,
+                            xga->sprite_pal_addr_idx_prefetch);
                     ret                      = xga->sprite_data[xga->sprite_pos_prefetch];
                     xga->sprite_pos_prefetch = (xga->sprite_pos_prefetch + 1) & 0x3ff;
                     break;
@@ -773,9 +789,7 @@ xga_ext_inb(uint16_t addr, void *priv)
             break;
     }
 
-#if 0
-    pclog("[%04X:%08X]: EXT INB = %02x, ret = %02x\n", CS, cpu_state.pc, addr, ret);
-#endif
+    xga_log("[%04X:%08X]: EXT INB = %02x, ret = %02x\n", CS, cpu_state.pc, addr, ret);
 
     return ret;
 }
@@ -1410,10 +1424,15 @@ xga_bitblt(svga_t *svga)
 
     xga->accel.pattern = 0;
 
-#if 0
-    pclog("XGA bitblt linear endian reverse=%d, access_mode=%x, octanty=%d, src command = %08x, pxsrcmap=%x, pxpatmap=%x, pxdstmap=%x, srcmap=%d, patmap=%d, dstmap=%d, usesrcvramfr=%d, usevrambk=%d.\n",
-          xga->linear_endian_reverse, xga->access_mode & 0x0f, ydir, xga->accel.command, xga->accel.px_map_format[xga->accel.src_map] & 0x0f, xga->accel.px_map_format[xga->accel.pat_src] & 0x0f, xga->accel.px_map_format[xga->accel.dst_map] & 0x0f, xga->accel.src_map, xga->accel.pat_src, xga->accel.dst_map, ((xga->accel.command >> 28) & 3), ((xga->accel.command >> 30) & 3));
-#endif
+    xga_log("XGA bitblt linear endian reverse=%d, access_mode=%x, octanty=%d, src command = %08x, "
+            "pxsrcmap=%x, pxpatmap=%x, pxdstmap=%x, srcmap=%d, patmap=%d, dstmap=%d, "
+            "usesrcvramfr=%d, usevrambk=%d.\n",
+            xga->linear_endian_reverse, xga->access_mode & 0x0f, ydir, xga->accel.command,
+            xga->accel.px_map_format[xga->accel.src_map] & 0x0f,
+            xga->accel.px_map_format[xga->accel.pat_src] & 0x0f,
+            xga->accel.px_map_format[xga->accel.dst_map] & 0x0f,
+            xga->accel.src_map, xga->accel.pat_src,
+            xga->accel.dst_map, ((xga->accel.command >> 28) & 3), ((xga->accel.command >> 30) & 3));
 
     if (xga->accel.pat_src == 8) {
         if (srcheight == 7)
@@ -1427,10 +1446,17 @@ xga_bitblt(svga_t *svga)
                 }
             }
         }
-#if 0
-        pclog("Pattern Map = 8: CMD = %08x: SRCBase = %08x, DSTBase = %08x, from/to vram dir = %d, cmd dir = %06x\n", xga->accel.command, srcbase, dstbase, xga->from_to_vram, xga->accel.dir_cmd);
-        pclog("CMD = %08x: Y = %d, X = %d, patsrc = %02x, srcmap = %d, dstmap = %d, py = %d, sy = %d, dy = %d, width0 = %d, width1 = %d, width2 = %d, width3 = %d\n", xga->accel.command, xga->accel.y, xga->accel.x, xga->accel.pat_src, xga->accel.src_map, xga->accel.dst_map, xga->accel.py, xga->accel.sy, xga->accel.dy, xga->accel.px_map_width[0], xga->accel.px_map_width[1], xga->accel.px_map_width[2], xga->accel.px_map_width[3]);
-#endif
+
+        xga_log("Pattern Map = 8: CMD = %08x: SRCBase = %08x, DSTBase = %08x, from/to vram dir = %d, "
+                "cmd dir = %06x\n", xga->accel.command, srcbase, dstbase, xga->from_to_vram,
+                xga->accel.dir_cmd);
+        xga_log("CMD = %08x: Y = %d, X = %d, patsrc = %02x, srcmap = %d, dstmap = %d, py = %d, "
+                "sy = %d, dy = %d, width0 = %d, width1 = %d, width2 = %d, width3 = %d\n",
+                xga->accel.command, xga->accel.y, xga->accel.x, xga->accel.pat_src, xga->accel.src_map,
+                xga->accel.dst_map, xga->accel.py, xga->accel.sy, xga->accel.dy,
+                xga->accel.px_map_width[0], xga->accel.px_map_width[1],
+                xga->accel.px_map_width[2], xga->accel.px_map_width[3]);
+
         while (xga->accel.y >= 0) {
             if (xga->accel.command & 0xc0) {
                 if ((xga->accel.dx >= xga->accel.mask_map_origin_x_off) && (xga->accel.dx <= ((xga->accel.px_map_width[0] & 0xfff) + xga->accel.mask_map_origin_x_off)) && (xga->accel.dy >= xga->accel.mask_map_origin_y_off) && (xga->accel.dy <= ((xga->accel.px_map_height[0] & 0xfff) + xga->accel.mask_map_origin_y_off))) {
@@ -1507,11 +1533,22 @@ xga_bitblt(svga_t *svga)
             }
         }
 
-#if 0
-        pclog("XGA bitblt linear endian reverse=%d, octanty=%d, src command = %08x, pxsrcmap=%x, pxdstmap=%x, srcmap=%d, patmap=%d, dstmap=%d, dstwidth=%d, dstheight=%d, srcwidth=%d, srcheight=%d, dstbase=%08x, srcbase=%08x.\n", xga->linear_endian_reverse, ydir, xga->accel.command, xga->accel.px_map_format[xga->accel.src_map] & 0x0f, xga->accel.px_map_format[xga->accel.dst_map] & 0x0f, xga->accel.src_map, xga->accel.pat_src, xga->accel.dst_map, dstwidth, dstheight, srcwidth, srcheight, dstbase, srcbase);
-        pclog("Pattern Map = %d: CMD = %08x: PATBase = %08x, SRCBase = %08x, DSTBase = %08x\n", xga->accel.pat_src, xga->accel.command, patbase, srcbase, dstbase);
-        pclog("CMD = %08x: Y = %d, X = %d, patsrc = %02x, srcmap = %d, dstmap = %d, py = %d, sy = %d, dy = %d, width0 = %d, width1 = %d, width2 = %d, width3 = %d\n", xga->accel.command, xga->accel.y, xga->accel.x, xga->accel.pat_src, xga->accel.src_map, xga->accel.dst_map, xga->accel.py, xga->accel.sy, xga->accel.dy, xga->accel.px_map_width[0], xga->accel.px_map_width[1], xga->accel.px_map_width[2], xga->accel.px_map_width[3]);
-#endif
+        xga_log("XGA bitblt linear endian reverse=%d, octanty=%d, src command = %08x, pxsrcmap=%x, "
+                "pxdstmap=%x, srcmap=%d, patmap=%d, dstmap=%d, dstwidth=%d, dstheight=%d, srcwidth=%d, "
+                "srcheight=%d, dstbase=%08x, srcbase=%08x.\n", xga->linear_endian_reverse, ydir,
+                xga->accel.command, xga->accel.px_map_format[xga->accel.src_map] & 0x0f,
+                xga->accel.px_map_format[xga->accel.dst_map] & 0x0f, xga->accel.src_map,
+                xga->accel.pat_src, xga->accel.dst_map, dstwidth, dstheight, srcwidth, srcheight,
+                dstbase, srcbase);
+        xga_log("Pattern Map = %d: CMD = %08x: PATBase = %08x, SRCBase = %08x, DSTBase = %08x\n",
+                xga->accel.pat_src, xga->accel.command, patbase, srcbase, dstbase);
+        xga_log("CMD = %08x: Y = %d, X = %d, patsrc = %02x, srcmap = %d, dstmap = %d, py = %d, "
+                "sy = %d, dy = %d, width0 = %d, width1 = %d, width2 = %d, width3 = %d\n",
+                xga->accel.command, xga->accel.y, xga->accel.x, xga->accel.pat_src,
+                xga->accel.src_map, xga->accel.dst_map, xga->accel.py, xga->accel.sy, xga->accel.dy,
+                xga->accel.px_map_width[0], xga->accel.px_map_width[1],
+                xga->accel.px_map_width[2], xga->accel.px_map_width[3]);
+
         while (xga->accel.y >= 0) {
             mix = xga_accel_read_pattern_map_pixel(svga, xga->accel.px, xga->accel.py, xga->accel.pat_src, patbase, patwidth + 1);
 
@@ -1702,9 +1739,10 @@ xga_mem_write(uint32_t addr, uint32_t val, xga_t *xga, svga_t *svga, int len)
                     xga->accel.short_stroke_vector3 = (xga->accel.short_stroke >> 16) & 0xff;
                     xga->accel.short_stroke_vector4 = (xga->accel.short_stroke >> 24) & 0xff;
 
-#if 0
-                    pclog("1Vector = %02x, 2Vector = %02x, 3Vector = %02x, 4Vector = %02x\n", xga->accel.short_stroke_vector1, xga->accel.short_stroke_vector2, xga->accel.short_stroke_vector3, xga->accel.short_stroke_vector4);
-#endif
+                    xga_log("1Vector = %02x, 2Vector = %02x, 3Vector = %02x, 4Vector = %02x\n",
+                            xga->accel.short_stroke_vector1, xga->accel.short_stroke_vector2,
+                            xga->accel.short_stroke_vector3, xga->accel.short_stroke_vector4);
+
                     xga_short_stroke(svga, xga->accel.short_stroke_vector1);
                     xga_short_stroke(svga, xga->accel.short_stroke_vector2);
                     xga_short_stroke(svga, xga->accel.short_stroke_vector3);
@@ -1975,51 +2013,52 @@ exec_command:
                     xga->accel.dst_map   = ((xga->accel.command >> 16) & 0x0f);
                     xga->accel.src_map   = ((xga->accel.command >> 20) & 0x0f);
 
-#if 0
-                    if (xga->accel.pat_src) {
-                        pclog("[%04X:%08X]: Accel Command = %02x, full = %08x, patwidth = %d, dstwidth = %d, srcwidth = %d, patheight = %d, dstheight = %d, srcheight = %d, px = %d, py = %d, dx = %d, dy = %d, sx = %d, sy = %d, patsrc = %d, dstmap = %d, srcmap = %d, dstbase = %08x, srcbase = %08x, patbase = %08x, dstformat = %x, srcformat = %x, planemask = %08x\n",
-                              CS, cpu_state.pc, ((xga->accel.command >> 24) & 0x0f), xga->accel.command, xga->accel.px_map_width[xga->accel.pat_src],
-                              xga->accel.px_map_width[xga->accel.dst_map], xga->accel.px_map_width[xga->accel.src_map],
-                              xga->accel.px_map_height[xga->accel.pat_src], xga->accel.px_map_height[xga->accel.dst_map],
-                              xga->accel.px_map_height[xga->accel.src_map],
-                              xga->accel.pat_map_x, xga->accel.pat_map_y,
-                              xga->accel.dst_map_x, xga->accel.dst_map_y,
-                              xga->accel.src_map_x, xga->accel.src_map_y,
-                              xga->accel.pat_src, xga->accel.dst_map, xga->accel.src_map,
-                              xga->accel.px_map_base[xga->accel.dst_map], xga->accel.px_map_base[xga->accel.src_map], xga->accel.px_map_base[xga->accel.pat_src],
-                              xga->accel.px_map_format[xga->accel.dst_map] & 0x0f, xga->accel.px_map_format[xga->accel.src_map] & 0x0f, xga->accel.plane_mask);
-                        pclog("\n");
-                    }
+#ifdef ENABLE_XGA_LOG
+                    if (xga->accel.pat_src)
+                        xga_log("[%04X:%08X]: Accel Command = %02x, full = %08x, patwidth = %d, "
+                                "dstwidth = %d, srcwidth = %d, patheight = %d, dstheight = %d, "
+                                "srcheight = %d, px = %d, py = %d, dx = %d, dy = %d, sx = %d, "
+                                "sy = %d, patsrc = %d, dstmap = %d, srcmap = %d, dstbase = %08x, "
+                                "srcbase = %08x, patbase = %08x, dstformat = %x, srcformat = %x, "
+                                "planemask = %08x\n\n",
+                                CS, cpu_state.pc, ((xga->accel.command >> 24) & 0x0f),
+                                xga->accel.command, xga->accel.px_map_width[xga->accel.pat_src],
+                                xga->accel.px_map_width[xga->accel.dst_map],
+                                xga->accel.px_map_width[xga->accel.src_map],
+                                xga->accel.px_map_height[xga->accel.pat_src],
+                                xga->accel.px_map_height[xga->accel.dst_map],
+                                xga->accel.px_map_height[xga->accel.src_map],
+                                xga->accel.pat_map_x, xga->accel.pat_map_y,
+                                xga->accel.dst_map_x, xga->accel.dst_map_y,
+                                xga->accel.src_map_x, xga->accel.src_map_y,
+                                xga->accel.pat_src, xga->accel.dst_map,
+                                xga->accel.src_map, xga->accel.px_map_base[xga->accel.dst_map],
+                                xga->accel.px_map_base[xga->accel.src_map],
+                                xga->accel.px_map_base[xga->accel.pat_src],
+                                xga->accel.px_map_format[xga->accel.dst_map] & 0x0f,
+                                xga->accel.px_map_format[xga->accel.src_map] & 0x0f,
+                                xga->accel.plane_mask);
 #endif
+
                     switch ((xga->accel.command >> 24) & 0x0f) {
                         case 3: /*Bresenham Line Draw Read*/
-#if 0
-                            pclog("Line Draw Read\n");
-#endif
+                            xga_log("Line Draw Read\n");
                             break;
                         case 4: /*Short Stroke Vectors*/
-#if 0
-                            pclog("Short Stroke Vectors.\n");
-#endif
+                            xga_log("Short Stroke Vectors.\n");
                             break;
                         case 5: /*Bresenham Line Draw Write*/
-#if 0
-                            pclog("Line Draw Write.\n");
-#endif
+                            xga_log("Line Draw Write.\n");
                             xga_line_draw_write(svga);
                             break;
                         case 8: /*BitBLT*/
                             xga_bitblt(svga);
                             break;
                         case 9: /*Inverting BitBLT*/
-#if 0
-                            pclog("Inverting BitBLT\n");
-#endif
+                            xga_log("Inverting BitBLT\n");
                             break;
                         case 0x0a: /*Area Fill*/
-#if 0
-                            pclog("Area Fill.\n");
-#endif
+                            xga_log("Area Fill.\n");
                             break;
 
                         default:
@@ -2061,9 +2100,8 @@ xga_memio_writeb(uint32_t addr, uint8_t val, void *priv)
     xga_t  *xga  = &svga->xga;
 
     xga_mem_write(addr, val, xga, svga, 1);
-#if 0
-    pclog("Write MEMIOB = %04x, val = %02x\n", addr & 0x7f, val);
-#endif
+
+    xga_log("Write MEMIOB = %04x, val = %02x\n", addr & 0x7f, val);
 }
 
 static void
@@ -2073,9 +2111,8 @@ xga_memio_writew(uint32_t addr, uint16_t val, void *priv)
     xga_t  *xga  = &svga->xga;
 
     xga_mem_write(addr, val, xga, svga, 2);
-#if 0
-    pclog("Write MEMIOW = %04x, val = %04x\n", addr & 0x7f, val);
-#endif
+
+    xga_log("Write MEMIOW = %04x, val = %04x\n", addr & 0x7f, val);
 }
 
 static void
@@ -2085,9 +2122,8 @@ xga_memio_writel(uint32_t addr, uint32_t val, void *priv)
     xga_t  *xga  = &svga->xga;
 
     xga_mem_write(addr, val, xga, svga, 4);
-#if 0
-    pclog("Write MEMIOL = %04x, val = %08x\n", addr & 0x7f, val);
-#endif
+
+    xga_log("Write MEMIOL = %04x, val = %08x\n", addr & 0x7f, val);
 }
 
 static uint8_t
@@ -2183,9 +2219,7 @@ xga_memio_readb(uint32_t addr, void *priv)
 
     temp = xga_mem_read(addr, xga, svga);
 
-#if 0
-    pclog("[%04X:%08X]: Read MEMIOB = %04x, temp = %02x\n", CS, cpu_state.pc, addr, temp);
-#endif
+    xga_log("[%04X:%08X]: Read MEMIOB = %04x, temp = %02x\n", CS, cpu_state.pc, addr, temp);
 
     return temp;
 }
@@ -2200,9 +2234,8 @@ xga_memio_readw(uint32_t addr, void *priv)
     temp = xga_mem_read(addr, xga, svga);
     temp |= (xga_mem_read(addr + 1, xga, svga) << 8);
 
-#if 0
-    pclog("[%04X:%08X]: Read MEMIOW = %04x, temp = %04x\n", CS, cpu_state.pc, addr, temp);
-#endif
+    xga_log("[%04X:%08X]: Read MEMIOW = %04x, temp = %04x\n", CS, cpu_state.pc, addr, temp);
+
     return temp;
 }
 
@@ -2218,9 +2251,8 @@ xga_memio_readl(uint32_t addr, void *priv)
     temp |= (xga_mem_read(addr + 2, xga, svga) << 16);
     temp |= (xga_mem_read(addr + 3, xga, svga) << 24);
 
-#if 0
-    pclog("Read MEMIOL = %04x, temp = %08x\n", addr, temp);
-#endif
+    xga_log("Read MEMIOL = %04x, temp = %08x\n", addr, temp);
+
     return temp;
 }
 
@@ -2817,9 +2849,8 @@ xga_mca_read(int port, void *priv)
     if (((port & 7) == 3) && !(ret & 1)) /*Always enable the mapping.*/
         ret |= 1;
 
-#if 0
-    pclog("[%04X:%08X]: POS Read Port = %x, val = %02x\n", CS, cpu_state.pc, port & 7, xga->pos_regs[port & 7]);
-#endif
+    xga_log("[%04X:%08X]: POS Read Port = %x, val = %02x\n", CS, cpu_state.pc,
+            port & 7, xga->pos_regs[port & 7]);
 
     return ret;
 }
@@ -2860,9 +2891,10 @@ xga_mca_write(int port, uint8_t val, void *priv)
         else
             mem_mapping_set_addr(&xga->memio_mapping, xga->rom_addr + 0x1c00 + (xga->instance * 0x80), 0x80);
     }
-#if 0
-    pclog("[%04X:%08X]: POS Write Port = %x, val = %02x, linear base = %08x, instance = %d, rom addr = %05x\n", CS, cpu_state.pc, port & 7, val, xga->linear_base, xga->instance, xga->rom_addr);
-#endif
+
+    xga_log("[%04X:%08X]: POS Write Port = %x, val = %02x, linear base = %08x, instance = %d, "
+            "rom addr = %05x\n", CS, cpu_state.pc, port & 7, val, xga->linear_base,
+            xga->instance, xga->rom_addr);
 }
 
 static uint8_t
@@ -2926,13 +2958,12 @@ xga_pos_in(uint16_t addr, void *priv)
                 ret = xga->pos_idx & 0xff;
                 break;
             case 0x0103:
-                if (!(xga->pos_idx & 3)) {
+                if (!(xga->pos_idx & 3))
                     ret = xga->pos_regs[3];
-                } else
+                else
                     ret = 0;
-#if 0
-                pclog("POS IDX for 0103 = %d, ret = %02x.\n", xga->pos_idx & 3, ret);
-#endif
+
+                xga_log("POS IDX for 0103 = %d, ret = %02x.\n", xga->pos_idx & 3, ret);
                 break;
             case 0x0104:
                 switch (xga->pos_idx & 3) {
@@ -2952,9 +2983,8 @@ xga_pos_in(uint16_t addr, void *priv)
                     default:
                         break;
                 }
-#if 0
-                pclog("POS IDX for 0104 = %d, ret = %02x.\n", xga->pos_idx & 3, ret);
-#endif
+
+                xga_log("POS IDX for 0104 = %d, ret = %02x.\n", xga->pos_idx & 3, ret);
                 break;
             case 0x0108:
             case 0x0109:
@@ -3030,9 +3060,7 @@ xga_pos_out(uint16_t addr, uint8_t val, void *priv)
                 break;
             case 0x0107:
                 xga->pos_idx = (xga->pos_idx & 0xff00) | val;
-#if 0
-                pclog("POS IDX Write = %04x.\n", xga->pos_idx);
-#endif
+                xga_log("POS IDX Write = %04x.\n", xga->pos_idx);
                 break;
             case 0x0108:
             case 0x0109:
@@ -3079,7 +3107,6 @@ xga_init(const device_t *info)
     xga_t   *xga  = &svga->xga;
     FILE    *f;
     uint8_t *rom = NULL;
-    size_t   res;
 
     xga->ext_mem_addr = device_get_config_hex16("ext_mem_addr");
     xga->instance_isa = device_get_config_int("instance");
@@ -3104,7 +3131,7 @@ xga_init(const device_t *info)
 
     rom = malloc(xga->bios_rom.sz);
     memset(rom, 0xff, xga->bios_rom.sz);
-    res = fread(rom, xga->bios_rom.sz, 1, f);
+    (void) fread(rom, xga->bios_rom.sz, 1, f);
     (void) fclose(f);
 
     xga->bios_rom.rom  = rom;
diff --git a/src/vnc.c b/src/vnc.c
index f8ef1ef38..7b4b1f7b0 100644
--- a/src/vnc.c
+++ b/src/vnc.c
@@ -94,7 +94,7 @@ vnc_ptrevent(int but, int x, int y, rfbClientPtr cl)
     dy = (y - ptr_y) / 0.96;
 
     /* VNC uses absolute positions within the window, no deltas. */
-    mouse_scale_x(dx, dy);
+    mouse_scale(dx, dy);
 
     ptr_x = x;
     ptr_y = y;
diff --git a/src/win/Makefile.mingw b/src/win/Makefile.mingw
index 17a8b0e46..4d778d387 100644
--- a/src/win/Makefile.mingw
+++ b/src/win/Makefile.mingw
@@ -590,7 +590,7 @@ CHIPSETOBJ := 82c100.o acc2168.o \
               ims8848.o intel_82335.o intel_420ex.o intel_4x0.o intel_i450kx.o intel_sio.o intel_piix.o \
               ioapic.o \
               neat.o \
-              opti283.o opti291.o opti391.o opti495.o opti822.o opti895.o opti5x7.o \
+              opti283.o opti291.o opti391.o opti495.o opti602.o opti822.o opti895.o opti5x7.o \
               scamp.o scat.o \
               stpc.o \
               wd76c10.o vl82c480.o \
diff --git a/src/win/win_cdrom.c b/src/win/win_cdrom.c
index 27e4e0a49..bcc473d16 100644
--- a/src/win/win_cdrom.c
+++ b/src/win/win_cdrom.c
@@ -8,11 +8,9 @@
  *
  *          Handle the platform-side of CDROM/ZIP/MO drives.
  *
- *
- *
- * Authors: Sarah Walker, <https://pcem-emulator.co.uk/>
- *          Miran Grca, <mgrca8@gmail.com>
+ * Authors: Miran Grca, <mgrca8@gmail.com>
  *          Fred N. van Kempen, <decwiz@yahoo.com>
+ *          Jasmine Iwanek,
  *
  *          Copyright 2016-2018 Miran Grca.
  *          Copyright 2017-2018 Fred N. van Kempen.
diff --git a/src/win/win_joystick_rawinput.c b/src/win/win_joystick_rawinput.c
index 6f2a1e4c0..7ee0e8227 100644
--- a/src/win/win_joystick_rawinput.c
+++ b/src/win/win_joystick_rawinput.c
@@ -10,11 +10,10 @@
  *
  *
  *
- * Authors: Sarah Walker, <https://pcem-emulator.co.uk/>
- *          Miran Grca, <mgrca8@gmail.com>
+ * Authors: Miran Grca, <mgrca8@gmail.com>
  *          GH Cao, <driver1998.ms@outlook.com>
+ *          Jasmine Iwanek,
  *
- *          Copyright 2008-2018 Sarah Walker.
  *          Copyright 2016-2018 Miran Grca.
  *          Copyright 2020 GH Cao.
  *          Copyright 2021-2023 Jasmine Iwanek.
@@ -99,8 +98,6 @@ joystick_add_button(raw_joystick_t *rawjoy, plat_joystick_t *joy, USAGE usage)
 void
 joystick_add_axis(raw_joystick_t *rawjoy, plat_joystick_t *joy, PHIDP_VALUE_CAPS prop)
 {
-    LONG               center;
-
     if (joy->nr_axes >= 8)
         return;
 
@@ -140,14 +137,11 @@ joystick_add_axis(raw_joystick_t *rawjoy, plat_joystick_t *joy, PHIDP_VALUE_CAPS
          * Some joysticks will send -1 in LogicalMax, like Xbox Controllers
          * so we need to mask that to appropriate value (instead of 0xFFFFFFFF)
          */
-        rawjoy->axis[joy->nr_axes].max = prop->LogicalMax & ((1 << prop->BitSize) - 1);
+        rawjoy->axis[joy->nr_axes].max = prop->LogicalMax & ((1ULL << prop->BitSize) - 1);
     }
     rawjoy->axis[joy->nr_axes].min = prop->LogicalMin;
 
-    center = (rawjoy->axis[joy->nr_axes].max - rawjoy->axis[joy->nr_axes].min + 1) / 2;
-
-    if (center != 0x00)
-        joy->nr_axes++;
+    joy->nr_axes++;
 }
 
 void
@@ -451,7 +445,7 @@ joystick_process(void)
 {
     int d;
 
-    if (joystick_type == 7)
+    if (joystick_type == JS_TYPE_NONE)
         return;
 
     for (int c = 0; c < joystick_get_max_joysticks(joystick_type); c++) {
diff --git a/src/win/win_joystick_xinput.c b/src/win/win_joystick_xinput.c
index a1c380668..16ea746e0 100644
--- a/src/win/win_joystick_xinput.c
+++ b/src/win/win_joystick_xinput.c
@@ -10,11 +10,10 @@
  *
  *
  *
- * Authors: Sarah Walker, <https://pcem-emulator.co.uk/>
- *          Miran Grca, <mgrca8@gmail.com>
+ * Authors: Miran Grca, <mgrca8@gmail.com>
  *          GH Cao, <driver1998.ms@outlook.com>
+ *          Jasmine Iwanek,
  *
- *          Copyright 2008-2018 Sarah Walker.
  *          Copyright 2016-2018 Miran Grca.
  *          Copyright 2019 GH Cao.
  *          Copyright 2021-2023 Jasmine Iwanek.
diff --git a/src/win/win_mouse.c b/src/win/win_mouse.c
index e30749145..b142f7bc4 100644
--- a/src/win/win_mouse.c
+++ b/src/win/win_mouse.c
@@ -10,11 +10,10 @@
  *
  *
  *
- * Authors: Sarah Walker, <https://pcem-emulator.co.uk/>
- *          Miran Grca, <mgrca8@gmail.com>
+ * Authors: Miran Grca, <mgrca8@gmail.com>
  *          GH Cao, <driver1998.ms@outlook.com>
+ *          Jasmine Iwanek,
  *
- *          Copyright 2008-2017 Sarah Walker.
  *          Copyright 2016-2017 Miran Grca.
  *          Copyright 2019 GH Cao.
  *          Copyright 2021-2023 Jasmine Iwanek.
diff --git a/src/win/win_settings.c b/src/win/win_settings.c
index 9ded351b9..39965937a 100644
--- a/src/win/win_settings.c
+++ b/src/win/win_settings.c
@@ -1349,10 +1349,10 @@ static BOOL CALLBACK
 #endif
 win_settings_input_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
 {
-    wchar_t str[128];
-    char   *joy_name;
-    int     c;
-    int     d;
+    wchar_t     str[128];
+    const char *joy_name;
+    int         c;
+    int         d;
 
     switch (message) {
         case WM_INITDIALOG:
@@ -1408,7 +1408,7 @@ win_settings_input_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
                 case IDC_COMBO_JOYSTICK:
                     temp_joystick = settings_get_cur_sel(hdlg, IDC_COMBO_JOYSTICK);
 
-                    for (c = 0; c < 4; c++)
+                    for (c = 0; c < MAX_JOYSTICKS; c++)
                         settings_enable_window(hdlg, IDC_JOY1 + c, joystick_get_max_joysticks(temp_joystick) > c);
                     break;
 
diff --git a/vcpkg.json b/vcpkg.json
index f9cf6783c..af8c75545 100644
--- a/vcpkg.json
+++ b/vcpkg.json
@@ -9,7 +9,8 @@
         "libpng",
         "sdl2",
         "rtmidi",
-        "libslirp"
+        "libslirp",
+        "fluidsynth"
     ],
     "features": {
         "qt-ui": {