diff --git a/.ci/dependencies_msys.txt b/.ci/dependencies_msys.txt
index 1b9ccdcc8..22601b643 100644
--- a/.ci/dependencies_msys.txt
+++ b/.ci/dependencies_msys.txt
@@ -9,5 +9,6 @@ zlib
 libpng
 rtmidi
 libslirp
+fluidsynth
 qt5-static
 qt5-translations
diff --git a/src/cdrom/cdrom_image_viso.c b/src/cdrom/cdrom_image_viso.c
index 7a4507b5b..94b4e44ca 100644
--- a/src/cdrom/cdrom_image_viso.c
+++ b/src/cdrom/cdrom_image_viso.c
@@ -331,7 +331,7 @@ viso_fill_fn_short(char *data, const viso_entry_t *entry, viso_entry_t **entries
     }
 
     /* Check if this filename is unique, and add a tail if required, while also adding the extension. */
-    char tail[8];
+    char tail[16];
     for (int i = force_tail; i <= 999999; i++) {
         /* Add tail to the filename if this is not the first run. */
         int tail_len = -1;
diff --git a/src/chipset/CMakeLists.txt b/src/chipset/CMakeLists.txt
index 0a6a5fbe5..0f3c78c84 100644
--- a/src/chipset/CMakeLists.txt
+++ b/src/chipset/CMakeLists.txt
@@ -13,13 +13,14 @@
 #          Copyright 2020-2021 David Hrdlička.
 #
 
-add_library(chipset OBJECT 82c100.c acc2168.c cs8230.c ali1429.c ali1435.c ali1489.c ali1531.c ali1541.c ali1543.c
-    ali1621.c ali6117.c headland.c ims8848.c intel_82335.c contaq_82c59x.c cs4031.c intel_420ex.c
-    intel_4x0.c intel_i450kx.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 sis_85c310.c
-    sis_85c4xx.c sis_85c496.c sis_85c50x.c gc100.c stpc.c umc_8886.c umc_hb4.c via_apollo.c
-    via_pipc.c vl82c480.c wd76c10.c)
+add_library(chipset OBJECT 82c100.c acc2168.c cs8230.c ali1429.c ali1435.c ali1489.c
+    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_sio.c intel_piix.c ../ioapic.c neat.c opti283.c opti291.c opti391.c opti495.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
+    sis_85c310.c sis_85c4xx.c sis_85c496.c sis_85c50x.c gc100.c stpc.c umc_8886.c
+    umc_hb4.c via_apollo.c via_pipc.c vl82c480.c wd76c10.c)
 
 if(OLIVETTI)
     target_sources(chipset PRIVATE olivetti_eva.c)
diff --git a/src/chipset/compaq_386.c b/src/chipset/compaq_386.c
new file mode 100644
index 000000000..c671f3696
--- /dev/null
+++ b/src/chipset/compaq_386.c
@@ -0,0 +1,761 @@
+/*
+ * 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.
+ *
+ *          Emulation of the Compaq 386 memory controller.
+ *
+ * Authors: Miran Grca, <mgrca8@gmail.com>
+ *
+ *          Copyright 2023 Miran Grca.
+ */
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
+#include <stdlib.h>
+#include <wchar.h>
+#include <math.h>
+#include <86box/86box.h>
+#include "cpu.h"
+#include <86box/io.h>
+#include <86box/timer.h>
+#include <86box/pit.h>
+#include <86box/mem.h>
+#include <86box/rom.h>
+#include <86box/device.h>
+#include <86box/keyboard.h>
+#include <86box/fdd.h>
+#include <86box/fdc.h>
+#include <86box/fdc_ext.h>
+#include <86box/hdc.h>
+#include <86box/hdc_ide.h>
+#include <86box/machine.h>
+#include <86box/video.h>
+#include <86box/vid_cga.h>
+#include <86box/vid_cga_comp.h>
+#include <86box/plat_unused.h>
+
+#define RAM_DIAG_L_BASE_MEM_640KB    0x00
+#define RAM_DIAG_L_BASE_MEM_INV      0x10
+#define RAM_DIAG_L_BASE_MEM_512KB    0x20
+#define RAM_DIAG_L_BASE_MEM_256KB    0x30
+#define RAM_DIAG_L_BASE_MEM_MASK     0x30
+#define RAM_DIAG_L_PERMA_BITS        0x80
+
+#define RAM_DIAG_H_SYS_RAM_4MB       0x01
+#define RAM_DIAG_H_SYS_RAM_1MB       0x02
+#define RAM_DIAG_H_SYS_RAM_NONE      0x03
+#define RAM_DIAG_H_SYS_RAM_MASK      0x03
+#define RAM_DIAG_H_MOD_A_RAM_4MB     0x04
+#define RAM_DIAG_H_MOD_A_RAM_1MB     0x08
+#define RAM_DIAG_H_MOD_A_RAM_NONE    0x0c
+#define RAM_DIAG_H_MOD_A_RAM_MASK    0x0c
+#define RAM_DIAG_H_MOD_B_RAM_4MB     0x10
+#define RAM_DIAG_H_MOD_B_RAM_1MB     0x20
+#define RAM_DIAG_H_MOD_B_RAM_NONE    0x30
+#define RAM_DIAG_H_MOD_B_RAM_MASK    0x30
+#define RAM_DIAG_H_MOD_C_RAM_4MB     0x40
+#define RAM_DIAG_H_MOD_C_RAM_1MB     0x80
+#define RAM_DIAG_H_MOD_C_RAM_NONE    0xc0
+#define RAM_DIAG_H_MOD_C_RAM_MASK    0xc0
+
+#define MEM_STATE_BUS                0x00
+#define MEM_STATE_SYS                0x01
+#define MEM_STATE_SYS_RELOC          0x02
+#define MEM_STATE_MOD_A              0x04
+#define MEM_STATE_MOD_B              0x08
+#define MEM_STATE_MOD_C              0x10
+#define MEM_STATE_MASK               (MEM_STATE_SYS | MEM_STATE_MOD_A | MEM_STATE_MOD_B | MEM_STATE_MOD_C)
+#define MEM_STATE_WP                 0x20
+
+typedef struct cpq_ram_t {
+    uint8_t          wp;
+
+    uint32_t         phys_base;
+    uint32_t         virt_base;
+
+    mem_mapping_t    mapping;
+} cpq_ram_t;
+
+typedef struct cpq_386_t {
+    uint8_t          regs[8];
+
+    uint8_t          old_state[256];
+    uint8_t          mem_state[256];
+
+    uint32_t         ram_bases[4];
+
+    uint32_t         ram_sizes[4];
+    uint32_t         ram_map_sizes[4];
+
+    cpq_ram_t        ram[4][64];
+    cpq_ram_t        high_ram[16];
+
+    mem_mapping_t    regs_mapping;
+} cpq_386_t;
+
+static uint8_t
+cpq_read_ram(uint32_t addr, void *priv)
+{
+    const cpq_ram_t *dev = (cpq_ram_t *) priv;
+    uint8_t          ret = 0xff;
+
+    addr = (addr - dev->virt_base) + dev->phys_base;
+
+    if (addr < (mem_size << 10))
+        ret = mem_read_ram(addr, priv);
+
+    return ret;
+}
+
+static uint16_t
+cpq_read_ramw(uint32_t addr, void *priv)
+{
+    const cpq_ram_t *dev = (cpq_ram_t *) priv;
+    uint16_t         ret = 0xffff;
+
+    addr = (addr - dev->virt_base) + dev->phys_base;
+
+    if (addr < (mem_size << 10))
+        ret = mem_read_ramw(addr, priv);
+
+    return ret;
+}
+
+static uint32_t
+cpq_read_raml(uint32_t addr, void *priv)
+{
+    const cpq_ram_t *dev = (cpq_ram_t *) priv;
+    uint32_t         ret = 0xffffffff;
+
+    addr = (addr - dev->virt_base) + dev->phys_base;
+
+    if (addr < (mem_size << 10))
+        ret = mem_read_raml(addr, priv);
+
+    return ret;
+}
+
+static void
+cpq_write_ram(uint32_t addr, uint8_t val, void *priv)
+{
+    const cpq_ram_t *dev = (cpq_ram_t *) priv;
+
+    addr = (addr - dev->virt_base) + dev->phys_base;
+
+    if (!dev->wp && (addr < (mem_size << 10)))
+        mem_write_ram(addr, val, priv);
+}
+
+static void
+cpq_write_ramw(uint32_t addr, uint16_t val, void *priv)
+{
+    const cpq_ram_t *dev = (cpq_ram_t *) priv;
+
+    addr = (addr - dev->virt_base) + dev->phys_base;
+
+    if (!dev->wp && (addr < (mem_size << 10)))
+        mem_write_ramw(addr, val, priv);
+}
+
+static void
+cpq_write_raml(uint32_t addr, uint32_t val, void *priv)
+{
+    const cpq_ram_t *dev = (cpq_ram_t *) priv;
+
+    addr = (addr - dev->virt_base) + dev->phys_base;
+
+    if (!dev->wp && (addr < (mem_size << 10)))
+        mem_write_raml(addr, val, priv);
+}
+
+static uint8_t
+cpq_read_regs(uint32_t addr, void *priv)
+{
+    const cpq_386_t *dev = (cpq_386_t *) priv;
+    uint8_t          ret = 0xff;
+
+    addr &= 0x00000fff;
+
+    switch (addr) {
+        case 0x00000000:
+        case 0x00000001:
+            /* RAM Diagnostics (Read Only) */
+        case 0x00000002:
+        case 0x00000003:
+            /* RAM Setup Port (Read/Write) */
+            ret = dev->regs[addr];
+            break;
+
+        default:
+            break;
+    }
+
+    return ret;
+}
+
+static uint16_t
+cpq_read_regsw(uint32_t addr, void *priv)
+{
+    uint16_t ret = 0xffff;
+
+    ret = cpq_read_regs(addr, priv);
+    ret |= (((uint16_t) cpq_read_regs(addr + 1, priv)) << 8);
+
+    return ret;
+}
+
+static uint32_t
+cpq_read_regsl(uint32_t addr, void *priv)
+{
+    uint32_t ret = 0xffffffff;
+
+    ret = cpq_read_regsw(addr, priv);
+    ret |= (((uint32_t) cpq_read_regsw(addr + 2, priv)) << 16);
+
+    return ret;
+}
+
+static void
+cpq_recalc_state(cpq_386_t *dev, uint8_t i)
+{
+    uint32_t addr;
+
+    addr = ((uint32_t) i) << 16;
+    if (dev->mem_state[i] == 0x00)
+        mem_set_mem_state(addr, 0x00010000, MEM_READ_EXTANY | MEM_WRITE_EXTANY);
+    else if (dev->mem_state[i] == MEM_STATE_WP)
+        mem_set_mem_state(addr, 0x00010000, MEM_READ_EXTANY | MEM_WRITE_DISABLED);
+    else if (dev->mem_state[i] & MEM_STATE_WP)
+        mem_set_mem_state(addr, 0x00010000, MEM_READ_INTERNAL | MEM_WRITE_DISABLED);
+    else
+        mem_set_mem_state(addr, 0x00010000, MEM_READ_INTERNAL | MEM_WRITE_INTERNAL);
+
+    dev->old_state[i] = dev->mem_state[i];
+}
+
+static void
+cpq_recalc_states(cpq_386_t *dev)
+{
+    /* Recalculate the entire 16 MB space. */
+    for (uint16_t i = 0; i < 256; i++) {
+        if (dev->mem_state[i] != dev->old_state[i])
+            cpq_recalc_state(dev, i);
+    }
+
+    flushmmucache_nopc();
+}
+
+static void
+cpq_recalc_cache(cpq_386_t *dev)
+{
+    cpu_cache_ext_enabled = (dev->regs[0x00000002] & 0x40);
+    cpu_update_waitstates();
+}
+
+static void
+cpq_recalc_ram(cpq_386_t *dev)
+{
+    uint8_t  sys_ram             = (dev->regs[0x00000001] & RAM_DIAG_H_SYS_RAM_MASK) & 0x01;
+    uint8_t  setup_port          = dev->regs[0x00000002] & 0x0f;
+    uint8_t  sys_min_high        = sys_ram ? 0xfa : 0xf4;
+    uint8_t  ram_states[4]       = { MEM_STATE_SYS, MEM_STATE_MOD_A,
+                                     MEM_STATE_MOD_B, MEM_STATE_MOD_C };
+    uint8_t  ram_bases[4][2][16] = { { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+                                       { 0x10, 0x00, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10,
+                                         0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10 } },
+                                     { { 0x00, 0x00, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10,
+                                         0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x00, 0x00 },
+                                       { 0x40, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x40,
+                                         0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40 } },
+                                     { { 0x00, 0x00, 0x00, 0x20, 0x20, 0x00, 0x20, 0x20,
+                                         0x50, 0x50, 0x50, 0x50, 0x50, 0x50, 0x00, 0x00 },
+                                       { 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x50,
+                                         0x00, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80 } },
+                                     { { 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x60,
+                                         0x00, 0x00, 0x90, 0x90, 0x90, 0x90, 0x00, 0x00 },
+                                       { 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60,
+                                         0x00, 0x00, 0x90, 0x00, 0x00, 0xc0, 0xc0, 0xc0 } } };
+    uint8_t  ram_sizes[4][2][16] = { { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+                                       { 0x30, 0x00, 0x10, 0x20, 0x30, 0x30, 0x30, 0x30,
+                                         0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30 } },
+                                     { { 0x00, 0x00, 0x10, 0x10, 0x10, 0x40, 0x10, 0x10,
+                                         0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x00, 0x00 },
+                                       { 0x40, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x10,
+                                         0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40 } },
+                                     { { 0x00, 0x00, 0x00, 0x10, 0x10, 0x00, 0x40, 0x40,
+                                         0x30, 0x40, 0x40, 0x40, 0x40, 0x40, 0x00, 0x00 },
+                                       { 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10,
+                                         0x00, 0x10, 0x10, 0x30, 0x40, 0x40, 0x40, 0x40 } },
+                                     { { 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x10,
+                                         0x00, 0x00, 0x10, 0x20, 0x30, 0x40, 0x00, 0x00 },
+                                       { 0x3a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10,
+                                         0x00, 0x00, 0x10, 0x00, 0x00, 0x10, 0x20, 0x30 } } };
+    uint8_t  size;
+    uint8_t  start;
+    uint8_t  end;
+    uint8_t  k;
+    uint32_t virt_base;
+    cpq_ram_t *cram;
+
+    for (uint16_t i = 0x10; i < sys_min_high; i++)
+        dev->mem_state[i] &= ~MEM_STATE_MASK;
+
+    for (uint8_t i = 0; i < 4; i++) {
+        for (uint8_t j = 0; j <= 64; j++) {
+            if ((i >= 1) || (j >= 0x10))
+                mem_mapping_disable(&dev->ram[i][j].mapping);
+        }
+    }
+
+    for (uint8_t i = 0; i < 4; i++) {
+        size = ram_sizes[i][sys_ram][setup_port];
+        if (size > 0x00) {
+            start     = ram_bases[i][sys_ram][setup_port];
+            end       = start + (size - 1);
+
+            virt_base = ((uint32_t) start) << 16;
+
+            for (uint16_t j = start; j <= end; j++) {
+                k = j - start;
+                if (i == 0)
+                    k += 0x10;
+
+                cram = &(dev->ram[i][k]);
+
+                dev->mem_state[j] |= ram_states[i];
+
+                cram->virt_base = ((uint32_t) j) << 16;
+                cram->phys_base = cram->virt_base - virt_base + dev->ram_bases[i];
+
+                mem_mapping_set_addr(&cram->mapping, cram->virt_base, 0x00010000);
+                mem_mapping_set_exec(&cram->mapping, &(ram[cram->phys_base]));
+            }
+        }
+    }
+
+    /* Recalculate the entire 16 MB space. */
+    cpq_recalc_states(dev);
+}
+
+static void
+cpq_write_regs(uint32_t addr, uint8_t val, void *priv)
+{
+    cpq_386_t *dev = (cpq_386_t *) priv;
+
+    addr &= 0x00000fff;
+
+    switch (addr) {
+        case 0x00000000:
+        case 0x00000001:
+            /* RAM Relocation (Write Only) */
+            dev->regs[addr + 4] = val;
+            if (addr == 0x00000000) {
+                dev->mem_state[0x0e] &= ~(MEM_STATE_SYS | MEM_STATE_WP);
+                dev->mem_state[0x0f] &= ~(MEM_STATE_SYS | MEM_STATE_WP);
+                dev->mem_state[0xfe] &= ~MEM_STATE_WP;
+                dev->mem_state[0xff] &= ~MEM_STATE_WP;
+                if (!(val & 0x01)) {
+                    dev->mem_state[0x0e] |= MEM_STATE_SYS;
+                    dev->mem_state[0x0f] |= MEM_STATE_SYS;
+                }
+                if (!(val & 0x02)) {
+                    dev->mem_state[0x0e] |= MEM_STATE_WP;
+                    dev->mem_state[0x0f] |= MEM_STATE_WP;
+                    dev->mem_state[0xfe] |= MEM_STATE_WP;
+                    dev->mem_state[0xff] |= MEM_STATE_WP;
+                }
+                cpq_recalc_state(dev, 0x0e);
+                cpq_recalc_state(dev, 0x0f);
+                cpq_recalc_state(dev, 0xfe);
+                cpq_recalc_state(dev, 0xff);
+                flushmmucache_nopc();
+            }
+            break;
+        case 0x00000002:
+        case 0x00000003:
+            /* RAM Setup Port (Read/Write) */
+            dev->regs[addr] = val;
+            if (addr == 0x00000002) {
+                cpq_recalc_ram(dev);
+                cpq_recalc_cache(dev);
+            }
+            break;
+
+        default:
+            break;
+    }
+}
+
+static void
+cpq_write_regsw(uint32_t addr, uint16_t val, void *priv)
+{
+    cpq_write_regs(addr, val & 0xff, priv);
+    cpq_write_regs(addr + 1, (val >> 8) & 0xff, priv);
+}
+
+static void
+cpq_write_regsl(uint32_t addr, uint32_t val, void *priv)
+{
+    cpq_write_regsw(addr, val & 0xff, priv);
+    cpq_write_regsw(addr + 2, (val >> 16) & 0xff, priv);
+}
+
+static void
+compaq_ram_init(cpq_ram_t *dev)
+{
+    mem_mapping_add(&dev->mapping,
+                    0x00000000,
+                    0x00010000,
+                    cpq_read_ram,
+                    cpq_read_ramw,
+                    cpq_read_raml,
+                    cpq_write_ram,
+                    cpq_write_ramw,
+                    cpq_write_raml,
+                    NULL,
+                    MEM_MAPPING_INTERNAL,
+                    dev);
+
+    mem_mapping_disable(&dev->mapping);
+}
+
+static void
+compaq_ram_diags_parse(cpq_386_t *dev)
+{
+    uint8_t  val = dev->regs[0x00000001];
+    uint32_t accum = 0x00100000;
+
+    for (uint8_t i = 0; i < 4; i++) {
+        dev->ram_bases[i] = accum;
+
+        switch (val & 0x03) {
+            case RAM_DIAG_H_SYS_RAM_1MB:
+                dev->ram_sizes[i] = 0x00100000;
+                break;
+            case RAM_DIAG_H_SYS_RAM_4MB:
+                dev->ram_sizes[i] = 0x00400000;
+                break;
+
+            default:
+                break;
+        }
+        if (i == 0)
+            dev->ram_sizes[i] -= 0x00100000;
+
+        dev->ram_map_sizes[i] = dev->ram_sizes[i];
+        accum += dev->ram_sizes[i];
+
+        if (accum >= (mem_size << 10)) {
+            dev->ram_sizes[i] = (mem_size << 10) - dev->ram_bases[i];
+            break;
+        }
+
+        val >>= 2;
+    }
+}
+
+static void
+compaq_recalc_base_ram(cpq_386_t *dev)
+{
+    uint8_t  base_mem    = dev->regs[0x00000000] & RAM_DIAG_L_BASE_MEM_MASK;
+    uint8_t  sys_ram     = dev->regs[0x00000001] & RAM_DIAG_H_SYS_RAM_MASK;
+    uint8_t  low_start   = 0x00;
+    uint8_t  low_end     = 0x00;
+    uint8_t  high_start  = 0x00;
+    uint8_t  high_end    = 0x00;
+    cpq_ram_t *cram;
+
+    switch (base_mem) {
+        case RAM_DIAG_L_BASE_MEM_256KB:
+            switch (sys_ram) {
+                case RAM_DIAG_H_SYS_RAM_1MB:
+                    low_start  = 0x00;
+                    low_end    = 0x03;
+                    high_start = 0xf4;
+                    high_end   = 0xff;
+                    break;
+                case RAM_DIAG_H_SYS_RAM_4MB:
+                    low_start  = 0x00;
+                    low_end    = 0x03;
+                    high_start = 0xfa;
+                    high_end   = 0xff;
+                    break;
+                default:
+                    fatal("Compaq 386 - Invalid configuation: %02X %02X\n", base_mem, sys_ram);
+                    return;
+            }
+            break;
+        case RAM_DIAG_L_BASE_MEM_512KB:
+            switch (sys_ram) {
+                case RAM_DIAG_H_SYS_RAM_1MB:
+                    low_start  = 0x00;
+                    low_end    = 0x07;
+                    high_start = 0xf8;
+                    high_end   = 0xff;
+                    break;
+                case RAM_DIAG_H_SYS_RAM_4MB:
+                    low_start  = 0x00;
+                    low_end    = 0x07;
+                    high_start = 0xfa;
+                    high_end   = 0xff;
+                    break;
+                default:
+                    fatal("Compaq 386 - Invalid configuation: %02X %02X\n", base_mem, sys_ram);
+                    return;
+            }
+            break;
+        case RAM_DIAG_L_BASE_MEM_640KB:
+            switch (sys_ram) {
+                case RAM_DIAG_H_SYS_RAM_1MB:
+                    low_start  = 0x00;
+                    low_end    = 0x09;
+                    high_start = 0xfa;
+                    high_end   = 0xff;
+                    break;
+                case RAM_DIAG_H_SYS_RAM_4MB:
+                    low_start  = 0x00;
+                    low_end    = 0x09;
+                    high_start = 0xfa;
+                    high_end   = 0xff;
+                    break;
+                default:
+                    fatal("Compaq 386 - Invalid configuation: %02X %02X\n", base_mem, sys_ram);
+                    return;
+            }
+            break;
+        default:
+            fatal("Compaq 386 - Invalid configuation: %02X %02X\n", base_mem, sys_ram);
+            return;
+    }
+
+    switch (sys_ram) {
+        case RAM_DIAG_H_SYS_RAM_1MB:
+            if (mem_size < 1024)
+                dev->regs[0x00000002] = 0x01;
+            else if (mem_size == 8192)
+                dev->regs[0x00000002] = 0x09;
+            else if (mem_size >= 11264)
+                dev->regs[0x00000002] = 0x0d;
+            else
+                dev->regs[0x00000002] = (mem_size >> 10);
+            break;
+        case RAM_DIAG_H_SYS_RAM_4MB:
+            if (mem_size < 4096)
+                dev->regs[0x00000002] = 0x04;
+            else if (mem_size == 11264)
+                dev->regs[0x00000002] = 0x0c;
+            else if (mem_size >= 16384)
+                dev->regs[0x00000002] = 0x00;
+            else if (mem_size > 13312)
+                dev->regs[0x00000002] = 0x0d;
+            else
+                dev->regs[0x00000002] = (mem_size >> 10);
+            break;
+        default:
+            fatal("Compaq 386 - Invalid configuation: %02X\n", sys_ram);
+            return;
+    }
+
+    /* The base 640 kB. */
+    for (uint8_t i = low_start; i <= low_end; i++) {
+        cram = &(dev->ram[0][i]);
+
+        cram->phys_base = cram->virt_base = ((uint32_t) i) << 16;
+        dev->mem_state[i] |= MEM_STATE_SYS;
+
+        mem_mapping_set_addr(&cram->mapping, cram->virt_base, 0x00010000);
+        mem_mapping_set_exec(&cram->mapping, &(ram[cram->phys_base]));
+
+        cpq_recalc_state(dev, i);
+    }
+
+    /* The relocated 128 kB. */
+    for (uint8_t i = 0x0e; i <= 0x0f; i++) {
+        cram = &(dev->ram[0][i]);
+
+        cram->phys_base = cram->virt_base = ((uint32_t) i) << 16;
+
+        mem_mapping_set_addr(&cram->mapping, cram->virt_base, 0x00010000);
+        mem_mapping_set_exec(&cram->mapping, &(ram[cram->phys_base]));
+    }
+
+    /* Blocks FA-FF. */
+    for (uint16_t i = high_start; i <= high_end; i++) {
+        cram = &(dev->high_ram[i & 0x0f]);
+
+        cram->phys_base = ((uint32_t) (i & 0x0f)) << 16;
+        cram->virt_base = ((uint32_t) i) << 16;
+        dev->mem_state[i] |= MEM_STATE_SYS;
+
+        mem_mapping_set_addr(&cram->mapping, cram->virt_base, 0x00010000);
+        mem_mapping_set_exec(&cram->mapping, &(ram[cram->phys_base]));
+
+        cpq_recalc_state(dev, i);
+    }
+}
+
+static void
+compaq_386_close(void *priv)
+{
+    cpq_386_t *dev = (cpq_386_t *) priv;
+
+    free(dev);
+}
+
+static void *
+compaq_386_init(UNUSED(const device_t *info))
+{
+    cpq_386_t *dev = (cpq_386_t *) calloc(1, sizeof(cpq_386_t));
+
+    mem_mapping_add(&dev->regs_mapping,
+                    0x80c00000,
+                    0x00001000,
+                    cpq_read_regs,
+                    cpq_read_regsw,
+                    cpq_read_regsl,
+                    cpq_write_regs,
+                    cpq_write_regsw,
+                    cpq_write_regsl,
+                    NULL,
+                    MEM_MAPPING_INTERNAL,
+                    dev);
+
+    mem_set_mem_state(0x80c00000, 0x00001000, MEM_READ_INTERNAL | MEM_WRITE_INTERNAL);
+
+    dev->regs[0x00000000] = RAM_DIAG_L_PERMA_BITS;
+    if (mem_size >= 640)
+        dev->regs[0x00000000] |= RAM_DIAG_L_BASE_MEM_640KB;
+    else if (mem_size >= 512)
+        dev->regs[0x00000000] |= RAM_DIAG_L_BASE_MEM_512KB;
+    else if (mem_size >= 256)
+        dev->regs[0x00000000] |= RAM_DIAG_L_BASE_MEM_256KB;
+    else
+        dev->regs[0x00000000] |= RAM_DIAG_L_BASE_MEM_INV;
+    /* Indicate no parity error. */
+    dev->regs[0x00000000] |= 0x0f;
+
+    if (mem_size >= 1024) {
+        switch (mem_size) {
+            case 1024:
+                dev->regs[0x00000001] = RAM_DIAG_H_SYS_RAM_4MB | RAM_DIAG_H_MOD_A_RAM_NONE |
+                                        RAM_DIAG_H_MOD_B_RAM_NONE | RAM_DIAG_H_MOD_C_RAM_NONE;
+                break;
+            case 2048:
+                dev->regs[0x00000001] = RAM_DIAG_H_SYS_RAM_4MB | RAM_DIAG_H_MOD_A_RAM_NONE |
+                                        RAM_DIAG_H_MOD_B_RAM_NONE | RAM_DIAG_H_MOD_C_RAM_NONE;
+                break;
+            case 3072:
+                dev->regs[0x00000001] = RAM_DIAG_H_SYS_RAM_4MB | RAM_DIAG_H_MOD_A_RAM_NONE |
+                                        RAM_DIAG_H_MOD_B_RAM_NONE | RAM_DIAG_H_MOD_C_RAM_NONE;
+                break;
+            case 4096:
+                dev->regs[0x00000001] = RAM_DIAG_H_SYS_RAM_4MB | RAM_DIAG_H_MOD_A_RAM_NONE |
+                                        RAM_DIAG_H_MOD_B_RAM_NONE | RAM_DIAG_H_MOD_C_RAM_NONE;
+                break;
+            case 5120:
+                dev->regs[0x00000001] = RAM_DIAG_H_SYS_RAM_4MB | RAM_DIAG_H_MOD_A_RAM_1MB |
+                                        RAM_DIAG_H_MOD_B_RAM_NONE | RAM_DIAG_H_MOD_C_RAM_NONE;
+                break;
+            case 6144:
+                dev->regs[0x00000001] = RAM_DIAG_H_SYS_RAM_4MB | RAM_DIAG_H_MOD_A_RAM_1MB |
+                                        RAM_DIAG_H_MOD_B_RAM_1MB | RAM_DIAG_H_MOD_C_RAM_NONE;
+                break;
+            case 7168:
+                dev->regs[0x00000001] = RAM_DIAG_H_SYS_RAM_4MB | RAM_DIAG_H_MOD_A_RAM_1MB |
+                                        RAM_DIAG_H_MOD_B_RAM_1MB | RAM_DIAG_H_MOD_C_RAM_1MB;
+                break;
+            case 8192:
+                dev->regs[0x00000001] = RAM_DIAG_H_SYS_RAM_4MB | RAM_DIAG_H_MOD_A_RAM_4MB |
+                                        RAM_DIAG_H_MOD_B_RAM_NONE | RAM_DIAG_H_MOD_C_RAM_NONE;
+                break;
+            case 9216:
+                dev->regs[0x00000001] = RAM_DIAG_H_SYS_RAM_4MB | RAM_DIAG_H_MOD_A_RAM_4MB |
+                                        RAM_DIAG_H_MOD_B_RAM_1MB | RAM_DIAG_H_MOD_C_RAM_NONE;
+                break;
+            case 10240:
+                dev->regs[0x00000001] = RAM_DIAG_H_SYS_RAM_4MB | RAM_DIAG_H_MOD_A_RAM_4MB |
+                                        RAM_DIAG_H_MOD_B_RAM_1MB | RAM_DIAG_H_MOD_C_RAM_1MB;
+                break;
+            case 11264:
+            case 12288:
+                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_NONE;
+                break;
+            case 13312:
+                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_1MB;
+                break;
+            case 14336:
+            case 15360:
+            case 16384:
+                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 |
+                                RAM_DIAG_H_MOD_B_RAM_NONE | RAM_DIAG_H_MOD_C_RAM_NONE;
+
+    dev->regs[0x00000003] = 0xfc;
+    dev->regs[0x00000004] = dev->regs[0x00000005] = 0xff;
+
+    compaq_ram_diags_parse(dev);
+
+    mem_mapping_disable(&ram_low_mapping);
+    mem_mapping_disable(&ram_mid_mapping);
+    mem_mapping_disable(&ram_high_mapping);
+#if (!(defined __amd64__ || defined _M_X64 || defined __aarch64__ || defined _M_ARM64))
+    /* Should never be the case, but you never know what a user may set. */
+    if (mem_size > 1048576)
+        mem_mapping_disable(&ram_2gb_mapping);
+#endif
+
+    /* Initialize in reverse order for memory mapping precedence
+       reasons. */
+    for (int8_t i = 3; i >= 0; i--) {
+        for (uint8_t j = 0; j < 64; j++)
+            compaq_ram_init(&(dev->ram[i][j]));
+    }
+
+    for (uint8_t i = 0; i < 16; i++)
+        compaq_ram_init(&(dev->high_ram[i]));
+
+    /* First, set the entire 256 MB of space to invalid states. */
+    for (uint16_t i = 0; i < 256; i++)
+        dev->old_state[i] = 0xff;
+
+    /* Then, recalculate the base RAM mappings. */
+    compaq_recalc_base_ram(dev);
+
+    /* Enable the external cache. */
+    dev->regs[0x00000002] |= 0x40;
+    cpq_recalc_cache(dev);
+
+    /* Recalculate the rest of the RAM mapping. */
+    cpq_recalc_ram(dev);
+
+    return dev;
+}
+
+const device_t compaq_386_device = {
+    .name          = "Compaq 386 Memory Control",
+    .internal_name = "opti391",
+    .flags         = 0,
+    .local         = 0,
+    .init          = compaq_386_init,
+    .close         = compaq_386_close,
+    .reset         = NULL,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
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_arm64_ops.c b/src/codegen_new/codegen_backend_arm64_ops.c
index 594a5d524..dd47204f3 100644
--- a/src/codegen_new/codegen_backend_arm64_ops.c
+++ b/src/codegen_new/codegen_backend_arm64_ops.c
@@ -341,7 +341,7 @@ host_arm64_ADDX_IMM(codeblock_t *block, int dst_reg, int src_n_reg, uint64_t imm
         } else if (imm_data & 0xfff000)
             codegen_addlong(block, OPCODE_ADDX_IMM | Rd(dst_reg) | Rn(src_n_reg) | IMM12((imm_data >> 12) & 0xfff) | DATPROC_IMM_SHIFT(1));
     } else
-        fatal("ADD_IMM_X %016llx\n", imm_data);
+        fatal("ADD_IMM_X %016" PRIu64 "\n", imm_data);
 }
 void
 host_arm64_ADD_REG(codeblock_t *block, int dst_reg, int src_n_reg, int src_m_reg, int shift)
@@ -684,7 +684,7 @@ host_arm64_CMPX_IMM(codeblock_t *block, int src_n_reg, uint64_t imm_data)
     } else if (!(imm_data & 0xfffffffffffff000ull)) {
         codegen_addlong(block, OPCODE_CMPX_IMM | Rd(REG_XZR) | Rn(src_n_reg) | IMM12(imm_data & 0xfff) | DATPROC_IMM_SHIFT(0));
     } else
-        fatal("CMPX_IMM %08llx\n", imm_data);
+        fatal("CMPX_IMM %08" PRIu64 "\n", imm_data);
 }
 
 void
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/cpu/808x.c b/src/cpu/808x.c
index 4f52fb8d2..84389874a 100644
--- a/src/cpu/808x.c
+++ b/src/cpu/808x.c
@@ -462,6 +462,9 @@ cycles_biu(int bus, int init)
                         cycles_idle(5 - BUS_CYCLE); /* Leftover BIU cycles + 2 idle cycles. */
                         BUS_CYCLE_T1;               /* Abort the prefetch. */
                         break;
+
+                    default:
+                        break;
                 }
 
                 schedule_fetch = 0;
@@ -1035,6 +1038,9 @@ do_mod_rm(void)
             case 2:
                 wait(3, 0);
                 break;
+
+            default:
+                break;
         }
     cpu_state.eaaddr = (*mod1add[0][cpu_rm]) + (*mod1add[1][cpu_rm]);
     easeg            = ovr_seg ? *ovr_seg : *mod1seg[cpu_rm];
@@ -1049,6 +1055,8 @@ do_mod_rm(void)
             cpu_state.eaaddr += pfq_fetchw();
             wait(1, 0);
             break;
+        default:
+            break;
     }
     cpu_state.eaaddr &= 0xffff;
     wait(2, 0);
@@ -1591,6 +1599,9 @@ alu_op(int bits)
         case 6:
             bitwise(bits, (cpu_dest ^ cpu_src));
             break;
+
+        default:
+            break;
     }
 }
 
@@ -2274,6 +2285,9 @@ execx86(int cycs)
                                 set_af(0);
                                 set_pzs(bits);
                                 break;
+
+                            default:
+                                break;
                         }
                         if ((opcode & 2) != 0)
                             wait(4, 0);
@@ -2288,6 +2302,9 @@ execx86(int cycs)
                     BP      = pop();
                     handled = 1;
                     break;
+
+                default:
+                    break;
             }
         }
         if (!handled) {
@@ -3433,6 +3450,9 @@ execx86(int cycs)
                                 set_af(0);
                                 set_pzs(bits);
                                 break;
+
+                            default:
+                                break;
                         }
                         if ((opcode & 2) != 0)
                             wait(4, 0);
@@ -3517,6 +3537,9 @@ execx86(int cycs)
                                 case 0xDF:
                                     ops_sf_fpu_8087_df[rmdat & 0xff](rmdat);
                                     break;
+
+                                default:
+                                    break;
                             }
                         } else {
                             switch (opcode) {
@@ -3544,6 +3567,9 @@ execx86(int cycs)
                                 case 0xDF:
                                     ops_fpu_8087_df[rmdat & 0xff](rmdat);
                                     break;
+
+                                default:
+                                    break;
                             }
                         }
                     }
@@ -3572,6 +3598,9 @@ execx86(int cycs)
                                 if (!(cpu_state.flags & Z_FLAG))
                                     oldc = 0;
                                 break;
+
+                            default:
+                                break;
                         }
                     } else
                         oldc = (CX == 0);
@@ -3744,6 +3773,9 @@ execx86(int cycs)
                             if (x86_div(AL, AH))
                                 wait(1, 0);
                             break;
+
+                        default:
+                            break;
                     }
                     break;
 
@@ -3843,6 +3875,9 @@ execx86(int cycs)
                             wait(4, 0);
                             push((uint16_t *) &cpu_data);
                             break;
+
+                        default:
+                            break;
                     }
                     break;
 
diff --git a/src/cpu/codegen_timing_pentium.c b/src/cpu/codegen_timing_pentium.c
index 58ec5b454..3951acc94 100644
--- a/src/cpu/codegen_timing_pentium.c
+++ b/src/cpu/codegen_timing_pentium.c
@@ -17,6 +17,7 @@
 #include "cpu.h"
 #include <86box/mem.h>
 #include <86box/plat_unused.h>
+#include <inttypes.h>
 
 #include "x86.h"
 #include "x86_ops.h"
@@ -850,7 +851,7 @@ COUNT(uint64_t timings, uint64_t deps, int op_32)
             return cpu_has_feature(CPU_FEATURE_MMX) ? 1 : 2;
     }
 
-    fatal("Illegal COUNT %016llx\n", timings);
+    fatal("Illegal COUNT %016" PRIu64 "\n", timings);
 
     return timings;
 }
diff --git a/src/cpu/x87_ops_conv.h b/src/cpu/x87_ops_conv.h
index bb1e497da..7a949cfb2 100644
--- a/src/cpu/x87_ops_conv.h
+++ b/src/cpu/x87_ops_conv.h
@@ -22,7 +22,7 @@ x87_from80(x87_conv_t *test)
     blah       = ((exp64 > 0) ? exp64 : -exp64) & 0x3ff;
     exp64final = ((exp64 > 0) ? blah : -blah) + BIAS64;
 
-    mant64 = (test->eind.ll >> 11) & (0xfffffffffffffll);
+    mant64 = (test->eind.ll >> 11) & (0xfffffffffffffLL);
     sign   = (test->begin & 0x8000) ? 1 : 0;
 
     if ((test->begin & 0x7fff) == 0x7fff)
@@ -48,19 +48,19 @@ x87_to80(double d, x87_conv_t *test)
 
     test->eind.d = d;
 
-    sign80      = (test->eind.ll & (0x8000000000000000ll)) ? 1 : 0;
-    exp80       = test->eind.ll & (0x7ff0000000000000ll);
+    sign80      = (test->eind.ll & (0x8000000000000000LL)) ? 1 : 0;
+    exp80       = test->eind.ll & (0x7ff0000000000000LL);
     exp80final  = (exp80 >> 52);
-    mant80      = test->eind.ll & (0x000fffffffffffffll);
+    mant80      = test->eind.ll & (0x000fffffffffffffLL);
     mant80final = (mant80 << 11);
 
     if (exp80final == 0x7ff) /*Infinity / Nan*/
     {
         exp80final = 0x7fff;
-        mant80final |= (0x8000000000000000ll);
+        mant80final |= (0x8000000000000000LL);
     } else if (d != 0) { /* Zero is a special case */
         /* Elvira wants the 8 and tcalc doesn't */
-        mant80final |= (0x8000000000000000ll);
+        mant80final |= (0x8000000000000000LL);
         /* Ca-cyber doesn't like this when result is zero. */
         exp80final += (BIAS80 - BIAS64);
     }
diff --git a/src/cpu/x87_ops_misc.h b/src/cpu/x87_ops_misc.h
index 86fc0307e..0c951815e 100644
--- a/src/cpu/x87_ops_misc.h
+++ b/src/cpu/x87_ops_misc.h
@@ -193,7 +193,7 @@ FSTOR(void)
       something like this is needed*/
     p = (uint64_t *) cpu_state.tag;
 #ifdef USE_NEW_DYNAREC
-    if (cpu_state.MM_w4[0] == 0xffff && cpu_state.MM_w4[1] == 0xffff && cpu_state.MM_w4[2] == 0xffff && cpu_state.MM_w4[3] == 0xffff && cpu_state.MM_w4[4] == 0xffff && cpu_state.MM_w4[5] == 0xffff && cpu_state.MM_w4[6] == 0xffff && cpu_state.MM_w4[7] == 0xffff && !cpu_state.TOP && (*p == 0x0101010101010101ull))
+    if (cpu_state.MM_w4[0] == 0xffff && cpu_state.MM_w4[1] == 0xffff && cpu_state.MM_w4[2] == 0xffff && cpu_state.MM_w4[3] == 0xffff && cpu_state.MM_w4[4] == 0xffff && cpu_state.MM_w4[5] == 0xffff && cpu_state.MM_w4[6] == 0xffff && cpu_state.MM_w4[7] == 0xffff && !cpu_state.TOP && (*p == 0x0101010101010101ULL))
 #else
     if (cpu_state.MM_w4[0] == 0xffff && cpu_state.MM_w4[1] == 0xffff && cpu_state.MM_w4[2] == 0xffff && cpu_state.MM_w4[3] == 0xffff && cpu_state.MM_w4[4] == 0xffff && cpu_state.MM_w4[5] == 0xffff && cpu_state.MM_w4[6] == 0xffff && cpu_state.MM_w4[7] == 0xffff && !cpu_state.TOP && !(*p))
 #endif
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/isapnp.c b/src/device/isapnp.c
index b3500027c..22b22dfcc 100644
--- a/src/device/isapnp.c
+++ b/src/device/isapnp.c
@@ -35,7 +35,7 @@
     }
 
 #define CHECK_CURRENT_CARD()                                       \
-    do {                                                           \
+    if (1) {                                                       \
         card = dev->first_card;                                    \
         while (card) {                                             \
             if (card->enable && (card->state == PNP_STATE_CONFIG)) \
@@ -46,7 +46,7 @@
             isapnp_log("ISAPnP: No card in CONFIG state\n");       \
             break;                                                 \
         }                                                          \
-    } while (0);
+    }
 
 static const uint8_t  pnp_init_key[32] = { 0x6A, 0xB5, 0xDA, 0xED, 0xF6, 0xFB, 0x7D, 0xBE,
                                            0xDF, 0x6F, 0x37, 0x1B, 0x0D, 0x86, 0xC3, 0x61,
diff --git a/src/device/kbc_at.c b/src/device/kbc_at.c
index 472c71b0f..f40c032c7 100644
--- a/src/device/kbc_at.c
+++ b/src/device/kbc_at.c
@@ -921,7 +921,7 @@ write64_generic(void *priv, uint8_t val)
            Bit 6: Mostly, display: 0 = CGA, 1 = MDA, inverted on Xi8088 and Acer KBC's;
                   Intel AMI MegaKey KB-5: Used for green features, SMM handler expects it to be set;
                   IBM PS/1 Model 2011: 0 = current FDD is 3.5", 1 = current FDD is 5.25";
-                  Comapq: 0 = Compaq dual-scan display, 1 = non-Compaq display.
+                  Compaq: 0 = Compaq dual-scan display, 1 = non-Compaq display.
            Bit 5: Mostly, manufacturing jumper: 0 = installed (infinite loop at POST), 1 = not installed;
                   NCR: power-on default speed: 0 = high, 1 = low;
                   Compaq: System board DIP switch 5: 0 = ON, 1 = OFF.
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.c b/src/device/mouse.c
index 4ca2d0a6f..24e1ba00f 100644
--- a/src/device/mouse.c
+++ b/src/device/mouse.c
@@ -156,7 +156,7 @@ mouse_clear_coords(void)
     mouse_z = 0;
 }
 
-static void
+void
 mouse_clear_buttons(void)
 {
     mouse_buttons  = 0x00;
@@ -165,6 +165,38 @@ mouse_clear_buttons(void)
     mouse_delta_b  = 0x00;
 }
 
+static double
+mouse_scale_coord_x(double x, int mul)
+{
+    double ratio = 1.0;
+
+    if (!mouse_raw)        
+        ratio = ((double) monitors[0].mon_unscaled_size_x) / monitors[0].mon_res_x;
+
+    if (mul)
+        x *= ratio;
+    else
+        x /= ratio;
+
+    return x;
+}
+
+static double
+mouse_scale_coord_y(double y, int mul)
+{
+    double ratio = 1.0;
+
+    if (!mouse_raw)        
+        ratio = ((double) monitors[0].mon_efscrnsz_y) / monitors[0].mon_res_y;
+
+    if (mul)
+        y *= ratio;
+    else
+        y /= ratio;
+
+    return y;
+}
+
 void
 mouse_subtract_x(int *delta_x, int *o_x, int min, int max, int abs)
 {
@@ -172,31 +204,53 @@ mouse_subtract_x(int *delta_x, int *o_x, int min, int max, int abs)
     double smax_x;
     double rsmin_x;
     double smin_x;
+    int    ds_x;
+    int    scaled_x;
 
-    rsmin_x = (double) min;
+    rsmin_x = mouse_scale_coord_x(min, 0);
     if (abs) {
-        smax_x = (double) max + ABS(rsmin_x);
-        max += ABS(min);
+        smax_x = mouse_scale_coord_x(max, 0) + ABS(rsmin_x);
+        max += ABSD(min);
         real_x += rsmin_x;
         smin_x = 0;
     } else {
-        smax_x = (double) max;
+        smax_x = mouse_scale_coord_x(max, 0);
         smin_x = rsmin_x;
     }
 
-    /* Default the X and Y overflows to 1. */
+    smax_x = floor(smax_x);
+    smin_x = ceil(smin_x);
+
+    /* Default the X overflow to 1. */
     if (o_x != NULL)
         *o_x = 1;
 
+    ds_x = mouse_scale_coord_x(real_x, 1);
+
+    if (ds_x >= 0.0)
+        scaled_x = (int) floor(mouse_scale_coord_x(real_x, 1));
+    else
+        scaled_x = (int) ceil(mouse_scale_coord_x(real_x, 1));
+
     if (real_x > smax_x) {
-        *delta_x = abs ? (int) real_x : max;
-        real_x -= smax_x;
+        if (abs) {
+            *delta_x = scaled_x;
+            real_x -= mouse_scale_coord_x((double) scaled_x, 0);
+        } else {
+            *delta_x = max;
+            real_x -= smax_x;
+       }
     } else if (real_x < smin_x) {
-        *delta_x = abs ? (int) real_x : min;
-        real_x += ABS(smin_x);
+        if (abs) {
+            *delta_x = scaled_x;
+            real_x -= mouse_scale_coord_x((double) scaled_x, 0);
+        } else {
+            *delta_x = min;
+            real_x += ABSD(smin_x);
+        }
     } else {
-        *delta_x = (int) real_x;
-        real_x = 0.0;
+        *delta_x = scaled_x;
+        real_x -= mouse_scale_coord_x((double) scaled_x, 0);
         if (o_x != NULL)
             *o_x = 0;
     }
@@ -217,34 +271,56 @@ mouse_subtract_y(int *delta_y, int *o_y, int min, int max, int invert, int abs)
     double smax_y;
     double rsmin_y;
     double smin_y;
+    int    ds_y;
+    int    scaled_y;
 
     if (invert)
         real_y = -real_y;
 
-    rsmin_y = (double) min;
+    rsmin_y = mouse_scale_coord_y(min, 0);
     if (abs) {
-        smax_y = (double) max + ABS(rsmin_y);
-        max += ABS(min);
+        smax_y = mouse_scale_coord_y(max, 0) + ABS(rsmin_y);
+        max += ABSD(min);
         real_y += rsmin_y;
         smin_y = 0;
     } else {
-        smax_y = (double) max;
+        smax_y = mouse_scale_coord_y(max, 0);
         smin_y = rsmin_y;
     }
 
-    /* Default the X and Y overflows to 1. */
+    smax_y = floor(smax_y);
+    smin_y = ceil(smin_y);
+
+    /* Default Y overflow to 1. */
     if (o_y != NULL)
         *o_y = 1;
 
+    ds_y = mouse_scale_coord_x(real_y, 1);
+
+    if (ds_y >= 0.0)
+        scaled_y = (int) floor(mouse_scale_coord_x(real_y, 1));
+    else
+        scaled_y = (int) ceil(mouse_scale_coord_x(real_y, 1));
+
     if (real_y > smax_y) {
-        *delta_y = abs ? (int) real_y : max;
-        real_y -= smax_y;
+        if (abs) {
+            *delta_y = scaled_y;
+            real_y -= mouse_scale_coord_y((double) scaled_y, 0);
+        } else {
+            *delta_y = max;
+            real_y -= smax_y;
+       }
     } else if (real_y < smin_y) {
-        *delta_y = abs ? (int) real_y : min;
-        real_y += ABS(smin_y);
+        if (abs) {
+            *delta_y = scaled_y;
+            real_y -= mouse_scale_coord_y((double) scaled_y, 0);
+        } else {
+            *delta_y = min;
+            real_y += ABSD(smin_y);
+        }
     } else {
-        *delta_y = (int) real_y;
-        real_y = 0.0;
+        *delta_y = scaled_y;
+        real_y -= mouse_scale_coord_y((double) scaled_y, 0);
         if (o_y != NULL)
             *o_y = 0;
     }
@@ -272,9 +348,11 @@ mouse_subtract_coords(int *delta_x, int *delta_y, int *o_x, int *o_y,
 int
 mouse_moved(void)
 {
+    int moved_x = !!((int) floor(ABSD(mouse_scale_coord_x(atomic_load(&mouse_x), 1))));
+    int moved_y = !!((int) floor(ABSD(mouse_scale_coord_y(atomic_load(&mouse_y), 1))));
+
     /* Convert them to integer so we treat < 1.0 and > -1.0 as 0. */
-    int ret = (((int) floor(atomic_load(&mouse_x)) != 0) ||
-               ((int) floor(atomic_load(&mouse_y)) != 0));
+    int ret = (moved_x || moved_y);
 
     return ret;
 }
@@ -328,26 +406,35 @@ atomic_double_add(_Atomic double *var, double val)
     atomic_store(var, temp);
 }
 
+void
+mouse_scale_fx(double x)
+{
+    atomic_double_add(&mouse_x, ((double) x) * mouse_sensitivity);
+}
+
+void
+mouse_scale_fy(double y)
+{
+    atomic_double_add(&mouse_y, ((double) y) * mouse_sensitivity);
+}
+
 void
 mouse_scale_x(int x)
 {
-    double ratio_x = ((double) monitors[0].mon_unscaled_size_x) / monitors[0].mon_res_x;
-
-    if (mouse_raw)
-        ratio_x /= plat_get_dpi();
-
-    atomic_double_add(&mouse_x, (((double) x) * mouse_sensitivity * ratio_x));
+    atomic_double_add(&mouse_x, ((double) x) * mouse_sensitivity);
 }
 
 void
 mouse_scale_y(int y)
 {
-    double ratio_y = ((double) monitors[0].mon_efscrnsz_y) / monitors[0].mon_res_y;
+    atomic_double_add(&mouse_y, ((double) y) * mouse_sensitivity);
+}
 
-    if (mouse_raw)
-        ratio_y /= plat_get_dpi();
-
-    atomic_double_add(&mouse_y, (((double) y) * mouse_sensitivity * ratio_y));
+void
+mouse_scalef(double x, double y)
+{
+    mouse_scale_fx(x);
+    mouse_scale_fy(y);
 }
 
 void
diff --git a/src/device/mouse_ps2.c b/src/device/mouse_ps2.c
index f623d23e9..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>
@@ -84,9 +84,9 @@ ps2_report_coordinates(atkbc_dev_t *dev, int main)
 
     mouse_subtract_coords(&delta_x, &delta_y, &overflow_x, &overflow_y,
                           -256, 255, 1, 0);
-    mouse_subtract_z(&delta_z, -8, 7, 1);
+    mouse_subtract_z(&delta_z, -8, 7, 0);
 
-    buff[0] = (overflow_y << 7) | (overflow_x << 6) |
+    buff[0] |= (overflow_y << 7) | (overflow_x << 6) |
               ((delta_y & 0x0100) >> 3) | ((delta_x & 0x0100) >> 4) |
               (b & ((dev->flags & FLAG_INTELLI) ? 0x07 : 0x03));
     buff[1] = (delta_x & 0x00ff);
diff --git a/src/device/mouse_serial.c b/src/device/mouse_serial.c
index 0939bf875..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;
 }
@@ -279,7 +277,7 @@ sermouse_report_ms(mouse_t *dev)
     int b = mouse_get_buttons_ex();
 
     mouse_subtract_coords(&delta_x, &delta_y, NULL, NULL, -128, 127, 0, 0);
-    mouse_subtract_z(&delta_z, -8, 7, 1);
+    mouse_subtract_z(&delta_z, -8, 7, 0);
 
     dev->buf[0] = 0x40;
     dev->buf[0] |= (((delta_y >> 6) & 0x03) << 2);
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 522f3db74..dbae3232a 100644
--- a/src/device/postcard.c
+++ b/src/device/postcard.c
@@ -29,15 +29,13 @@
 #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 13
+#define UISTR_LEN 32
 static char postcard_str[UISTR_LEN]; /* UI output string */
 
 extern void ui_sb_bugui(char *__str);
@@ -66,44 +64,46 @@ static void
 postcard_setui(void)
 {
     if (postcard_ports_num > 1) {
-        char ps[2][POSTCARDS_NUM][64] = { { 0 },
-                                          { 0 } };
+        char ps[2][POSTCARDS_NUM][3] = { { { 0 },
+                                           { 0 },
+                                        } };
+
         for (uint8_t i = 0; i < POSTCARDS_NUM; i++) {
             if (!postcard_written[i]) {
-                sprintf(ps[0][i], "--");
-                sprintf(ps[1][i], "--");
+                snprintf(ps[0][i], sizeof(ps[0][i]), "--");
+                snprintf(ps[1][i], sizeof(ps[1][i]), "--");
             } else if (postcard_written[i] == 1) {
-                sprintf(ps[0][i], "%02X", postcard_codes[i]);
-                sprintf(ps[1][i], "--");
+                snprintf(ps[0][i], sizeof(ps[0][i]), "%02X", postcard_codes[i]);
+                snprintf(ps[1][i], sizeof(ps[1][i]), "--");
             } else {
-                sprintf(ps[0][i], "%02X", postcard_codes[i]);
-                sprintf(ps[1][i], "%02X", postcard_prev_codes[i]);
+                snprintf(ps[0][i], sizeof(ps[0][i]), "%02X", postcard_codes[i]);
+                snprintf(ps[1][i], sizeof(ps[1][i]), "%02X", postcard_prev_codes[i]);
             }
         }
  
         switch (postcard_ports_num) {
             default:
             case 2:
-                sprintf(postcard_str, "POST: %s%s %s%s",
+                snprintf(postcard_str, sizeof(postcard_str), "POST: %s%s %s%s",
                         ps[0][0], ps[0][1], ps[1][0], ps[1][1]);
                 break;
             case 3:
-                sprintf(postcard_str, "POST: %s/%s%s %s/%s%s",
+                snprintf(postcard_str, sizeof(postcard_str), "POST: %s/%s%s %s/%s%s",
                         ps[0][0], ps[0][1], ps[0][2], ps[1][0], ps[1][1], ps[1][2]);
                 break;
             case 4:
-                sprintf(postcard_str, "POST: %s%s/%s%s %s%s/%s%s",
+                snprintf(postcard_str, sizeof(postcard_str), "POST: %s%s/%s%s %s%s/%s%s",
                         ps[0][0], ps[0][1], ps[0][2], ps[0][3],
                         ps[1][0], ps[1][1], ps[1][2], ps[1][3]);
                 break;
         }
     } else {
         if (!postcard_written[0])
-            sprintf(postcard_str, "POST: -- --");
+            snprintf(postcard_str, sizeof(postcard_str), "POST: -- --");
         else if (postcard_written[0] == 1)
-            sprintf(postcard_str, "POST: %02X --", postcard_codes[0]);
+            snprintf(postcard_str, sizeof(postcard_str), "POST: %02X --", postcard_codes[0]);
         else
-            sprintf(postcard_str, "POST: %02X %02X", postcard_codes[0], postcard_prev_codes[0]);
+            snprintf(postcard_str, sizeof(postcard_str), "POST: %02X %02X", postcard_codes[0], postcard_prev_codes[0]);
     }
 
     ui_sb_bugui(postcard_str);
diff --git a/src/device/serial.c b/src/device/serial.c
index c6222d11f..3a5b237c2 100644
--- a/src/device/serial.c
+++ b/src/device/serial.c
@@ -109,8 +109,12 @@ serial_transmit_period(serial_t *dev)
 void
 serial_do_irq(serial_t *dev, int set)
 {
-    if (dev->irq != 0xff)
-        picint_common(1 << dev->irq, !!(dev->type >= SERIAL_16450), set, &dev->irq_state);
+    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)
+            dev->irq_state = !!set;
+    }
 }
 
 void
diff --git a/src/disk/minivhd/manage.c b/src/disk/minivhd/manage.c
index 053acc40c..39b3ca69b 100644
--- a/src/disk/minivhd/manage.c
+++ b/src/disk/minivhd/manage.c
@@ -445,7 +445,6 @@ mvhd_file_is_vhd(FILE* f)
     }
 
     mvhd_fseeko64(f, -MVHD_FOOTER_SIZE, SEEK_END);
-    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 f65f58f63..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
@@ -47,10 +50,14 @@
 #ifdef ABS
 #    undef ABS
 #endif
+#ifdef ABSD
+#    undef ABSD
+#endif
 
 #define MIN(a, b) ((a) < (b) ? (a) : (b))
 #define MAX(a, b) ((a) > (b) ? (a) : (b))
 #define ABS(x)    ((x) > 0 ? (x) : -(x))
+#define ABSD(x)   ((x) > 0.0 ? (x) : -(x))
 #define BCD8(x)   ((((x) / 10) << 4) | ((x) % 10))
 #define BCD16(x)  ((((x) / 1000) << 12) | (((x) / 100) << 8) | BCD8(x))
 #define BCD32(x)  ((((x) / 10000000) << 28) | (((x) / 1000000) << 24) | (((x) / 100000) << 20) | (((x) / 10000) << 16) | BCD16(x))
@@ -138,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 */
@@ -174,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[]);
@@ -203,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..50f90168a 100644
--- a/src/include/86box/cdrom.h
+++ b/src/include/86box/cdrom.h
@@ -60,12 +60,13 @@ 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              -1
 
-static const struct {
+static const struct
+{
     const char  vendor[9];
     const char  model[17];
     const char  revision[5];
@@ -73,7 +74,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*/
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 9d6bd64cf..95440a172 100644
--- a/src/include/86box/chipset.h
+++ b/src/include/86box/chipset.h
@@ -36,6 +36,9 @@ extern const device_t ali6117d_device;
 /* AMD */
 extern const device_t amd640_device;
 
+/* Compaq */
+extern const device_t compaq_386_device;
+
 /* Contaq/Cypress */
 extern const device_t contaq_82c596a_device;
 extern const device_t contaq_82c597_device;
@@ -108,6 +111,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 a2f824619..58b650250 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)
@@ -303,8 +318,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 5133ddfbc..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;
@@ -78,6 +78,7 @@ extern const device_t mouse_wacom_artpad_device;
 extern void            mouse_clear_x(void);
 extern void            mouse_clear_y(void);
 extern void            mouse_clear_coords(void);
+extern void            mouse_clear_buttons(void);
 extern void            mouse_subtract_x(int *delta_x, int *o_x, int min, int max, int abs);
 extern void            mouse_subtract_y(int *delta_y, int *o_y, int min, int max, int invert, int abs);
 extern void            mouse_subtract_coords(int *delta_x, int *delta_y, int *o_x, int *o_y,
@@ -85,8 +86,11 @@ extern void            mouse_subtract_coords(int *delta_x, int *delta_y, int *o_
 extern  int            mouse_moved(void);
 extern  int            mouse_state_changed(void);
 extern  int            mouse_mbut_changed(void);
+extern void            mouse_scale_fx(double x);
+extern void            mouse_scale_fy(double y);
 extern void            mouse_scale_x(int x);
 extern void            mouse_scale_y(int y);
+extern void            mouse_scalef(double x, double y);
 extern void            mouse_scale(int x, int y);
 extern void            mouse_set_z(int z);
 extern void            mouse_clear_z(void);
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..34cf87365 100644
--- a/src/include/86box/plat.h
+++ b/src/include/86box/plat.h
@@ -49,7 +49,7 @@ 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
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/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 1f601e149..a78434bd2 100644
--- a/src/include/86box/vid_8514a.h
+++ b/src/include/86box/vid_8514a.h
@@ -19,22 +19,31 @@
 #ifndef VIDEO_8514A_H
 #define VIDEO_8514A_H
 
-typedef struct {
-    int ena,
-        x, y, xoff, yoff, cur_xsize, cur_ysize,
-        v_acc, h_acc;
-    uint32_t addr, pitch;
+typedef struct hwcursor8514_t {
+    int      ena;
+    int      x;
+    int      y;
+    int      xoff;
+    int      yoff;
+    int      cur_xsize;
+    int      cur_ysize;
+    int      v_acc;
+    int      h_acc;
+    uint32_t addr;
+    uint32_t pitch;
 } hwcursor8514_t;
 
 typedef struct ibm8514_t {
-	hwcursor8514_t hwcursor;
-	hwcursor8514_t hwcursor_latch;
-    uint8_t pos_regs[8];
+    hwcursor8514_t hwcursor;
+    hwcursor8514_t hwcursor_latch;
+    uint8_t        pos_regs[8];
 
     int force_old_addr;
     int type;
     int local;
     int bpp;
+    int on;
+    int accel_bpp;
 
     uint32_t vram_size;
     uint32_t vram_mask;
@@ -49,9 +58,9 @@ typedef struct ibm8514_t {
     int       dac_pos;
     int       dac_r;
     int       dac_g;
-    int		  dac_b;
+    int       dac_b;
     int       internal_pitch;
-    int 	  hwcursor_on;
+    int       hwcursor_on;
 
     struct {
         uint16_t subsys_cntl;
diff --git a/src/include/86box/vid_ega.h b/src/include/86box/vid_ega.h
index a5ca1114c..180803c8a 100644
--- a/src/include/86box/vid_ega.h
+++ b/src/include/86box/vid_ega.h
@@ -45,8 +45,8 @@ typedef struct ega_t {
     uint8_t scrblank;
     uint8_t plane_mask;
     uint8_t ctl_mode;
-    uint8_t pad;
-    uint8_t pad0;
+    uint8_t color_mux;
+    uint8_t dot;
     uint8_t crtc[32];
     uint8_t gdcreg[16];
     uint8_t attrregs[32];
@@ -108,6 +108,7 @@ typedef struct ega_t {
     int res_y;
     int bpp;
     int index;
+    int remap_required;
 
     uint32_t charseta;
     uint32_t charsetb;
@@ -117,21 +118,24 @@ typedef struct ega_t {
     uint32_t ca;
     uint32_t vram_limit;
     uint32_t overscan_color;
+    uint32_t cca;
 
     uint32_t *pallook;
 
     uint64_t   dispontime;
     uint64_t   dispofftime;
+
+    uint64_t   dot_time;
+
     pc_timer_t timer;
+    pc_timer_t dot_timer;
 
-    double clock;
+    double     dot_clock;
 
-    int remap_required;
-    uint32_t (*remap_func)(struct ega_t *ega, uint32_t in_addr);
+    void *     eeprom;
 
-    void (*render)(struct ega_t *svga);
-
-    void *eeprom;
+    uint32_t   (*remap_func)(struct ega_t *ega, uint32_t in_addr);
+    void       (*render)(struct ega_t *svga);
 } ega_t;
 #endif
 
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 0731aa810..fe1236ed8 100644
--- a/src/machine/m_at_compaq.c
+++ b/src/machine/m_at_compaq.c
@@ -31,6 +31,7 @@
 #include <86box/mem.h>
 #include <86box/rom.h>
 #include <86box/device.h>
+#include <86box/chipset.h>
 #include <86box/keyboard.h>
 #include <86box/fdd.h>
 #include <86box/fdc.h>
@@ -704,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 = "",
@@ -795,34 +796,28 @@ machine_at_compaq_init(const machine_t *model, int type)
 {
     compaq_machine_type = type;
 
-    if ((type != COMPAQ_DESKPRO386) && (type != COMPAQ_DESKPRO386_01_1988))
-        mem_remap_top(384);
-
     if (fdc_type == FDC_INTERNAL)
         device_add(&fdc_at_device);
 
-    if ((type == COMPAQ_DESKPRO386) || (type == COMPAQ_DESKPRO386_01_1988) || (type == COMPAQ_PORTABLEIII386))
-        mem_mapping_add(&ram_mapping, 0xfa0000, 0x60000,
-                        read_ram, read_ramw, read_raml,
-                        write_ram, write_ramw, write_raml,
-                        0xa0000 + ram, MEM_MAPPING_EXTERNAL, NULL);
-    else
+    if (type < COMPAQ_PORTABLEIII386) {
+        mem_remap_top(384);
         mem_mapping_add(&ram_mapping, 0xfa0000, 0x60000,
                         read_ram, read_ramw, read_raml,
                         write_ram, write_ramw, write_raml,
                         0xa0000 + ram, MEM_MAPPING_INTERNAL, NULL);
+    }
 
     video_reset(gfxcard[0]);
 
     switch (type) {
         case COMPAQ_PORTABLEII:
-			machine_at_init(model);
+            machine_at_init(model);
             break;
 
         case COMPAQ_PORTABLEIII:
             if (gfxcard[0] == VID_INTERNAL)
                 device_add(&compaq_plasma_device);
-			machine_at_init(model);
+            machine_at_init(model);
             break;
 
         case COMPAQ_PORTABLEIII386:
@@ -830,13 +825,14 @@ machine_at_compaq_init(const machine_t *model, int type)
                 device_add(&ide_isa_device);
             if (gfxcard[0] == VID_INTERNAL)
                 device_add(&compaq_plasma_device);
-			machine_at_init(model);
+            machine_at_init(model);
             break;
 
         case COMPAQ_DESKPRO386:
         case COMPAQ_DESKPRO386_01_1988:
             if (hdc_current == 1)
                 device_add(&ide_isa_device);
+            device_add(&compaq_386_device);
             machine_at_common_init(model);
             device_add(&keyboard_at_compaq_device);
             break;
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 acaff764e..5a8ddd2cc 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>
@@ -191,7 +189,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..959616956 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.
  */
diff --git a/src/machine/machine_table.c b/src/machine/machine_table.c
index 665e833c1..06adf71f9 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.
  */
@@ -4694,9 +4692,9 @@ const machine_t machines[] = {
         .bus_flags = MACHINE_AT,
         .flags = MACHINE_IDE,
         .ram = {
-            .min = 640,
+            .min = 1024,
             .max = 16384,
-            .step = 128
+            .step = 1024
         },
         .nvrmask = 63,
         .kbc_device = NULL,
@@ -4732,9 +4730,9 @@ const machine_t machines[] = {
         .bus_flags = MACHINE_AT,
         .flags = MACHINE_IDE,
         .ram = {
-            .min = 640,
+            .min = 1024,
             .max = 16384,
-            .step = 128
+            .step = 1024
         },
         .nvrmask = 63,
         .kbc_device = NULL,
@@ -6485,17 +6483,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,
@@ -7072,7 +7070,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,
@@ -8322,7 +8320,7 @@ const machine_t machines[] = {
             .max = 131072,
             .step = 8192
         },
-        .nvrmask = 127,
+        .nvrmask = 255,
         .kbc_device = NULL,
         .kbc_p1 = 0,
         .gpio = 0,
@@ -8763,7 +8761,7 @@ const machine_t machines[] = {
             .max = 131072,
             .step = 8192
         },
-        .nvrmask = 127,
+        .nvrmask = 255,
         .kbc_device = NULL,
         .kbc_p1 = 0,
         .gpio = 0,
@@ -8844,7 +8842,7 @@ const machine_t machines[] = {
             .max = 131072,
             .step = 8192
         },
-        .nvrmask = 127,
+        .nvrmask = 255,
         .kbc_device = NULL,
         .kbc_p1 = 0,
         .gpio = 0,
@@ -8885,7 +8883,7 @@ const machine_t machines[] = {
             .max = 131072,
             .step = 8192
         },
-        .nvrmask = 127,
+        .nvrmask = 255,
         .kbc_device = NULL,
         .kbc_p1 = 0,
         .gpio = 0,
@@ -8926,7 +8924,7 @@ const machine_t machines[] = {
             .max = 131072,
             .step = 8192
         },
-        .nvrmask = 127,
+        .nvrmask = 255,
         .kbc_device = NULL,
         .kbc_p1 = 0,
         .gpio = 0,
@@ -9005,7 +9003,7 @@ const machine_t machines[] = {
             .max = 131072,
             .step = 8192
         },
-        .nvrmask = 127,
+        .nvrmask = 255,
         .kbc_device = NULL,
         .kbc_p1 = 0,
         .gpio = 0,
@@ -9244,7 +9242,7 @@ const machine_t machines[] = {
             .max = 786432,
             .step = 8192
         },
-        .nvrmask = 127,
+        .nvrmask = 255,
         .kbc_device = NULL,
         .kbc_p1 = 0,
         .gpio = 0,
@@ -9648,7 +9646,7 @@ const machine_t machines[] = {
             .max = 196608,
             .step = 8192
         },
-        .nvrmask = 127,
+        .nvrmask = 255,
         .kbc_device = NULL,
         .kbc_p1 = 0,
         .gpio = 0,
@@ -9690,7 +9688,7 @@ const machine_t machines[] = {
             .max = 196608,
             .step = 8192
         },
-        .nvrmask = 127,
+        .nvrmask = 255,
         .kbc_device = NULL,
         .kbc_p1 = 0,
         .gpio = 0,
@@ -10086,7 +10084,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 f60d733a0..187e42a25 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;
@@ -440,12 +440,14 @@ timer_update_irq(nvr_t *nvr)
     local_t *local = (local_t *) nvr->data;
     uint8_t irq = (nvr->regs[RTC_REGB] & nvr->regs[RTC_REGC]) & (REGB_UIE | REGB_AIE | REGB_PIE);
 
-    if (irq) {
-        nvr->regs[RTC_REGC] |= REGC_IRQF;
-        picintlevel(1 << nvr->irq, &local->irq_state);
-    } else {
-        nvr->regs[RTC_REGC] &= ~REGC_IRQF;
-        picintclevel(1 << nvr->irq, &local->irq_state);
+    if (irq || (local->irq_state != !!irq)) {
+        if (irq) {
+            nvr->regs[RTC_REGC] |= REGC_IRQF;
+            picintlevel(1 << nvr->irq, &local->irq_state);
+        } else {
+            nvr->regs[RTC_REGC] &= ~REGC_IRQF;
+            picintclevel(1 << nvr->irq, &local->irq_state);
+        }
     }
 }
 
@@ -558,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))
@@ -568,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;
@@ -663,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]);
@@ -1079,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. */
@@ -1173,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/macos_event_filter.mm b/src/qt/macos_event_filter.mm
index 5e276679f..ff4e7c4d2 100644
--- a/src/qt/macos_event_filter.mm
+++ b/src/qt/macos_event_filter.mm
@@ -33,7 +33,7 @@ CocoaEventFilter::nativeEventFilter(const QByteArray &eventType, void *message,
                 || [event type] == NSEventTypeLeftMouseDragged
                 || [event type] == NSEventTypeRightMouseDragged
                 || [event type] == NSEventTypeOtherMouseDragged) {
-                mouse_scale([event deltaX], [event deltaY]);
+                mouse_scalef((double) [event deltaX], (double) [event deltaY]);
                 return true;
             }
             if ([event type] == NSEventTypeScrollWheel) {
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_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/win_joystick_rawinput.c b/src/qt/win_joystick_rawinput.c
index e5d477296..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>
@@ -98,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;
 
@@ -139,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
@@ -450,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/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 24eb8b97a..51d65c842 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_adlibgold.c b/src/sound/snd_adlibgold.c
index 984a06ea9..6cbcea69b 100644
--- a/src/sound/snd_adlibgold.c
+++ b/src/sound/snd_adlibgold.c
@@ -692,7 +692,7 @@ adgold_timer_poll(void *priv)
 {
     adgold_t *adgold = (adgold_t *) priv;
 
-	/*A small timer period will result in hangs.*/
+    /*A small timer period will result in hangs.*/
     timer_on_auto(&adgold->adgold_mma_timer_count, 4.88964);
 
     if (adgold->adgold_midi_ctrl & 0x3f) {
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/unix/unix_serial_passthrough.c b/src/unix/unix_serial_passthrough.c
index 61f23c345..78041397e 100644
--- a/src/unix/unix_serial_passthrough.c
+++ b/src/unix/unix_serial_passthrough.c
@@ -94,6 +94,7 @@ plat_serpt_write_vcon(serial_passthrough_t *dev, uint8_t data)
     fd_set wrfds;
     int    res;
 #endif
+    size_t res;
 
     /* We cannot use select here, this would block the hypervisor! */
 #if 0
@@ -109,12 +110,11 @@ plat_serpt_write_vcon(serial_passthrough_t *dev, uint8_t data)
 
     /* just write it out */
     if (dev->mode == SERPT_MODE_HOSTSER) {
-        int res = 0;
         do {
             res = write(dev->master_fd, &data, 1);
         } while (res == 0 || (res == -1 && (errno == EAGAIN || res == EWOULDBLOCK)));
     } else
-        write(dev->master_fd, &data, 1);
+        res = write(dev->master_fd, &data, 1);
 }
 
 void
diff --git a/src/video/vid_8514a.c b/src/video/vid_8514a.c
index f46d8a7e7..70561ede8 100644
--- a/src/video/vid_8514a.c
+++ b/src/video/vid_8514a.c
@@ -193,7 +193,7 @@ int ibm8514_has_vga = 0;
 int
 ibm8514_cpu_src(svga_t *svga)
 {
-    ibm8514_t *dev = &svga->dev8514;
+    const ibm8514_t *dev = &svga->dev8514;
 
     if (!(dev->accel.cmd & 0x100))
         return 0;
@@ -207,7 +207,7 @@ ibm8514_cpu_src(svga_t *svga)
 int
 ibm8514_cpu_dest(svga_t *svga)
 {
-    ibm8514_t *dev = &svga->dev8514;
+    const ibm8514_t *dev = &svga->dev8514;
 
     if (!(dev->accel.cmd & 0x100))
         return 0;
@@ -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;
@@ -978,6 +978,7 @@ static void
 ibm8514_accel_outb(uint16_t port, uint8_t val, void *priv)
 {
     svga_t *svga = (svga_t *) priv;
+
     ibm8514_accel_out(port, val, svga, 1);
 }
 
@@ -985,6 +986,7 @@ static void
 ibm8514_accel_outw(uint16_t port, uint16_t val, void *priv)
 {
     svga_t *svga = (svga_t *) priv;
+
     ibm8514_accel_out(port, val, svga, 2);
 }
 
@@ -3742,7 +3744,6 @@ void
 ibm8514_render_8bpp(svga_t *svga)
 {
     ibm8514_t *dev = &svga->dev8514;
-    int       x;
     uint32_t  *p;
     uint32_t   dat;
 
@@ -3757,7 +3758,7 @@ ibm8514_render_8bpp(svga_t *svga)
             dev->firstline_draw = dev->displine;
         dev->lastline_draw = dev->displine;
 
-        for (x = 0; x <= dev->h_disp; x += 8) {
+        for (int x = 0; x <= dev->h_disp; x += 8) {
             dat  = *(uint32_t *) (&dev->vram[dev->ma & dev->vram_mask]);
             p[0] = dev->pallook[dat & 0xff];
             p[1] = dev->pallook[(dat >> 8) & 0xff];
@@ -3781,7 +3782,7 @@ void
 ibm8514_render_15bpp(svga_t *svga)
 {
     ibm8514_t *dev = &svga->dev8514;
-    int x;
+    int        x;
     uint32_t  *p;
     uint32_t   dat;
 
@@ -3822,7 +3823,7 @@ void
 ibm8514_render_16bpp(svga_t *svga)
 {
     ibm8514_t *dev = &svga->dev8514;
-    int x;
+    int        x;
     uint32_t  *p;
     uint32_t   dat;
 
@@ -3863,7 +3864,6 @@ void
 ibm8514_render_24bpp(svga_t *svga)
 {
     ibm8514_t *dev = &svga->dev8514;
-    int       x;
     uint32_t *p;
     uint32_t  dat;
 
@@ -3877,7 +3877,7 @@ ibm8514_render_24bpp(svga_t *svga)
             dev->firstline_draw = dev->displine;
         dev->lastline_draw = dev->displine;
 
-        for (x = 0; x <= dev->h_disp; x += 4) {
+        for (int x = 0; x <= dev->h_disp; x += 4) {
             dat  = *(uint32_t *) (&dev->vram[dev->ma & dev->vram_mask]);
             p[x] = dat & 0xffffff;
 
@@ -3900,9 +3900,8 @@ void
 ibm8514_render_BGR(svga_t *svga)
 {
     ibm8514_t *dev = &svga->dev8514;
-    int       x;
-    uint32_t *p;
-    uint32_t  dat;
+    uint32_t  *p;
+    uint32_t   dat;
 
     if ((dev->displine + svga->y_add) < 0)
         return;
@@ -3914,7 +3913,7 @@ ibm8514_render_BGR(svga_t *svga)
             dev->firstline_draw = dev->displine;
         dev->lastline_draw = dev->displine;
 
-        for (x = 0; x <= dev->h_disp; x += 4) {
+        for (int x = 0; x <= dev->h_disp; x += 4) {
             dat  = *(uint32_t *) (&dev->vram[dev->ma & dev->vram_mask]);
             p[x] = ((dat & 0xff0000) >> 16) | (dat & 0x00ff00) | ((dat & 0x0000ff) << 16);
 
@@ -3937,9 +3936,9 @@ void
 ibm8514_render_ABGR8888(svga_t *svga)
 {
     ibm8514_t *dev = &svga->dev8514;
-    int       x;
-    uint32_t *p;
-    uint32_t  dat;
+    int        x;
+    uint32_t  *p;
+    uint32_t   dat;
 
     if ((dev->displine + svga->y_add) < 0)
         return;
@@ -3964,9 +3963,9 @@ void
 ibm8514_render_RGBA8888(svga_t *svga)
 {
     ibm8514_t *dev = &svga->dev8514;
-    int       x;
-    uint32_t *p;
-    uint32_t  dat;
+    int        x;
+    uint32_t  *p;
+    uint32_t   dat;
 
     if ((dev->displine + svga->y_add) < 0)
         return;
@@ -4029,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;
         }
@@ -4045,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);
@@ -4137,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)
@@ -4167,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);
@@ -4224,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 ffc96fb01..169199826 100644
--- a/src/video/vid_ati68860_ramdac.c
+++ b/src/video/vid_ati68860_ramdac.c
@@ -65,22 +65,23 @@ typedef struct ati68860_ramdac_t {
 } ati68860_ramdac_t;
 
 void
-ati68860_ramdac_out(uint16_t addr, uint8_t val, void *p, svga_t *svga)
+ati68860_ramdac_out(uint16_t addr, uint8_t val, void *priv, svga_t *svga)
 {
-    ati68860_ramdac_t *ramdac = (ati68860_ramdac_t *) p;
+    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;
@@ -168,23 +169,24 @@ ati68860_ramdac_out(uint16_t addr, uint8_t val, void *p, svga_t *svga)
 }
 
 uint8_t
-ati68860_ramdac_in(uint16_t addr, void *p, svga_t *svga)
+ati68860_ramdac_in(uint16_t addr, void *priv, svga_t *svga)
 {
-    ati68860_ramdac_t *ramdac = (ati68860_ramdac_t *) p;
-    uint8_t            temp   = 0;
+    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:
@@ -207,9 +209,9 @@ ati68860_ramdac_in(uint16_t addr, void *p, svga_t *svga)
 }
 
 void
-ati68860_set_ramdac_type(void *p, int type)
+ati68860_set_ramdac_type(void *priv, int type)
 {
-    ati68860_ramdac_t *ramdac = (ati68860_ramdac_t *) p;
+    ati68860_ramdac_t *ramdac = (ati68860_ramdac_t *) priv;
 
     if (ramdac->ramdac_type != type) {
         ramdac->ramdac_type = type;
@@ -237,17 +239,17 @@ ati68860_ramdac_init(UNUSED(const device_t *info))
 }
 
 void
-ati68860_ramdac_set_render(void *p, svga_t *svga)
+ati68860_ramdac_set_render(void *priv, svga_t *svga)
 {
-    ati68860_ramdac_t *ramdac = (ati68860_ramdac_t *) p;
+    ati68860_ramdac_t *ramdac = (ati68860_ramdac_t *) priv;
 
     svga->render = ramdac->render;
 }
 
 void
-ati68860_ramdac_set_pallook(void *p, int i, uint32_t col)
+ati68860_ramdac_set_pallook(void *priv, int i, uint32_t col)
 {
-    ati68860_ramdac_t *ramdac = (ati68860_ramdac_t *) p;
+    ati68860_ramdac_t *ramdac = (ati68860_ramdac_t *) priv;
 
     ramdac->pallook[i] = col;
 }
@@ -255,11 +257,11 @@ ati68860_ramdac_set_pallook(void *p, int i, uint32_t col)
 void
 ati68860_hwcursor_draw(svga_t *svga, int displine)
 {
-    ati68860_ramdac_t *ramdac = (ati68860_ramdac_t *) svga->ramdac;
-    int                offset;
-    uint8_t            dat;
-    uint32_t           col0 = ramdac->pallook[0];
-    uint32_t           col1 = ramdac->pallook[1];
+    const ati68860_ramdac_t *ramdac = (ati68860_ramdac_t *) svga->ramdac;
+    int                      offset;
+    uint8_t                  dat;
+    uint32_t                 col0 = ramdac->pallook[0];
+    uint32_t                 col1 = ramdac->pallook[1];
 
     offset = svga->dac_hwcursor_latch.xoff;
     for (uint32_t x = 0; x < 64 - svga->dac_hwcursor_latch.xoff; x += 4) {
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 3d019251e..75bdb4d03 100644
--- a/src/video/vid_ati_mach8.c
+++ b/src/video/vid_ati_mach8.c
@@ -40,18 +40,18 @@
 #include <86box/vid_svga_render.h>
 #include <86box/vid_ati_eeprom.h>
 
-#define BIOS_MACH8_ROM_PATH             "roms/video/mach8/BIOS.BIN"
-#define BIOS_MACH32_ISA_ROM_PATH        "roms/video/mach32/ATi Mach32 Graphics Pro ISA.BIN"
-#define BIOS_MACH32_VLB_ROM_PATH        "roms/video/mach32/MACH32VLB.VBI"
-#define BIOS_MACH32_MCA_ROM_PATH        "roms/video/mach32/MACH32MCA_Olivetti.BIN"
-#define BIOS_MACH32_PCI_ROM_PATH        "roms/video/mach32/intelopt_00000.rom"
+#define BIOS_MACH8_ROM_PATH      "roms/video/mach8/BIOS.BIN"
+#define BIOS_MACH32_ISA_ROM_PATH "roms/video/mach32/ATi Mach32 Graphics Pro ISA.BIN"
+#define BIOS_MACH32_VLB_ROM_PATH "roms/video/mach32/MACH32VLB.VBI"
+#define BIOS_MACH32_MCA_ROM_PATH "roms/video/mach32/MACH32MCA_Olivetti.BIN"
+#define BIOS_MACH32_PCI_ROM_PATH "roms/video/mach32/intelopt_00000.rom"
 
 typedef struct mach_t {
     ati_eeprom_t eeprom;
     svga_t       svga;
 
     rom_t         bios_rom;
-    rom_t		  bios_rom2;
+    rom_t         bios_rom2;
     mem_mapping_t mmio_linear_mapping;
 
     int mca_bus;
@@ -65,9 +65,9 @@ typedef struct mach_t {
     uint8_t pci_slot;
     uint8_t irq_state;
 
-    int     index;
-    int     ramdac_type;
-    int     old_mode;
+    int index;
+    int ramdac_type;
+    int old_mode;
 
     uint32_t memory;
 
@@ -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,27 +408,26 @@ 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)
 {
-    svga_t   *svga = &mach->svga;
-    int       compare_mode;
-    int       poly_src     = 0;
-    uint16_t  rd_mask      = dev->accel.rd_mask;
-    uint16_t  wrt_mask     = dev->accel.wrt_mask;
-    uint16_t  dest_cmp_clr = dev->accel.color_cmp;
-    int       frgd_sel;
-    int       bkgd_sel;
-    int       mono_src;
-    int       compare  = 0;
-    uint16_t  src_dat  = 0;
-    uint16_t  dest_dat = 0;
-    uint16_t  old_dest_dat;
-    uint16_t *vram_w    = (uint16_t *) dev->vram;
-    uint16_t  mix       = 0;
-    int16_t   clip_l    = dev->accel.clip_left & 0x7ff;
-    int16_t   clip_t    = dev->accel.clip_top & 0x7ff;
-    int16_t   clip_r    = dev->accel.multifunc[4] & 0x7ff;
-    int16_t   clip_b    = dev->accel.multifunc[3] & 0x7ff;
-    uint32_t  mono_dat0 = 0;
-    uint32_t  mono_dat1 = 0;
+    int           compare_mode;
+    int           poly_src     = 0;
+    uint16_t      rd_mask      = dev->accel.rd_mask;
+    uint16_t      wrt_mask     = dev->accel.wrt_mask;
+    uint16_t      dest_cmp_clr = dev->accel.color_cmp;
+    int           frgd_sel;
+    int           bkgd_sel;
+    int           mono_src;
+    int           compare  = 0;
+    uint16_t      src_dat  = 0;
+    uint16_t      dest_dat = 0;
+    uint16_t      old_dest_dat;
+    uint16_t     *vram_w    = (uint16_t *) dev->vram;
+    uint16_t      mix       = 0;
+    int16_t       clip_l    = dev->accel.clip_left & 0x7ff;
+    int16_t       clip_t    = dev->accel.clip_top & 0x7ff;
+    int16_t       clip_r    = dev->accel.multifunc[4] & 0x7ff;
+    int16_t       clip_b    = dev->accel.multifunc[3] & 0x7ff;
+    uint32_t      mono_dat0 = 0;
+    uint32_t      mono_dat1 = 0;
 
     if (!dev->bpp) {
         rd_mask &= 0xff;
@@ -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, uint16_t len)
+mach_accel_out_pixtrans(mach_t *mach, ibm8514_t *dev, uint16_t val)
 {
     int frgd_sel;
     int bkgd_sel;
@@ -2299,7 +2298,7 @@ mach_out(uint16_t addr, uint8_t val, void *priv)
 {
     mach_t          *mach = (mach_t *) priv;
     svga_t          *svga = &mach->svga;
-    ibm8514_t 		*dev  = &svga->dev8514;
+    const ibm8514_t *dev  = &svga->dev8514;
     uint8_t          old;
     uint8_t          rs2;
     uint8_t          rs3;
@@ -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;
     }
@@ -2483,7 +2471,7 @@ mach_in(uint16_t addr, void *priv)
 {
     mach_t          *mach = (mach_t *) priv;
     svga_t          *svga = &mach->svga;
-    ibm8514_t 		*dev  = &svga->dev8514;
+    const ibm8514_t *dev  = &svga->dev8514;
     uint8_t          temp = 0xff;
     uint8_t          rs2;
     uint8_t          rs3;
@@ -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;
@@ -2575,9 +2567,9 @@ mach_in(uint16_t addr, void *priv)
 static void
 mach_recalctimings(svga_t *svga)
 {
-    mach_t *mach = (mach_t *) svga->priv;
+    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);
 
@@ -2595,9 +2587,6 @@ mach_recalctimings(svga_t *svga)
     if (mach->regs[0xb0] & 0x40)
         svga->ma_latch |= 0x20000;
 
-    if (mach->regs[0xa7] & 0x80)
-        svga->clock *= 3;
-
     if (mach->regs[0xb6] & 0x10) {
         svga->hdisp <<= 1;
         svga->htotal <<= 1;
@@ -2605,50 +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))) {
-            mach_log("VGA ON.\n");
-            svga->clock = (uint64_t)((cpuclock * svga->getclock(clock_sel, svga->clock_gen)) / (double) (1ull << 32));
-            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;
-
-                    }
-                    break;
-            }
-        }
-    }
-
-    if (dev->local >= 2) {
-        if (ibm8514_on) {
-            svga->clock = (uint64_t)((cpuclock * svga->getclock((mach->accel.clock_sel >> 2) & 0x0f, svga->clock_gen)) / (double) (1ull << 32));
+    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);
@@ -2671,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;
                     }
@@ -2689,44 +2640,48 @@ 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 & 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:
                         break;
                 }
             }
@@ -2740,11 +2695,11 @@ mach_recalctimings(svga_t *svga)
                 case 0xc0:
                     svga->clock *= 4;
                     break;
+
+                default:
+                    break;
             }
-        }
-    } else {
-        if (ibm8514_on) {
-            svga->clock = (uint64_t)((cpuclock * svga->getclock((mach->accel.clock_sel >> 2) & 0x0f, svga->clock_gen)) / (double) (1ull << 32));
+        } else {
             dev->h_disp                     = (dev->hdisp + 1) << 3;
             dev->h_total                    = (dev->htotal + 1);
             dev->v_total                    = (dev->vtotal + 1);
@@ -2769,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;
                     }
@@ -2783,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
@@ -2929,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:
@@ -3016,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;
@@ -3101,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;
@@ -3235,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)
@@ -3259,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)
@@ -3287,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;
@@ -3307,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
@@ -3622,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;
 
@@ -3659,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;
@@ -3667,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:
@@ -3679,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;
+                pclog("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;
 
@@ -3719,7 +3717,7 @@ mach_accel_out(uint16_t port, uint8_t val, mach_t *mach)
         case 0xeef:
             WRITE8(port, mach->cursor_offset_hi_reg, val);
             mach->cursor_offset_hi = mach->cursor_offset_hi_reg & 0x0f;
-            dev->hwcursor.addr = ((mach->cursor_offset_lo | (mach->cursor_offset_hi << 16))) << 2;
+            dev->hwcursor.addr = (mach->cursor_offset_lo | (mach->cursor_offset_hi << 16)) << 2;
             dev->hwcursor.ena = !!(mach->cursor_offset_hi_reg & 0x8000);
             break;
 
@@ -3757,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;
 
@@ -3819,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) {
+                pclog("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;
 
@@ -3848,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;
 
@@ -3887,9 +3875,11 @@ 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);
+            if (port & 1)
+                dev->ext_pitch = ((mach->accel.ge_pitch & 0xff) << 3);
+
             svga_recalctimings(svga);
             break;
 
@@ -3897,7 +3887,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:
@@ -3914,12 +3905,14 @@ mach_accel_out(uint16_t port, uint8_t val, mach_t *mach)
                         else
                             dev->ext_crt_pitch *= 3;
                         break;
+
+                    default:
+                        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:
@@ -3930,17 +3923,17 @@ mach_accel_out(uint16_t port, uint8_t val, mach_t *mach)
             svga_recalctimings(svga);
             break;
 
-		default:
-			break;
+        default:
+            break;
     }
 }
 
 static uint16_t
 mach_accel_in_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, int len)
 {
-	uint16_t  	   *vram_w = (uint16_t *) dev->vram;
-    uint16_t   		temp = 0;
-    int        		cmd;
+    const uint16_t *vram_w = (uint16_t *) dev->vram;
+    uint16_t        temp = 0;
+    int             cmd;
     int             frgd_sel;
     int             bkgd_sel;
     int             mono_src;
@@ -4049,7 +4042,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 {
@@ -4106,6 +4099,9 @@ mach_accel_in_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, in
                                 } else
                                     mach_accel_start(mach->accel.cmd_type, 1, 2, -1, mach->accel.pix_trans[0] | (mach->accel.pix_trans[1] << 8), mach, dev);
                                 break;
+
+                            default:
+                                break;
                         }
                     }
                 }
@@ -4144,6 +4140,9 @@ mach_accel_in_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, in
                     case 0x0a:
                         temp = dev->accel.multifunc[0x0a];
                         break;
+
+                    default:
+                        break;
                 }
             }
             break;
@@ -4316,6 +4315,9 @@ mach_accel_in_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, in
                     temp = 0x22;
             }
             break;
+
+        default:
+            break;
     }
 
     mach_log("Port FIFO IN=%04x, temp=%04x, len=%d.\n", port, temp, len);
@@ -4365,7 +4367,7 @@ mach_accel_in(uint16_t port, mach_t *mach)
             break;
 
         case 0x42e8:
-       	case 0x42e9:
+        case 0x42e9:
             vpos = dev->vc & 0x7ff;
             if (vblankend > dev->v_total) {
                 vblankend -= dev->v_total;
@@ -4419,9 +4421,9 @@ mach_accel_in(uint16_t port, mach_t *mach)
 
             if (!(port & 1)) {
                 switch (mach->memory) {
-                	case 512:
-                		temp &= ~0x0c;
-                		break;
+                    case 512:
+                        temp &= ~0x0c;
+                        break;
                     case 1024:
                         temp |= 0x04;
                         break;
@@ -4431,6 +4433,9 @@ mach_accel_in(uint16_t port, mach_t *mach)
                     case 4096:
                         temp |= 0x0c;
                         break;
+
+                    default:
+                        break;
                 }
             }
             break;
@@ -4468,10 +4473,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;
 
@@ -4513,8 +4515,8 @@ mach_accel_in(uint16_t port, mach_t *mach)
             READ8(port, dev->accel.multifunc[3]);
             break;
 
-		default:
-			break;
+        default:
+            break;
     }
     mach_log("Port accel in = %04x, temp = %04x.\n", port, temp);
     return temp;
@@ -4612,10 +4614,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)) &&
@@ -4629,7 +4942,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);
     }
 }
 
@@ -4637,6 +4950,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)) &&
@@ -4650,7 +4964,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);
     }
 }
 
@@ -4658,6 +4973,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)) &&
@@ -4673,7 +4989,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);
     }
 }
 
@@ -4681,6 +5000,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;
 
@@ -4692,7 +5012,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;
 }
@@ -4701,6 +5021,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;
 
@@ -4711,8 +5032,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;
 }
@@ -4721,6 +5044,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;
 
@@ -4733,8 +5057,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;
 }
@@ -4797,21 +5125,21 @@ mach32_updatemapping(mach_t *mach)
 static void
 mach32_hwcursor_draw(svga_t *svga, int displine)
 {
-    mach_t *mach 	   = (mach_t *) svga->priv;
-    ibm8514_t *dev 	   = &svga->dev8514;
+    const mach_t *mach   = (mach_t *) svga->priv;
+    ibm8514_t    *dev    = &svga->dev8514;
     uint16_t      dat;
     int           comb;
     int           offset = dev->hwcursor_latch.x - dev->hwcursor_latch.xoff;
     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 {
@@ -4850,6 +5178,7 @@ mach32_hwcursor_draw(svga_t *svga, int displine)
         dev->hwcursor_latch.addr += 16;
 }
 
+#if 0
 static void
 mach_io_remove(mach_t *mach)
 {
@@ -4963,6 +5292,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)
@@ -5079,9 +5409,10 @@ mach_io_set(mach_t *mach)
 }
 
 static uint8_t
-mach_mca_read(int port, void *p)
+mach_mca_read(int port, void *priv)
 {
-    mach_t *mach = (mach_t *) p;
+    const mach_t *mach = (mach_t *) priv;
+
     mach_log("[%04X]: MCA read port = %x, val = %02x.\n", CS, port & 7, mach->pos_regs[port & 7]);
     return mach->pos_regs[port & 7];
 }
@@ -5089,8 +5420,7 @@ mach_mca_read(int port, void *p)
 static void
 mach_mca_write(int port, uint8_t val, void *priv)
 {
-    mach_t *mach = (mach_t *) priv;
-    svga_t *svga = &mach->svga;
+    mach_t       *mach = (mach_t *) priv;
 
     if (port < 0x102)
         return;
@@ -5106,22 +5436,25 @@ mach_mca_write(int port, uint8_t val, void *priv)
 }
 
 static uint8_t
-mach_mca_feedb(void *p)
+mach_mca_feedb(void *priv)
 {
-    mach_t *mach = (mach_t *) p;
+    const mach_t *mach = (mach_t *) priv;
+
     mach_log("FeedB = %x.\n", mach->pos_regs[2] & 0x01);
     return mach->pos_regs[2] & 0x01;
 }
 
 static void
-mach_mca_reset(void *p)
+mach_mca_reset(void *priv)
 {
-    mach_t *mach = (mach_t *) p;
+    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);
 }
@@ -5320,13 +5653,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
@@ -5362,6 +5694,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 {
@@ -5382,8 +5715,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;
@@ -5392,7 +5727,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) {
@@ -5411,10 +5745,10 @@ mach8_init(const device_t *info)
             mca_add(mach_mca_read, mach_mca_write, mach_mca_feedb, mach_mca_reset, mach);
         } else if (mach->pci_bus) {
             ati_eeprom_load(&mach->eeprom, "mach32_pci.nvr", 1);
-			if (mach->has_bios) {
-	            mem_mapping_disable(&mach->bios_rom.mapping);
+            if (mach->has_bios) {
+                mem_mapping_disable(&mach->bios_rom.mapping);
                 pci_add_card(PCI_ADD_NORMAL, mach32_pci_read, mach32_pci_write, mach, &mach->pci_slot);
-			} else
+            } else
                 pci_add_card(PCI_ADD_VIDEO, mach32_pci_read, mach32_pci_write, mach, &mach->pci_slot);
             mach->pci_regs[PCI_REG_COMMAND] = 0x83;
             mach->pci_regs[0x30]            = 0x00;
@@ -5466,7 +5800,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_cga_comp.c b/src/video/vid_cga_comp.c
index 31e4a6bf7..d580f0c06 100644
--- a/src/video/vid_cga_comp.c
+++ b/src/video/vid_cga_comp.c
@@ -44,22 +44,22 @@ static const double tau = 6.28318531; /* == 2*pi */
 
 static unsigned char chroma_multiplexer[256] = {
     // clang-format off
-	  2,  2,  2,  2, 114,174,  4,  3,   2,  1,133,135,   2,113,150,  4,
-	133,  2,  1, 99, 151,152,  2,  1,   3,  2, 96,136, 151,152,151,152,
-	  2, 56, 62,  4, 111,250,118,  4,   0, 51,207,137,   1,171,209,  5,
-	140, 50, 54,100, 133,202, 57,  4,   2, 50,153,149, 128,198,198,135,
-	 32,  1, 36, 81, 147,158,  1, 42,  33,  1,210,254,  34,109,169, 77,
-	177,  2,  0,165, 189,154,  3, 44,  33,  0, 91,197, 178,142,144,192,
-	  4,  2, 61, 67, 117,151,112, 83,   4,  0,249,255,   3,107,249,117,
-	147,  1, 50,162, 143,141, 52, 54,   3,  0,145,206, 124,123,192,193,
-	 72, 78,  2,  0, 159,208,  4,  0,  53, 58,164,159,  37,159,171,  1,
-	248,117,  4, 98, 212,218,  5,  2,  54, 59, 93,121, 176,181,134,130,
-	  1, 61, 31,  0, 160,255, 34,  1,   1, 58,197,166,   0,177,194,  2,
-	162,111, 34, 96, 205,253, 32,  1,   1, 57,123,125, 119,188,150,112,
-	 78,  4,  0, 75, 166,180, 20, 38,  78,  1,143,246,  42,113,156, 37,
-	252,  4,  1,188, 175,129,  1, 37, 118,  4, 88,249, 202,150,145,200,
-	 61, 59, 60, 60, 228,252,117, 77,  60, 58,248,251,  81,212,254,107,
-	198, 59, 58,169, 250,251, 81, 80, 100, 58,154,250, 251,252,252,252
+      2,  2,  2,  2, 114,174,  4,  3,   2,  1,133,135,   2,113,150,  4,
+    133,  2,  1, 99, 151,152,  2,  1,   3,  2, 96,136, 151,152,151,152,
+      2, 56, 62,  4, 111,250,118,  4,   0, 51,207,137,   1,171,209,  5,
+    140, 50, 54,100, 133,202, 57,  4,   2, 50,153,149, 128,198,198,135,
+     32,  1, 36, 81, 147,158,  1, 42,  33,  1,210,254,  34,109,169, 77,
+    177,  2,  0,165, 189,154,  3, 44,  33,  0, 91,197, 178,142,144,192,
+      4,  2, 61, 67, 117,151,112, 83,   4,  0,249,255,   3,107,249,117,
+    147,  1, 50,162, 143,141, 52, 54,   3,  0,145,206, 124,123,192,193,
+     72, 78,  2,  0, 159,208,  4,  0,  53, 58,164,159,  37,159,171,  1,
+    248,117,  4, 98, 212,218,  5,  2,  54, 59, 93,121, 176,181,134,130,
+      1, 61, 31,  0, 160,255, 34,  1,   1, 58,197,166,   0,177,194,  2,
+    162,111, 34, 96, 205,253, 32,  1,   1, 57,123,125, 119,188,150,112,
+     78,  4,  0, 75, 166,180, 20, 38,  78,  1,143,246,  42,113,156, 37,
+    252,  4,  1,188, 175,129,  1, 37, 118,  4, 88,249, 202,150,145,200,
+     61, 59, 60, 60, 228,252,117, 77,  60, 58,248,251,  81,212,254,107,
+    198, 59, 58,169, 250,251, 81, 80, 100, 58,154,250, 251,252,252,252
     // clang-format on
 };
 
diff --git a/src/video/vid_cl54xx.c b/src/video/vid_cl54xx.c
index cf4ff402d..2d89df10b 100644
--- a/src/video/vid_cl54xx.c
+++ b/src/video/vid_cl54xx.c
@@ -3353,13 +3353,13 @@ gd54xx_pattern_copy(gd54xx_t *gd54xx)
     /* The vertical offset is in the three low-order bits of the Source Address register. */
     pattern_y = gd54xx->blt.src_addr & 0x07;
 
-    /* Mode		Pattern bytes	Pattern line bytes
+    /* Mode             Pattern bytes   Pattern line bytes
        ---------------------------------------------------
-       Color Expansion	8		1
-       8-bpp		64		8
-       16-bpp		128		16
-       24-bpp		256		32
-       32-bpp		256		32
+       Color Expansion    8              1
+       8-bpp             64              8
+       16-bpp           128             16
+       24-bpp           256             32
+       32-bpp           256             32
      */
 
     /* The boundary has to be equal to the size of the pattern. */
@@ -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_ega.c b/src/video/vid_ega.c
index 67ca78821..b5d38a8e0 100644
--- a/src/video/vid_ega.c
+++ b/src/video/vid_ega.c
@@ -17,6 +17,7 @@
  *          Copyright 2008-2019 Sarah Walker.
  *          Copyright 2016-2019 Miran Grca.
  */
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdint.h>
 #include <string.h>
@@ -26,6 +27,7 @@
 #include "cpu.h"
 #include <86box/io.h>
 #include <86box/timer.h>
+#include <86box/pic.h>
 #include <86box/pit.h>
 #include <86box/mem.h>
 #include <86box/rom.h>
@@ -92,11 +94,11 @@ ega_out(uint16_t addr, uint8_t val, void *priv)
                 case 0xb2:
                 case 0xbe:
 #if 0
-				if (ega->regs[0xbe] & 8) {	/*Read/write bank mode*/
-					svga->read_bank  = ((ega->regs[0xb2] >> 5) & 7) * 0x10000;
-					svga->write_bank = ((ega->regs[0xb2] >> 1) & 7) * 0x10000;
-				} else                    /*Single bank mode*/
-					svga->read_bank = svga->write_bank = ((ega->regs[0xb2] >> 1) & 7) * 0x10000;
+                    if (ega->regs[0xbe] & 8) { /*Read/write bank mode*/
+                        svga->read_bank  = ((ega->regs[0xb2] >> 5) & 7) * 0x10000;
+                        svga->write_bank = ((ega->regs[0xb2] >> 1) & 7) * 0x10000;
+                    } else                    /*Single bank mode*/
+                        svga->read_bank = svga->write_bank = ((ega->regs[0xb2] >> 1) & 7) * 0x10000;
 #endif
                     break;
                 case 0xb3:
@@ -302,8 +304,8 @@ ega_in(uint16_t addr, void *priv)
                 ret = ega->attrregs[ega->attraddr];
             break;
         case 0x3c2:
-            ret = (egaswitches & (8 >> egaswitchread)) ? 0x10 : 0x00;
-            break;
+             ret = (egaswitches & (8 >> egaswitchread)) ? 0x10 : 0x00;
+             break;
         case 0x3c4:
             if (ega_type)
                 ret = ega->seqaddr;
@@ -361,8 +363,31 @@ ega_in(uint16_t addr, void *priv)
             break;
         case 0x3da:
             ega->attrff = 0;
-            ega->stat ^= 0x30; /* Fools IBM EGA video BIOS self-test. */
-            ret = ega->stat;
+            if (ega_type == 2) {
+                ret = ega->stat & 0xcf;
+                switch ((ega->attrregs[0x12] >> 4) & 0x03) {
+                    case 0x00:
+                        /* 00 = Pri. Red (5), Pri. Blue (4) */
+                        ret |= (ega->color_mux & 0x04) ? 0x20 : 0x00;
+                        ret |= (ega->color_mux & 0x01) ? 0x10 : 0x00;
+                        break;
+                    case 0x01:
+                    case 0x03:
+                        /* 01 = Sec. Red (5), Sec. Green (4) */
+                        /* 11 = Sec. Red (5), Sec. Green (4) */
+                        ret |= (ega->color_mux & 0x20) ? 0x20 : 0x00;
+                        ret |= (ega->color_mux & 0x10) ? 0x10 : 0x00;
+                        break;
+                    case 0x02:
+                        /* 10 = Sec. Blue (5), Pri. Green (4) */
+                        ret |= (ega->color_mux & 0x08) ? 0x20 : 0x00;
+                        ret |= (ega->color_mux & 0x02) ? 0x10 : 0x00;
+                        break;
+                }
+            } else {
+                ega->stat ^= 0x30; /* Fools IBM EGA video BIOS self-test. */
+                ret = ega->stat;
+            }
             break;
         case 0x7c6:
             ret = 0xfd;        /* EGA mode supported. */
@@ -371,7 +396,7 @@ ega_in(uint16_t addr, void *priv)
             /* 0000 = None;
                0001 = Compaq Dual-Mode (DM) Monitor;
                0010 = RGBI Color Monitor;
-               0011 = COMAPQ Color Monitor (RrGgBb) or Compatible;
+               0011 = COMPAQ Color Monitor (RrGgBb) or Compatible;
                0100 - 1111 = Reserved. */
             ret = 0x01;
             break;
@@ -436,15 +461,15 @@ ega_recalctimings(ega_t *ega)
 
     if (ega_type == 2) {
         color = (ega->miscout & 1);
-        clksel = ((ega->miscout & 0xc) >> 2) | ((ega->regs[0xbe] & 0x10) ? 4 : 0);
+        clksel = ((ega->miscout & 0xc) >> 2);
 
         if (color) {
-            if (clksel)
+            if (ega->vidclock)
                 crtcconst = (cpuclock / 16257000.0 * (double) (1ULL << 32));
             else
                 crtcconst = (cpuclock / (157500000.0 / 11.0) * (double) (1ULL << 32));
         } else {
-            if (clksel)
+            if (ega->vidclock)
                 crtcconst = (cpuclock / 18981000.0 * (double) (1ULL << 32));
             else
                 crtcconst = (cpuclock / 16872000.0 * (double) (1ULL << 32));
@@ -484,6 +509,10 @@ ega_recalctimings(ega_t *ega)
         else
             crtcconst = (ega->seqregs[1] & 1) ? CGACONST : (CGACONST * (9.0 / 8.0));
     }
+    if (!(ega->seqregs[1] & 1))
+        ega->dot_clock = crtcconst / 9.0;
+    else
+        ega->dot_clock = crtcconst / 8.0;
 
     ega->interlace = 0;
 
@@ -538,9 +567,110 @@ ega_recalctimings(ega_t *ega)
     if (ega->dispofftime < TIMER_USEC)
         ega->dispofftime = TIMER_USEC;
 
+    ega->dot_time  = (uint64_t) (ega->dot_clock);
+    if (ega->dot_time < TIMER_USEC)
+        ega->dot_time = TIMER_USEC;
+
     ega_recalc_remap_func(ega);
 }
 
+/* This is needed for the Compaq EGA so that it can pass the 3DA
+   palette mux part of the self-test. */
+void
+ega_dot_poll(void *priv)
+{
+    ega_t   *ega = (ega_t *) priv;
+    static uint8_t chr;
+    static uint8_t attr;
+    const bool doublewidth   = ((ega->seqregs[1] & 8) != 0);
+    const bool attrblink     = ((ega->attrregs[0x10] & 8) != 0);
+    const bool attrlinechars = (ega->attrregs[0x10] & 4);
+    const bool crtcreset     = ((ega->crtc[0x17] & 0x80) == 0);
+    const bool seq9dot       = ((ega->seqregs[1] & 1) == 0);
+    const bool blinked       = ega->blink & 0x10;
+    const int  dwshift       = doublewidth ? 1 : 0;
+    const int  dotwidth      = 1 << dwshift;
+    const int  charwidth     = dotwidth * (seq9dot ? 9 : 8);
+    const int  cursoron      = (ega->sc == (ega->crtc[10] & 31));
+    const int  cursoraddr    = (ega->crtc[0xe] << 8) | ega->crtc[0xf];
+    uint32_t addr;
+    int drawcursor;
+    uint32_t charaddr;
+    static int fg;
+    static int bg;
+    static uint32_t dat;
+    static int disptime;
+    static int _dispontime;
+    static int _dispofftime;
+    static int cclock = 0;
+    static int active = 0;
+
+    if (ega->seqregs[1] & 8) {
+        disptime    = ((ega->crtc[0] + 2) << 1);
+        _dispontime = ((ega->crtc[1] + 1) << 1);
+    } else {
+        disptime    = (ega->crtc[0] + 2);
+        _dispontime = (ega->crtc[1] + 1);
+    }
+    _dispofftime = disptime - _dispontime;
+
+    timer_advance_u64(&ega->dot_timer, ega->dot_time);
+
+    if (ega->render == ega_render_text)
+        ega->color_mux = (dat & (0x100 >> (ega->dot >> dwshift))) ? fg : bg;
+    else
+        ega->color_mux = 0x00;
+
+    addr = ega->remap_func(ega, ega->cca) & ega->vrammask;
+
+    if (!crtcreset) {
+        chr  = ega->vram[addr];
+        attr = ega->vram[addr + 1];
+    } else
+        chr = attr = 0;
+
+    drawcursor = ((ega->cca == cursoraddr) && cursoron && ega->cursoron);
+
+    if (attr & 8)
+        charaddr = ega->charsetb + (chr * 0x80);
+    else
+        charaddr = ega->charseta + (chr * 0x80);
+
+    dat = ega->vram[charaddr + (ega->sc << 2)];
+    dat <<= 1;
+    if ((chr & ~0x1F) == 0xC0 && attrlinechars)
+        dat |= (dat >> 1) & 1;
+
+    if (!active)
+        dat = 0x200;
+
+    if (drawcursor) {
+        bg = ega->egapal[attr & 0x0f];
+        fg = ega->egapal[attr >> 4];
+    } else {
+        fg = ega->egapal[attr & 0x0f];
+        bg = ega->egapal[attr >> 4];
+        if ((attr & 0x80) && attrblink) {
+            bg = ega->egapal[(attr >> 4) & 7];
+            if (blinked)
+                fg = bg;
+        }
+    }
+
+    ega->dot = (ega->dot + 1) % charwidth;
+
+    if (ega->dot == 0) {
+        ega->cca = (ega->cca + 4) & 0x3ffff;
+
+        cclock++;
+
+        if (active && (cclock == _dispofftime))
+            active = 0;
+        else if (!active && (cclock == _dispontime))
+            active = 1;
+    }
+}
+
 void
 ega_poll(void *priv)
 {
@@ -623,6 +753,7 @@ ega_poll(void *priv)
             if (ega->linedbl && !ega->linecountff) {
                 ega->linecountff = 1;
                 ega->ma          = ega->maback;
+                ega->cca          = ega->maback;
             }
             if (ega->sc == (ega->crtc[9] & 31)) {
                 ega->linecountff = 0;
@@ -633,11 +764,13 @@ ega_poll(void *priv)
                     ega->maback += (ega->rowoffset << 3);
                 ega->maback &= ega->vrammask;
                 ega->ma = ega->maback;
+                ega->cca = ega->maback;
             } else {
                 ega->linecountff = 0;
                 ega->sc++;
                 ega->sc &= 31;
                 ega->ma = ega->maback;
+                ega->cca = ega->maback;
             }
         }
         ega->vc++;
@@ -649,6 +782,7 @@ ega_poll(void *priv)
             else
                 ega->ma = ega->maback = 0;
             ega->ma <<= 2;
+            ega->cca = ega->ma;
             ega->maback <<= 2;
             ega->sc = 0;
             if (ega->attrregs[0x10] & 0x20) {
@@ -676,6 +810,7 @@ ega_poll(void *priv)
         if (ega->vc == ega->vsyncstart) {
             ega->dispon = 0;
             ega->stat |= 8;
+            // picint(1 << 2);
             x = ega->hdisp;
 
             if (ega->interlace && !ega->oddeven)
@@ -715,6 +850,7 @@ ega_poll(void *priv)
             ega->ma <<= 2;
             ega->maback <<= 2;
             ega->ca <<= 2;
+            ega->cca = ega->ma;
         }
         if (ega->vc == ega->vtotal) {
             ega->vc       = 0;
@@ -1263,6 +1399,8 @@ ega_init(ega_t *ega, int monitor_type, int is_mono)
     ega->crtc[6] = 255;
 
     timer_add(&ega->timer, ega_poll, ega, 1);
+    if (ega_type == 2)
+        timer_add(&ega->dot_timer, ega_dot_poll, ega, 1);
 }
 
 static void *
@@ -1339,6 +1477,7 @@ ega_standalone_init(const device_t *info)
         memset(ega->eeprom, 0, sizeof(ati_eeprom_t));
         ati_eeprom_load((ati_eeprom_t *) ega->eeprom, "egawonder800.nvr", 0);
     } else if (info->local == EGA_COMPAQ) {
+        io_sethandler(0x0084, 0x0001, ega_in, NULL, NULL, ega_out, NULL, NULL, ega);
         io_sethandler(0x07c6, 0x0001, ega_in, NULL, NULL, ega_out, NULL, NULL, ega);
         io_sethandler(0x0bc6, 0x0001, ega_in, NULL, NULL, ega_out, NULL, NULL, ega);
         io_sethandler(0x0fc6, 0x0001, ega_in, NULL, NULL, ega_out, NULL, NULL, ega);
@@ -1403,11 +1542,11 @@ ega_speed_changed(void *priv)
 }
 
 /* SW1 SW2 SW3 SW4
-   OFF OFF  ON OFF	Monochrome			(5151)		1011	0x0B
-    ON OFF OFF  ON	Color 40x25			(5153)		0110	0x06
-   OFF OFF OFF  ON	Color 80x25			(5153)		0111	0x07
-    ON  ON  ON OFF	Enhanced Color - Normal Mode	(5154)		1000	0x08
-   OFF  ON  ON OFF	Enhanced Color - Enhanced Mode	(5154)		1001	0x09
+   OFF OFF  ON OFF  Monochrome                      (5151) 1011 0x0B
+    ON OFF OFF  ON  Color 40x25                     (5153) 0110 0x06
+   OFF OFF OFF  ON  Color 80x25                     (5153) 0111 0x07
+    ON  ON  ON OFF  Enhanced Color - Normal Mode    (5154) 1000 0x08
+   OFF  ON  ON OFF  Enhanced Color - Enhanced Mode  (5154) 1001 0x09
 
    0 = Switch closed (ON);
    1 = Switch open   (OFF). */
diff --git a/src/video/vid_f82c425.c b/src/video/vid_f82c425.c
index a2ffeddb5..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
@@ -39,7 +39,7 @@
  *
  * This program is  distributed in the hope that it will be useful, but
  * WITHOUT   ANY  WARRANTY;  without  even   the  implied  warranty  of
- * MERCHANTABILITY  or FITNESS	FOR A PARTICULAR  PURPOSE. See	the GNU
+ * MERCHANTABILITY  or FITNESS  FOR A PARTICULAR  PURPOSE. See  the GNU
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
diff --git a/src/video/vid_genius.c b/src/video/vid_genius.c
index 763cfe540..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>
@@ -74,7 +74,7 @@ static video_timings_t timing_genius = { .type = VIDEO_ISA, .write_b = 8, .write
  * Two card-specific registers control text and graphics display:
  *
  *  03B0: Control register.
- * 	   Bit 0: Map all graphics framebuffer into memory.
+ *         Bit 0: Map all graphics framebuffer into memory.
  *         Bit 2: Unknown. Set by GMC /M; cleared by mode set or GMC /T.
  *         Bit 4: Set for CGA-compatible graphics, clear for native graphics.
  *         Bit 5: Set for black on white, clear for white on black.
@@ -404,13 +404,13 @@ genius_textline(genius_t *genius, uint8_t background, int mda, int cols80)
         charh = 15 - (genius->genius_charh & 3);
 
 #if 0
-	if (genius->genius_charh & 0x10) {
-		row = ((dl >> 1) / charh);
-		sc  = ((dl >> 1) % charh);
-	} else {
-		row = (dl / charh);
-		sc  = (dl % charh);
-	}
+    if (genius->genius_charh & 0x10) {
+        row = ((dl >> 1) / charh);
+        sc  = ((dl >> 1) % charh);
+    } else {
+        row = (dl / charh);
+        sc  = (dl % charh);
+    }
 #else
         row = (dl / charh);
         sc  = (dl % charh);
@@ -449,10 +449,10 @@ genius_textline(genius_t *genius, uint8_t background, int mda, int cols80)
 
     for (int x = 0; x < w; x++) {
 #if 0
-	if ((genius->genius_charh & 0x10) && ((addr + 2 * x) > 0x0FFF))
-		chr = 0x00;
-	if ((genius->genius_charh & 0x10) && ((addr + 2 * x + 1) > 0x0FFF))
-		attr = 0x00;
+    if ((genius->genius_charh & 0x10) && ((addr + 2 * x) > 0x0FFF))
+        chr = 0x00;
+    if ((genius->genius_charh & 0x10) && ((addr + 2 * x + 1) > 0x0FFF))
+        attr = 0x00;
 #endif
         chr  = framebuf[(addr + 2 * x) & 0x3FFF];
         attr = framebuf[(addr + 2 * x + 1) & 0x3FFF];
diff --git a/src/video/vid_ics2494.c b/src/video/vid_ics2494.c
index bfe41a871..309d07966 100644
--- a/src/video/vid_ics2494.c
+++ b/src/video/vid_ics2494.c
@@ -49,9 +49,9 @@ ics2494_log(const char *fmt, ...)
 #endif
 
 float
-ics2494_getclock(int clock, void *p)
+ics2494_getclock(int clock, void *priv)
 {
-    ics2494_t *ics2494 = (ics2494_t *) p;
+    const ics2494_t *ics2494 = (ics2494_t *) priv;
 
     if (clock > 15)
         clock = 15;
@@ -142,6 +142,9 @@ ics2494_init(const device_t *info)
             ics2494->freq[0xe] = 75000000.0;
             ics2494->freq[0xf] = 94500000.0;
             break;
+
+        default:
+            break;
     }
 
     return ics2494;
diff --git a/src/video/vid_ogc.c b/src/video/vid_ogc.c
index edc4c841e..a0a49525d 100644
--- a/src/video/vid_ogc.c
+++ b/src/video/vid_ogc.c
@@ -84,8 +84,8 @@ ogc_out(uint16_t addr, uint8_t val, void *priv)
 {
     ogc_t *ogc = (ogc_t *) priv;
 
-    // if (addr >= 0x3c0 && addr <= 0x3cf){
-    // 	addr = addr + 16;
+    // if (addr >= 0x3c0 && addr <= 0x3cf) {
+    //     addr = addr + 16;
     // }
 
     switch (addr) {
@@ -110,8 +110,8 @@ ogc_in(uint16_t addr, void *priv)
 {
     ogc_t *ogc = (ogc_t *) priv;
 
-    // if (addr >= 0x3c0 && addr <= 0x3cf){
-    // 	addr = addr + 16;
+    // if (addr >= 0x3c0 && addr <= 0x3cf) {
+    //     addr = addr + 16;
     // }
 
     uint8_t ret = 0xff;
diff --git a/src/video/vid_pgc.c b/src/video/vid_pgc.c
index 0033e96d1..ce848b964 100644
--- a/src/video/vid_pgc.c
+++ b/src/video/vid_pgc.c
@@ -747,7 +747,7 @@ pgc_plot(pgc_t *dev, uint16_t x, uint16_t y)
  * Draw a line (using raster coordinates).
  *
  * Bresenham's Algorithm from:
- *	<https://rosettacode.org/wiki/Bitmap/Bresenham%27s_line_algorithm#C>
+ *  <https://rosettacode.org/wiki/Bitmap/Bresenham%27s_line_algorithm#C>
  *
  * The line pattern mask to use is passed in. Return value is the
  * line pattern mask, rotated by the number of points drawn.
@@ -1384,11 +1384,11 @@ hndl_window(pgc_t *dev)
  * core commands (listed below) and subclass commands (listed in the clone).
  *
  * Each row has five parameters:
- * 	ASCII-mode command
- * 	Hex-mode command
- * 	Function that executes this command
- * 	Function that parses this command when building a command list
- * 	Parameter for the parse function
+ *  ASCII-mode command
+ *  Hex-mode command
+ *  Function that executes this command
+ *  Function that parses this command when building a command list
+ *  Parameter for the parse function
  *
  * TODO: This list omits numerous commands present in a genuine PGC
  *       (ARC, AREA, AREABC, BUFFER, CIRCLE etc etc).
diff --git a/src/video/vid_sigma.c b/src/video/vid_sigma.c
index 97383bc65..a91716657 100644
--- a/src/video/vid_sigma.c
+++ b/src/video/vid_sigma.c
@@ -109,8 +109,8 @@
  * 0x2DC: On write: Resets the NMI.
  * 0x2DD: Memory paging. The memory from 0xC1800 to 0xC1FFF can be either:
  *
- *	> ROM: A 128 character 8x16 font for use in graphics modes
- *	> RAM: Use by the video BIOS to hold its settings.
+ *  > ROM: A 128 character 8x16 font for use in graphics modes
+ *  > RAM: Use by the video BIOS to hold its settings.
  *
  * Reading port 2DD switches to ROM. Bit 7 of the value read gives the
  * previous paging state: bit 7 set if ROM was paged, clear if RAM was
diff --git a/src/video/vid_svga.c b/src/video/vid_svga.c
index 0b75e4b09..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;
@@ -110,11 +109,11 @@ svga_set_override(svga_t *svga, int val)
 void
 svga_out(uint16_t addr, uint8_t val, void *priv)
 {
-    svga_t *svga = (svga_t *) priv;
+    svga_t    *svga = (svga_t *) priv;
     ibm8514_t *dev = &svga->dev8514;
-    xga_t *xga = &svga->xga;
-    uint8_t o;
-    uint8_t index;
+    xga_t     *xga = &svga->xga;
+    uint8_t    o;
+    uint8_t    index;
 
     switch (addr) {
         case 0x2ea:
@@ -150,6 +149,9 @@ svga_out(uint16_t addr, uint8_t val, void *priv)
                     dev->dac_pos  = 0;
                     dev->dac_addr = (dev->dac_addr + 1) & 0xff;
                     break;
+
+                default:
+                    break;
             }
             break;
 
@@ -208,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;
@@ -274,7 +276,7 @@ svga_out(uint16_t addr, uint8_t val, void *priv)
                     break;
                 case 2:
                     index                 = svga->dac_addr & 255;
-					svga->dac_b 		  = val;
+                    svga->dac_b           = val;
                     svga->vgapal[index].r = svga->dac_r;
                     svga->vgapal[index].g = svga->dac_g;
                     svga->vgapal[index].b = svga->dac_b;
@@ -353,10 +355,10 @@ svga_out(uint16_t addr, uint8_t val, void *priv)
 uint8_t
 svga_in(uint16_t addr, void *priv)
 {
-    svga_t *svga = (svga_t *) priv;
+    svga_t    *svga = (svga_t *) priv;
     ibm8514_t *dev = &svga->dev8514;
-    uint8_t index;
-    uint8_t ret = 0xff;
+    uint8_t    index;
+    uint8_t    ret = 0xff;
 
     switch (addr) {
         case 0x2ea:
@@ -394,8 +396,8 @@ svga_in(uint16_t addr, void *priv)
                         ret = svga->vgapal[index].b & 0x3f;
                     break;
 
-              	default:
-              		break;
+                default:
+                    break;
             }
             break;
 
@@ -515,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);
         }
     }
 }
@@ -538,11 +539,10 @@ void
 svga_recalctimings(svga_t *svga)
 {
     ibm8514_t *dev = &svga->dev8514;
-    xga_t *xga = &svga->xga;
-    double crtcconst;
-    double _dispontime;
-    double _dispofftime;
-    double disptime;
+    double           crtcconst;
+    double           _dispontime;
+    double           _dispofftime;
+    double           disptime;
 
     svga->vtotal      = svga->crtc[6];
     svga->dispend     = svga->crtc[0x12];
@@ -725,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;
@@ -812,7 +807,7 @@ svga_poll(void *priv)
 {
     svga_t    *svga = (svga_t *) priv;
     ibm8514_t *dev  = &svga->dev8514;
-   	xga_t     *xga  = &svga->xga;
+    xga_t     *xga  = &svga->xga;
     uint32_t   x;
     uint32_t   blink_delay;
     int        wx;
@@ -820,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;
     }
@@ -919,7 +915,7 @@ svga_poll(void *priv)
             svga->con = 0;
         if (svga->dispon) {
             if (svga->linedbl && !svga->linecountff) {
-            	svga->linecountff = 1;
+                svga->linecountff = 1;
                 svga->ma          = svga->maback;
             } else if (svga->sc == svga->rowcount) {
                 svga->linecountff = 0;
@@ -1220,12 +1216,12 @@ svga_decode_addr(svga_t *svga, uint32_t addr, int write)
 static __inline void
 svga_write_common(uint32_t addr, uint8_t val, uint8_t linear, void *priv)
 {
-    svga_t *svga = (svga_t *) priv;
-    xga_t  *xga  = &svga->xga;
+    svga_t *svga       = (svga_t *) priv;
+    xga_t  *xga        = &svga->xga;
     int     writemask2 = svga->writemask;
     int     reset_wm   = 0;
     latch_t vall;
-    uint8_t wm = svga->writemask;
+    uint8_t wm         = svga->writemask;
     uint8_t count;
     uint8_t i;
 
@@ -1281,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)
@@ -1437,7 +1425,7 @@ static __inline uint8_t
 svga_read_common(uint32_t addr, uint8_t linear, void *priv)
 {
     svga_t  *svga       = (svga_t *) priv;
-    xga_t  *xga         = &svga->xga;
+    xga_t   *xga        = &svga->xga;
     uint32_t latch_addr = 0;
     int      readplane  = svga->readplane;
     uint8_t  count;
@@ -1502,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_table.c b/src/video/vid_table.c
index dcc95b4b0..7d25f8625 100644
--- a/src/video/vid_table.c
+++ b/src/video/vid_table.c
@@ -81,7 +81,7 @@ video_cards[] = {
     { &vid_internal_device                           },
     { &atiega_device                                 },
     { &mach8_isa_device,        VIDEO_FLAG_TYPE_8514 },
-    { &mach32_isa_device, 		VIDEO_FLAG_TYPE_8514 },
+    { &mach32_isa_device,       VIDEO_FLAG_TYPE_8514 },
     { &mach64gx_isa_device                           },
     { &ati28800k_device                              },
     { &ati18800_vga88_device                         },
@@ -159,7 +159,7 @@ video_cards[] = {
     { &gd5428_mca_device                             },
     { &et4000_mca_device                             },
     { &radius_svga_multiview_mca_device              },
-    { &mach32_pci_device, 		VIDEO_FLAG_TYPE_8514 },
+    { &mach32_pci_device,       VIDEO_FLAG_TYPE_8514 },
     { &mach64gx_pci_device                           },
     { &mach64vt2_device                              },
     { &et4000w32p_videomagic_revb_pci_device         },
@@ -217,7 +217,7 @@ video_cards[] = {
     { &voodoo_3_1000_device                          },
     { &voodoo_3_2000_device                          },
     { &voodoo_3_3000_device                          },
-    { &mach32_vlb_device, 		VIDEO_FLAG_TYPE_8514 },
+    { &mach32_vlb_device,       VIDEO_FLAG_TYPE_8514 },
     { &mach64gx_vlb_device                           },
     { &et4000w32i_vlb_device                         },
     { &et4000w32p_videomagic_revb_vlb_device         },
diff --git a/src/video/vid_tgui9440.c b/src/video/vid_tgui9440.c
index a1fbe09e5..98f295e45 100644
--- a/src/video/vid_tgui9440.c
+++ b/src/video/vid_tgui9440.c
@@ -1102,8 +1102,8 @@ tgui_ext_linear_write(uint32_t addr, uint8_t val, void *priv)
 {
     svga_t *svga = (svga_t *) priv;
     tgui_t *tgui = (tgui_t *) svga->priv;
-    int c;
-    int bpp = (tgui->ext_gdc_regs[0] & EXT_CTRL_16BIT);
+    int     c;
+    int     bpp = (tgui->ext_gdc_regs[0] & EXT_CTRL_16BIT);
     uint8_t fg[2] = { tgui->ext_gdc_regs[4], tgui->ext_gdc_regs[5] };
     uint8_t bg[2] = { tgui->ext_gdc_regs[1], tgui->ext_gdc_regs[2] };
     uint8_t mask  = tgui->ext_gdc_regs[7];
@@ -1168,8 +1168,8 @@ tgui_ext_linear_writew(uint32_t addr, uint16_t val, void *priv)
 {
     svga_t  *svga = (svga_t *) priv;
     tgui_t  *tgui = (tgui_t *) svga->priv;
-    int  c;
-    int bpp = (tgui->ext_gdc_regs[0] & EXT_CTRL_16BIT);
+    int      c;
+    int      bpp = (tgui->ext_gdc_regs[0] & EXT_CTRL_16BIT);
     uint8_t  fg[2] = { tgui->ext_gdc_regs[4], tgui->ext_gdc_regs[5] };
     uint8_t  bg[2] = { tgui->ext_gdc_regs[1], tgui->ext_gdc_regs[2] };
     uint16_t mask  = (tgui->ext_gdc_regs[7] << 8) | tgui->ext_gdc_regs[8];
@@ -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_ti_cf62011.c b/src/video/vid_ti_cf62011.c
index 32c37ca8b..fa083b76b 100644
--- a/src/video/vid_ti_cf62011.c
+++ b/src/video/vid_ti_cf62011.c
@@ -91,7 +91,7 @@ vid_out(uint16_t addr, uint8_t val, void *priv)
 
 #if 0
     if (((addr & 0xfff0) == 0x03d0 || (addr & 0xfff0) == 0x03b0) &&
-	!(svga->miscout & 1)) addr ^= 0x60;
+        !(svga->miscout & 1)) addr ^= 0x60;
 #endif
 
     switch (addr) {
@@ -151,7 +151,7 @@ vid_in(uint16_t addr, void *priv)
 
 #if 0
     if (((addr & 0xfff0) == 0x03d0 || (addr & 0xfff0) == 0x03b0) &&
-	!(svga->miscout & 1)) addr ^= 0x60;
+        !(svga->miscout & 1)) addr ^= 0x60;
 #endif
 
     switch (addr) {
diff --git a/src/video/vid_xga.c b/src/video/vid_xga.c
index ac6d75f59..de9e14559 100644
--- a/src/video/vid_xga.c
+++ b/src/video/vid_xga.c
@@ -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.
  *
- *		IBM XGA emulation.
+ *          IBM XGA emulation.
  *
  *
  *
- * Authors:	TheCollector1995.
+ * Authors: TheCollector1995.
  *
- *		Copyright 2022 TheCollector1995.
+ *          Copyright 2022 TheCollector1995.
  */
 #include <stdio.h>
 #include <stdint.h>
@@ -3103,7 +3103,6 @@ xga_init(const device_t *info)
 
     rom = malloc(xga->bios_rom.sz);
     memset(rom, 0xff, xga->bios_rom.sz);
-    (void) fread(rom, xga->bios_rom.sz, 1, f);
     (void) fclose(f);
 
     xga->bios_rom.rom  = rom;
diff --git a/src/video/video.c b/src/video/video.c
index 798f2c5ec..76982abdf 100644
--- a/src/video/video.c
+++ b/src/video/video.c
@@ -106,7 +106,7 @@ void *__cdecl (*video_copy)(void *_Dst, const void *_Src, size_t _Size) = memcpy
 void *(*video_copy)(void *__restrict, const void *__restrict, size_t);
 #endif
 
-PALETTE		cgapal = {
+PALETTE cgapal = {
     {0,0,0},    {0,42,0},   {42,0,0},   {42,21,0},
     {0,0,0},    {0,42,42},  {42,0,42},  {42,42,42},
     {0,0,0},    {21,63,21}, {63,21,21},  {63,63,21},
@@ -127,109 +127,108 @@ PALETTE		cgapal = {
     {0,0,0},   {0,63,63},   {63,0,0},   {63,63,63},
     {0,0,0},   {0,63,63},   {63,0,0},   {63,63,63},
 };
-PALETTE		cgapal_mono[6] = {
-    {	/* 0 - green, 4-color-optimized contrast. */
-	{0x00,0x00,0x00},{0x00,0x0d,0x03},{0x01,0x17,0x05},
-	{0x01,0x1a,0x06},{0x02,0x28,0x09},{0x02,0x2c,0x0a},
-	{0x03,0x39,0x0d},{0x03,0x3c,0x0e},{0x00,0x07,0x01},
-	{0x01,0x13,0x04},{0x01,0x1f,0x07},{0x01,0x23,0x08},
-	{0x02,0x31,0x0b},{0x02,0x35,0x0c},{0x05,0x3f,0x11},{0x0d,0x3f,0x17},
+PALETTE cgapal_mono[6] = {
+    { /* 0 - green, 4-color-optimized contrast. */
+        {0x00,0x00,0x00},{0x00,0x0d,0x03},{0x01,0x17,0x05},
+        {0x01,0x1a,0x06},{0x02,0x28,0x09},{0x02,0x2c,0x0a},
+        {0x03,0x39,0x0d},{0x03,0x3c,0x0e},{0x00,0x07,0x01},
+        {0x01,0x13,0x04},{0x01,0x1f,0x07},{0x01,0x23,0x08},
+        {0x02,0x31,0x0b},{0x02,0x35,0x0c},{0x05,0x3f,0x11},{0x0d,0x3f,0x17},
     },
-    {	/* 1 - green, 16-color-optimized contrast. */
-	{0x00,0x00,0x00},{0x00,0x0d,0x03},{0x01,0x15,0x05},
-	{0x01,0x17,0x05},{0x01,0x21,0x08},{0x01,0x24,0x08},
-	{0x02,0x2e,0x0b},{0x02,0x31,0x0b},{0x01,0x22,0x08},
-	{0x02,0x28,0x09},{0x02,0x30,0x0b},{0x02,0x32,0x0c},
-	{0x03,0x39,0x0d},{0x03,0x3b,0x0e},{0x09,0x3f,0x14},{0x0d,0x3f,0x17},
+    { /* 1 - green, 16-color-optimized contrast. */
+        {0x00,0x00,0x00},{0x00,0x0d,0x03},{0x01,0x15,0x05},
+        {0x01,0x17,0x05},{0x01,0x21,0x08},{0x01,0x24,0x08},
+        {0x02,0x2e,0x0b},{0x02,0x31,0x0b},{0x01,0x22,0x08},
+        {0x02,0x28,0x09},{0x02,0x30,0x0b},{0x02,0x32,0x0c},
+        {0x03,0x39,0x0d},{0x03,0x3b,0x0e},{0x09,0x3f,0x14},{0x0d,0x3f,0x17},
     },
-    {	/* 2 - amber, 4-color-optimized contrast. */
-	{0x00,0x00,0x00},{0x15,0x05,0x00},{0x20,0x0b,0x00},
-	{0x24,0x0d,0x00},{0x33,0x18,0x00},{0x37,0x1b,0x00},
-	{0x3f,0x26,0x01},{0x3f,0x2b,0x06},{0x0b,0x02,0x00},
-	{0x1b,0x08,0x00},{0x29,0x11,0x00},{0x2e,0x14,0x00},
-	{0x3b,0x1e,0x00},{0x3e,0x21,0x00},{0x3f,0x32,0x0a},{0x3f,0x38,0x0d},
+    { /* 2 - amber, 4-color-optimized contrast. */
+        {0x00,0x00,0x00},{0x15,0x05,0x00},{0x20,0x0b,0x00},
+        {0x24,0x0d,0x00},{0x33,0x18,0x00},{0x37,0x1b,0x00},
+        {0x3f,0x26,0x01},{0x3f,0x2b,0x06},{0x0b,0x02,0x00},
+        {0x1b,0x08,0x00},{0x29,0x11,0x00},{0x2e,0x14,0x00},
+        {0x3b,0x1e,0x00},{0x3e,0x21,0x00},{0x3f,0x32,0x0a},{0x3f,0x38,0x0d},
     },
-    {	/* 3 - amber, 16-color-optimized contrast. */
-	{0x00,0x00,0x00},{0x15,0x05,0x00},{0x1e,0x09,0x00},
-	{0x21,0x0b,0x00},{0x2b,0x12,0x00},{0x2f,0x15,0x00},
-	{0x38,0x1c,0x00},{0x3b,0x1e,0x00},{0x2c,0x13,0x00},
-	{0x32,0x17,0x00},{0x3a,0x1e,0x00},{0x3c,0x1f,0x00},
-	{0x3f,0x27,0x01},{0x3f,0x2a,0x04},{0x3f,0x36,0x0c},{0x3f,0x38,0x0d},
+    { /* 3 - amber, 16-color-optimized contrast. */
+        {0x00,0x00,0x00},{0x15,0x05,0x00},{0x1e,0x09,0x00},
+        {0x21,0x0b,0x00},{0x2b,0x12,0x00},{0x2f,0x15,0x00},
+        {0x38,0x1c,0x00},{0x3b,0x1e,0x00},{0x2c,0x13,0x00},
+        {0x32,0x17,0x00},{0x3a,0x1e,0x00},{0x3c,0x1f,0x00},
+        {0x3f,0x27,0x01},{0x3f,0x2a,0x04},{0x3f,0x36,0x0c},{0x3f,0x38,0x0d},
     },
-    {	/* 4 - grey, 4-color-optimized contrast. */
-	{0x00,0x00,0x00},{0x0e,0x0f,0x10},{0x15,0x17,0x18},
-	{0x18,0x1a,0x1b},{0x24,0x25,0x25},{0x27,0x28,0x28},
-	{0x33,0x34,0x32},{0x37,0x38,0x35},{0x09,0x0a,0x0b},
-	{0x11,0x12,0x13},{0x1c,0x1e,0x1e},{0x20,0x22,0x22},
-	{0x2c,0x2d,0x2c},{0x2f,0x30,0x2f},{0x3c,0x3c,0x38},{0x3f,0x3f,0x3b},
+    { /* 4 - grey, 4-color-optimized contrast. */
+        {0x00,0x00,0x00},{0x0e,0x0f,0x10},{0x15,0x17,0x18},
+        {0x18,0x1a,0x1b},{0x24,0x25,0x25},{0x27,0x28,0x28},
+        {0x33,0x34,0x32},{0x37,0x38,0x35},{0x09,0x0a,0x0b},
+        {0x11,0x12,0x13},{0x1c,0x1e,0x1e},{0x20,0x22,0x22},
+        {0x2c,0x2d,0x2c},{0x2f,0x30,0x2f},{0x3c,0x3c,0x38},{0x3f,0x3f,0x3b},
     },
-    {	/* 5 - grey, 16-color-optimized contrast. */
-	{0x00,0x00,0x00},{0x0e,0x0f,0x10},{0x13,0x14,0x15},
-	{0x15,0x17,0x18},{0x1e,0x20,0x20},{0x20,0x22,0x22},
-	{0x29,0x2a,0x2a},{0x2c,0x2d,0x2c},{0x1f,0x21,0x21},
-	{0x23,0x25,0x25},{0x2b,0x2c,0x2b},{0x2d,0x2e,0x2d},
-	{0x34,0x35,0x33},{0x37,0x37,0x34},{0x3e,0x3e,0x3a},{0x3f,0x3f,0x3b},
+    { /* 5 - grey, 16-color-optimized contrast. */
+        {0x00,0x00,0x00},{0x0e,0x0f,0x10},{0x13,0x14,0x15},
+        {0x15,0x17,0x18},{0x1e,0x20,0x20},{0x20,0x22,0x22},
+        {0x29,0x2a,0x2a},{0x2c,0x2d,0x2c},{0x1f,0x21,0x21},
+        {0x23,0x25,0x25},{0x2b,0x2c,0x2b},{0x2d,0x2e,0x2d},
+        {0x34,0x35,0x33},{0x37,0x37,0x34},{0x3e,0x3e,0x3a},{0x3f,0x3f,0x3b},
     }
 };
 
-const uint32_t shade[5][256] =
-{
-	{0},	// RGB Color (unused)
-	{0},	// RGB Grayscale (unused)
-	{		// Amber monitor
-		0x000000, 0x060000, 0x090000, 0x0d0000, 0x100000, 0x120100, 0x150100, 0x170100, 0x1a0100, 0x1c0100, 0x1e0200, 0x210200, 0x230200, 0x250300, 0x270300, 0x290300,
-		0x2b0400, 0x2d0400, 0x2f0400, 0x300500, 0x320500, 0x340500, 0x360600, 0x380600, 0x390700, 0x3b0700, 0x3d0700, 0x3f0800, 0x400800, 0x420900, 0x440900, 0x450a00,
-		0x470a00, 0x480b00, 0x4a0b00, 0x4c0c00, 0x4d0c00, 0x4f0d00, 0x500d00, 0x520e00, 0x530e00, 0x550f00, 0x560f00, 0x581000, 0x591000, 0x5b1100, 0x5c1200, 0x5e1200,
-		0x5f1300, 0x601300, 0x621400, 0x631500, 0x651500, 0x661600, 0x671600, 0x691700, 0x6a1800, 0x6c1800, 0x6d1900, 0x6e1a00, 0x701a00, 0x711b00, 0x721c00, 0x741c00,
-		0x751d00, 0x761e00, 0x781e00, 0x791f00, 0x7a2000, 0x7c2000, 0x7d2100, 0x7e2200, 0x7f2300, 0x812300, 0x822400, 0x832500, 0x842600, 0x862600, 0x872700, 0x882800,
-		0x8a2900, 0x8b2900, 0x8c2a00, 0x8d2b00, 0x8e2c00, 0x902c00, 0x912d00, 0x922e00, 0x932f00, 0x953000, 0x963000, 0x973100, 0x983200, 0x993300, 0x9b3400, 0x9c3400,
-		0x9d3500, 0x9e3600, 0x9f3700, 0xa03800, 0xa23900, 0xa33a00, 0xa43a00, 0xa53b00, 0xa63c00, 0xa73d00, 0xa93e00, 0xaa3f00, 0xab4000, 0xac4000, 0xad4100, 0xae4200,
-		0xaf4300, 0xb14400, 0xb24500, 0xb34600, 0xb44700, 0xb54800, 0xb64900, 0xb74a00, 0xb94a00, 0xba4b00, 0xbb4c00, 0xbc4d00, 0xbd4e00, 0xbe4f00, 0xbf5000, 0xc05100,
-		0xc15200, 0xc25300, 0xc45400, 0xc55500, 0xc65600, 0xc75700, 0xc85800, 0xc95900, 0xca5a00, 0xcb5b00, 0xcc5c00, 0xcd5d00, 0xce5e00, 0xcf5f00, 0xd06000, 0xd26101,
-		0xd36201, 0xd46301, 0xd56401, 0xd66501, 0xd76601, 0xd86701, 0xd96801, 0xda6901, 0xdb6a01, 0xdc6b01, 0xdd6c01, 0xde6d01, 0xdf6e01, 0xe06f01, 0xe17001, 0xe27201,
-		0xe37301, 0xe47401, 0xe57501, 0xe67602, 0xe77702, 0xe87802, 0xe97902, 0xeb7a02, 0xec7b02, 0xed7c02, 0xee7e02, 0xef7f02, 0xf08002, 0xf18103, 0xf28203, 0xf38303,
-		0xf48403, 0xf58503, 0xf68703, 0xf78803, 0xf88903, 0xf98a04, 0xfa8b04, 0xfb8c04, 0xfc8d04, 0xfd8f04, 0xfe9005, 0xff9105, 0xff9205, 0xff9305, 0xff9405, 0xff9606,
-		0xff9706, 0xff9806, 0xff9906, 0xff9a07, 0xff9b07, 0xff9d07, 0xff9e08, 0xff9f08, 0xffa008, 0xffa109, 0xffa309, 0xffa409, 0xffa50a, 0xffa60a, 0xffa80a, 0xffa90b,
-		0xffaa0b, 0xffab0c, 0xffac0c, 0xffae0d, 0xffaf0d, 0xffb00e, 0xffb10e, 0xffb30f, 0xffb40f, 0xffb510, 0xffb610, 0xffb811, 0xffb912, 0xffba12, 0xffbb13, 0xffbd14,
-		0xffbe14, 0xffbf15, 0xffc016, 0xffc217, 0xffc317, 0xffc418, 0xffc619, 0xffc71a, 0xffc81b, 0xffca1c, 0xffcb1d, 0xffcc1e, 0xffcd1f, 0xffcf20, 0xffd021, 0xffd122,
-		0xffd323, 0xffd424, 0xffd526, 0xffd727, 0xffd828, 0xffd92a, 0xffdb2b, 0xffdc2c, 0xffdd2e, 0xffdf2f, 0xffe031, 0xffe133, 0xffe334, 0xffe436, 0xffe538, 0xffe739
-	},
-	{		// Green monitor
-		0x000000, 0x000400, 0x000700, 0x000900, 0x000b00, 0x000d00, 0x000f00, 0x001100, 0x001300, 0x001500, 0x001600, 0x001800, 0x001a00, 0x001b00, 0x001d00, 0x001e00,
-		0x002000, 0x002100, 0x002300, 0x002400, 0x002601, 0x002701, 0x002901, 0x002a01, 0x002b01, 0x002d01, 0x002e01, 0x002f01, 0x003101, 0x003201, 0x003301, 0x003401,
-		0x003601, 0x003702, 0x003802, 0x003902, 0x003b02, 0x003c02, 0x003d02, 0x003e02, 0x004002, 0x004102, 0x004203, 0x004303, 0x004403, 0x004503, 0x004703, 0x004803,
-		0x004903, 0x004a03, 0x004b04, 0x004c04, 0x004d04, 0x004e04, 0x005004, 0x005104, 0x005205, 0x005305, 0x005405, 0x005505, 0x005605, 0x005705, 0x005806, 0x005906,
-		0x005a06, 0x005b06, 0x005d06, 0x005e07, 0x005f07, 0x006007, 0x006107, 0x006207, 0x006308, 0x006408, 0x006508, 0x006608, 0x006708, 0x006809, 0x006909, 0x006a09,
-		0x006b09, 0x016c0a, 0x016d0a, 0x016e0a, 0x016f0a, 0x01700b, 0x01710b, 0x01720b, 0x01730b, 0x01740c, 0x01750c, 0x01760c, 0x01770c, 0x01780d, 0x01790d, 0x017a0d,
-		0x017b0d, 0x017b0e, 0x017c0e, 0x017d0e, 0x017e0f, 0x017f0f, 0x01800f, 0x018110, 0x028210, 0x028310, 0x028410, 0x028511, 0x028611, 0x028711, 0x028812, 0x028912,
-		0x028a12, 0x028a13, 0x028b13, 0x028c13, 0x028d14, 0x028e14, 0x038f14, 0x039015, 0x039115, 0x039215, 0x039316, 0x039416, 0x039417, 0x039517, 0x039617, 0x039718,
-		0x049818, 0x049918, 0x049a19, 0x049b19, 0x049c19, 0x049c1a, 0x049d1a, 0x049e1b, 0x059f1b, 0x05a01b, 0x05a11c, 0x05a21c, 0x05a31c, 0x05a31d, 0x05a41d, 0x06a51e,
-		0x06a61e, 0x06a71f, 0x06a81f, 0x06a920, 0x06aa20, 0x07aa21, 0x07ab21, 0x07ac21, 0x07ad22, 0x07ae22, 0x08af23, 0x08b023, 0x08b024, 0x08b124, 0x08b225, 0x09b325,
-		0x09b426, 0x09b526, 0x09b527, 0x0ab627, 0x0ab728, 0x0ab828, 0x0ab929, 0x0bba29, 0x0bba2a, 0x0bbb2a, 0x0bbc2b, 0x0cbd2b, 0x0cbe2c, 0x0cbf2c, 0x0dbf2d, 0x0dc02d,
-		0x0dc12e, 0x0ec22e, 0x0ec32f, 0x0ec42f, 0x0fc430, 0x0fc530, 0x0fc631, 0x10c731, 0x10c832, 0x10c932, 0x11c933, 0x11ca33, 0x11cb34, 0x12cc35, 0x12cd35, 0x12cd36,
-		0x13ce36, 0x13cf37, 0x13d037, 0x14d138, 0x14d139, 0x14d239, 0x15d33a, 0x15d43a, 0x16d43b, 0x16d53b, 0x17d63c, 0x17d73d, 0x17d83d, 0x18d83e, 0x18d93e, 0x19da3f,
-		0x19db40, 0x1adc40, 0x1adc41, 0x1bdd41, 0x1bde42, 0x1cdf43, 0x1ce043, 0x1de044, 0x1ee145, 0x1ee245, 0x1fe346, 0x1fe446, 0x20e447, 0x20e548, 0x21e648, 0x22e749,
-		0x22e74a, 0x23e84a, 0x23e94b, 0x24ea4c, 0x25ea4c, 0x25eb4d, 0x26ec4e, 0x27ed4e, 0x27ee4f, 0x28ee50, 0x29ef50, 0x29f051, 0x2af152, 0x2bf153, 0x2cf253, 0x2cf354,
-		0x2df455, 0x2ef455, 0x2ff556, 0x2ff657, 0x30f758, 0x31f758, 0x32f859, 0x32f95a, 0x33fa5a, 0x34fa5b, 0x35fb5c, 0x36fc5d, 0x37fd5d, 0x38fd5e, 0x38fe5f, 0x39ff60
-	},
-	{		// White monitor
-		0x000000, 0x010102, 0x020203, 0x020304, 0x030406, 0x040507, 0x050608, 0x060709, 0x07080a, 0x08090c, 0x080a0d, 0x090b0e, 0x0a0c0f, 0x0b0d10, 0x0c0e11, 0x0d0f12,
-		0x0e1013, 0x0f1115, 0x101216, 0x111317, 0x121418, 0x121519, 0x13161a, 0x14171b, 0x15181c, 0x16191d, 0x171a1e, 0x181b1f, 0x191c20, 0x1a1d21, 0x1b1e22, 0x1c1f23,
-		0x1d2024, 0x1e2125, 0x1f2226, 0x202327, 0x212428, 0x222529, 0x22262b, 0x23272c, 0x24282d, 0x25292e, 0x262a2f, 0x272b30, 0x282c30, 0x292d31, 0x2a2e32, 0x2b2f33,
-		0x2c3034, 0x2d3035, 0x2e3136, 0x2f3237, 0x303338, 0x313439, 0x32353a, 0x33363b, 0x34373c, 0x35383d, 0x36393e, 0x373a3f, 0x383b40, 0x393c41, 0x3a3d42, 0x3b3e43,
-		0x3c3f44, 0x3d4045, 0x3e4146, 0x3f4247, 0x404348, 0x414449, 0x42454a, 0x43464b, 0x44474c, 0x45484d, 0x46494d, 0x474a4e, 0x484b4f, 0x484c50, 0x494d51, 0x4a4e52,
-		0x4b4f53, 0x4c5054, 0x4d5155, 0x4e5256, 0x4f5357, 0x505458, 0x515559, 0x52565a, 0x53575b, 0x54585b, 0x55595c, 0x565a5d, 0x575b5e, 0x585c5f, 0x595d60, 0x5a5e61,
-		0x5b5f62, 0x5c6063, 0x5d6164, 0x5e6265, 0x5f6366, 0x606466, 0x616567, 0x626668, 0x636769, 0x64686a, 0x65696b, 0x666a6c, 0x676b6d, 0x686c6e, 0x696d6f, 0x6a6e70,
-		0x6b6f70, 0x6c7071, 0x6d7172, 0x6f7273, 0x707374, 0x707475, 0x717576, 0x727677, 0x747778, 0x757879, 0x767979, 0x777a7a, 0x787b7b, 0x797c7c, 0x7a7d7d, 0x7b7e7e,
-		0x7c7f7f, 0x7d8080, 0x7e8181, 0x7f8281, 0x808382, 0x818483, 0x828584, 0x838685, 0x848786, 0x858887, 0x868988, 0x878a89, 0x888b89, 0x898c8a, 0x8a8d8b, 0x8b8e8c,
-		0x8c8f8d, 0x8d8f8e, 0x8e908f, 0x8f9190, 0x909290, 0x919391, 0x929492, 0x939593, 0x949694, 0x959795, 0x969896, 0x979997, 0x989a98, 0x999b98, 0x9a9c99, 0x9b9d9a,
-		0x9c9e9b, 0x9d9f9c, 0x9ea09d, 0x9fa19e, 0xa0a29f, 0xa1a39f, 0xa2a4a0, 0xa3a5a1, 0xa4a6a2, 0xa6a7a3, 0xa7a8a4, 0xa8a9a5, 0xa9aaa5, 0xaaaba6, 0xabaca7, 0xacada8,
-		0xadaea9, 0xaeafaa, 0xafb0ab, 0xb0b1ac, 0xb1b2ac, 0xb2b3ad, 0xb3b4ae, 0xb4b5af, 0xb5b6b0, 0xb6b7b1, 0xb7b8b2, 0xb8b9b2, 0xb9bab3, 0xbabbb4, 0xbbbcb5, 0xbcbdb6,
-		0xbdbeb7, 0xbebfb8, 0xbfc0b8, 0xc0c1b9, 0xc1c2ba, 0xc2c3bb, 0xc3c4bc, 0xc5c5bd, 0xc6c6be, 0xc7c7be, 0xc8c8bf, 0xc9c9c0, 0xcacac1, 0xcbcbc2, 0xccccc3, 0xcdcdc3,
-		0xcecec4, 0xcfcfc5, 0xd0d0c6, 0xd1d1c7, 0xd2d2c8, 0xd3d3c9, 0xd4d4c9, 0xd5d5ca, 0xd6d6cb, 0xd7d7cc, 0xd8d8cd, 0xd9d9ce, 0xdadacf, 0xdbdbcf, 0xdcdcd0, 0xdeddd1,
-		0xdfded2, 0xe0dfd3, 0xe1e0d4, 0xe2e1d4, 0xe3e2d5, 0xe4e3d6, 0xe5e4d7, 0xe6e5d8, 0xe7e6d9, 0xe8e7d9, 0xe9e8da, 0xeae9db, 0xebeadc, 0xecebdd, 0xedecde, 0xeeeddf,
-		0xefeedf, 0xf0efe0, 0xf1f0e1, 0xf2f1e2, 0xf3f2e3, 0xf4f3e3, 0xf6f3e4, 0xf7f4e5, 0xf8f5e6, 0xf9f6e7, 0xfaf7e8, 0xfbf8e9, 0xfcf9e9, 0xfdfaea, 0xfefbeb, 0xfffcec
-	}
+const uint32_t shade[5][256] = {
+    {0}, // RGB Color (unused)
+    {0}, // RGB Grayscale (unused)
+    {    // Amber monitor
+        0x000000, 0x060000, 0x090000, 0x0d0000, 0x100000, 0x120100, 0x150100, 0x170100, 0x1a0100, 0x1c0100, 0x1e0200, 0x210200, 0x230200, 0x250300, 0x270300, 0x290300,
+        0x2b0400, 0x2d0400, 0x2f0400, 0x300500, 0x320500, 0x340500, 0x360600, 0x380600, 0x390700, 0x3b0700, 0x3d0700, 0x3f0800, 0x400800, 0x420900, 0x440900, 0x450a00,
+        0x470a00, 0x480b00, 0x4a0b00, 0x4c0c00, 0x4d0c00, 0x4f0d00, 0x500d00, 0x520e00, 0x530e00, 0x550f00, 0x560f00, 0x581000, 0x591000, 0x5b1100, 0x5c1200, 0x5e1200,
+        0x5f1300, 0x601300, 0x621400, 0x631500, 0x651500, 0x661600, 0x671600, 0x691700, 0x6a1800, 0x6c1800, 0x6d1900, 0x6e1a00, 0x701a00, 0x711b00, 0x721c00, 0x741c00,
+        0x751d00, 0x761e00, 0x781e00, 0x791f00, 0x7a2000, 0x7c2000, 0x7d2100, 0x7e2200, 0x7f2300, 0x812300, 0x822400, 0x832500, 0x842600, 0x862600, 0x872700, 0x882800,
+        0x8a2900, 0x8b2900, 0x8c2a00, 0x8d2b00, 0x8e2c00, 0x902c00, 0x912d00, 0x922e00, 0x932f00, 0x953000, 0x963000, 0x973100, 0x983200, 0x993300, 0x9b3400, 0x9c3400,
+        0x9d3500, 0x9e3600, 0x9f3700, 0xa03800, 0xa23900, 0xa33a00, 0xa43a00, 0xa53b00, 0xa63c00, 0xa73d00, 0xa93e00, 0xaa3f00, 0xab4000, 0xac4000, 0xad4100, 0xae4200,
+        0xaf4300, 0xb14400, 0xb24500, 0xb34600, 0xb44700, 0xb54800, 0xb64900, 0xb74a00, 0xb94a00, 0xba4b00, 0xbb4c00, 0xbc4d00, 0xbd4e00, 0xbe4f00, 0xbf5000, 0xc05100,
+        0xc15200, 0xc25300, 0xc45400, 0xc55500, 0xc65600, 0xc75700, 0xc85800, 0xc95900, 0xca5a00, 0xcb5b00, 0xcc5c00, 0xcd5d00, 0xce5e00, 0xcf5f00, 0xd06000, 0xd26101,
+        0xd36201, 0xd46301, 0xd56401, 0xd66501, 0xd76601, 0xd86701, 0xd96801, 0xda6901, 0xdb6a01, 0xdc6b01, 0xdd6c01, 0xde6d01, 0xdf6e01, 0xe06f01, 0xe17001, 0xe27201,
+        0xe37301, 0xe47401, 0xe57501, 0xe67602, 0xe77702, 0xe87802, 0xe97902, 0xeb7a02, 0xec7b02, 0xed7c02, 0xee7e02, 0xef7f02, 0xf08002, 0xf18103, 0xf28203, 0xf38303,
+        0xf48403, 0xf58503, 0xf68703, 0xf78803, 0xf88903, 0xf98a04, 0xfa8b04, 0xfb8c04, 0xfc8d04, 0xfd8f04, 0xfe9005, 0xff9105, 0xff9205, 0xff9305, 0xff9405, 0xff9606,
+        0xff9706, 0xff9806, 0xff9906, 0xff9a07, 0xff9b07, 0xff9d07, 0xff9e08, 0xff9f08, 0xffa008, 0xffa109, 0xffa309, 0xffa409, 0xffa50a, 0xffa60a, 0xffa80a, 0xffa90b,
+        0xffaa0b, 0xffab0c, 0xffac0c, 0xffae0d, 0xffaf0d, 0xffb00e, 0xffb10e, 0xffb30f, 0xffb40f, 0xffb510, 0xffb610, 0xffb811, 0xffb912, 0xffba12, 0xffbb13, 0xffbd14,
+        0xffbe14, 0xffbf15, 0xffc016, 0xffc217, 0xffc317, 0xffc418, 0xffc619, 0xffc71a, 0xffc81b, 0xffca1c, 0xffcb1d, 0xffcc1e, 0xffcd1f, 0xffcf20, 0xffd021, 0xffd122,
+        0xffd323, 0xffd424, 0xffd526, 0xffd727, 0xffd828, 0xffd92a, 0xffdb2b, 0xffdc2c, 0xffdd2e, 0xffdf2f, 0xffe031, 0xffe133, 0xffe334, 0xffe436, 0xffe538, 0xffe739
+    },
+    { // Green monitor
+        0x000000, 0x000400, 0x000700, 0x000900, 0x000b00, 0x000d00, 0x000f00, 0x001100, 0x001300, 0x001500, 0x001600, 0x001800, 0x001a00, 0x001b00, 0x001d00, 0x001e00,
+        0x002000, 0x002100, 0x002300, 0x002400, 0x002601, 0x002701, 0x002901, 0x002a01, 0x002b01, 0x002d01, 0x002e01, 0x002f01, 0x003101, 0x003201, 0x003301, 0x003401,
+        0x003601, 0x003702, 0x003802, 0x003902, 0x003b02, 0x003c02, 0x003d02, 0x003e02, 0x004002, 0x004102, 0x004203, 0x004303, 0x004403, 0x004503, 0x004703, 0x004803,
+        0x004903, 0x004a03, 0x004b04, 0x004c04, 0x004d04, 0x004e04, 0x005004, 0x005104, 0x005205, 0x005305, 0x005405, 0x005505, 0x005605, 0x005705, 0x005806, 0x005906,
+        0x005a06, 0x005b06, 0x005d06, 0x005e07, 0x005f07, 0x006007, 0x006107, 0x006207, 0x006308, 0x006408, 0x006508, 0x006608, 0x006708, 0x006809, 0x006909, 0x006a09,
+        0x006b09, 0x016c0a, 0x016d0a, 0x016e0a, 0x016f0a, 0x01700b, 0x01710b, 0x01720b, 0x01730b, 0x01740c, 0x01750c, 0x01760c, 0x01770c, 0x01780d, 0x01790d, 0x017a0d,
+        0x017b0d, 0x017b0e, 0x017c0e, 0x017d0e, 0x017e0f, 0x017f0f, 0x01800f, 0x018110, 0x028210, 0x028310, 0x028410, 0x028511, 0x028611, 0x028711, 0x028812, 0x028912,
+        0x028a12, 0x028a13, 0x028b13, 0x028c13, 0x028d14, 0x028e14, 0x038f14, 0x039015, 0x039115, 0x039215, 0x039316, 0x039416, 0x039417, 0x039517, 0x039617, 0x039718,
+        0x049818, 0x049918, 0x049a19, 0x049b19, 0x049c19, 0x049c1a, 0x049d1a, 0x049e1b, 0x059f1b, 0x05a01b, 0x05a11c, 0x05a21c, 0x05a31c, 0x05a31d, 0x05a41d, 0x06a51e,
+        0x06a61e, 0x06a71f, 0x06a81f, 0x06a920, 0x06aa20, 0x07aa21, 0x07ab21, 0x07ac21, 0x07ad22, 0x07ae22, 0x08af23, 0x08b023, 0x08b024, 0x08b124, 0x08b225, 0x09b325,
+        0x09b426, 0x09b526, 0x09b527, 0x0ab627, 0x0ab728, 0x0ab828, 0x0ab929, 0x0bba29, 0x0bba2a, 0x0bbb2a, 0x0bbc2b, 0x0cbd2b, 0x0cbe2c, 0x0cbf2c, 0x0dbf2d, 0x0dc02d,
+        0x0dc12e, 0x0ec22e, 0x0ec32f, 0x0ec42f, 0x0fc430, 0x0fc530, 0x0fc631, 0x10c731, 0x10c832, 0x10c932, 0x11c933, 0x11ca33, 0x11cb34, 0x12cc35, 0x12cd35, 0x12cd36,
+        0x13ce36, 0x13cf37, 0x13d037, 0x14d138, 0x14d139, 0x14d239, 0x15d33a, 0x15d43a, 0x16d43b, 0x16d53b, 0x17d63c, 0x17d73d, 0x17d83d, 0x18d83e, 0x18d93e, 0x19da3f,
+        0x19db40, 0x1adc40, 0x1adc41, 0x1bdd41, 0x1bde42, 0x1cdf43, 0x1ce043, 0x1de044, 0x1ee145, 0x1ee245, 0x1fe346, 0x1fe446, 0x20e447, 0x20e548, 0x21e648, 0x22e749,
+        0x22e74a, 0x23e84a, 0x23e94b, 0x24ea4c, 0x25ea4c, 0x25eb4d, 0x26ec4e, 0x27ed4e, 0x27ee4f, 0x28ee50, 0x29ef50, 0x29f051, 0x2af152, 0x2bf153, 0x2cf253, 0x2cf354,
+        0x2df455, 0x2ef455, 0x2ff556, 0x2ff657, 0x30f758, 0x31f758, 0x32f859, 0x32f95a, 0x33fa5a, 0x34fa5b, 0x35fb5c, 0x36fc5d, 0x37fd5d, 0x38fd5e, 0x38fe5f, 0x39ff60
+    },
+    { // White monitor
+        0x000000, 0x010102, 0x020203, 0x020304, 0x030406, 0x040507, 0x050608, 0x060709, 0x07080a, 0x08090c, 0x080a0d, 0x090b0e, 0x0a0c0f, 0x0b0d10, 0x0c0e11, 0x0d0f12,
+        0x0e1013, 0x0f1115, 0x101216, 0x111317, 0x121418, 0x121519, 0x13161a, 0x14171b, 0x15181c, 0x16191d, 0x171a1e, 0x181b1f, 0x191c20, 0x1a1d21, 0x1b1e22, 0x1c1f23,
+        0x1d2024, 0x1e2125, 0x1f2226, 0x202327, 0x212428, 0x222529, 0x22262b, 0x23272c, 0x24282d, 0x25292e, 0x262a2f, 0x272b30, 0x282c30, 0x292d31, 0x2a2e32, 0x2b2f33,
+        0x2c3034, 0x2d3035, 0x2e3136, 0x2f3237, 0x303338, 0x313439, 0x32353a, 0x33363b, 0x34373c, 0x35383d, 0x36393e, 0x373a3f, 0x383b40, 0x393c41, 0x3a3d42, 0x3b3e43,
+        0x3c3f44, 0x3d4045, 0x3e4146, 0x3f4247, 0x404348, 0x414449, 0x42454a, 0x43464b, 0x44474c, 0x45484d, 0x46494d, 0x474a4e, 0x484b4f, 0x484c50, 0x494d51, 0x4a4e52,
+        0x4b4f53, 0x4c5054, 0x4d5155, 0x4e5256, 0x4f5357, 0x505458, 0x515559, 0x52565a, 0x53575b, 0x54585b, 0x55595c, 0x565a5d, 0x575b5e, 0x585c5f, 0x595d60, 0x5a5e61,
+        0x5b5f62, 0x5c6063, 0x5d6164, 0x5e6265, 0x5f6366, 0x606466, 0x616567, 0x626668, 0x636769, 0x64686a, 0x65696b, 0x666a6c, 0x676b6d, 0x686c6e, 0x696d6f, 0x6a6e70,
+        0x6b6f70, 0x6c7071, 0x6d7172, 0x6f7273, 0x707374, 0x707475, 0x717576, 0x727677, 0x747778, 0x757879, 0x767979, 0x777a7a, 0x787b7b, 0x797c7c, 0x7a7d7d, 0x7b7e7e,
+        0x7c7f7f, 0x7d8080, 0x7e8181, 0x7f8281, 0x808382, 0x818483, 0x828584, 0x838685, 0x848786, 0x858887, 0x868988, 0x878a89, 0x888b89, 0x898c8a, 0x8a8d8b, 0x8b8e8c,
+        0x8c8f8d, 0x8d8f8e, 0x8e908f, 0x8f9190, 0x909290, 0x919391, 0x929492, 0x939593, 0x949694, 0x959795, 0x969896, 0x979997, 0x989a98, 0x999b98, 0x9a9c99, 0x9b9d9a,
+        0x9c9e9b, 0x9d9f9c, 0x9ea09d, 0x9fa19e, 0xa0a29f, 0xa1a39f, 0xa2a4a0, 0xa3a5a1, 0xa4a6a2, 0xa6a7a3, 0xa7a8a4, 0xa8a9a5, 0xa9aaa5, 0xaaaba6, 0xabaca7, 0xacada8,
+        0xadaea9, 0xaeafaa, 0xafb0ab, 0xb0b1ac, 0xb1b2ac, 0xb2b3ad, 0xb3b4ae, 0xb4b5af, 0xb5b6b0, 0xb6b7b1, 0xb7b8b2, 0xb8b9b2, 0xb9bab3, 0xbabbb4, 0xbbbcb5, 0xbcbdb6,
+        0xbdbeb7, 0xbebfb8, 0xbfc0b8, 0xc0c1b9, 0xc1c2ba, 0xc2c3bb, 0xc3c4bc, 0xc5c5bd, 0xc6c6be, 0xc7c7be, 0xc8c8bf, 0xc9c9c0, 0xcacac1, 0xcbcbc2, 0xccccc3, 0xcdcdc3,
+        0xcecec4, 0xcfcfc5, 0xd0d0c6, 0xd1d1c7, 0xd2d2c8, 0xd3d3c9, 0xd4d4c9, 0xd5d5ca, 0xd6d6cb, 0xd7d7cc, 0xd8d8cd, 0xd9d9ce, 0xdadacf, 0xdbdbcf, 0xdcdcd0, 0xdeddd1,
+        0xdfded2, 0xe0dfd3, 0xe1e0d4, 0xe2e1d4, 0xe3e2d5, 0xe4e3d6, 0xe5e4d7, 0xe6e5d8, 0xe7e6d9, 0xe8e7d9, 0xe9e8da, 0xeae9db, 0xebeadc, 0xecebdd, 0xedecde, 0xeeeddf,
+        0xefeedf, 0xf0efe0, 0xf1f0e1, 0xf2f1e2, 0xf3f2e3, 0xf4f3e3, 0xf6f3e4, 0xf7f4e5, 0xf8f5e6, 0xf9f6e7, 0xfaf7e8, 0xfbf8e9, 0xfcf9e9, 0xfdfaea, 0xfefbeb, 0xfffcec
+    }
 };
 
 typedef struct blit_data_struct {
diff --git a/src/vnc.c b/src/vnc.c
index 30caff9e2..f8ef1ef38 100644
--- a/src/vnc.c
+++ b/src/vnc.c
@@ -46,15 +46,6 @@ static int              ptr_x;
 static int              ptr_y;
 static int              ptr_but;
 
-typedef struct {
-    int buttons;
-    int dx;
-    int dy;
-    int dwheel;
-} MOUSESTATE;
-
-static MOUSESTATE ms;
-
 #ifdef ENABLE_VNC_LOG
 int vnc_do_log = ENABLE_VNC_LOG;
 
@@ -82,26 +73,31 @@ vnc_kbdevent(rfbBool down, rfbKeySym k, rfbClientPtr cl)
     vnc_kbinput(down ? 1 : 0, (int) k);
 }
 
-void
-vnc_mouse_poll(void)
+static void
+vnc_ptrevent(int but, int x, int y, rfbClientPtr cl)
 {
-    static int b = 0;
-    if (ms.dx != 0 || ms.dy != 0) {
-        mouse_x += ms.dx;
-        mouse_y += ms.dy;
+    int dx;
+    int dy;
+    int b;
 
-        ms.dx = 0;
-        ms.dy = 0;
+    b = 0x00;
+    if (but & 0x01)
+        b |= 0x01;
+    if (but & 0x02)
+        b |= 0x04;
+    if (but & 0x04)
+        b |= 0x02;
+    mouse_set_buttons_ex(b);
+    ptr_but = but;
 
-#if 0
-        pclog("dx=%d, dy=%d, dwheel=%d\n", mouse_x, mouse_y, mouse_z);
-#endif
-    }
+    dx = (x - ptr_x) / 0.96; /* TODO: Figure out the correct scale factor for X and Y. */
+    dy = (y - ptr_y) / 0.96;
 
-    if (b != ms.buttons) {
-        mouse_buttons = ms.buttons;
-        b             = ms.buttons;
-    }
+    /* VNC uses absolute positions within the window, no deltas. */
+    mouse_scale_x(dx, dy);
+
+    ptr_x = x;
+    ptr_y = y;
 
     mouse_x_abs = (double)ptr_x / (double)allowedX;
     mouse_y_abs = (double)ptr_y / (double)allowedY;
@@ -110,25 +106,6 @@ vnc_mouse_poll(void)
     if (mouse_y_abs > 1.0) mouse_y_abs = 1.0;
     if (mouse_x_abs < 0.0) mouse_x_abs = 0.0;
     if (mouse_y_abs < 0.0) mouse_y_abs = 0.0;
-}
-
-static void
-vnc_ptrevent(int but, int x, int y, rfbClientPtr cl)
-{
-    ms.buttons = 0;
-    if (but & 0x01)
-        ms.buttons |= 0x01;
-    if (but & 0x02)
-        ms.buttons |= 0x04;
-    if (but & 0x04)
-        ms.buttons |= 0x02;
-    ptr_but = but;
-
-    /* VNC uses absolute positions within the window, no deltas. */
-    ms.dx += (x - ptr_x) / 0.96; /* TODO: Figure out the correct scale factor for X and Y. */
-    ms.dy += (y - ptr_y) / 0.96;
-    ptr_x = x;
-    ptr_y = y;
 
     rfbDefaultPtrAddEvent(but, x, y, cl);
 }
@@ -165,9 +142,8 @@ vnc_newclient(rfbClientPtr cl)
         /* Reset the mouse. */
         ptr_x   = allowedX / 2;
         ptr_y   = allowedY / 2;
-        mouse_x = mouse_y = mouse_z = 0;
-        mouse_buttons               = 0x00;
-        memset(&ms, 0, sizeof(MOUSESTATE));
+        mouse_clear_coords();
+        mouse_clear_buttons();
 
         /* We now have clients, un-pause the emulator if needed. */
         vnc_log("VNC: unpausing..\n");
diff --git a/src/win/Makefile.mingw b/src/win/Makefile.mingw
index 8a0e36a2e..ebc669f56 100644
--- a/src/win/Makefile.mingw
+++ b/src/win/Makefile.mingw
@@ -582,6 +582,7 @@ CPUOBJ := $(DYNARECOBJ) \
 	  softfloat-muladd.o softfloat-round-pack.o softfloat-specialize.o softfloatx80.o
 
 CHIPSETOBJ := 82c100.o acc2168.o \
+              compaq_386.o \
               contaq_82c59x.o \
               cs4031.o cs8230.o \
               ali1429.o ali1435.o ali1489.o ali1531.o ali1541.o ali1543.o ali1621.o ali6117.o \
@@ -589,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.c b/src/win/win.c
index 83135cd68..3e3535a32 100644
--- a/src/win/win.c
+++ b/src/win/win.c
@@ -1286,3 +1286,11 @@ endblit(void)
 {
     ReleaseMutex(ghMutex);
 }
+
+double
+plat_get_dpi(void)
+{
+    UINT dpi = win_get_dpi(hwndRender);
+
+    return ((double) dpi) / 96.0;
+}
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 c8f7f90fd..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.
@@ -32,15 +31,6 @@
 
 int    mouse_capture;
 
-typedef struct {
-    int buttons;
-    int dx;
-    int dy;
-    int dwheel;
-} MOUSESTATE;
-
-MOUSESTATE mousestate;
-
 void
 win_mouse_init(void)
 {
@@ -56,8 +46,6 @@ win_mouse_init(void)
     ridev.usUsage     = 0x02;
     if (!RegisterRawInputDevices(&ridev, 1, sizeof(ridev)))
         fatal("plat_mouse_init: RegisterRawInputDevices failed\n");
-
-    memset(&mousestate, 0, sizeof(MOUSESTATE));
 }
 
 void
diff --git a/src/win/win_opengl_glslp.c b/src/win/win_opengl_glslp.c
index 47cc755dc..33ed9feab 100644
--- a/src/win/win_opengl_glslp.c
+++ b/src/win/win_opengl_glslp.c
@@ -50,8 +50,8 @@ in vec2 VertexCoord;\n\
 in vec2 TexCoord;\n\
 out vec2 tex;\n\
 void main(){\n\
-	gl_Position = vec4(VertexCoord, 0.0, 1.0);\n\
-	tex = TexCoord;\n\
+    gl_Position = vec4(VertexCoord, 0.0, 1.0);\n\
+    tex = TexCoord;\n\
 }\n";
 
 /**
@@ -62,7 +62,7 @@ in vec2 tex;\n\
 uniform sampler2D texsampler;\n\
 out vec4 color;\n\
 void main() {\n\
-	color = texture(texsampler, tex);\n\
+    color = texture(texsampler, tex);\n\
 }\n";
 
 /**
@@ -179,7 +179,7 @@ load_custom_shaders(const char *path)
         /* Check if the shader program defines version directive */
         char *version_start = strstr(shader, "#version");
 
-        /*	If the shader program contains a version directive,
+        /* If the shader program contains a version directive,
                 it must be captured and placed as the first statement. */
         if (version_start != NULL) {
             /* Version directive found, search the line end */
@@ -197,7 +197,7 @@ load_custom_shaders(const char *path)
                 fragment_sources[0] = version;
             }
 
-            /*	Comment out the original version directive
+            /* Comment out the original version directive
                     as only one is allowed. */
             memset(version_start, '/', 2);
         }
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;