diff --git a/hw/xbox/acpi_xbox.c b/hw/xbox/acpi_xbox.c
index ce78d9580d..288218543c 100644
--- a/hw/xbox/acpi_xbox.c
+++ b/hw/xbox/acpi_xbox.c
@@ -2,7 +2,7 @@
  * Xbox ACPI implementation
  *
  * Copyright (c) 2012 espes
- * Copyright (c) 2020 Matt Borgerson
+ * Copyright (c) 2020-2021 Matt Borgerson
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/hw/xbox/chihiro.c b/hw/xbox/chihiro.c
index 7c69046860..9bae859945 100644
--- a/hw/xbox/chihiro.c
+++ b/hw/xbox/chihiro.c
@@ -2,7 +2,7 @@
  * QEMU Chihiro emulation
  *
  * Copyright (c) 2013 espes
- * Copyright (c) 2018 Matt Borgerson
+ * Copyright (c) 2018-2021 Matt Borgerson
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/hw/xbox/lpc47m157.c b/hw/xbox/lpc47m157.c
index 1d2e8f36cd..6e6fa3823d 100644
--- a/hw/xbox/lpc47m157.c
+++ b/hw/xbox/lpc47m157.c
@@ -2,7 +2,7 @@
  * QEMU SMSC LPC47M157 (Super I/O)
  *
  * Copyright (c) 2013 espes
- * Copyright (c) 2018-2020 Matt Borgerson
+ * Copyright (c) 2018-2021 Matt Borgerson
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/hw/xbox/nv2a/gl/gloffscreen_sdl.c b/hw/xbox/nv2a/gl/gloffscreen_sdl.c
index 876dc82c9b..ab94b70743 100644
--- a/hw/xbox/nv2a/gl/gloffscreen_sdl.c
+++ b/hw/xbox/nv2a/gl/gloffscreen_sdl.c
@@ -1,7 +1,7 @@
 /*
  *  Offscreen OpenGL abstraction layer -- SDL based
  *
- *  Copyright (c) 2018 Matt Borgerson
+ *  Copyright (c) 2018-2021 Matt Borgerson
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/hw/xbox/nv2a/nv2a.c b/hw/xbox/nv2a/nv2a.c
index 468c59cfd4..8f8d7674b6 100644
--- a/hw/xbox/nv2a/nv2a.c
+++ b/hw/xbox/nv2a/nv2a.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2012 espes
  * Copyright (c) 2015 Jannik Vogel
- * Copyright (c) 2018-2020 Matt Borgerson
+ * Copyright (c) 2018-2021 Matt Borgerson
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/hw/xbox/nv2a/nv2a.h b/hw/xbox/nv2a/nv2a.h
index 3d43c6e2d1..464ee4ae9c 100644
--- a/hw/xbox/nv2a/nv2a.h
+++ b/hw/xbox/nv2a/nv2a.h
@@ -2,7 +2,7 @@
  * QEMU Geforce NV2A implementation
  *
  * Copyright (c) 2012 espes
- * Copyright (c) 2020 Matt Borgerson
+ * Copyright (c) 2020-2021 Matt Borgerson
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/hw/xbox/nv2a/nv2a_int.h b/hw/xbox/nv2a/nv2a_int.h
index 8e45650967..81a59037d4 100644
--- a/hw/xbox/nv2a/nv2a_int.h
+++ b/hw/xbox/nv2a/nv2a_int.h
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2012 espes
  * Copyright (c) 2015 Jannik Vogel
- * Copyright (c) 2018-2020 Matt Borgerson
+ * Copyright (c) 2018-2021 Matt Borgerson
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/hw/xbox/nv2a/pbus.c b/hw/xbox/nv2a/pbus.c
index dee4dcc582..737d1bfb2d 100644
--- a/hw/xbox/nv2a/pbus.c
+++ b/hw/xbox/nv2a/pbus.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2012 espes
  * Copyright (c) 2015 Jannik Vogel
- * Copyright (c) 2018-2020 Matt Borgerson
+ * Copyright (c) 2018-2021 Matt Borgerson
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/hw/xbox/nv2a/pcrtc.c b/hw/xbox/nv2a/pcrtc.c
index cad4d89bc3..340b370077 100644
--- a/hw/xbox/nv2a/pcrtc.c
+++ b/hw/xbox/nv2a/pcrtc.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2012 espes
  * Copyright (c) 2015 Jannik Vogel
- * Copyright (c) 2018 Matt Borgerson
+ * Copyright (c) 2018-2021 Matt Borgerson
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/hw/xbox/nv2a/pfb.c b/hw/xbox/nv2a/pfb.c
index 511d24d919..892195d06a 100644
--- a/hw/xbox/nv2a/pfb.c
+++ b/hw/xbox/nv2a/pfb.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2012 espes
  * Copyright (c) 2015 Jannik Vogel
- * Copyright (c) 2018 Matt Borgerson
+ * Copyright (c) 2018-2021 Matt Borgerson
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/hw/xbox/nv2a/pfifo.c b/hw/xbox/nv2a/pfifo.c
index 5ab3256fe5..d686e8cb33 100644
--- a/hw/xbox/nv2a/pfifo.c
+++ b/hw/xbox/nv2a/pfifo.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2012 espes
  * Copyright (c) 2015 Jannik Vogel
- * Copyright (c) 2018-2020 Matt Borgerson
+ * Copyright (c) 2018-2021 Matt Borgerson
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/hw/xbox/nv2a/pgraph.c b/hw/xbox/nv2a/pgraph.c
index 19f806a79f..32acaa7751 100644
--- a/hw/xbox/nv2a/pgraph.c
+++ b/hw/xbox/nv2a/pgraph.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2012 espes
  * Copyright (c) 2015 Jannik Vogel
- * Copyright (c) 2018-2020 Matt Borgerson
+ * Copyright (c) 2018-2021 Matt Borgerson
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/hw/xbox/nv2a/pmc.c b/hw/xbox/nv2a/pmc.c
index 1839817c0c..1a0191cbbf 100644
--- a/hw/xbox/nv2a/pmc.c
+++ b/hw/xbox/nv2a/pmc.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2012 espes
  * Copyright (c) 2015 Jannik Vogel
- * Copyright (c) 2018 Matt Borgerson
+ * Copyright (c) 2018-2021 Matt Borgerson
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/hw/xbox/nv2a/pramdac.c b/hw/xbox/nv2a/pramdac.c
index 69e7c3597d..a9288a32f4 100644
--- a/hw/xbox/nv2a/pramdac.c
+++ b/hw/xbox/nv2a/pramdac.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2012 espes
  * Copyright (c) 2015 Jannik Vogel
- * Copyright (c) 2018 Matt Borgerson
+ * Copyright (c) 2018-2021 Matt Borgerson
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/hw/xbox/nv2a/prmcio.c b/hw/xbox/nv2a/prmcio.c
index f672ee67cd..fe396a00b3 100644
--- a/hw/xbox/nv2a/prmcio.c
+++ b/hw/xbox/nv2a/prmcio.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2012 espes
  * Copyright (c) 2015 Jannik Vogel
- * Copyright (c) 2018 Matt Borgerson
+ * Copyright (c) 2018-2021 Matt Borgerson
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/hw/xbox/nv2a/prmvio.c b/hw/xbox/nv2a/prmvio.c
index a014fb8eab..bdf075e069 100644
--- a/hw/xbox/nv2a/prmvio.c
+++ b/hw/xbox/nv2a/prmvio.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2012 espes
  * Copyright (c) 2015 Jannik Vogel
- * Copyright (c) 2018 Matt Borgerson
+ * Copyright (c) 2018-2021 Matt Borgerson
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/hw/xbox/nv2a/psh.c b/hw/xbox/nv2a/psh.c
index 49243dc9bb..4c5a431d14 100644
--- a/hw/xbox/nv2a/psh.c
+++ b/hw/xbox/nv2a/psh.c
@@ -3,6 +3,7 @@
  *
  * Copyright (c) 2013 espes
  * Copyright (c) 2015 Jannik Vogel
+ * Copyright (c) 2020-2021 Matt Borgerson
  *
  * Based on:
  * Cxbx, PixelShader.cpp
diff --git a/hw/xbox/nv2a/ptimer.c b/hw/xbox/nv2a/ptimer.c
index 3d16a2a269..c056a9edb4 100644
--- a/hw/xbox/nv2a/ptimer.c
+++ b/hw/xbox/nv2a/ptimer.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2012 espes
  * Copyright (c) 2015 Jannik Vogel
- * Copyright (c) 2018 Matt Borgerson
+ * Copyright (c) 2018-2021 Matt Borgerson
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/hw/xbox/nv2a/pvideo.c b/hw/xbox/nv2a/pvideo.c
index f4a469b608..4c2aaae742 100644
--- a/hw/xbox/nv2a/pvideo.c
+++ b/hw/xbox/nv2a/pvideo.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2012 espes
  * Copyright (c) 2015 Jannik Vogel
- * Copyright (c) 2018 Matt Borgerson
+ * Copyright (c) 2018-2021 Matt Borgerson
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/hw/xbox/nv2a/shaders.c b/hw/xbox/nv2a/shaders.c
index 5d23cdfa59..1ead948744 100644
--- a/hw/xbox/nv2a/shaders.c
+++ b/hw/xbox/nv2a/shaders.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2015 espes
  * Copyright (c) 2015 Jannik Vogel
- * Copyright (c) 2020 Matt Borgerson
+ * Copyright (c) 2020-2021 Matt Borgerson
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/hw/xbox/nv2a/stubs.c b/hw/xbox/nv2a/stubs.c
index 6c7313a69d..ec3d8e8d85 100644
--- a/hw/xbox/nv2a/stubs.c
+++ b/hw/xbox/nv2a/stubs.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2012 espes
  * Copyright (c) 2015 Jannik Vogel
- * Copyright (c) 2018 Matt Borgerson
+ * Copyright (c) 2018-2021 Matt Borgerson
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/hw/xbox/nv2a/user.c b/hw/xbox/nv2a/user.c
index 2efd719346..b0429de495 100644
--- a/hw/xbox/nv2a/user.c
+++ b/hw/xbox/nv2a/user.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2012 espes
  * Copyright (c) 2015 Jannik Vogel
- * Copyright (c) 2018 Matt Borgerson
+ * Copyright (c) 2018-2021 Matt Borgerson
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/hw/xbox/nvnet.c b/hw/xbox/nvnet.c
index 7a246857d6..55b68ac578 100644
--- a/hw/xbox/nvnet.c
+++ b/hw/xbox/nvnet.c
@@ -2,7 +2,7 @@
  * QEMU nForce Ethernet Controller implementation
  *
  * Copyright (c) 2013 espes
- * Copyright (c) 2015-2020 Matt Borgerson
+ * Copyright (c) 2015-2021 Matt Borgerson
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/hw/xbox/smbus_xbox_smc.c b/hw/xbox/smbus_xbox_smc.c
index 389caacaa5..d21944726a 100644
--- a/hw/xbox/smbus_xbox_smc.c
+++ b/hw/xbox/smbus_xbox_smc.c
@@ -2,7 +2,7 @@
  * QEMU SMBus Xbox System Management Controller
  *
  * Copyright (c) 2011 espes
- * Copyright (c) 2020 Matt Borgerson
+ * Copyright (c) 2020-2021 Matt Borgerson
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/hw/xbox/xbox.c b/hw/xbox/xbox.c
index aeafec3777..103604a120 100644
--- a/hw/xbox/xbox.c
+++ b/hw/xbox/xbox.c
@@ -2,7 +2,7 @@
  * QEMU Xbox System Emulator
  *
  * Copyright (c) 2012 espes
- * Copyright (c) 2018 Matt Borgerson
+ * Copyright (c) 2018-2021 Matt Borgerson
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -53,7 +53,7 @@
 #include "hw/i2c/smbus_eeprom.h"
 #include "hw/xbox/nv2a/nv2a.h"
 #include "hw/xbox/mcpx/apu.h"
- 
+
 #include "hw/xbox/xbox.h"
 #include "smbus.h"
 
@@ -146,13 +146,13 @@ static void xbox_flash_init(MemoryRegion *rom_memory)
     /* XBOX_FIXME: The "memory_region_set_readonly" calls below have been
     * temporarily commented out due to MCPX 1.1-based kernels hanging
     * in the first bootloader stage when doing RSA signature verification.
-    * 
+    *
     * This is caused by code incorrectly using the flash memory range to
     * store the following computation; luckily real hardware's writeback
     * cache policy (verified against MTRR config) appears to allow this
     * to succeed, but qemu's emulation of such isn't capable of this yet
     * so the value is never updated in ROM unless readonly is unspecified.
-    * 
+    *
     *   sub ds:0FFFFD52Ch, eax
     *   mov eax, ds:0FFFFD52Ch
     */
diff --git a/hw/xbox/xbox.h b/hw/xbox/xbox.h
index bcab3fd0f8..5ec777ca49 100644
--- a/hw/xbox/xbox.h
+++ b/hw/xbox/xbox.h
@@ -2,7 +2,7 @@
  * QEMU Xbox System Emulator
  *
  * Copyright (c) 2013 espes
- * Copyright (c) 2018 Matt Borgerson
+ * Copyright (c) 2018-2021 Matt Borgerson
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/hw/xbox/xbox_pci.c b/hw/xbox/xbox_pci.c
index 17e472f6fb..3d2e552a23 100644
--- a/hw/xbox/xbox_pci.c
+++ b/hw/xbox/xbox_pci.c
@@ -2,7 +2,7 @@
  * QEMU Xbox PCI buses implementation
  *
  * Copyright (c) 2012 espes
- * Copyright (c) 2018-2020 Matt Borgerson
+ * Copyright (c) 2018-2021 Matt Borgerson
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/hw/xbox/xbox_pci.h b/hw/xbox/xbox_pci.h
index 430829400a..1d20f2d5a5 100644
--- a/hw/xbox/xbox_pci.h
+++ b/hw/xbox/xbox_pci.h
@@ -2,7 +2,7 @@
  * QEMU Xbox PCI buses implementation
  *
  * Copyright (c) 2012 espes
- * Copyright (c) 2020 Matt Borgerson
+ * Copyright (c) 2020-2021 Matt Borgerson
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/hw/xbox/xid.c b/hw/xbox/xid.c
index 2224c44727..516e349257 100644
--- a/hw/xbox/xid.c
+++ b/hw/xbox/xid.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2013 espes
  * Copyright (c) 2017 Jannik Vogel
- * Copyright (c) 2018-2020 Matt Borgerson
+ * Copyright (c) 2018-2021 Matt Borgerson
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/ui/xemu-custom-widgets.c b/ui/xemu-custom-widgets.c
index d4b687b84b..360fab5450 100644
--- a/ui/xemu-custom-widgets.c
+++ b/ui/xemu-custom-widgets.c
@@ -1,7 +1,7 @@
 /*
  * xemu User Interface Rendering Helpers
  *
- * Copyright (C) 2020 Matt Borgerson
+ * Copyright (C) 2020-2021 Matt Borgerson
  *
  * 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/ui/xemu-custom-widgets.h b/ui/xemu-custom-widgets.h
index a2234958cd..776113423f 100644
--- a/ui/xemu-custom-widgets.h
+++ b/ui/xemu-custom-widgets.h
@@ -1,7 +1,7 @@
 /*
  * xemu User Interface Rendering Helpers
  *
- * Copyright (C) 2020 Matt Borgerson
+ * Copyright (C) 2020-2021 Matt Borgerson
  *
  * 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/ui/xemu-data.c b/ui/xemu-data.c
index 3fdc437bce..171d2c14f3 100644
--- a/ui/xemu-data.c
+++ b/ui/xemu-data.c
@@ -1,7 +1,7 @@
 /*
  * xemu Data File and Path Helpers
  *
- * Copyright (C) 2020 Matt Borgerson
+ * Copyright (C) 2020-2021 Matt Borgerson
  *
  * 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/ui/xemu-data.h b/ui/xemu-data.h
index d0a4831fbe..ebae9a567b 100644
--- a/ui/xemu-data.h
+++ b/ui/xemu-data.h
@@ -1,7 +1,7 @@
 /*
  * xemu Data File and Path Helpers
  *
- * Copyright (C) 2020 Matt Borgerson
+ * Copyright (C) 2020-2021 Matt Borgerson
  *
  * 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/ui/xemu-hud.cc b/ui/xemu-hud.cc
index 30b04c57bf..a88f420f90 100644
--- a/ui/xemu-hud.cc
+++ b/ui/xemu-hud.cc
@@ -1,7 +1,7 @@
 /*
  * xemu User Interface
  *
- * Copyright (C) 2020 Matt Borgerson
+ * Copyright (C) 2020-2021 Matt Borgerson
  *
  * 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/ui/xemu-hud.h b/ui/xemu-hud.h
index 455e812dcf..e9a50bfbb6 100644
--- a/ui/xemu-hud.h
+++ b/ui/xemu-hud.h
@@ -4,7 +4,7 @@
  * Subsystem handling primary graphical user interface, which can be controlled
  * via mouse and keyboard or through any attached gamepad.
  *
- * Copyright (C) 2020 Matt Borgerson
+ * Copyright (C) 2020-2021 Matt Borgerson
  *
  * 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/ui/xemu-input.c b/ui/xemu-input.c
index ce8f8b637c..08a10b44ec 100644
--- a/ui/xemu-input.c
+++ b/ui/xemu-input.c
@@ -1,7 +1,7 @@
 /*
  * xemu Input Management
  *
- * Copyright (C) 2020 Matt Borgerson
+ * Copyright (C) 2020-2021 Matt Borgerson
  *
  * 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/ui/xemu-input.h b/ui/xemu-input.h
index 324b923466..e570757aa7 100644
--- a/ui/xemu-input.h
+++ b/ui/xemu-input.h
@@ -6,7 +6,7 @@
  * Xbox gamepad and support automatic binding, hotplugging, and removal at
  * runtime.
  *
- * Copyright (C) 2020 Matt Borgerson
+ * Copyright (C) 2020-2021 Matt Borgerson
  *
  * 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/ui/xemu-monitor.c b/ui/xemu-monitor.c
index 96bea48fa6..a16003cae3 100644
--- a/ui/xemu-monitor.c
+++ b/ui/xemu-monitor.c
@@ -1,7 +1,7 @@
 /*
  * xemu QEMU Monitor Interface
  *
- * Copyright (c) 2020 Matt Borgerson
+ * Copyright (c) 2020-2021 Matt Borgerson
  *
  * Based on gdbstub.c
  *
diff --git a/ui/xemu-monitor.h b/ui/xemu-monitor.h
index 959f21c7c9..87ba2f250a 100644
--- a/ui/xemu-monitor.h
+++ b/ui/xemu-monitor.h
@@ -1,7 +1,7 @@
 /*
  * xemu QEMU Monitor Interface
  *
- * Copyright (c) 2020 Matt Borgerson
+ * Copyright (c) 2020-2021 Matt Borgerson
  *
  * Based on gdbstub.c
  *
diff --git a/ui/xemu-net.c b/ui/xemu-net.c
index 72acc822e0..c59e852f0b 100644
--- a/ui/xemu-net.c
+++ b/ui/xemu-net.c
@@ -3,7 +3,7 @@
  *
  * Wrapper functions to configure network settings at runtime.
  *
- * Copyright (C) 2020 Matt Borgerson
+ * Copyright (C) 2020-2021 Matt Borgerson
  *
  * 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
@@ -127,5 +127,5 @@ int xemu_net_is_enabled(void)
 {
     NetClientState *nc;
     nc = qemu_find_netdev(id);
-    return (nc != NULL); 
+    return (nc != NULL);
 }
diff --git a/ui/xemu-net.h b/ui/xemu-net.h
index 2c3f0dc668..82ae93fa62 100644
--- a/ui/xemu-net.h
+++ b/ui/xemu-net.h
@@ -3,7 +3,7 @@
  *
  * Wrapper functions to configure network settings at runtime.
  *
- * Copyright (C) 2020 Matt Borgerson
+ * Copyright (C) 2020-2021 Matt Borgerson
  *
  * 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/ui/xemu-notifications.h b/ui/xemu-notifications.h
index 5b85219a43..f023eb350a 100644
--- a/ui/xemu-notifications.h
+++ b/ui/xemu-notifications.h
@@ -4,7 +4,7 @@
  * Helper functions for other subsystems to queue a notification for the user,
  * which can be displayed by the HUD.
  *
- * Copyright (C) 2020 Matt Borgerson
+ * Copyright (C) 2020-2021 Matt Borgerson
  *
  * 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/ui/xemu-os-utils-linux.c b/ui/xemu-os-utils-linux.c
index f2038c88eb..5e77859ee7 100644
--- a/ui/xemu-os-utils-linux.c
+++ b/ui/xemu-os-utils-linux.c
@@ -1,7 +1,7 @@
 /*
  * OS-specific Helpers
  *
- * Copyright (C) 2020 Matt Borgerson
+ * Copyright (C) 2020-2021 Matt Borgerson
  *
  * 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/ui/xemu-os-utils-windows.c b/ui/xemu-os-utils-windows.c
index 0202dee2a0..8fc323746e 100644
--- a/ui/xemu-os-utils-windows.c
+++ b/ui/xemu-os-utils-windows.c
@@ -1,7 +1,7 @@
 /*
  * OS-specific Helpers
  *
- * Copyright (C) 2020 Matt Borgerson
+ * Copyright (C) 2020-2021 Matt Borgerson
  *
  * 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/ui/xemu-os-utils.h b/ui/xemu-os-utils.h
index 46a4925f18..682270deb8 100644
--- a/ui/xemu-os-utils.h
+++ b/ui/xemu-os-utils.h
@@ -1,7 +1,7 @@
 /*
  * OS-specific Helpers
  *
- * Copyright (C) 2020 Matt Borgerson
+ * Copyright (C) 2020-2021 Matt Borgerson
  *
  * 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
@@ -26,7 +26,7 @@ extern "C" {
 
 const char *xemu_get_os_info(void);
 void xemu_open_web_browser(const char *url);
-	
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/ui/xemu-reporting.cc b/ui/xemu-reporting.cc
index b16638e452..5b946d2f64 100644
--- a/ui/xemu-reporting.cc
+++ b/ui/xemu-reporting.cc
@@ -3,7 +3,7 @@
  *
  * Title compatibility and bug report submission.
  *
- * Copyright (C) 2020 Matt Borgerson
+ * Copyright (C) 2020-2021 Matt Borgerson
  *
  * 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
@@ -57,7 +57,7 @@ const std::string &CompatibilityReport::GetSerializedReport()
 		{"compat_comments", compat_comments},
 		{"xbe_headers", xbe_headers},
 	};
-	serialized = report.dump(2); 
+	serialized = report.dump(2);
 	return serialized;
 }
 
diff --git a/ui/xemu-reporting.h b/ui/xemu-reporting.h
index 1554fe07ae..383bb2a615 100644
--- a/ui/xemu-reporting.h
+++ b/ui/xemu-reporting.h
@@ -3,7 +3,7 @@
  *
  * Title compatibility and bug report submission.
  *
- * Copyright (C) 2020 Matt Borgerson
+ * Copyright (C) 2020-2021 Matt Borgerson
  *
  * 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/ui/xemu-settings.c b/ui/xemu-settings.c
index 2c00ae2d3f..6fe65ab48d 100644
--- a/ui/xemu-settings.c
+++ b/ui/xemu-settings.c
@@ -1,7 +1,7 @@
 /*
  * xemu Settings Management
  *
- * Copyright (C) 2020 Matt Borgerson
+ * Copyright (C) 2020-2021 Matt Borgerson
  *
  * 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
@@ -107,7 +107,7 @@ struct config_offset_table {
 	[XEMU_SETTINGS_SYSTEM_EEPROM_PATH]  = { CONFIG_TYPE_STRING, "system", "eeprom_path",  offsetof(struct xemu_settings, eeprom_path),     { .default_str  = "" } },
 	[XEMU_SETTINGS_SYSTEM_MEMORY]       = { CONFIG_TYPE_INT,    "system", "memory",       offsetof(struct xemu_settings, memory),          { .default_int  = 64 } },
 	[XEMU_SETTINGS_SYSTEM_SHORTANIM]    = { CONFIG_TYPE_BOOL,   "system", "shortanim",    offsetof(struct xemu_settings, short_animation), { .default_bool = 0  } },
-	
+
 	[XEMU_SETTINGS_AUDIO_USE_DSP] = { CONFIG_TYPE_BOOL, "audio", "use_dsp", offsetof(struct xemu_settings, use_dsp), { .default_bool = 0  } },
 
 	[XEMU_SETTINGS_DISPLAY_SCALE] =    { CONFIG_TYPE_ENUM, "display", "scale",    offsetof(struct xemu_settings, scale),    { .default_int = DISPLAY_SCALE_SCALE }, display_scale_map },
diff --git a/ui/xemu-settings.h b/ui/xemu-settings.h
index 3cdb5a8841..1e34b4925b 100644
--- a/ui/xemu-settings.h
+++ b/ui/xemu-settings.h
@@ -5,7 +5,7 @@
  * that gets saved to an INI file. All entries should be accessed through the
  * appropriate getter/setter functions.
  *
- * Copyright (C) 2020 Matt Borgerson
+ * Copyright (C) 2020-2021 Matt Borgerson
  *
  * 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/ui/xemu-shaders.c b/ui/xemu-shaders.c
index 7f83370fa5..7ef314ec5f 100644
--- a/ui/xemu-shaders.c
+++ b/ui/xemu-shaders.c
@@ -1,7 +1,7 @@
 /*
  * xemu User Interface Rendering Helpers
  *
- * Copyright (C) 2020 Matt Borgerson
+ * Copyright (C) 2020-2021 Matt Borgerson
  *
  * 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
@@ -199,7 +199,7 @@ GLuint load_texture_from_file(const char *name)
 
     // Flip vertically so textures are loaded according to GL convention.
     stbi_set_flip_vertically_on_load(1);
-    
+
     // Read file into memory
     int width, height, channels = 0;
     unsigned char *data = stbi_load(name, &width, &height, &channels, 4);
@@ -212,7 +212,7 @@ GLuint load_texture_from_file(const char *name)
     return tex;
 }
 
-void render_decal( 
+void render_decal(
     struct decal_shader *s,
     float x,     float y,     float w,     float h,
     float tex_x, float tex_y, float tex_w, float tex_h,
@@ -251,7 +251,7 @@ void render_decal(
     glDrawElements(GL_TRIANGLE_FAN, 4, GL_UNSIGNED_INT, NULL);
 }
 
-void render_decal_image( 
+void render_decal_image(
     struct decal_shader *s,
     float x,     float y,     float w,     float h,
     float tex_x, float tex_y, float tex_w, float tex_h
@@ -281,7 +281,7 @@ struct fbo *create_fbo(int width, int height)
     fbo->w = width;
     fbo->h = height;
 
-    // Allocate the texture    
+    // Allocate the texture
     glGenTextures(1, &fbo->tex);
     glBindTexture(GL_TEXTURE_2D, fbo->tex);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL,  0);
diff --git a/ui/xemu-shaders.h b/ui/xemu-shaders.h
index cd6fef2af1..6909b0577a 100644
--- a/ui/xemu-shaders.h
+++ b/ui/xemu-shaders.h
@@ -1,7 +1,7 @@
 /*
  * xemu User Interface Rendering Helpers
  *
- * Copyright (C) 2020 Matt Borgerson
+ * Copyright (C) 2020-2021 Matt Borgerson
  *
  * 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
@@ -80,14 +80,14 @@ struct fbo *create_fbo(int width, int height);
 void render_to_default_fb(void);
 GLuint render_to_fbo(struct fbo *fbo);
 
-void render_decal( 
+void render_decal(
     struct decal_shader *s,
     float x,     float y,     float w,     float h,
     float tex_x, float tex_y, float tex_w, float tex_h,
     uint32_t primary, uint32_t secondary, uint32_t fill
     );
 
-void render_decal_image( 
+void render_decal_image(
     struct decal_shader *s,
     float x,     float y,     float w,     float h,
     float tex_x, float tex_y, float tex_w, float tex_h
@@ -95,6 +95,6 @@ void render_decal_image(
 
 #ifdef __cplusplus
 }
-#endif   
+#endif
 
 #endif
diff --git a/ui/xemu.c b/ui/xemu.c
index 673344f07b..d30e7a5435 100644
--- a/ui/xemu.c
+++ b/ui/xemu.c
@@ -1,7 +1,7 @@
 /*
  * xemu SDL display driver
  *
- * Copyright (c) 2020 Matt Borgerson
+ * Copyright (c) 2020-2021 Matt Borgerson
  *
  * Based on sdl2.c, sdl2-gl.c
  *
diff --git a/xemu-xbe.c b/xemu-xbe.c
index 3a97fc4cbf..87cea9ff64 100644
--- a/xemu-xbe.c
+++ b/xemu-xbe.c
@@ -3,7 +3,7 @@
  *
  * Helper functions to get details about the currently running executable.
  *
- * Copyright (C) 2020 Matt Borgerson
+ * Copyright (C) 2020-2021 Matt Borgerson
  *
  * 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
@@ -110,7 +110,7 @@ struct xbe *xemu_get_xbe_info(void)
 
     xbe.headers = malloc(xbe.headers_len);
     assert(xbe.headers != NULL);
-    
+
     // Read all XBE headers
     ssize_t bytes_read = virt_dma_memory_read(hdr_addr_virt,
                                               xbe.headers,
diff --git a/xemu-xbe.h b/xemu-xbe.h
index 22313c5cc9..a60ea2eb62 100644
--- a/xemu-xbe.h
+++ b/xemu-xbe.h
@@ -3,7 +3,7 @@
  *
  * Helper functions to get details about the currently running executable.
  *
- * Copyright (C) 2020 Matt Borgerson
+ * Copyright (C) 2020-2021 Matt Borgerson
  *
  * 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