diff --git a/Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/canyon_bomber.qpf b/Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/Canyon_Bomber.qpf
similarity index 100%
rename from Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/canyon_bomber.qpf
rename to Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/Canyon_Bomber.qpf
diff --git a/Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/canyon_bomber.qsf b/Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/Canyon_Bomber.qsf
similarity index 92%
rename from Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/canyon_bomber.qsf
rename to Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/Canyon_Bomber.qsf
index 78859910..5f793be2 100644
--- a/Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/canyon_bomber.qsf	
+++ b/Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/Canyon_Bomber.qsf	
@@ -41,31 +41,9 @@
 # ========================
 set_global_assignment -name ORIGINAL_QUARTUS_VERSION "13.0 SP1"
 set_global_assignment -name PROJECT_CREATION_TIME_DATE "19:52:16  OCTOBER 10, 2017"
-set_global_assignment -name LAST_QUARTUS_VERSION 13.1
+set_global_assignment -name LAST_QUARTUS_VERSION "13.1 SP4.26"
 set_global_assignment -name PROJECT_OUTPUT_DIRECTORY output_files
 set_global_assignment -name PRE_FLOW_SCRIPT_FILE "quartus_sh:rtl/build_id.tcl"
-set_global_assignment -name SYSTEMVERILOG_FILE rtl/canyon_bomber_mist.sv
-set_global_assignment -name VHDL_FILE rtl/canyon_bomber.vhd
-set_global_assignment -name VHDL_FILE rtl/whistle.vhd
-set_global_assignment -name VHDL_FILE rtl/playfield.vhd
-set_global_assignment -name VHDL_FILE rtl/motor.vhd
-set_global_assignment -name VHDL_FILE rtl/motion.vhd
-set_global_assignment -name VHDL_FILE rtl/cpu_mem.vhd
-set_global_assignment -name VHDL_FILE rtl/sync.vhd
-set_global_assignment -name VHDL_FILE rtl/sound.vhd
-set_global_assignment -name VHDL_FILE rtl/spram.vhd
-set_global_assignment -name VHDL_FILE rtl/sprom.vhd
-set_global_assignment -name VHDL_FILE rtl/T65/T65_Pack.vhd
-set_global_assignment -name VHDL_FILE rtl/T65/T65_MCode.vhd
-set_global_assignment -name VHDL_FILE rtl/T65/T65_ALU.vhd
-set_global_assignment -name VHDL_FILE rtl/T65/T65.vhd
-set_global_assignment -name SYSTEMVERILOG_FILE rtl/video_mixer.sv
-set_global_assignment -name SYSTEMVERILOG_FILE rtl/scandoubler.sv
-set_global_assignment -name VERILOG_FILE rtl/pll.v
-set_global_assignment -name SYSTEMVERILOG_FILE rtl/osd.sv
-set_global_assignment -name SYSTEMVERILOG_FILE rtl/mist_io.sv
-set_global_assignment -name SYSTEMVERILOG_FILE rtl/hq2x.sv
-set_global_assignment -name SYSTEMVERILOG_FILE rtl/dac.sv
 
 # Pin & Location Assignments
 # ==========================
@@ -135,7 +113,7 @@ set_global_assignment -name GENERATE_RBF_FILE ON
 # SignalTap II Assignments
 # ========================
 set_global_assignment -name ENABLE_SIGNALTAP OFF
-set_global_assignment -name USE_SIGNALTAP_FILE output_files/stp3.stp
+set_global_assignment -name USE_SIGNALTAP_FILE output_files/cb.stp
 
 # Power Estimation Assignments
 # ============================
@@ -199,4 +177,19 @@ set_global_assignment -name OUTPUT_IO_TIMING_FAR_END_VMEAS "HALF SIGNAL SWING" -
 
 # end ENTITY(canyon_bomber_mist)
 # ------------------------------
+set_global_assignment -name SYSTEMVERILOG_FILE rtl/canyon_bomber_mist.sv
+set_global_assignment -name VHDL_FILE rtl/canyon_bomber.vhd
+set_global_assignment -name VHDL_FILE rtl/whistle.vhd
+set_global_assignment -name VHDL_FILE rtl/playfield.vhd
+set_global_assignment -name VHDL_FILE rtl/motor.vhd
+set_global_assignment -name VHDL_FILE rtl/motion.vhd
+set_global_assignment -name VHDL_FILE rtl/cpu_mem.vhd
+set_global_assignment -name VHDL_FILE rtl/sync.vhd
+set_global_assignment -name VHDL_FILE rtl/sound.vhd
+set_global_assignment -name VHDL_FILE rtl/spram.vhd
+set_global_assignment -name VHDL_FILE rtl/sprom.vhd
+set_global_assignment -name VERILOG_FILE rtl/pll.v
+set_global_assignment -name QIP_FILE ../../../common/CPU/T65/T65.qip
+set_global_assignment -name QIP_FILE ../../../common/mist/mist.qip
+set_global_assignment -name SIGNALTAP_FILE output_files/cb.stp
 set_instance_assignment -name PARTITION_HIERARCHY root_partition -to | -section_id Top
\ No newline at end of file
diff --git a/Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/Canyon_Bomber.sdc b/Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/Canyon_Bomber.sdc
new file mode 100644
index 00000000..8232c0f3
--- /dev/null
+++ b/Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/Canyon_Bomber.sdc	
@@ -0,0 +1,128 @@
+## Generated SDC file "vectrex_MiST.out.sdc"
+
+## Copyright (C) 1991-2013 Altera Corporation
+## Your use of Altera Corporation's design tools, logic functions 
+## and other software and tools, and its AMPP partner logic 
+## functions, and any output files from any of the foregoing 
+## (including device programming or simulation files), and any 
+## associated documentation or information are expressly subject 
+## to the terms and conditions of the Altera Program License 
+## Subscription Agreement, Altera MegaCore Function License 
+## Agreement, or other applicable license agreement, including, 
+## without limitation, that your use is for the sole purpose of 
+## programming logic devices manufactured by Altera and sold by 
+## Altera or its authorized distributors.  Please refer to the 
+## applicable agreement for further details.
+
+
+## VENDOR  "Altera"
+## PROGRAM "Quartus II"
+## VERSION "Version 13.1.0 Build 162 10/23/2013 SJ Web Edition"
+
+## DATE    "Sun Jun 24 12:53:00 2018"
+
+##
+## DEVICE  "EP3C25E144C8"
+##
+
+# Clock constraints
+
+# Automatically constrain PLL and other generated clocks
+derive_pll_clocks -create_base_clocks
+
+# Automatically calculate clock uncertainty to jitter and other effects.
+derive_clock_uncertainty
+
+# tsu/th constraints
+
+# tco constraints
+
+# tpd constraints
+
+#**************************************************************
+# Time Information
+#**************************************************************
+
+set_time_format -unit ns -decimal_places 3
+
+
+
+#**************************************************************
+# Create Clock
+#**************************************************************
+
+create_clock -name {SPI_SCK}  -period 41.666 -waveform { 20.8 41.666 } [get_ports {SPI_SCK}]
+
+set sys_clk   "pll|altpll_component|auto_generated|pll1|clk[1]"
+set vid_clk   "pll|altpll_component|auto_generated|pll1|clk[0]"
+#**************************************************************
+# Create Generated Clock
+#**************************************************************
+
+
+#**************************************************************
+# Set Clock Latency
+#**************************************************************
+
+
+
+#**************************************************************
+# Set Clock Uncertainty
+#**************************************************************
+
+#**************************************************************
+# Set Input Delay
+#**************************************************************
+
+set_input_delay -add_delay  -clock_fall -clock [get_clocks {CLOCK_27}]  1.000 [get_ports {CLOCK_27}]
+set_input_delay -add_delay  -clock_fall -clock [get_clocks {SPI_SCK}]  1.000 [get_ports {CONF_DATA0}]
+set_input_delay -add_delay  -clock_fall -clock [get_clocks {SPI_SCK}]  1.000 [get_ports {SPI_DI}]
+set_input_delay -add_delay  -clock_fall -clock [get_clocks {SPI_SCK}]  1.000 [get_ports {SPI_SCK}]
+set_input_delay -add_delay  -clock_fall -clock [get_clocks {SPI_SCK}]  1.000 [get_ports {SPI_SS2}]
+set_input_delay -add_delay  -clock_fall -clock [get_clocks {SPI_SCK}]  1.000 [get_ports {SPI_SS3}]
+
+#**************************************************************
+# Set Output Delay
+#**************************************************************
+
+set_output_delay -add_delay  -clock_fall -clock [get_clocks {SPI_SCK}] 1.000 [get_ports {SPI_DO}]
+set_output_delay -add_delay  -clock_fall -clock [get_clocks $sys_clk]  1.000 [get_ports {AUDIO_L}]
+set_output_delay -add_delay  -clock_fall -clock [get_clocks $sys_clk]  1.000 [get_ports {AUDIO_R}]
+set_output_delay -add_delay  -clock_fall -clock [get_clocks $sys_clk]  1.000 [get_ports {LED}]
+set_output_delay -add_delay  -clock_fall -clock [get_clocks $vid_clk]  1.000 [get_ports {VGA_*}]
+
+#**************************************************************
+# Set Clock Groups
+#**************************************************************
+
+set_clock_groups -asynchronous -group [get_clocks {SPI_SCK}] -group [get_clocks {pll|altpll_component|auto_generated|pll1|clk[*]}]
+
+#**************************************************************
+# Set False Path
+#**************************************************************
+
+
+
+#**************************************************************
+# Set Multicycle Path
+#**************************************************************
+
+set_multicycle_path -to {VGA_*[*]} -setup 2
+set_multicycle_path -to {VGA_*[*]} -hold 1
+
+#**************************************************************
+# Set Maximum Delay
+#**************************************************************
+
+
+
+#**************************************************************
+# Set Minimum Delay
+#**************************************************************
+
+
+
+#**************************************************************
+# Set Input Transition
+#**************************************************************
+
diff --git a/Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/rtl/T65/T65.vhd b/Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/rtl/T65/T65.vhd
deleted file mode 100644
index 09253fe0..00000000
--- a/Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/rtl/T65/T65.vhd	
+++ /dev/null
@@ -1,564 +0,0 @@
--- ****
--- T65(b) core. In an effort to merge and maintain bug fixes ....
---
---
--- Ver 301 more merging
--- Ver 300 Bugfixes by ehenciak added, started tidyup *bust*
--- MikeJ March 2005
--- Latest version from www.fpgaarcade.com (original www.opencores.org)
---
--- ****
---
--- 65xx compatible microprocessor core
---
--- Version : 0246
---
--- Copyright (c) 2002 Daniel Wallner (jesus@opencores.org)
---
--- All rights reserved
---
--- Redistribution and use in source and synthezised forms, with or without
--- modification, are permitted provided that the following conditions are met:
---
--- Redistributions of source code must retain the above copyright notice,
--- this list of conditions and the following disclaimer.
---
--- Redistributions in synthesized form must reproduce the above copyright
--- notice, this list of conditions and the following disclaimer in the
--- documentation and/or other materials provided with the distribution.
---
--- Neither the name of the author nor the names of other contributors may
--- be used to endorse or promote products derived from this software without
--- specific prior written permission.
---
--- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
--- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
--- THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
--- PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE
--- LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
--- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
--- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
--- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
--- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
--- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
--- POSSIBILITY OF SUCH DAMAGE.
---
--- Please report bugs to the author, but before you do so, please
--- make sure that this is not a derivative work and that
--- you have the latest version of this file.
---
--- The latest version of this file can be found at:
---      http://www.opencores.org/cvsweb.shtml/t65/
---
--- Limitations :
---
--- 65C02 and 65C816 modes are incomplete
--- Undocumented instructions are not supported
--- Some interface signals behaves incorrect
---
--- File history :
---
---      0246 : First release
---
-
-library IEEE;
-  use IEEE.std_logic_1164.all;
-  use IEEE.numeric_std.all;
-  use work.T65_Pack.all;
-
--- ehenciak 2-23-2005 : Added the enable signal so that one doesn't have to use
--- the ready signal to limit the CPU.
-entity T65 is
-	port(
-		Mode    : in  std_logic_vector(1 downto 0);      -- "00" => 6502, "01" => 65C02, "10" => 65C816
-		Res_n   : in  std_logic;
-		Enable  : in  std_logic;
-		Clk     : in  std_logic;
-		Rdy     : in  std_logic;
-		Abort_n : in  std_logic;
-		IRQ_n   : in  std_logic;
-		NMI_n   : in  std_logic;
-		SO_n    : in  std_logic;
-		R_W_n   : out std_logic;
-		Sync    : out std_logic;
-		EF      : out std_logic;
-		MF      : out std_logic;
-		XF      : out std_logic;
-		ML_n    : out std_logic;
-		VP_n    : out std_logic;
-		VDA     : out std_logic;
-		VPA     : out std_logic;
-		A       : out std_logic_vector(23 downto 0);
-		DI      : in  std_logic_vector(7 downto 0);
-		DO      : out std_logic_vector(7 downto 0)
-	);
-end T65;
-
-architecture rtl of T65 is
-
-	-- Registers
-	signal ABC, X, Y, D       : std_logic_vector(15 downto 0);
-	signal P, AD, DL          : std_logic_vector(7 downto 0) :=  x"00";
-	signal BAH                : std_logic_vector(7 downto 0);
-	signal BAL                : std_logic_vector(8 downto 0);
-	signal PBR                : std_logic_vector(7 downto 0);
-	signal DBR                : std_logic_vector(7 downto 0);
-	signal PC                 : unsigned(15 downto 0);
-	signal S                  : unsigned(15 downto 0);
-	signal EF_i               : std_logic;
-	signal MF_i               : std_logic;
-	signal XF_i               : std_logic;
-
-	signal IR                 : std_logic_vector(7 downto 0);
-	signal MCycle             : std_logic_vector(2 downto 0);
-
-	signal Mode_r             : std_logic_vector(1 downto 0);
-	signal ALU_Op_r           : std_logic_vector(3 downto 0);
-	signal Write_Data_r       : std_logic_vector(2 downto 0);
-	signal Set_Addr_To_r      : std_logic_vector(1 downto 0);
-	signal PCAdder            : unsigned(8 downto 0);
-
-	signal RstCycle           : std_logic;
-	signal IRQCycle           : std_logic;
-	signal NMICycle           : std_logic;
-
-	signal B_o                : std_logic;
-	signal SO_n_o             : std_logic;
-	signal IRQ_n_o            : std_logic;
-	signal NMI_n_o            : std_logic;
-	signal NMIAct             : std_logic;
-
-	signal Break              : std_logic;
-
-	-- ALU signals
-	signal BusA               : std_logic_vector(7 downto 0);
-	signal BusA_r             : std_logic_vector(7 downto 0);
-	signal BusB               : std_logic_vector(7 downto 0);
-	signal ALU_Q              : std_logic_vector(7 downto 0);
-	signal P_Out              : std_logic_vector(7 downto 0);
-
-	-- Micro code outputs
-	signal LCycle             : std_logic_vector(2 downto 0);
-	signal ALU_Op             : std_logic_vector(3 downto 0);
-	signal Set_BusA_To        : std_logic_vector(2 downto 0);
-	signal Set_Addr_To        : std_logic_vector(1 downto 0);
-	signal Write_Data         : std_logic_vector(2 downto 0);
-	signal Jump               : std_logic_vector(1 downto 0);
-	signal BAAdd              : std_logic_vector(1 downto 0);
-	signal BreakAtNA          : std_logic;
-	signal ADAdd              : std_logic;
-	signal AddY               : std_logic;
-	signal PCAdd              : std_logic;
-	signal Inc_S              : std_logic;
-	signal Dec_S              : std_logic;
-	signal LDA                : std_logic;
-	signal LDP                : std_logic;
-	signal LDX                : std_logic;
-	signal LDY                : std_logic;
-	signal LDS                : std_logic;
-	signal LDDI               : std_logic;
-	signal LDALU              : std_logic;
-	signal LDAD               : std_logic;
-	signal LDBAL              : std_logic;
-	signal LDBAH              : std_logic;
-	signal SaveP              : std_logic;
-	signal Write              : std_logic;
-
-	signal really_rdy         : std_logic;
-	signal R_W_n_i            : std_logic;
-
-begin
-	-- ehenciak : gate Rdy with read/write to make an "OK, it's
-	--            really OK to stop the processor now if Rdy is
-	--            deasserted" signal
-	really_rdy <= Rdy or not(R_W_n_i);
-
-	-- ehenciak : Drive R_W_n_i off chip.
-	R_W_n      <= R_W_n_i;
-
-	Sync <= '1' when MCycle = "000" else '0';
-	EF <= EF_i;
-	MF <= MF_i;
-	XF <= XF_i;
-	ML_n <= '0' when IR(7 downto 6) /= "10" and IR(2 downto 1) = "11" and MCycle(2 downto 1) /= "00" else '1';
-	VP_n <= '0' when IRQCycle = '1' and (MCycle = "101" or MCycle = "110") else '1';
-	VDA <= '1' when Set_Addr_To_r /= "00" else '0';             -- Incorrect !!!!!!!!!!!!
-	VPA <= '1' when Jump(1) = '0' else '0';                     -- Incorrect !!!!!!!!!!!!
-
-	mcode : T65_MCode
-		port map(
-			Mode        => Mode_r,
-			IR          => IR,
-			MCycle      => MCycle,
-			P           => P,
-			LCycle      => LCycle,
-			ALU_Op      => ALU_Op,
-			Set_BusA_To => Set_BusA_To,
-			Set_Addr_To => Set_Addr_To,
-			Write_Data  => Write_Data,
-			Jump        => Jump,
-			BAAdd       => BAAdd,
-			BreakAtNA   => BreakAtNA,
-			ADAdd       => ADAdd,
-			AddY        => AddY,
-			PCAdd       => PCAdd,
-			Inc_S       => Inc_S,
-			Dec_S       => Dec_S,
-			LDA         => LDA,
-			LDP         => LDP,
-			LDX         => LDX,
-			LDY         => LDY,
-			LDS         => LDS,
-			LDDI        => LDDI,
-			LDALU       => LDALU,
-			LDAD        => LDAD,
-			LDBAL       => LDBAL,
-			LDBAH       => LDBAH,
-			SaveP       => SaveP,
-			Write       => Write
-			);
-
-	alu : T65_ALU
-		port map(
-			Mode => Mode_r,
-			Op => ALU_Op_r,
-			BusA => BusA_r,
-			BusB => BusB,
-			P_In => P,
-			P_Out => P_Out,
-			Q => ALU_Q
-			);
-
-	process (Res_n, Clk)
-	begin
-		if Res_n = '0' then
-			PC <= (others => '0');  -- Program Counter
-			IR <= "00000000";
-			S <= (others => '0');       -- Dummy !!!!!!!!!!!!!!!!!!!!!
-			D <= (others => '0');
-			PBR <= (others => '0');
-			DBR <= (others => '0');
-
-			Mode_r <= (others => '0');
-			ALU_Op_r <= "1100";
-			Write_Data_r <= "000";
-			Set_Addr_To_r <= "00";
-
-			R_W_n_i <= '1';
-			EF_i <= '1';
-			MF_i <= '1';
-			XF_i <= '1';
-
-		elsif Clk'event and Clk = '1' then
-		  if (Enable = '1') then
-			if (really_rdy = '1') then
-				R_W_n_i <= not Write or RstCycle;
-
-				D <= (others => '1');   -- Dummy
-				PBR <= (others => '1'); -- Dummy
-				DBR <= (others => '1'); -- Dummy
-				EF_i <= '0';    -- Dummy
-				MF_i <= '0';    -- Dummy
-				XF_i <= '0';    -- Dummy
-
-				if MCycle  = "000" then
-					Mode_r <= Mode;
-
-					if IRQCycle = '0' and NMICycle = '0' then
-						PC <= PC + 1;
-					end if;
-
-					if IRQCycle = '1' or NMICycle = '1' then
-						IR <= "00000000";
-					else
-						IR <= DI;
-					end if;
-				end if;
-
-				ALU_Op_r <= ALU_Op;
-				Write_Data_r <= Write_Data;
-				if Break = '1' then
-					Set_Addr_To_r <= "00";
-				else
-					Set_Addr_To_r <= Set_Addr_To;
-				end if;
-
-				if Inc_S = '1' then
-					S <= S + 1;
-				end if;
-				if Dec_S = '1' and RstCycle = '0' then
-					S <= S - 1;
-				end if;
-				if LDS = '1' then
-					S(7 downto 0) <= unsigned(ALU_Q);
-				end if;
-
-				if IR = "00000000" and MCycle = "001" and IRQCycle = '0' and NMICycle = '0' then
-					PC <= PC + 1;
-				end if;
-				--
-				-- jump control logic
-				--
-				case Jump is
-				  when "01" =>
-					  PC <= PC + 1;
-
-				  when "10" =>
-					  PC <= unsigned(DI & DL);
-
-				  when "11" =>
-					  if PCAdder(8) = '1' then
-						  if DL(7) = '0' then
-							  PC(15 downto 8) <= PC(15 downto 8) + 1;
-						  else
-							  PC(15 downto 8) <= PC(15 downto 8) - 1;
-						  end if;
-					  end if;
-					  PC(7 downto 0) <= PCAdder(7 downto 0);
-
-				  when others => null;
-				end case;
-			end if;
-		  end if;
-		end if;
-	end process;
-
-	PCAdder <= resize(PC(7 downto 0),9) + resize(unsigned(DL(7) & DL),9) when PCAdd = '1'
-			   else "0" & PC(7 downto 0);
-
-	process (Clk)
-	begin
-		if Clk'event and Clk = '1' then
-		  if (Enable = '1') then
-			if (really_rdy = '1') then
-				if MCycle = "000" then
-					if LDA = '1' then
-						ABC(7 downto 0) <= ALU_Q;
-					end if;
-					if LDX = '1' then
-						X(7 downto 0) <= ALU_Q;
-					end if;
-					if LDY = '1' then
-						Y(7 downto 0) <= ALU_Q;
-					end if;
-					if (LDA or LDX or LDY) = '1' then
-						P <= P_Out;
-					end if;
-				end if;
-				if SaveP = '1' then
-					P <= P_Out;
-				end if;
-				if LDP = '1' then
-					P <= ALU_Q;
-				end if;
-				if IR(4 downto 0) = "11000" then
-					case IR(7 downto 5) is
-					when "000" =>
-						P(Flag_C) <= '0';
-					when "001" =>
-						P(Flag_C) <= '1';
-					when "010" =>
-						P(Flag_I) <= '0';
-					when "011" =>
-						P(Flag_I) <= '1';
-					when "101" =>
-						P(Flag_V) <= '0';
-					when "110" =>
-						P(Flag_D) <= '0';
-					when "111" =>
-						P(Flag_D) <= '1';
-					when others =>
-					end case;
-				end if;
-
-				--if IR = "00000000" and MCycle = "011" and RstCycle = '0' and NMICycle = '0' and IRQCycle = '0' then
-				--	P(Flag_B) <= '1';
-				--end if;
-				--if IR = "00000000" and MCycle = "100" and RstCycle = '0' and (NMICycle = '1' or IRQCycle = '1')  then
-				--	P(Flag_I) <= '1';
-				--	P(Flag_B) <= B_o;
-				--end if;
-
-        -- B=1 always on the 6502
-				P(Flag_B) <= '1';
-				if IR = "00000000" and RstCycle = '0' and (NMICycle = '1' or IRQCycle = '1') then
-          if MCycle = "011" then
-            -- B=0 in *copy* of P pushed onto the stack
-            P(Flag_B) <= '0';
-          elsif MCycle = "100" then
-            P(Flag_I) <= '1';
-          end if;
-				end if;
-
-				if SO_n_o = '1' and SO_n = '0' then
-					P(Flag_V) <= '1';
-				end if;
-				if RstCycle = '1' and Mode_r /= "00" then
-					P(Flag_1) <= '1';
-					P(Flag_D) <= '0';
-					P(Flag_I) <= '1';
-				end if;
-				P(Flag_1) <= '1';
-
-				B_o     <= P(Flag_B);
-				SO_n_o <= SO_n;
-				IRQ_n_o <= IRQ_n;
-				NMI_n_o <= NMI_n;
-			end if;
-		  end if;
-		end if;
-	end process;
-
----------------------------------------------------------------------------
---
--- Buses
---
----------------------------------------------------------------------------
-
-	process (Res_n, Clk)
-	begin
-		if Res_n = '0' then
-			BusA_r <= (others => '0');
-			BusB <= (others => '0');
-			AD <= (others => '0');
-			BAL <= (others => '0');
-			BAH <= (others => '0');
-			DL <= (others => '0');
-		elsif Clk'event and Clk = '1' then
-		  if (Enable = '1') then
-			if (Rdy = '1') then
-				BusA_r <= BusA;
-				BusB <= DI;
-
-				case BAAdd is
-				when "01" =>
-					-- BA Inc
-					AD <= std_logic_vector(unsigned(AD) + 1);
-					BAL <= std_logic_vector(unsigned(BAL) + 1);
-				when "10" =>
-					-- BA Add
-					BAL <= std_logic_vector(resize(unsigned(BAL(7 downto 0)),9) + resize(unsigned(BusA),9));
-				when "11" =>
-					-- BA Adj
-					if BAL(8) = '1' then
-						BAH <= std_logic_vector(unsigned(BAH) + 1);
-					end if;
-				when others =>
-				end case;
-
-				-- ehenciak : modified to use Y register as well (bugfix)
-				if ADAdd = '1' then
-				  if (AddY = '1') then
-					AD <= std_logic_vector(unsigned(AD) + unsigned(Y(7 downto 0)));
-				  else
-					AD <= std_logic_vector(unsigned(AD) + unsigned(X(7 downto 0)));
-				  end if;
-				end if;
-
-				if IR = "00000000" then
-					BAL <= (others => '1');
-					BAH <= (others => '1');
-					if RstCycle = '1' then
-						BAL(2 downto 0) <= "100";
-					elsif NMICycle = '1' then
-						BAL(2 downto 0) <= "010";
-					else
-						BAL(2 downto 0) <= "110";
-					end if;
-					if Set_addr_To_r = "11" then
-						BAL(0) <= '1';
-					end if;
-				end if;
-
-
-				if LDDI = '1' then
-					DL <= DI;
-				end if;
-				if LDALU = '1' then
-					DL <= ALU_Q;
-				end if;
-				if LDAD = '1' then
-					AD <= DI;
-				end if;
-				if LDBAL = '1' then
-					BAL(7 downto 0) <= DI;
-				end if;
-				if LDBAH = '1' then
-					BAH <= DI;
-				end if;
-			end if;
-		end if;
-	  end if;
-	end process;
-
-	Break <= (BreakAtNA and not BAL(8)) or (PCAdd and not PCAdder(8));
-
-
-	with Set_BusA_To select
-		BusA <= DI when "000",
-			ABC(7 downto 0) when "001",
-			X(7 downto 0) when "010",
-			Y(7 downto 0) when "011",
-			std_logic_vector(S(7 downto 0)) when "100",
-			P when "101",
-			(others => '-') when others;
-
-	with Set_Addr_To_r select
-		A <= "0000000000000001" & std_logic_vector(S(7 downto 0)) when "01",
-			DBR & "00000000" & AD when "10",
-			"00000000" & BAH & BAL(7 downto 0) when "11",
-			PBR & std_logic_vector(PC(15 downto 8)) & std_logic_vector(PCAdder(7 downto 0)) when others;
-
-	with Write_Data_r select
-		DO <= DL when "000",
-			ABC(7 downto 0) when "001",
-			X(7 downto 0) when "010",
-			Y(7 downto 0) when "011",
-			std_logic_vector(S(7 downto 0)) when "100",
-			P when "101",
-			std_logic_vector(PC(7 downto 0)) when "110",
-			std_logic_vector(PC(15 downto 8)) when others;
-
--------------------------------------------------------------------------
---
--- Main state machine
---
--------------------------------------------------------------------------
-
-	process (Res_n, Clk)
-	begin
-		if Res_n = '0' then
-			MCycle <= "001";
-			RstCycle <= '1';
-			IRQCycle <= '0';
-			NMICycle <= '0';
-			NMIAct <= '0';
-		elsif Clk'event and Clk = '1' then
-		  if (Enable = '1') then
-			if (really_rdy = '1') then
-				if MCycle = LCycle or Break = '1' then
-					MCycle <= "000";
-					RstCycle <= '0';
-					IRQCycle <= '0';
-					NMICycle <= '0';
-					if NMIAct = '1' then
-						NMICycle <= '1';
-					elsif IRQ_n_o = '0' and P(Flag_I) = '0' then
-						IRQCycle <= '1';
-					end if;
-				else
-					MCycle <= std_logic_vector(unsigned(MCycle) + 1);
-				end if;
-
-				if NMICycle = '1' then
-					NMIAct <= '0';
-				end if;
-				if NMI_n_o = '1' and NMI_n = '0' then
-					NMIAct <= '1';
-				end if;
-			end if;
-		  end if;
-		end if;
-	end process;
-
-end;
diff --git a/Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/rtl/T65/T65_ALU.vhd b/Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/rtl/T65/T65_ALU.vhd
deleted file mode 100644
index b1f6d632..00000000
--- a/Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/rtl/T65/T65_ALU.vhd	
+++ /dev/null
@@ -1,260 +0,0 @@
--- ****
--- T65(b) core. In an effort to merge and maintain bug fixes ....
---
---
--- Ver 300 Bugfixes by ehenciak added
--- MikeJ March 2005
--- Latest version from www.fpgaarcade.com (original www.opencores.org)
---
--- ****
---
--- 6502 compatible microprocessor core
---
--- Version : 0245
---
--- Copyright (c) 2002 Daniel Wallner (jesus@opencores.org)
---
--- All rights reserved
---
--- Redistribution and use in source and synthezised forms, with or without
--- modification, are permitted provided that the following conditions are met:
---
--- Redistributions of source code must retain the above copyright notice,
--- this list of conditions and the following disclaimer.
---
--- Redistributions in synthesized form must reproduce the above copyright
--- notice, this list of conditions and the following disclaimer in the
--- documentation and/or other materials provided with the distribution.
---
--- Neither the name of the author nor the names of other contributors may
--- be used to endorse or promote products derived from this software without
--- specific prior written permission.
---
--- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
--- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
--- THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
--- PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE
--- LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
--- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
--- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
--- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
--- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
--- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
--- POSSIBILITY OF SUCH DAMAGE.
---
--- Please report bugs to the author, but before you do so, please
--- make sure that this is not a derivative work and that
--- you have the latest version of this file.
---
--- The latest version of this file can be found at:
---      http://www.opencores.org/cvsweb.shtml/t65/
---
--- Limitations :
---
--- File history :
---
---      0245 : First version
---
-
-library IEEE;
-use IEEE.std_logic_1164.all;
-use IEEE.numeric_std.all;
-use work.T65_Pack.all;
-
-entity T65_ALU is
-	port(
-		Mode    : in std_logic_vector(1 downto 0);      -- "00" => 6502, "01" => 65C02, "10" => 65816
-		Op      : in std_logic_vector(3 downto 0);
-		BusA    : in std_logic_vector(7 downto 0);
-		BusB    : in std_logic_vector(7 downto 0);
-		P_In    : in std_logic_vector(7 downto 0);
-		P_Out   : out std_logic_vector(7 downto 0);
-		Q       : out std_logic_vector(7 downto 0)
-	);
-end T65_ALU;
-
-architecture rtl of T65_ALU is
-
-	-- AddSub variables (temporary signals)
-	signal      ADC_Z           : std_logic;
-	signal      ADC_C           : std_logic;
-	signal      ADC_V           : std_logic;
-	signal      ADC_N           : std_logic;
-	signal      ADC_Q           : std_logic_vector(7 downto 0);
-	signal      SBC_Z           : std_logic;
-	signal      SBC_C           : std_logic;
-	signal      SBC_V           : std_logic;
-	signal      SBC_N           : std_logic;
-	signal      SBC_Q           : std_logic_vector(7 downto 0);
-
-begin
-
-	process (P_In, BusA, BusB)
-		variable AL : unsigned(6 downto 0);
-		variable AH : unsigned(6 downto 0);
-		variable C : std_logic;
-	begin
-		AL := resize(unsigned(BusA(3 downto 0) & P_In(Flag_C)), 7) + resize(unsigned(BusB(3 downto 0) & "1"), 7);
-		AH := resize(unsigned(BusA(7 downto 4) & AL(5)), 7) + resize(unsigned(BusB(7 downto 4) & "1"), 7);
-
--- pragma translate_off
-			if is_x(std_logic_vector(AL)) then AL := "0000000"; end if;
-			if is_x(std_logic_vector(AH)) then AH := "0000000"; end if;
--- pragma translate_on
-
-		if AL(4 downto 1) = 0 and AH(4 downto 1) = 0 then
-			ADC_Z <= '1';
-		else
-			ADC_Z <= '0';
-		end if;
-
-		if AL(5 downto 1) > 9 and P_In(Flag_D) = '1' then
-			AL(6 downto 1) := AL(6 downto 1) + 6;
-		end if;
-
-		C := AL(6) or AL(5);
-		AH := resize(unsigned(BusA(7 downto 4) & C), 7) + resize(unsigned(BusB(7 downto 4) & "1"), 7);
-
-		ADC_N <= AH(4);
-		ADC_V <= (AH(4) xor BusA(7)) and not (BusA(7) xor BusB(7));
-
--- pragma translate_off
-			if is_x(std_logic_vector(AH)) then AH := "0000000"; end if;
--- pragma translate_on
-
-		if AH(5 downto 1) > 9 and P_In(Flag_D) = '1' then
-			AH(6 downto 1) := AH(6 downto 1) + 6;
-		end if;
-
-		ADC_C <= AH(6) or AH(5);
-
-		ADC_Q <= std_logic_vector(AH(4 downto 1) & AL(4 downto 1));
-	end process;
-
-	process (Op, P_In, BusA, BusB)
-		variable AL : unsigned(6 downto 0);
-		variable AH : unsigned(5 downto 0);
-		variable C : std_logic;
-	begin
-		C := P_In(Flag_C) or not Op(0);
-		AL := resize(unsigned(BusA(3 downto 0) & C), 7) - resize(unsigned(BusB(3 downto 0) & "1"), 6);
-		AH := resize(unsigned(BusA(7 downto 4) & "0"), 6) - resize(unsigned(BusB(7 downto 4) & AL(5)), 6);
-
--- pragma translate_off
-			if is_x(std_logic_vector(AL)) then AL := "0000000"; end if;
-			if is_x(std_logic_vector(AH)) then AH := "000000"; end if;
--- pragma translate_on
-
-		if AL(4 downto 1) = 0 and AH(4 downto 1) = 0 then
-			SBC_Z <= '1';
-		else
-			SBC_Z <= '0';
-		end if;
-
-		SBC_C <= not AH(5);
-		SBC_V <= (AH(4) xor BusA(7)) and (BusA(7) xor BusB(7));
-		SBC_N <= AH(4);
-
-		if P_In(Flag_D) = '1' then
-			if AL(5) = '1' then
-				AL(5 downto 1) := AL(5 downto 1) - 6;
-			end if;
-			AH := resize(unsigned(BusA(7 downto 4) & "0"), 6) - resize(unsigned(BusB(7 downto 4) & AL(6)), 6);
-			if AH(5) = '1' then
-				AH(5 downto 1) := AH(5 downto 1) - 6;
-			end if;
-		end if;
-
-		SBC_Q <= std_logic_vector(AH(4 downto 1) & AL(4 downto 1));
-	end process;
-
-	process (Op, P_In, BusA, BusB,
-			ADC_Z, ADC_C, ADC_V, ADC_N, ADC_Q,
-			SBC_Z, SBC_C, SBC_V, SBC_N, SBC_Q)
-		variable Q_t : std_logic_vector(7 downto 0);
-	begin
-		-- ORA, AND, EOR, ADC, NOP, LD, CMP, SBC
-		-- ASL, ROL, LSR, ROR, BIT, LD, DEC, INC
-		P_Out <= P_In;
-		Q_t := BusA;
-		case Op(3 downto 0) is
-		when "0000" =>
-			-- ORA
-			Q_t := BusA or BusB;
-		when "0001" =>
-			-- AND
-			Q_t := BusA and BusB;
-		when "0010" =>
-			-- EOR
-			Q_t := BusA xor BusB;
-		when "0011" =>
-			-- ADC
-			P_Out(Flag_V) <= ADC_V;
-			P_Out(Flag_C) <= ADC_C;
-			Q_t := ADC_Q;
-		when "0101" | "1101" =>
-			-- LDA
-		when "0110" =>
-			-- CMP
-			P_Out(Flag_C) <= SBC_C;
-		when "0111" =>
-			-- SBC
-			P_Out(Flag_V) <= SBC_V;
-			P_Out(Flag_C) <= SBC_C;
-			Q_t := SBC_Q;
-		when "1000" =>
-			-- ASL
-			Q_t := BusA(6 downto 0) & "0";
-			P_Out(Flag_C) <= BusA(7);
-		when "1001" =>
-			-- ROL
-			Q_t := BusA(6 downto 0) & P_In(Flag_C);
-			P_Out(Flag_C) <= BusA(7);
-		when "1010" =>
-			-- LSR
-			Q_t := "0" & BusA(7 downto 1);
-			P_Out(Flag_C) <= BusA(0);
-		when "1011" =>
-			-- ROR
-			Q_t := P_In(Flag_C) & BusA(7 downto 1);
-			P_Out(Flag_C) <= BusA(0);
-		when "1100" =>
-			-- BIT
-			P_Out(Flag_V) <= BusB(6);
-		when "1110" =>
-			-- DEC
-			Q_t := std_logic_vector(unsigned(BusA) - 1);
-		when "1111" =>
-			-- INC
-			Q_t := std_logic_vector(unsigned(BusA) + 1);
-		when others =>
-		end case;
-
-		case Op(3 downto 0) is
-		when "0011" =>
-			P_Out(Flag_N) <= ADC_N;
-			P_Out(Flag_Z) <= ADC_Z;
-		when "0110" | "0111" =>
-			P_Out(Flag_N) <= SBC_N;
-			P_Out(Flag_Z) <= SBC_Z;
-		when "0100" =>
-		when "1100" =>
-			P_Out(Flag_N) <= BusB(7);
-			if (BusA and BusB) = "00000000" then
-				P_Out(Flag_Z) <= '1';
-			else
-				P_Out(Flag_Z) <= '0';
-			end if;
-		when others =>
-			P_Out(Flag_N) <= Q_t(7);
-			if Q_t = "00000000" then
-				P_Out(Flag_Z) <= '1';
-			else
-				P_Out(Flag_Z) <= '0';
-			end if;
-		end case;
-
-		Q <= Q_t;
-	end process;
-
-end;
diff --git a/Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/rtl/T65/T65_MCode.vhd b/Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/rtl/T65/T65_MCode.vhd
deleted file mode 100644
index 6c6c864a..00000000
--- a/Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/rtl/T65/T65_MCode.vhd	
+++ /dev/null
@@ -1,1052 +0,0 @@
--- ****
--- T65(b) core. In an effort to merge and maintain bug fixes ....
---
---
--- Ver 302 minor timing fixes
--- Ver 301 Jump timing fixed
--- Ver 300 Bugfixes by ehenciak added
--- MikeJ March 2005
--- Latest version from www.fpgaarcade.com (original www.opencores.org)
---
--- ****
---
--- 65xx compatible microprocessor core
---
--- Version : 0246 + fix
---
--- Copyright (c) 2002 Daniel Wallner (jesus@opencores.org)
---
--- All rights reserved
---
--- Redistribution and use in source and synthezised forms, with or without
--- modification, are permitted provided that the following conditions are met:
---
--- Redistributions of source code must retain the above copyright notice,
--- this list of conditions and the following disclaimer.
---
--- Redistributions in synthesized form must reproduce the above copyright
--- notice, this list of conditions and the following disclaimer in the
--- documentation and/or other materials provided with the distribution.
---
--- Neither the name of the author nor the names of other contributors may
--- be used to endorse or promote products derived from this software without
--- specific prior written permission.
---
--- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
--- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
--- THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
--- PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE
--- LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
--- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
--- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
--- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
--- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
--- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
--- POSSIBILITY OF SUCH DAMAGE.
---
--- Please report bugs to the author, but before you do so, please
--- make sure that this is not a derivative work and that
--- you have the latest version of this file.
---
--- The latest version of this file can be found at:
---      http://www.opencores.org/cvsweb.shtml/t65/
---
--- Limitations :
---
--- 65C02
--- supported : inc, dec, phx, plx, phy, ply
--- missing : bra, ora, lda, cmp, sbc, tsb*2, trb*2, stz*2, bit*2, wai, stp, jmp, bbr*8, bbs*8
---
--- File history :
---
---      0246 : First release
---
-
-library IEEE;
-use IEEE.std_logic_1164.all;
-use IEEE.numeric_std.all;
-use work.T65_Pack.all;
-
-entity T65_MCode is
-	port(
-		Mode                    : in  std_logic_vector(1 downto 0);      -- "00" => 6502, "01" => 65C02, "10" => 65816
-		IR                      : in  std_logic_vector(7 downto 0);
-		MCycle                  : in  std_logic_vector(2 downto 0);
-		P                       : in  std_logic_vector(7 downto 0);
-		LCycle                  : out std_logic_vector(2 downto 0);
-		ALU_Op                  : out std_logic_vector(3 downto 0);
-		Set_BusA_To             : out std_logic_vector(2 downto 0); -- DI,A,X,Y,S,P
-		Set_Addr_To             : out std_logic_vector(1 downto 0); -- PC Adder,S,AD,BA
-		Write_Data              : out std_logic_vector(2 downto 0); -- DL,A,X,Y,S,P,PCL,PCH
-		Jump                    : out std_logic_vector(1 downto 0); -- PC,++,DIDL,Rel
-		BAAdd                   : out std_logic_vector(1 downto 0);     -- None,DB Inc,BA Add,BA Adj
-		BreakAtNA               : out std_logic;
-		ADAdd                   : out std_logic;
-		AddY                    : out std_logic;
-		PCAdd                   : out std_logic;
-		Inc_S                   : out std_logic;
-		Dec_S                   : out std_logic;
-		LDA                     : out std_logic;
-		LDP                     : out std_logic;
-		LDX                     : out std_logic;
-		LDY                     : out std_logic;
-		LDS                     : out std_logic;
-		LDDI                    : out std_logic;
-		LDALU                   : out std_logic;
-		LDAD                    : out std_logic;
-		LDBAL                   : out std_logic;
-		LDBAH                   : out std_logic;
-		SaveP                   : out std_logic;
-		Write                   : out std_logic
-	);
-end T65_MCode;
-
-architecture rtl of T65_MCode is
-
-	signal Branch : std_logic;
-
-begin
-
-	with IR(7 downto 5) select
-		Branch <= not P(Flag_N) when "000",
-					  P(Flag_N) when "001",
-				  not P(Flag_V) when "010",
-					  P(Flag_V) when "011",
-				  not P(Flag_C) when "100",
-					  P(Flag_C) when "101",
-				  not P(Flag_Z) when "110",
-					  P(Flag_Z) when others;
-
-	process (IR, MCycle, P, Branch, Mode)
-	begin
-		LCycle      <= "001";
-		Set_BusA_To <= "001"; -- A
-		Set_Addr_To <= (others => '0');
-		Write_Data  <= (others => '0');
-		Jump        <= (others => '0');
-		BAAdd       <= "00";
-		BreakAtNA   <= '0';
-		ADAdd       <= '0';
-		PCAdd       <= '0';
-		Inc_S       <= '0';
-		Dec_S       <= '0';
-		LDA         <= '0';
-		LDP         <= '0';
-		LDX         <= '0';
-		LDY         <= '0';
-		LDS         <= '0';
-		LDDI        <= '0';
-		LDALU       <= '0';
-		LDAD        <= '0';
-		LDBAL       <= '0';
-		LDBAH       <= '0';
-		SaveP       <= '0';
-		Write       <= '0';
-		AddY        <= '0';
-
-		case IR(7 downto 5) is
-		when "100" =>
-		--{{{
-			case IR(1 downto 0) is
-			when "00" =>
-				Set_BusA_To <= "011"; -- Y
-				Write_Data <= "011"; -- Y
-			when "10" =>
-				Set_BusA_To <= "010"; -- X
-				Write_Data <= "010"; -- X
-			when others =>
-				Write_Data <= "001"; -- A
-			end case;
-		--}}}
-		when "101" =>
-		--{{{
-			case IR(1 downto 0) is
-			when "00" =>
-				if IR(4) /= '1' or IR(2) /= '0' then
-					LDY <= '1';
-				end if;
-			when "10" =>
-				LDX <= '1';
-			when others =>
-				LDA <= '1';
-			end case;
-			Set_BusA_To <= "000"; -- DI
-		--}}}
-		when "110" =>
-		--{{{
-			case IR(1 downto 0) is
-			when "00" =>
-				if IR(4) = '0' then
-					LDY <= '1';
-				end if;
-				Set_BusA_To <= "011"; -- Y
-			when others =>
-				Set_BusA_To <= "001"; -- A
-			end case;
-		--}}}
-		when "111" =>
-		--{{{
-			case IR(1 downto 0) is
-			when "00" =>
-				if IR(4) = '0' then
-					LDX <= '1';
-				end if;
-				Set_BusA_To <= "010"; -- X
-			when others =>
-				Set_BusA_To <= "001"; -- A
-			end case;
-		--}}}
-		when others =>
-		end case;
-
-		if IR(7 downto 6) /= "10" and IR(1 downto 0) = "10" then
-			Set_BusA_To <= "000"; -- DI
-		end if;
-
-		case IR(4 downto 0) is
-		when "00000" | "01000" | "01010" | "11000" | "11010" =>
-		--{{{
-			-- Implied
-			case IR is
-			when "00000000" =>
-				-- BRK
-				LCycle <= "110";
-				case to_integer(unsigned(MCycle)) is
-				when 1 =>
-					Set_Addr_To <= "01"; -- S
-					Write_Data <= "111"; -- PCH
-					Write <= '1';
-				when 2 =>
-					Dec_S <= '1';
-					Set_Addr_To <= "01"; -- S
-					Write_Data <= "110"; -- PCL
-					Write <= '1';
-				when 3 =>
-					Dec_S <= '1';
-					Set_Addr_To <= "01"; -- S
-					Write_Data <= "101"; -- P
-					Write <= '1';
-				when 4 =>
-					Dec_S <= '1';
-					Set_Addr_To <= "11"; -- BA
-				when 5 =>
-					LDDI <= '1';
-					Set_Addr_To <= "11"; -- BA
-				when 6 =>
-					Jump <= "10"; -- DIDL
-				when others =>
-				end case;
-			when "00100000" =>
-				-- JSR
-				LCycle <= "101";
-				case to_integer(unsigned(MCycle)) is
-				when 1 =>
-					Jump <= "01";
-					LDDI <= '1';
-					Set_Addr_To <= "01"; -- S
-				when 2 =>
-					Set_Addr_To <= "01"; -- S
-					Write_Data <= "111"; -- PCH
-					Write <= '1';
-				when 3 =>
-					Dec_S <= '1';
-					Set_Addr_To <= "01"; -- S
-					Write_Data <= "110"; -- PCL
-					Write <= '1';
-				when 4 =>
-					Dec_S <= '1';
-				when 5 =>
-					Jump <= "10"; -- DIDL
-				when others =>
-				end case;
-			when "01000000" =>
-				-- RTI
-				LCycle <= "101";
-				case to_integer(unsigned(MCycle)) is
-				when 1 =>
-					Set_Addr_To <= "01"; -- S
-				when 2 =>
-					Inc_S <= '1';
-					Set_Addr_To <= "01"; -- S
-				when 3 =>
-					Inc_S <= '1';
-					Set_Addr_To <= "01"; -- S
-					Set_BusA_To <= "000"; -- DI
-				when 4 =>
-					LDP <= '1';
-					Inc_S <= '1';
-					LDDI <= '1';
-					Set_Addr_To <= "01"; -- S
-				when 5 =>
-					Jump <= "10"; -- DIDL
-				when others =>
-				end case;
-			when "01100000" =>
-				-- RTS
-				LCycle <= "101";
-				case to_integer(unsigned(MCycle)) is
-				when 1 =>
-					Set_Addr_To <= "01"; -- S
-				when 2 =>
-					Inc_S <= '1';
-					Set_Addr_To <= "01"; -- S
-				when 3 =>
-					Inc_S <= '1';
-					LDDI <= '1';
-					Set_Addr_To <= "01"; -- S
-				when 4 =>
-					Jump <= "10"; -- DIDL
-				when 5 =>
-					Jump <= "01";
-				when others =>
-				end case;
-			when "00001000" | "01001000" | "01011010" | "11011010" =>
-				-- PHP, PHA, PHY*, PHX*
-				LCycle <= "010";
-				if Mode = "00" and IR(1) = '1' then
-					LCycle <= "001";
-				end if;
-				case to_integer(unsigned(MCycle)) is
-				when 1 =>
-					case IR(7 downto 4) is
-					when "0000" =>
-						Write_Data <= "101"; -- P
-					when "0100" =>
-						Write_Data <= "001"; -- A
-					when "0101" =>
-						Write_Data <= "011"; -- Y
-					when "1101" =>
-						Write_Data <= "010"; -- X
-					when others =>
-					end case;
-					Write <= '1';
-					Set_Addr_To <= "01"; -- S
-				when 2 =>
-					Dec_S <= '1';
-				when others =>
-				end case;
-			when "00101000" | "01101000" | "01111010" | "11111010" =>
-				-- PLP, PLA, PLY*, PLX*
-				LCycle <= "011";
-				if Mode = "00" and IR(1) = '1' then
-					LCycle <= "001";
-				end if;
-				case IR(7 downto 4) is
-				when "0010" =>
-					LDP <= '1';
-				when "0110" =>
-					LDA <= '1';
-				when "0111" =>
-					if Mode /= "00" then
-						LDY <= '1';
-					end if;
-				when "1111" =>
-					if Mode /= "00" then
-						LDX <= '1';
-					end if;
-				when others =>
-				end case;
-				case to_integer(unsigned(MCycle)) is
-				when 0 =>
-					SaveP <= '1';
-				when 1 =>
-					Set_Addr_To <= "01"; -- S
-				when 2 =>
-					Inc_S <= '1';
-					Set_Addr_To <= "01"; -- S
-				when 3 =>
-					Set_BusA_To <= "000"; -- DI
-				when others =>
-				end case;
-			when "10100000" | "11000000" | "11100000" =>
-				-- LDY, CPY, CPX
-				-- Immediate
-				case to_integer(unsigned(MCycle)) is
-				when 0 =>
-				when 1 =>
-					Jump <= "01";
-				when others =>
-				end case;
-			when "10001000" =>
-				-- DEY
-				LDY <= '1';
-				case to_integer(unsigned(MCycle)) is
-				when 0 =>
-				when 1 =>
-					Set_BusA_To <= "011"; -- Y
-				when others =>
-				end case;
-			when "11001010" =>
-				-- DEX
-				LDX <= '1';
-				case to_integer(unsigned(MCycle)) is
-				when 0 =>
-				when 1 =>
-					Set_BusA_To <= "010"; -- X
-				when others =>
-				end case;
-			when "00011010" | "00111010" =>
-				-- INC*, DEC*
-				if Mode /= "00" then
-					LDA <= '1'; -- A
-				end if;
-				case to_integer(unsigned(MCycle)) is
-				when 0 =>
-				when 1 =>
-					Set_BusA_To <= "100"; -- S
-				when others =>
-				end case;
-			when "00001010" | "00101010" | "01001010" | "01101010" =>
-				-- ASL, ROL, LSR, ROR
-				LDA <= '1'; -- A
-				Set_BusA_To <= "001"; -- A
-				case to_integer(unsigned(MCycle)) is
-				when 0 =>
-				when 1 =>
-				when others =>
-				end case;
-			when "10001010" | "10011000" =>
-				-- TYA, TXA
-				LDA <= '1'; -- A
-				case to_integer(unsigned(MCycle)) is
-				when 0 =>
-				when 1 =>
-				when others =>
-				end case;
-			when "10101010" | "10101000" =>
-				-- TAX, TAY
-				case to_integer(unsigned(MCycle)) is
-				when 0 =>
-				when 1 =>
-					Set_BusA_To <= "001"; -- A
-				when others =>
-				end case;
-			when "10011010" =>
-				-- TXS
-				case to_integer(unsigned(MCycle)) is
-				when 0 =>
-					LDS <= '1';
-				when 1 =>
-				when others =>
-				end case;
-			when "10111010" =>
-				-- TSX
-				LDX <= '1';
-				case to_integer(unsigned(MCycle)) is
-				when 0 =>
-				when 1 =>
-					Set_BusA_To <= "100"; -- S
-				when others =>
-				end case;
-
-		--                      when "00011000" | "00111000" | "01011000" | "01111000" | "10111000" | "11011000" | "11111000" | "11001000" | "11101000" =>
-		--                              -- CLC, SEC, CLI, SEI, CLV, CLD, SED, INY, INX
-		--                              case to_integer(unsigned(MCycle)) is
-		--                              when 1 =>
-		--                              when others =>
-		--                              end case;
-			when others =>
-				case to_integer(unsigned(MCycle)) is
-				when 0 =>
-				when others =>
-				end case;
-			end case;
-		--}}}
-
-		when "00001" | "00011" =>
-		--{{{
-			-- Zero Page Indexed Indirect (d,x)
-			LCycle <= "101";
-			if IR(7 downto 6) /= "10" then
-				LDA <= '1';
-			end if;
-			case to_integer(unsigned(MCycle)) is
-			when 0 =>
-			when 1 =>
-				Jump <= "01";
-				LDAD <= '1';
-				Set_Addr_To <= "10"; -- AD
-			when 2 =>
-				ADAdd <= '1';
-				Set_Addr_To <= "10"; -- AD
-			when 3 =>
-				BAAdd <= "01";  -- DB Inc
-				LDBAL <= '1';
-				Set_Addr_To <= "10"; -- AD
-			when 4 =>
-				LDBAH <= '1';
-				if IR(7 downto 5) = "100" then
-					Write <= '1';
-				end if;
-				Set_Addr_To <= "11"; -- BA
-			when 5 =>
-			when others =>
-			end case;
-		--}}}
-
-		when "01001" | "01011" =>
-		--{{{
-			-- Immediate
-			LDA <= '1';
-			case to_integer(unsigned(MCycle)) is
-			when 0 =>
-			when 1 =>
-				Jump <= "01";
-			when others =>
-			end case;
-
-		--}}}
-
-		when "00010" | "10010" =>
-		--{{{
-			-- Immediate, KIL
-			LDX <= '1';
-			case to_integer(unsigned(MCycle)) is
-			when 0 =>
-			when 1 =>
-				if IR = "10100010" then
-					-- LDX
-					Jump <= "01";
-				else
-					-- KIL !!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-				end if;
-			when others =>
-			end case;
-		--}}}
-
-		when "00100" =>
-		--{{{
-			-- Zero Page
-			LCycle <= "010";
-			case to_integer(unsigned(MCycle)) is
-			when 0 =>
-				if IR(7 downto 5) = "001" then
-					SaveP <= '1';
-				end if;
-			when 1 =>
-				Jump <= "01";
-				LDAD <= '1';
-				if IR(7 downto 5) = "100" then
-					Write <= '1';
-				end if;
-				Set_Addr_To <= "10"; -- AD
-			when 2 =>
-			when others =>
-			end case;
-		--}}}
-
-		when "00101" | "00110" | "00111" =>
-		--{{{
-			-- Zero Page
-			if IR(7 downto 6) /= "10" and IR(1 downto 0) = "10" then
-				-- Read-Modify-Write
-				LCycle <= "100";
-				case to_integer(unsigned(MCycle)) is
-				when 1 =>
-					Jump <= "01";
-					LDAD <= '1';
-					Set_Addr_To <= "10"; -- AD
-				when 2 =>
-					LDDI <= '1';
-					Write <= '1';
-					Set_Addr_To <= "10"; -- AD
-				when 3 =>
-					LDALU <= '1';
-					SaveP <= '1';
-					Write <= '1';
-					Set_Addr_To <= "10"; -- AD
-				when 4 =>
-				when others =>
-				end case;
-			else
-				LCycle <= "010";
-				if IR(7 downto 6) /= "10" then
-					LDA <= '1';
-				end if;
-				case to_integer(unsigned(MCycle)) is
-				when 0 =>
-				when 1 =>
-					Jump <= "01";
-					LDAD <= '1';
-					if IR(7 downto 5) = "100" then
-						Write <= '1';
-					end if;
-					Set_Addr_To <= "10"; -- AD
-				when 2 =>
-				when others =>
-				end case;
-			end if;
-		--}}}
-
-		when "01100" =>
-		--{{{
-			-- Absolute
-			if IR(7 downto 6) = "01" and IR(4 downto 0) = "01100" then
-				-- JMP
-				if IR(5) = '0' then
-					--LCycle <= "011";
-					LCycle <= "010";
-					case to_integer(unsigned(MCycle)) is
-					when 1 =>
-						Jump <= "01";
-						LDDI <= '1';
-					when 2 =>
-						Jump <= "10"; -- DIDL
-					when others =>
-					end case;
-				else
-					--LCycle <= "101";
-					LCycle <= "100"; -- mikej
-					case to_integer(unsigned(MCycle)) is
-					when 1 =>
-						Jump <= "01";
-						LDDI <= '1';
-						LDBAL <= '1';
-					when 2 =>
-						LDBAH <= '1';
-						if Mode /= "00" then
-							Jump <= "10"; -- DIDL
-						end if;
-						if Mode = "00" then
-							Set_Addr_To <= "11"; -- BA
-						end if;
-					when 3 =>
-						LDDI <= '1';
-						if Mode = "00" then
-							Set_Addr_To <= "11"; -- BA
-							BAAdd <= "01";      -- DB Inc
-						else
-							Jump <= "01";
-						end if;
-					when 4 =>
-						Jump <= "10"; -- DIDL
-					when others =>
-					end case;
-				end if;
-			else
-				LCycle <= "011";
-				case to_integer(unsigned(MCycle)) is
-				when 0 =>
-					if IR(7 downto 5) = "001" then
-						SaveP <= '1';
-					end if;
-				when 1 =>
-					Jump <= "01";
-					LDBAL <= '1';
-				when 2 =>
-					Jump <= "01";
-					LDBAH <= '1';
-					if IR(7 downto 5) = "100" then
-						Write <= '1';
-					end if;
-					Set_Addr_To <= "11"; -- BA
-				when 3 =>
-				when others =>
-				end case;
-			end if;
-		--}}}
-
-		when "01101" | "01110" | "01111" =>
-		--{{{
-			-- Absolute
-			if IR(7 downto 6) /= "10" and IR(1 downto 0) = "10" then
-				-- Read-Modify-Write
-				LCycle <= "101";
-				case to_integer(unsigned(MCycle)) is
-				when 1 =>
-					Jump <= "01";
-					LDBAL <= '1';
-				when 2 =>
-					Jump <= "01";
-					LDBAH <= '1';
-					Set_Addr_To <= "11"; -- BA
-				when 3 =>
-					LDDI <= '1';
-					Write <= '1';
-					Set_Addr_To <= "11"; -- BA
-				when 4 =>
-					Write <= '1';
-					LDALU <= '1';
-					SaveP <= '1';
-					Set_Addr_To <= "11"; -- BA
-				when 5 =>
-					SaveP <= '0'; -- MIKEJ was 1
-				when others =>
-				end case;
-			else
-				LCycle <= "011";
-				if IR(7 downto 6) /= "10" then
-					LDA <= '1';
-				end if;
-				case to_integer(unsigned(MCycle)) is
-				when 0 =>
-				when 1 =>
-					Jump <= "01";
-					LDBAL <= '1';
-				when 2 =>
-					Jump <= "01";
-					LDBAH <= '1';
-					if IR(7 downto 5) = "100" then
-						Write <= '1';
-					end if;
-					Set_Addr_To <= "11"; -- BA
-				when 3 =>
-				when others =>
-				end case;
-			end if;
-		--}}}
-
-		when "10000" =>
-		--{{{
-			-- Relative
-
-						-- This circuit dictates when the last
-						-- microcycle occurs for the branch depending on
-						-- whether or not the branch is taken and if a page
-						-- is crossed...
-			if (Branch = '1') then
-
-							 LCycle <= "011"; -- We're done @ T3 if branching...upper
-											  -- level logic will stop at T2 if no page cross
-											  -- (See the Break signal)
-			else
-
-							 LCycle <= "001";
-
-			end if;
-
-						-- This decodes the current microcycle and takes the
-						-- proper course of action...
-			case to_integer(unsigned(MCycle)) is
-
-							-- On the T1 microcycle, increment the program counter
-							-- and instruct the upper level logic to fetch the offset
-							-- from the Din bus and store it in the data latches. This
-							-- will be the last microcycle if the branch isn't taken.
-				when 1 =>
-
-					Jump <= "01"; -- Increments the PC by one (PC will now be PC+2)
-											  -- from microcycle T0.
-
-				LDDI <= '1';  -- Tells logic in top level (T65.vhd) to route
-											  -- the Din bus to the memory data latch (DL)
-											  -- so that the branch offset is fetched.
-
-							-- In microcycle T2, tell the logic in the top level to
-							-- add the offset.  If the most significant byte of the
-							-- program counter (i.e. the current "page") does not need
-							-- updating, we are done here...the Break signal at the
-							-- T65.vhd level takes care of that...
-				when 2 =>
-
-				Jump    <= "11"; -- Tell the PC Jump logic to use relative mode.
-
-				PCAdd   <= '1';  -- This tells the PC adder to update itself with
-												 -- the current offset recently fetched from
-												 -- memory.
-
-							-- The following is microcycle T3 :
-							-- The program counter should be completely updated
-							-- on this cycle after the page cross is detected.
-							-- We don't need to do anything here...
-				when 3 =>
-
-
-				when others => null; -- Do nothing.
-
-			end case;
-		--}}}
-
-		when "10001" | "10011" =>
-		--{{{
-			-- Zero Page Indirect Indexed (d),y
-			LCycle <= "101";
-			if IR(7 downto 6) /= "10" then
-				LDA <= '1';
-			end if;
-			case to_integer(unsigned(MCycle)) is
-			when 0 =>
-			when 1 =>
-				Jump <= "01";
-				LDAD <= '1';
-				Set_Addr_To <= "10"; -- AD
-			when 2 =>
-				LDBAL <= '1';
-				BAAdd <= "01";  -- DB Inc
-				Set_Addr_To <= "10"; -- AD
-			when 3 =>
-				Set_BusA_To <= "011"; -- Y
-				BAAdd <= "10";  -- BA Add
-				LDBAH <= '1';
-				Set_Addr_To <= "11"; -- BA
-			when 4 =>
-				BAAdd <= "11";  -- BA Adj
-				if IR(7 downto 5) = "100" then
-					Write <= '1';
-				else
-					BreakAtNA <= '1';
-				end if;
-				Set_Addr_To <= "11"; -- BA
-			when 5 =>
-			when others =>
-			end case;
-		--}}}
-
-		when "10100" | "10101" | "10110" | "10111" =>
-		--{{{
-			-- Zero Page, X
-			if IR(7 downto 6) /= "10" and IR(1 downto 0) = "10" then
-				-- Read-Modify-Write
-				LCycle <= "101";
-				case to_integer(unsigned(MCycle)) is
-				when 1 =>
-					Jump <= "01";
-					LDAD <= '1';
-					Set_Addr_To <= "10"; -- AD
-				when 2 =>
-					ADAdd <= '1';
-					Set_Addr_To <= "10"; -- AD
-				when 3 =>
-					LDDI <= '1';
-					Write <= '1';
-					Set_Addr_To <= "10"; -- AD
-				when 4 =>
-					LDALU <= '1';
-					SaveP <= '1';
-					Write <= '1';
-					Set_Addr_To <= "10"; -- AD
-				when 5 =>
-				when others =>
-				end case;
-			else
-				LCycle <= "011";
-				if IR(7 downto 6) /= "10" then
-					LDA <= '1';
-				end if;
-				case to_integer(unsigned(MCycle)) is
-				when 0 =>
-				when 1 =>
-					Jump <= "01";
-					LDAD <= '1';
-					Set_Addr_To <= "10"; -- AD
-				when 2 =>
-					ADAdd <= '1';
-					-- Added this check for Y reg. use...
-					if (IR(3 downto 0) = "0110") then
-					  AddY <= '1';
-					end if;
-
-					if IR(7 downto 5) = "100" then
-						Write <= '1';
-					end if;
-					Set_Addr_To <= "10"; -- AD
-				when 3 => null;
-				when others =>
-				end case;
-			end if;
-		--}}}
-
-		when "11001" | "11011" =>
-		--{{{
-			-- Absolute Y
-			LCycle <= "100";
-			if IR(7 downto 6) /= "10" then
-				LDA <= '1';
-			end if;
-			case to_integer(unsigned(MCycle)) is
-			when 0 =>
-			when 1 =>
-				Jump <= "01";
-				LDBAL <= '1';
-			when 2 =>
-				Jump <= "01";
-				Set_BusA_To <= "011"; -- Y
-				BAAdd <= "10";  -- BA Add
-				LDBAH <= '1';
-				Set_Addr_To <= "11"; -- BA
-			when 3 =>
-				BAAdd <= "11";  -- BA adj
-				if IR(7 downto 5) = "100" then
-					Write <= '1';
-				else
-					BreakAtNA <= '1';
-				end if;
-				Set_Addr_To <= "11"; -- BA
-			when 4 =>
-			when others =>
-			end case;
-		--}}}
-
-		when "11100" | "11101" | "11110" | "11111" =>
-		--{{{
-			-- Absolute X
-
-			if IR(7 downto 6) /= "10" and IR(1 downto 0) = "10" then
-				-- Read-Modify-Write
-				LCycle <= "110";
-				case to_integer(unsigned(MCycle)) is
-				when 1 =>
-					Jump <= "01";
-					LDBAL <= '1';
-				when 2 =>
-					Jump <= "01";
-					Set_BusA_To <= "010"; -- X
-					BAAdd <= "10";      -- BA Add
-					LDBAH <= '1';
-					Set_Addr_To <= "11"; -- BA
-				when 3 =>
-					BAAdd <= "11";      -- BA adj
-					Set_Addr_To <= "11"; -- BA
-				when 4 =>
-					LDDI <= '1';
-					Write <= '1';
-					Set_Addr_To <= "11"; -- BA
-				when 5 =>
-					LDALU <= '1';
-					SaveP <= '1';
-					Write <= '1';
-					Set_Addr_To <= "11"; -- BA
-				when 6 =>
-				when others =>
-				end case;
-			else
-				LCycle <= "100";
-				if IR(7 downto 6) /= "10" then
-					LDA <= '1';
-				end if;
-				case to_integer(unsigned(MCycle)) is
-				when 0 =>
-				when 1 =>
-					Jump <= "01";
-					LDBAL <= '1';
-				when 2 =>
-					Jump <= "01";
-					-- mikej
-					-- special case 0xBE which uses Y reg as index!!
-					if (IR = "10111110") then
-					  Set_BusA_To <= "011"; -- Y
-					else
-					  Set_BusA_To <= "010"; -- X
-					end if;
-					BAAdd <= "10";      -- BA Add
-					LDBAH <= '1';
-					Set_Addr_To <= "11"; -- BA
-				when 3 =>
-					BAAdd <= "11";      -- BA adj
-					if IR(7 downto 5) = "100" then
-						Write <= '1';
-					else
-						BreakAtNA <= '1';
-					end if;
-					Set_Addr_To <= "11"; -- BA
-				when 4 =>
-				when others =>
-				end case;
-			end if;
-		--}}}
-		when others =>
-		end case;
-	end process;
-
-	process (IR, MCycle)
-	begin
-		-- ORA, AND, EOR, ADC, NOP, LD, CMP, SBC
-		-- ASL, ROL, LSR, ROR, BIT, LD, DEC, INC
-		case IR(1 downto 0) is
-		when "00" =>
-		--{{{
-			case IR(4 downto 2) is
-			when "000" | "001" | "011" =>
-				case IR(7 downto 5) is
-				when "110" | "111" =>
-					-- CP
-					ALU_Op <= "0110";
-				when "101" =>
-					-- LD
-					ALU_Op <= "0101";
-				when "001" =>
-					-- BIT
-					ALU_Op <= "1100";
-				when others =>
-					-- NOP/ST
-					ALU_Op <= "0100";
-				end case;
-			when "010" =>
-				case IR(7 downto 5) is
-				when "111" | "110" =>
-					-- IN
-					ALU_Op <= "1111";
-				when "100" =>
-					-- DEY
-					ALU_Op <= "1110";
-				when others =>
-					-- LD
-					ALU_Op <= "1101";
-				end case;
-			when "110" =>
-				case IR(7 downto 5) is
-				when "100" =>
-					-- TYA
-					ALU_Op <= "1101";
-				when others =>
-					ALU_Op <= "----";
-				end case;
-			when others =>
-				case IR(7 downto 5) is
-				when "101" =>
-					-- LD
-					ALU_Op <= "1101";
-				when others =>
-					ALU_Op <= "0100";
-				end case;
-			end case;
-		--}}}
-		when "01" => -- OR
-		--{{{
-			ALU_Op(3) <= '0';
-			ALU_Op(2 downto 0) <= IR(7 downto 5);
-		--}}}
-		when "10" =>
-		--{{{
-			ALU_Op(3) <= '1';
-			ALU_Op(2 downto 0) <= IR(7 downto 5);
-			case IR(7 downto 5) is
-			when "000" =>
-				if IR(4 downto 2) = "110" then
-					-- INC
-					ALU_Op <= "1111";
-				end if;
-			when "001" =>
-				if IR(4 downto 2) = "110" then
-					-- DEC
-					ALU_Op <= "1110";
-				end if;
-			when "100" =>
-				if IR(4 downto 2) = "010" then
-					-- TXA
-					ALU_Op <= "0101";
-				else
-					ALU_Op <= "0100";
-				end if;
-			when others =>
-			end case;
-		--}}}
-		when others =>
-		--{{{
-			case IR(7 downto 5) is
-			when "100" =>
-				ALU_Op <= "0100";
-			when others =>
-				if MCycle = "000" then
-					ALU_Op(3) <= '0';
-					ALU_Op(2 downto 0) <= IR(7 downto 5);
-				else
-					ALU_Op(3) <= '1';
-					ALU_Op(2 downto 0) <= IR(7 downto 5);
-				end if;
-			end case;
-		--}}}
-		end case;
-	end process;
-
-end;
diff --git a/Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/rtl/T65/T65_Pack.vhd b/Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/rtl/T65/T65_Pack.vhd
deleted file mode 100644
index e025e1bf..00000000
--- a/Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/rtl/T65/T65_Pack.vhd	
+++ /dev/null
@@ -1,117 +0,0 @@
--- ****
--- T65(b) core. In an effort to merge and maintain bug fixes ....
---
---
--- Ver 300 Bugfixes by ehenciak added
--- MikeJ March 2005
--- Latest version from www.fpgaarcade.com (original www.opencores.org)
---
--- ****
---
--- 65xx compatible microprocessor core
---
--- Version : 0246
---
--- Copyright (c) 2002 Daniel Wallner (jesus@opencores.org)
---
--- All rights reserved
---
--- Redistribution and use in source and synthezised forms, with or without
--- modification, are permitted provided that the following conditions are met:
---
--- Redistributions of source code must retain the above copyright notice,
--- this list of conditions and the following disclaimer.
---
--- Redistributions in synthesized form must reproduce the above copyright
--- notice, this list of conditions and the following disclaimer in the
--- documentation and/or other materials provided with the distribution.
---
--- Neither the name of the author nor the names of other contributors may
--- be used to endorse or promote products derived from this software without
--- specific prior written permission.
---
--- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
--- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
--- THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
--- PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE
--- LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
--- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
--- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
--- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
--- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
--- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
--- POSSIBILITY OF SUCH DAMAGE.
---
--- Please report bugs to the author, but before you do so, please
--- make sure that this is not a derivative work and that
--- you have the latest version of this file.
---
--- The latest version of this file can be found at:
---      http://www.opencores.org/cvsweb.shtml/t65/
---
--- Limitations :
---
--- File history :
---
-
-library IEEE;
-use IEEE.std_logic_1164.all;
-
-package T65_Pack is
-
-	constant Flag_C : integer := 0;
-	constant Flag_Z : integer := 1;
-	constant Flag_I : integer := 2;
-	constant Flag_D : integer := 3;
-	constant Flag_B : integer := 4;
-	constant Flag_1 : integer := 5;
-	constant Flag_V : integer := 6;
-	constant Flag_N : integer := 7;
-
-	component T65_MCode
-	port(
-		Mode                    : in  std_logic_vector(1 downto 0);      -- "00" => 6502, "01" => 65C02, "10" => 65816
-		IR                      : in  std_logic_vector(7 downto 0);
-		MCycle                  : in  std_logic_vector(2 downto 0);
-		P                       : in  std_logic_vector(7 downto 0);
-		LCycle                  : out std_logic_vector(2 downto 0);
-		ALU_Op                  : out std_logic_vector(3 downto 0);
-		Set_BusA_To             : out std_logic_vector(2 downto 0); -- DI,A,X,Y,S,P
-		Set_Addr_To             : out std_logic_vector(1 downto 0); -- PC Adder,S,AD,BA
-		Write_Data              : out std_logic_vector(2 downto 0); -- DL,A,X,Y,S,P,PCL,PCH
-		Jump                    : out std_logic_vector(1 downto 0); -- PC,++,DIDL,Rel
-		BAAdd                   : out std_logic_vector(1 downto 0);     -- None,DB Inc,BA Add,BA Adj
-		BreakAtNA               : out std_logic;
-		ADAdd                   : out std_logic;
-		AddY                    : out std_logic;
-		PCAdd                   : out std_logic;
-		Inc_S                   : out std_logic;
-		Dec_S                   : out std_logic;
-		LDA                     : out std_logic;
-		LDP                     : out std_logic;
-		LDX                     : out std_logic;
-		LDY                     : out std_logic;
-		LDS                     : out std_logic;
-		LDDI                    : out std_logic;
-		LDALU                   : out std_logic;
-		LDAD                    : out std_logic;
-		LDBAL                   : out std_logic;
-		LDBAH                   : out std_logic;
-		SaveP                   : out std_logic;
-		Write                   : out std_logic
-	);
-	end component;
-
-	component T65_ALU
-	port(
-		Mode    : in  std_logic_vector(1 downto 0);      -- "00" => 6502, "01" => 65C02, "10" => 65C816
-		Op      : in  std_logic_vector(3 downto 0);
-		BusA    : in  std_logic_vector(7 downto 0);
-		BusB    : in  std_logic_vector(7 downto 0);
-		P_In    : in  std_logic_vector(7 downto 0);
-		P_Out   : out std_logic_vector(7 downto 0);
-		Q       : out std_logic_vector(7 downto 0)
-	);
-	end component;
-
-end;
diff --git a/Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/rtl/build_id.sv b/Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/rtl/build_id.sv
deleted file mode 100644
index 2e1852c1..00000000
--- a/Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/rtl/build_id.sv	
+++ /dev/null
@@ -1,2 +0,0 @@
-`define BUILD_DATE "190322"
-`define BUILD_TIME "101029"
diff --git a/Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/rtl/build_id.tcl b/Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/rtl/build_id.tcl
index be673dac..938515d8 100644
--- a/Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/rtl/build_id.tcl	
+++ b/Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/rtl/build_id.tcl	
@@ -17,7 +17,7 @@ proc generateBuildID_Verilog {} {
 	set buildTime [ clock format [ clock seconds ] -format %H%M%S ]
 
 	# Create a Verilog file for output
-	set outputFileName "rtl/build_id.sv"
+	set outputFileName "rtl/build_id.v"
 	set outputFile [open $outputFileName "w"]
 
 	# Output the Verilog source
diff --git a/Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/rtl/canyon_bomber.vhd b/Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/rtl/canyon_bomber.vhd
index 8659c591..5e333840 100644
--- a/Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/rtl/canyon_bomber.vhd	
+++ b/Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/rtl/canyon_bomber.vhd	
@@ -29,7 +29,7 @@ use IEEE.STD_LOGIC_UNSIGNED.all;
 
 entity canyon_bomber is 
 port(		
-			clk_12	: in	std_logic;	-- 50MHz input clock
+			clk_12	: in	std_logic;	-- 12MHz input clock
 			Reset_I		: in	std_logic;	-- Reset button (Active low)
 			RGB	: out 	std_logic_vector(7 downto 0);
 			Vblank_O		: out 	std_logic;
@@ -55,6 +55,7 @@ end canyon_bomber;
 architecture rtl of canyon_bomber is
 
 signal clk_6		: std_logic;
+signal clk_6en	: std_logic;
 signal Ena_3k		: std_logic;
 signal phi1 		: std_logic;
 signal phi2		: std_logic;
@@ -127,6 +128,7 @@ Vid_sync: entity work.synchronizer
 port map(
 		clk_12 => clk_12,
 		clk_6	=> clk_6,
+		clk_6en	=> clk_6en,
 		hcount => hcount,
 		vcount => vcount,
 		hsync => HSync,
@@ -140,7 +142,8 @@ port map(
 
 Background: entity work.playfield
 port map( 
-		clk6	=> clk_6,
+		clk12	=> clk_12,
+		clk6en	=> clk_6en,
 		display => display,
 		HCount => HCount,
 		VCount => VCount,
@@ -158,8 +161,8 @@ port map(
 		
 Motion_Objects: entity work.motion
 port map(
-		CLK6 => clk_6,
 		CLK12 => clk_12,
+		clk6en => clk_6en,
 		PHI2 => phi2,
 		DISPLAY => Display,
 		H256_s => H256_s,
@@ -175,7 +178,6 @@ port map(
 CPU: entity work.cpu_mem
 port map(
 		Clk12 => clk_12,
-		Clk6	=> clk_6,
 		Ena_3k => Ena_3k,
 		Reset_I => Reset_I,
 		Reset_n => reset_n,
@@ -208,7 +210,7 @@ port map(
 	
 Sound: entity work.audio
 port map( 
-		Clk_6	=> Clk_6,
+		Clk_12	=> Clk_12,
 		Ena_3k => Ena_3k,
 		Reset_n => Reset_n,
 		Motor1_n => Motor1_n,
diff --git a/Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/rtl/canyon_bomber_mist.sv b/Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/rtl/canyon_bomber_mist.sv
index c141bbe7..f4839ab2 100644
--- a/Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/rtl/canyon_bomber_mist.sv	
+++ b/Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/rtl/canyon_bomber_mist.sv	
@@ -18,26 +18,25 @@ module canyon_bomber_mist(
 	input         CLOCK_27
 );
 
-`include "rtl\build_id.sv" 
+`include "rtl\build_id.v" 
 
 localparam CONF_STR = {
-	"Cany.Bomb.;;",
+	"CANYON;;",
 	"O1,Self_Test,Off,On;",
 	"O34,Scanlines,Off,25%,50%,75%;",
-	"T6,Reset;",
+	"O5,Blend,Off,On;",
+	"T0,Reset;",
 	"V,v1.20.",`BUILD_DATE
 };
 
 assign LED = 1;
-assign AUDIO_R = AUDIO_L;
 
-wire clk_24, clk_12, clk_6;
+wire clk_24, clk_12;
 wire locked;
 pll pll(
 	.inclk0(CLOCK_27),
 	.c0(clk_24),//24.192
 	.c1(clk_12),//12.096
-	.c2(clk_6),//6.048
 	.locked(locked)
 	);
 
@@ -48,7 +47,9 @@ wire [11:0] kbjoy;
 wire  [7:0] joystick_0, joystick_1;
 wire        scandoublerD;
 wire        ypbpr;
-wire [10:0] ps2_key;
+wire        key_strobe;
+wire        key_pressed;
+wire  [7:0] key_code;
 wire  [6:0] audio1, audio2;
 wire	[7:0] RGB;
 wire 			vb, hb;
@@ -56,10 +57,9 @@ wire 			blankn = ~(hb | vb);
 wire 			hs, vs;
 
 
-
 canyon_bomber canyon_bomber(		
 	.clk_12(clk_12),
-	.Reset_I(~(status[0] | status[6] | buttons[1])),		
+	.Reset_I(~(status[0] | buttons[1])),		
 	.RGB(RGB),
 	.Vblank_O(vb),
 	.HBlank_O(hb),
@@ -79,58 +79,62 @@ canyon_bomber canyon_bomber(
 	.Lamp2_O()
 	);
 
-dac dacl(
-	.CLK(clk_24),
-	.RESET(0),
-	.DACin({audio1,audio2,2'b0}),
-	.DACout(AUDIO_L)
+dac #(7) dacl(
+	.clk_i(clk_12),
+	.res_n_i(1'b1),
+	.dac_i(audio1),
+	.dac_o(AUDIO_L)
 	);
 
-video_mixer video_mixer(
-	.clk_sys(clk_24),
-	.ce_pix(clk_6),
-	.ce_pix_actual(clk_6),
-	.SPI_SCK(SPI_SCK),
-	.SPI_SS3(SPI_SS3),
-	.SPI_DI(SPI_DI),
-	.R(blankn ? {RGB[7:2]} : 0),
-	.G(blankn ? {RGB[7:2]} : 0),
-	.B(blankn ? {RGB[7:2]} : 0),
-	.HSync(hs),
-	.VSync(vs),
-	.VGA_R(VGA_R),
-	.VGA_G(VGA_G),
-	.VGA_B(VGA_B),
-	.VGA_VS(VGA_VS),
-	.VGA_HS(VGA_HS),
-	.scandoublerD(scandoublerD),
-	.scanlines(scandoublerD ? 2'b00 : status[4:3]),
-	.ypbpr(ypbpr),
-	.ypbpr_full(1),
-	.line_start(0),
-	.mono(0)
+dac #(7) dacr(
+	.clk_i(clk_12),
+	.res_n_i(1'b1),
+	.dac_i(audio2),
+	.dac_o(AUDIO_R)
 	);
 
-mist_io #(
-	.STRLEN(($size(CONF_STR)>>3))) 
-mist_io(
-	.clk_sys        (clk_24   	     ),
+mist_video #(.SD_HCNT_WIDTH(10)) mist_video(
+	.clk_sys        ( clk_24           ),
+	.SPI_SCK        ( SPI_SCK          ),
+	.SPI_SS3        ( SPI_SS3          ),
+	.SPI_DI         ( SPI_DI           ),
+	.R              ( blankn ? RGB[7:2] : 0 ),
+	.G              ( blankn ? RGB[7:2] : 0 ),
+	.B              ( blankn ? RGB[7:2] : 0 ),
+	.HSync          ( ~hs              ),
+	.VSync          ( ~vs              ),
+	.VGA_R          ( VGA_R            ),
+	.VGA_G          ( VGA_G            ),
+	.VGA_B          ( VGA_B            ),
+	.VGA_VS         ( VGA_VS           ),
+	.VGA_HS         ( VGA_HS           ),
+	.ce_divider     ( 1'b1             ),
+	.blend          ( status[5]        ),
+	.scandoubler_disable(scandoublerD  ),
+	.scanlines      ( status[4:3]      ),
+	.ypbpr          ( ypbpr            )
+);
+
+user_io #(
+	.STRLEN(($size(CONF_STR)>>3)))
+user_io(
+	.clk_sys        (clk_12         ),
 	.conf_str       (CONF_STR       ),
-	.SPI_SCK        (SPI_SCK        ),
-	.CONF_DATA0     (CONF_DATA0     ),
-	.SPI_SS2			 (SPI_SS2        ),
-	.SPI_DO         (SPI_DO         ),
-	.SPI_DI         (SPI_DI         ),
+	.SPI_CLK        (SPI_SCK        ),
+	.SPI_SS_IO      (CONF_DATA0     ),
+	.SPI_MISO       (SPI_DO         ),
+	.SPI_MOSI       (SPI_DI         ),
 	.buttons        (buttons        ),
-	.switches   	 (switches       ),
-	.scandoublerD	 (scandoublerD	  ),
+	.switches       (switches       ),
+	.scandoubler_disable (scandoublerD        ),
 	.ypbpr          (ypbpr          ),
-	.ps2_key			 (ps2_key        ),
-	.joystick_0   	 (joystick_0	  ),
-	.joystick_1     (joystick_1	  ),
+	.key_strobe     (key_strobe     ),
+	.key_pressed    (key_pressed    ),
+	.key_code       (key_code       ),
+	.joystick_0     (joystick_0     ),
+	.joystick_1     (joystick_1     ),
 	.status         (status         )
-	);
-
+);
 	
 reg btn_one_player = 0;
 reg btn_two_players = 0;
@@ -141,24 +145,20 @@ reg btn_up = 0;
 reg btn_fire1 = 0;
 reg btn_fire2 = 0;
 reg btn_coin  = 0;
-wire       pressed = ps2_key[9];
-wire [7:0] code    = ps2_key[7:0];	
 
-always @(posedge clk_24) begin
-	reg old_state;
-	old_state <= ps2_key[10];
-	if(old_state != ps2_key[10]) begin
-		case(code)
-			'h75: btn_up         	<= pressed; // up
-			'h72: btn_down        	<= pressed; // down
-			'h6B: btn_left      		<= pressed; // left
-			'h74: btn_right       	<= pressed; // right
-			'h76: btn_coin				<= pressed; // ESC
-			'h05: btn_one_player   	<= pressed; // F1
-			'h06: btn_two_players  	<= pressed; // F2
-			'h14: btn_fire1 			<= pressed; // ctrl
-			'h11: btn_fire1 			<= pressed; // alt
-			'h29: btn_fire2   		<= pressed; // Space
+always @(posedge clk_12) begin
+	if(key_strobe) begin
+		case(key_code)
+			'h75: btn_up         	<= key_pressed; // up
+			'h72: btn_down        <= key_pressed; // down
+			'h6B: btn_left        <= key_pressed; // left
+			'h74: btn_right       <= key_pressed; // right
+			'h76: btn_coin				<= key_pressed; // ESC
+			'h05: btn_one_player  <= key_pressed; // F1
+			'h06: btn_two_players <= key_pressed; // F2
+			'h14: btn_fire1       <= key_pressed; // ctrl
+			'h11: btn_fire1 			<= key_pressed; // alt
+			'h29: btn_fire2       <= key_pressed; // Space
 		endcase
 	end
 end
diff --git a/Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/rtl/cpu_mem.vhd b/Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/rtl/cpu_mem.vhd
index b835443f..da4fafea 100644
--- a/Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/rtl/cpu_mem.vhd	
+++ b/Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/rtl/cpu_mem.vhd	
@@ -21,7 +21,6 @@ use IEEE.STD_LOGIC_UNSIGNED.all;
 entity CPU_mem is 
 port(		
 			CLK12				: in  	        std_logic;
-			CLK6				: in  	    	std_logic; -- 6MHz on schematic
 			Ena_3k				: buffer     	std_logic; -- 3kHz clock enable, used by sound circuit
 			Reset_I				: in  	     	std_logic;
 			Reset_n				: buffer	std_logic;
@@ -74,6 +73,7 @@ signal H16		: std_logic;
 signal H8		: std_logic;
 signal H4		: std_logic;
 
+signal V128_D : std_logic;
 signal V128		: std_logic;
 signal V64		: std_logic;
 signal V32		: std_logic;
@@ -130,7 +130,7 @@ signal K8_y		: std_logic_vector(1 downto 0);
 
 signal H7_y		: std_logic_vector(1 downto 0);
 
-signal ena_count        : std_logic_vector(10 downto 0) := (others => '0');
+signal ena_count        : std_logic_vector(11 downto 0) := (others => '0');
 signal ena_750k		: std_logic;
 
 
@@ -151,20 +151,21 @@ V64 <= VCount(6);
 V128 <= VCount(7);
 
 
+
 -- In the original hardware the CPU is clocked by a signal derived from 4H from the horizontal
 -- line counter. This attemps to do things in a manner that is more proper for a synchronous
 -- FPGA design using the main 6MHz clock in conjunction with a 750kHz clock enable for the CPU.
 -- This also creates a 3kHz clock enable used by the sound module.
-Clock_ena: process(Clk6) 
+Clock_ena: process(Clk12) 
 begin
-	if rising_edge(Clk6) then
+	if rising_edge(Clk12) then
 		ena_count <= ena_count + "1";
 		ena_750k <= '0';
-		if (ena_count(2 downto 0) = "000") then --100
+		if (ena_count(3 downto 0) = "0000") then --100
 			ena_750k <= '1'; -- 750 kHz
 		end if;
 		ena_3k <= '0';
-		if (ena_count(10 downto 0) = "00000000000") then
+		if (ena_count(11 downto 0) = "000000000000") then
 			ena_3k <= '1';
 		end if;
 	end if;
@@ -172,18 +173,21 @@ end process;
 
 
 -- Watchdog timer, counts pulses from V128 and resets CPU if not cleared by Timer_Reset_n
-Watchdog: process(V128, WDog_Clear, Reset_I)
+Watchdog: process(clk12, WDog_Clear, Reset_I)
 begin
 	if Reset_I = '0' then
 		WDog_count <= "1111";
-	elsif Wdog_Clear = '1' then
-		WDog_count <= "0000";
-	elsif rising_edge(V128) then
-		WDog_count <= WDog_count + 1;
+	elsif rising_edge(clk12) then 
+		V128_D <= V128;
+		if Wdog_Clear = '1' then
+			WDog_count <= "0000";
+		elsif V128_D = '0' and V128 = '1' then
+			WDog_count <= WDog_count + 1;
+		end if;
 	end if;
 end process;
 WDog_Clear <= (Test_n nand Timer_Reset_n);
-Reset_n <= (not WDog_count(3));
+Reset_n <= not WDog_count(3);
 
 
 CPU: entity work.T65
@@ -191,7 +195,7 @@ port map(
 		Enable => ena_750k,
 		Mode => "00",
 		Res_n => reset_n,
-		Clk => Clk6,
+		Clk => Clk12,
 		Rdy => '1',
 		Abort_n => '1',
 		IRQ_n => '1',
@@ -247,7 +251,7 @@ generic map(
 		widthad_a => 10,
 		width_a => 4)
 port map(
-		clock => clk6, 
+		clock => clk12, 
 		address => Adr(9 downto 0),
 		q => rom3_dout(3 downto 0)
 		);
@@ -258,7 +262,7 @@ generic map(
 		widthad_a => 10,
 		width_a => 4)
 port map(
-		clock => clk6, 
+		clock => clk12, 
 		address => Adr(9 downto 0),
 		q => rom3_dout(7 downto 4)
 		);
@@ -269,7 +273,7 @@ generic map(
 		widthad_a => 11,
 		width_a => 8)
 port map(
-		clock => clk6, 
+		clock => clk12, 
 		address => Adr(10 downto 0),
 		q => rom4_dout
 		);
@@ -284,7 +288,7 @@ generic map(
 		addr_width_g => 8,
 		data_width_g => 8)
 port map(
-		clock => Clk6,
+		clock => Clk12,
 		address => Adr(7 downto 0),
 		wren => (not write_n) and (not WRAM_n),
 		data => CPUDout,
@@ -342,7 +346,7 @@ Explode_n <= '0' when Write_n = '0' and Adr(13 downto 9) = "00010" and Adr(8) =
 Timer_Reset_n <= '0' when Write_n = '0' and Adr(13 downto 9) = "00010" and Adr(8) = '1' and Adr(0) = '1' else '1';
 
 -- 9334 addressable latch at C7, this drives outputs
-C7: process(clk6, Reset_n, Adr)
+C7: process(clk12, Reset_n, Adr)
 begin
 	if (Reset_n = '0') then
 		Whistle1 <= '0'; 		-- Shell whistle sound 1
@@ -351,7 +355,7 @@ begin
 		Player2Lamp <= '0'; 	-- Player 2 Start LED
 		Attract1 <= '0';		-- Attract1 signal
 		Attract2 <= '0';		-- Attract2 signal
-		elsif rising_edge(clk6) then
+		elsif rising_edge(clk12) then
 		-- This next line models part of the address decoder that enables this latch
 		if (Write_n = '0' and ADR(13 downto 9) = "00011") then 
 		  case Adr(8 downto 7) & Adr(0) is
diff --git a/Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/rtl/dac.sv b/Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/rtl/dac.sv
deleted file mode 100644
index 5dea333e..00000000
--- a/Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/rtl/dac.sv	
+++ /dev/null
@@ -1,33 +0,0 @@
-//
-// PWM DAC
-//
-// MSBI is the highest bit number. NOT amount of bits!
-//
-module dac #(parameter MSBI=15, parameter INV=1'b1)
-(
-   output reg      DACout, //Average Output feeding analog lowpass
-   input  [MSBI:0] DACin,  //DAC input (excess 2**MSBI)
-   input           CLK,
-   input           RESET
-);
-
-reg [MSBI+2:0] DeltaAdder; //Output of Delta Adder
-reg [MSBI+2:0] SigmaAdder; //Output of Sigma Adder
-reg [MSBI+2:0] SigmaLatch; //Latches output of Sigma Adder
-reg [MSBI+2:0] DeltaB;     //B input of Delta Adder
-
-always @(*) DeltaB = {SigmaLatch[MSBI+2], SigmaLatch[MSBI+2]} << (MSBI+1);
-always @(*) DeltaAdder = DACin + DeltaB;
-always @(*) SigmaAdder = DeltaAdder + SigmaLatch;
-
-always @(posedge CLK or posedge RESET) begin
-   if(RESET) begin
-      SigmaLatch <= 1'b1 << (MSBI+1);
-      DACout <= INV;
-   end else begin
-      SigmaLatch <= SigmaAdder;
-      DACout <= SigmaLatch[MSBI+2] ^ INV;
-   end
-end
-
-endmodule
diff --git a/Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/rtl/hq2x.sv b/Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/rtl/hq2x.sv
deleted file mode 100644
index f17732b6..00000000
--- a/Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/rtl/hq2x.sv	
+++ /dev/null
@@ -1,454 +0,0 @@
-//
-//
-// Copyright (c) 2012-2013 Ludvig Strigeus
-// Copyright (c) 2017 Sorgelig
-//
-// This program is GPL Licensed. See COPYING for the full license.
-//
-//
-////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-// synopsys translate_off
-`timescale 1 ps / 1 ps
-// synopsys translate_on
-
-`define BITS_TO_FIT(N) ( \
-     N <=   2 ? 0 : \
-     N <=   4 ? 1 : \
-     N <=   8 ? 2 : \
-     N <=  16 ? 3 : \
-     N <=  32 ? 4 : \
-     N <=  64 ? 5 : \
-     N <= 128 ? 6 : \
-     N <= 256 ? 7 : \
-     N <= 512 ? 8 : \
-     N <=1024 ? 9 : 10 )
-
-module hq2x_in #(parameter LENGTH, parameter DWIDTH)
-(
-	input            clk,
-
-	input [AWIDTH:0] rdaddr,
-	input            rdbuf,
-	output[DWIDTH:0] q,
-
-	input [AWIDTH:0] wraddr,
-	input            wrbuf,
-	input [DWIDTH:0] data,
-	input            wren
-);
-
-	localparam AWIDTH = `BITS_TO_FIT(LENGTH);
-	wire [DWIDTH:0] out[2];
-	assign q = out[rdbuf];
-
-	hq2x_buf #(.NUMWORDS(LENGTH), .AWIDTH(AWIDTH), .DWIDTH(DWIDTH)) buf0(clk,data,rdaddr,wraddr,wren && (wrbuf == 0),out[0]);
-	hq2x_buf #(.NUMWORDS(LENGTH), .AWIDTH(AWIDTH), .DWIDTH(DWIDTH)) buf1(clk,data,rdaddr,wraddr,wren && (wrbuf == 1),out[1]);
-endmodule
-
-
-module hq2x_out #(parameter LENGTH, parameter DWIDTH)
-(
-	input            clk,
-
-	input [AWIDTH:0] rdaddr,
-	input      [1:0] rdbuf,
-	output[DWIDTH:0] q,
-
-	input [AWIDTH:0] wraddr,
-	input      [1:0] wrbuf,
-	input [DWIDTH:0] data,
-	input            wren
-);
-
-	localparam AWIDTH = `BITS_TO_FIT(LENGTH*2);
-	wire  [DWIDTH:0] out[4];
-	assign q = out[rdbuf];
-
-	hq2x_buf #(.NUMWORDS(LENGTH*2), .AWIDTH(AWIDTH), .DWIDTH(DWIDTH)) buf0(clk,data,rdaddr,wraddr,wren && (wrbuf == 0),out[0]);
-	hq2x_buf #(.NUMWORDS(LENGTH*2), .AWIDTH(AWIDTH), .DWIDTH(DWIDTH)) buf1(clk,data,rdaddr,wraddr,wren && (wrbuf == 1),out[1]);
-	hq2x_buf #(.NUMWORDS(LENGTH*2), .AWIDTH(AWIDTH), .DWIDTH(DWIDTH)) buf2(clk,data,rdaddr,wraddr,wren && (wrbuf == 2),out[2]);
-	hq2x_buf #(.NUMWORDS(LENGTH*2), .AWIDTH(AWIDTH), .DWIDTH(DWIDTH)) buf3(clk,data,rdaddr,wraddr,wren && (wrbuf == 3),out[3]);
-endmodule
-
-
-module hq2x_buf #(parameter NUMWORDS, parameter AWIDTH, parameter DWIDTH)
-(
-	input	            clock,
-	input	 [DWIDTH:0] data,
-	input	 [AWIDTH:0] rdaddress,
-	input	 [AWIDTH:0] wraddress,
-	input	            wren,
-	output [DWIDTH:0] q
-);
-
-	altsyncram	altsyncram_component (
-				.address_a (wraddress),
-				.clock0 (clock),
-				.data_a (data),
-				.wren_a (wren),
-				.address_b (rdaddress),
-				.q_b(q),
-				.aclr0 (1'b0),
-				.aclr1 (1'b0),
-				.addressstall_a (1'b0),
-				.addressstall_b (1'b0),
-				.byteena_a (1'b1),
-				.byteena_b (1'b1),
-				.clock1 (1'b1),
-				.clocken0 (1'b1),
-				.clocken1 (1'b1),
-				.clocken2 (1'b1),
-				.clocken3 (1'b1),
-				.data_b ({(DWIDTH+1){1'b1}}),
-				.eccstatus (),
-				.q_a (),
-				.rden_a (1'b1),
-				.rden_b (1'b1),
-				.wren_b (1'b0));
-	defparam
-		altsyncram_component.address_aclr_b = "NONE",
-		altsyncram_component.address_reg_b = "CLOCK0",
-		altsyncram_component.clock_enable_input_a = "BYPASS",
-		altsyncram_component.clock_enable_input_b = "BYPASS",
-		altsyncram_component.clock_enable_output_b = "BYPASS",
-		altsyncram_component.intended_device_family = "Cyclone III",
-		altsyncram_component.lpm_type = "altsyncram",
-		altsyncram_component.numwords_a = NUMWORDS,
-		altsyncram_component.numwords_b = NUMWORDS,
-		altsyncram_component.operation_mode = "DUAL_PORT",
-		altsyncram_component.outdata_aclr_b = "NONE",
-		altsyncram_component.outdata_reg_b = "UNREGISTERED",
-		altsyncram_component.power_up_uninitialized = "FALSE",
-		altsyncram_component.read_during_write_mode_mixed_ports = "DONT_CARE",
-		altsyncram_component.widthad_a = AWIDTH+1,
-		altsyncram_component.widthad_b = AWIDTH+1,
-		altsyncram_component.width_a = DWIDTH+1,
-		altsyncram_component.width_b = DWIDTH+1,
-		altsyncram_component.width_byteena_a = 1;
-
-endmodule
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-module DiffCheck
-(
-	input [17:0] rgb1,
-	input [17:0] rgb2,
-	output result
-);
-
-	wire [5:0] r = rgb1[5:1] - rgb2[5:1];
-	wire [5:0] g = rgb1[11:7] - rgb2[11:7];
-	wire [5:0] b = rgb1[17:13] - rgb2[17:13];
-	wire [6:0] t = $signed(r) + $signed(b);
-	wire [6:0] gx = {g[5], g};
-	wire [7:0] y = $signed(t) + $signed(gx);
-	wire [6:0] u = $signed(r) - $signed(b);
-	wire [7:0] v = $signed({g, 1'b0}) - $signed(t);
-
-	// if y is inside (-24..24)
-	wire y_inside = (y < 8'h18 || y >= 8'he8);
-
-	// if u is inside (-4, 4)
-	wire u_inside = (u < 7'h4 || u >= 7'h7c);
-
-	// if v is inside (-6, 6)
-	wire v_inside = (v < 8'h6 || v >= 8'hfA);
-	assign result = !(y_inside && u_inside && v_inside);
-endmodule
-
-module InnerBlend
-(
-	input  [8:0] Op,
-	input  [5:0] A,
-	input  [5:0] B,
-	input  [5:0] C,
-	output [5:0] O
-);
-
-	function  [8:0] mul6x3;
-		input  [5:0] op1;
-		input  [2:0] op2;
-	begin
-		mul6x3 = 9'd0;
-		if(op2[0]) mul6x3 = mul6x3 + op1;
-		if(op2[1]) mul6x3 = mul6x3 + {op1, 1'b0};
-		if(op2[2]) mul6x3 = mul6x3 + {op1, 2'b00};
-	end
-	endfunction
-
-	wire OpOnes = Op[4];
-	wire [8:0] Amul = mul6x3(A, Op[7:5]);
-	wire [8:0] Bmul = mul6x3(B, {Op[3:2], 1'b0});
-	wire [8:0] Cmul = mul6x3(C, {Op[1:0], 1'b0});
-	wire [8:0] At =  Amul;
-	wire [8:0] Bt = (OpOnes == 0) ? Bmul : {3'b0, B};
-	wire [8:0] Ct = (OpOnes == 0) ? Cmul : {3'b0, C};
-	wire [9:0] Res = {At, 1'b0} + Bt + Ct;
-	assign O = Op[8] ? A : Res[9:4];
-endmodule
-
-module Blend
-(
-	input   [5:0] rule,
-	input         disable_hq2x,
-	input  [17:0] E,
-	input  [17:0] A,
-	input  [17:0] B,
-	input  [17:0] D,
-	input  [17:0] F,
-	input  [17:0] H,
-	output [17:0] Result
-);
-
-	reg [1:0] input_ctrl;
-	reg [8:0] op;
-	localparam BLEND0 = 9'b1_xxx_x_xx_xx; // 0: A
-	localparam BLEND1 = 9'b0_110_0_10_00; // 1: (A * 12 + B * 4) >> 4
-	localparam BLEND2 = 9'b0_100_0_10_10; // 2: (A * 8 + B * 4 + C * 4) >> 4
-	localparam BLEND3 = 9'b0_101_0_10_01; // 3: (A * 10 + B * 4 + C * 2) >> 4
-	localparam BLEND4 = 9'b0_110_0_01_01; // 4: (A * 12 + B * 2 + C * 2) >> 4
-	localparam BLEND5 = 9'b0_010_0_11_11; // 5: (A * 4 + (B + C) * 6) >> 4
-	localparam BLEND6 = 9'b0_111_1_xx_xx; // 6: (A * 14 + B + C) >> 4
-	localparam AB = 2'b00;
-	localparam AD = 2'b01;
-	localparam DB = 2'b10;
-	localparam BD = 2'b11;
-	wire is_diff;
-	DiffCheck diff_checker(rule[1] ? B : H, rule[0] ? D : F, is_diff);
-
-	always @* begin
-		case({!is_diff, rule[5:2]})
-			1,17:  {op, input_ctrl} = {BLEND1, AB};
-			2,18:  {op, input_ctrl} = {BLEND1, DB};
-			3,19:  {op, input_ctrl} = {BLEND1, BD};
-			4,20:  {op, input_ctrl} = {BLEND2, DB};
-			5,21:  {op, input_ctrl} = {BLEND2, AB};
-			6,22:  {op, input_ctrl} = {BLEND2, AD};
-
-			8: {op, input_ctrl} = {BLEND0, 2'bxx};
-			9: {op, input_ctrl} = {BLEND0, 2'bxx};
-			10: {op, input_ctrl} = {BLEND0, 2'bxx};
-			11: {op, input_ctrl} = {BLEND1, AB};
-			12: {op, input_ctrl} = {BLEND1, AB};
-			13: {op, input_ctrl} = {BLEND1, AB};
-			14: {op, input_ctrl} = {BLEND1, DB};
-			15: {op, input_ctrl} = {BLEND1, BD};
-
-			24: {op, input_ctrl} = {BLEND2, DB};
-			25: {op, input_ctrl} = {BLEND5, DB};
-			26: {op, input_ctrl} = {BLEND6, DB};
-			27: {op, input_ctrl} = {BLEND2, DB};
-			28: {op, input_ctrl} = {BLEND4, DB};
-			29: {op, input_ctrl} = {BLEND5, DB};
-			30: {op, input_ctrl} = {BLEND3, BD};
-			31: {op, input_ctrl} = {BLEND3, DB};
-			default: {op, input_ctrl} = 11'bx;
-		endcase
-
-		// Setting op[8] effectively disables HQ2X because blend will always return E.
-		if (disable_hq2x) op[8] = 1;
-	end
-
-	// Generate inputs to the inner blender. Valid combinations.
-	// 00: E A B
-	// 01: E A D 
-	// 10: E D B
-	// 11: E B D
-	wire [17:0] Input1 = E;
-	wire [17:0] Input2 = !input_ctrl[1] ? A :
-                        !input_ctrl[0] ? D : B;
-
-	wire [17:0] Input3 = !input_ctrl[0] ? B : D;
-	InnerBlend inner_blend1(op, Input1[5:0],   Input2[5:0],   Input3[5:0],   Result[5:0]);
-	InnerBlend inner_blend2(op, Input1[11:6],  Input2[11:6],  Input3[11:6],  Result[11:6]);
-	InnerBlend inner_blend3(op, Input1[17:12], Input2[17:12], Input3[17:12], Result[17:12]);
-endmodule
-
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-module Hq2x #(parameter LENGTH, parameter HALF_DEPTH)
-(
-	input               clk,
-	input               ce_x4,
-	input    [DWIDTH:0] inputpixel,
-	input               mono,
-	input               disable_hq2x,
-	input               reset_frame,
-	input               reset_line,
-	input         [1:0] read_y,
-	input  [AWIDTH+1:0] read_x,
-	output   [DWIDTH:0] outpixel
-);
-
-
-localparam AWIDTH = `BITS_TO_FIT(LENGTH);
-localparam DWIDTH = HALF_DEPTH ? 8 : 17;
-
-wire [5:0] hqTable[256] = '{
-	19, 19, 26, 11, 19, 19, 26, 11, 23, 15, 47, 35, 23, 15, 55, 39,
-	19, 19, 26, 58, 19, 19, 26, 58, 23, 15, 35, 35, 23, 15, 7,  35,
-	19, 19, 26, 11, 19, 19, 26, 11, 23, 15, 55, 39, 23, 15, 51, 43,
-	19, 19, 26, 58, 19, 19, 26, 58, 23, 15, 51, 35, 23, 15, 7,  43,
-	19, 19, 26, 11, 19, 19, 26, 11, 23, 61, 35, 35, 23, 61, 51, 35,
-	19, 19, 26, 11, 19, 19, 26, 11, 23, 15, 51, 35, 23, 15, 51, 35,
-	19, 19, 26, 11, 19, 19, 26, 11, 23, 61, 7,  35, 23, 61, 7,  43,
-	19, 19, 26, 11, 19, 19, 26, 58, 23, 15, 51, 35, 23, 61, 7,  43,
-	19, 19, 26, 11, 19, 19, 26, 11, 23, 15, 47, 35, 23, 15, 55, 39,
-	19, 19, 26, 11, 19, 19, 26, 11, 23, 15, 51, 35, 23, 15, 51, 35,
-	19, 19, 26, 11, 19, 19, 26, 11, 23, 15, 55, 39, 23, 15, 51, 43,
-	19, 19, 26, 11, 19, 19, 26, 11, 23, 15, 51, 39, 23, 15, 7,  43,
-	19, 19, 26, 11, 19, 19, 26, 11, 23, 15, 51, 35, 23, 15, 51, 39,
-	19, 19, 26, 11, 19, 19, 26, 11, 23, 15, 51, 35, 23, 15, 7,  35,
-	19, 19, 26, 11, 19, 19, 26, 11, 23, 15, 51, 35, 23, 15, 7,  43,
-	19, 19, 26, 11, 19, 19, 26, 11, 23, 15, 7,  35, 23, 15, 7,  43
-};
-
-reg [17:0] Prev0, Prev1, Prev2, Curr0, Curr1, Next0, Next1, Next2;
-reg [17:0] A, B, D, F, G, H;
-reg  [7:0] pattern, nextpatt;
-reg  [1:0] i;
-reg  [7:0] y;
-
-wire curbuf = y[0];
-reg  prevbuf = 0;
-wire iobuf = !curbuf;
-
-wire diff0, diff1;
-DiffCheck diffcheck0(Curr1, (i == 0) ? Prev0 : (i == 1) ? Curr0 : (i == 2) ? Prev2 : Next1, diff0);
-DiffCheck diffcheck1(Curr1, (i == 0) ? Prev1 : (i == 1) ? Next0 : (i == 2) ? Curr2 : Next2, diff1);
-
-wire [7:0] new_pattern = {diff1, diff0, pattern[7:2]};
-
-wire [17:0] X = (i == 0) ? A : (i == 1) ? Prev1 : (i == 2) ? Next1 : G;
-wire [17:0] blend_result;
-Blend blender(hqTable[nextpatt], disable_hq2x, Curr0, X, B, D, F, H, blend_result);
-
-reg             Curr2_addr1;
-reg  [AWIDTH:0] Curr2_addr2;
-wire     [17:0] Curr2 = HALF_DEPTH ? h2rgb(Curr2tmp) : Curr2tmp;
-wire [DWIDTH:0] Curr2tmp;
-
-reg  [AWIDTH:0] wrin_addr2;
-reg  [DWIDTH:0] wrpix;
-reg             wrin_en;
-
-function [17:0] h2rgb;
-	input  [8:0] v;
-begin
-	h2rgb = mono ? {v[5:3],v[2:0], v[5:3],v[2:0], v[5:3],v[2:0]} : {v[8:6],v[8:6],v[5:3],v[5:3],v[2:0],v[2:0]};
-end
-endfunction
-
-function  [8:0] rgb2h;
-	input [17:0] v;
-begin
-	rgb2h = mono ? {3'b000, v[17:15], v[14:12]} : {v[17:15], v[11:9], v[5:3]};
-end
-endfunction
-
-hq2x_in #(.LENGTH(LENGTH), .DWIDTH(DWIDTH)) hq2x_in
-(
-	.clk(clk),
-
-	.rdaddr(Curr2_addr2),
-	.rdbuf(Curr2_addr1),
-	.q(Curr2tmp),
-
-	.wraddr(wrin_addr2),
-	.wrbuf(iobuf),
-	.data(wrpix),
-	.wren(wrin_en)
-);
-
-reg         [1:0] wrout_addr1;
-reg  [AWIDTH+1:0] wrout_addr2;
-reg               wrout_en;
-reg    [DWIDTH:0] wrdata;
-
-hq2x_out #(.LENGTH(LENGTH), .DWIDTH(DWIDTH)) hq2x_out
-(
-	.clk(clk),
-
-	.rdaddr(read_x),
-	.rdbuf(read_y),
-	.q(outpixel),
-
-	.wraddr(wrout_addr2),
-	.wrbuf(wrout_addr1),
-	.data(wrdata),
-	.wren(wrout_en)
-);
-
-always @(posedge clk) begin
-	reg [AWIDTH:0] offs;
-	reg old_reset_line;
-	reg old_reset_frame;
-
-	wrout_en <= 0;
-	wrin_en  <= 0;
-
-	if(ce_x4) begin
-
-		pattern <= new_pattern;
-
-		if(~&offs) begin
-			if (i == 0) begin
-				Curr2_addr1 <= prevbuf;
-				Curr2_addr2 <= offs;
-			end
-			if (i == 1) begin
-				Prev2 <= Curr2;
-				Curr2_addr1 <= curbuf;
-				Curr2_addr2 <= offs;
-			end
-			if (i == 2) begin
-				Next2 <= HALF_DEPTH ? h2rgb(inputpixel) : inputpixel;
-				wrpix <= inputpixel;
-				wrin_addr2 <= offs;
-				wrin_en <= 1;
-			end
-			if (i == 3) begin
-				offs <= offs + 1'd1;
-			end
-
-			if(HALF_DEPTH) wrdata <= rgb2h(blend_result);
-			else           wrdata <= blend_result;
-
-			wrout_addr1 <= {curbuf, i[1]};
-			wrout_addr2 <= {offs, i[1]^i[0]};
-			wrout_en    <= 1;
-		end
-
-		if(i==3) begin
-			nextpatt <= {new_pattern[7:6], new_pattern[3], new_pattern[5], new_pattern[2], new_pattern[4], new_pattern[1:0]};
-			{A, G} <= {Prev0, Next0};
-			{B, F, H, D} <= {Prev1, Curr2, Next1, Curr0};
-			{Prev0, Prev1} <= {Prev1, Prev2};
-			{Curr0, Curr1} <= {Curr1, Curr2};
-			{Next0, Next1} <= {Next1, Next2};
-		end else begin
-			nextpatt <= {nextpatt[5], nextpatt[3], nextpatt[0], nextpatt[6], nextpatt[1], nextpatt[7], nextpatt[4], nextpatt[2]};
-			{B, F, H, D} <= {F, H, D, B};
-		end
-
-		i <= i + 1'b1;
-		if(old_reset_line && ~reset_line) begin
-			old_reset_frame <= reset_frame;
-			offs <= 0;
-			i <= 0;
-			y <= y + 1'd1;
-			prevbuf <= curbuf;
-			if(old_reset_frame & ~reset_frame) begin
-				y <= 0;
-				prevbuf <= 0;
-			end
-		end
-
-		old_reset_line  <= reset_line;
-	end
-end
-
-endmodule  // Hq2x
diff --git a/Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/rtl/mist_io.sv b/Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/rtl/mist_io.sv
deleted file mode 100644
index 2f41221f..00000000
--- a/Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/rtl/mist_io.sv	
+++ /dev/null
@@ -1,530 +0,0 @@
-//
-// mist_io.v
-//
-// mist_io for the MiST board
-// http://code.google.com/p/mist-board/
-//
-// Copyright (c) 2014 Till Harbaum <till@harbaum.org>
-// Copyright (c) 2015-2017 Sorgelig
-//
-// This source file is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published
-// by the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This source file 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 General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-///////////////////////////////////////////////////////////////////////
-
-//
-// Use buffer to access SD card. It's time-critical part.
-// Made module synchroneous with 2 clock domains: clk_sys and SPI_SCK
-//                                                           (Sorgelig)
-//
-// for synchronous projects default value for PS2DIV is fine for any frequency of system clock.
-// clk_ps2 = clk_sys/(PS2DIV*2)
-//
-
-module mist_io #(parameter STRLEN=0, parameter PS2DIV=100)
-(
-
-	// parameter STRLEN and the actual length of conf_str have to match
-	input [(8*STRLEN)-1:0] conf_str,
-
-	// Global clock. It should be around 100MHz (higher is better).
-	input             clk_sys,
-
-	// Global SPI clock from ARM. 24MHz
-	input             SPI_SCK,
-
-	input             CONF_DATA0,
-	input             SPI_SS2,
-	output            SPI_DO,
-	input             SPI_DI,
-
-	output reg [7:0] joystick_0,
-	output reg [7:0] joystick_1,
-//	output reg [31:0] joystick_2,
-//	output reg [31:0] joystick_3,
-//	output reg [31:0] joystick_4,
-	output reg [15:0] joystick_analog_0,
-	output reg [15:0] joystick_analog_1,
-	output      [1:0] buttons,
-	output      [1:0] switches,
-	output            scandoublerD,
-	output            ypbpr,
-
-	output reg [31:0] status,
-
-	// SD config
-	input             sd_conf,
-	input             sd_sdhc,
-	output      [1:0] img_mounted, // signaling that new image has been mounted
-	output reg [31:0] img_size,    // size of image in bytes
-
-	// SD block level access
-	input      [31:0] sd_lba,
-	input       [1:0] sd_rd,
-	input       [1:0] sd_wr,
-	output reg        sd_ack,
-	output reg        sd_ack_conf,
-
-	// SD byte level access. Signals for 2-PORT altsyncram.
-	output reg  [8:0] sd_buff_addr,
-	output reg  [7:0] sd_buff_dout,
-	input       [7:0] sd_buff_din,
-	output reg        sd_buff_wr,
-
-	// ps2 keyboard emulation
-	output            ps2_kbd_clk,
-	output reg        ps2_kbd_data,
-	output            ps2_mouse_clk,
-	output reg        ps2_mouse_data,
-
-	// ps2 alternative interface. 
-
-	// [8] - extended, [9] - pressed, [10] - toggles with every press/release
-	output reg [10:0] ps2_key = 0,
-
-	// [24] - toggles with every event
-	output reg [24:0] ps2_mouse = 0,
-
-	// ARM -> FPGA download
-	input             ioctl_ce,
-	output reg        ioctl_download = 0, // signal indicating an active download
-	output reg  [7:0] ioctl_index,        // menu index used to upload the file
-	output reg        ioctl_wr = 0,
-	output reg [24:0] ioctl_addr,
-	output reg  [7:0] ioctl_dout
-);
-
-reg [7:0] but_sw;
-reg [2:0] stick_idx;
-
-reg [1:0] mount_strobe = 0;
-assign img_mounted  = mount_strobe;
-
-assign buttons = but_sw[1:0];
-assign switches = but_sw[3:2];
-assign scandoublerD = but_sw[4];
-assign ypbpr = but_sw[5];
-
-// this variant of user_io is for 8 bit cores (type == a4) only
-wire [7:0] core_type = 8'ha4;
-
-// command byte read by the io controller
-wire       drive_sel = sd_rd[1] | sd_wr[1];
-wire [7:0] sd_cmd = { 4'h6, sd_conf, sd_sdhc, sd_wr[drive_sel], sd_rd[drive_sel] };
-
-reg [7:0] cmd;
-reg [2:0] bit_cnt;    // counts bits 0-7 0-7 ...
-reg [9:0] byte_cnt;   // counts bytes
-
-reg spi_do;
-assign SPI_DO = CONF_DATA0 ? 1'bZ : spi_do;
-
-reg [7:0] spi_data_out;
-
-// SPI transmitter
-always@(negedge SPI_SCK) spi_do <= spi_data_out[~bit_cnt];
-
-reg [7:0] spi_data_in;
-reg       spi_data_ready = 0;
-
-// SPI receiver
-always@(posedge SPI_SCK or posedge CONF_DATA0) begin
-	reg [6:0]  sbuf;
-	reg [31:0] sd_lba_r;
-	reg        drive_sel_r;
-
-	if(CONF_DATA0) begin
-	   bit_cnt <= 0;
-	   byte_cnt <= 0;
-		spi_data_out <= core_type;
-	end
-	else
-	begin
-		bit_cnt <= bit_cnt + 1'd1;
-		sbuf <= {sbuf[5:0], SPI_DI};
-
-		// finished reading command byte
-      if(bit_cnt == 7) begin
-			if(!byte_cnt) cmd <= {sbuf, SPI_DI};
-
-			spi_data_in <= {sbuf, SPI_DI};
-			spi_data_ready <= ~spi_data_ready;
-			if(~&byte_cnt) byte_cnt <= byte_cnt + 8'd1;
-			
-			spi_data_out <= 0;
-			case({(!byte_cnt) ? {sbuf, SPI_DI} : cmd})
-				// reading config string
-				8'h14: if(byte_cnt < STRLEN) spi_data_out <= conf_str[(STRLEN - byte_cnt - 1)<<3 +:8];
-
-				// reading sd card status
-				8'h16: if(byte_cnt == 0) begin
-							spi_data_out <= sd_cmd;
-							sd_lba_r <= sd_lba;
-							drive_sel_r <= drive_sel;
-						end else if (byte_cnt == 1) begin
-							spi_data_out <= drive_sel_r;
-						end else if(byte_cnt < 6) spi_data_out <= sd_lba_r[(5-byte_cnt)<<3 +:8];
-
-				// reading sd card write data
-				8'h18: spi_data_out <= sd_buff_din;
-			endcase
-		end
-	end
-end
-
-reg [31:0] ps2_key_raw = 0;
-wire       pressed  = (ps2_key_raw[15:8] != 8'hf0);
-wire       extended = (~pressed ? (ps2_key_raw[23:16] == 8'he0) : (ps2_key_raw[15:8] == 8'he0));
-
-// transfer to clk_sys domain
-always@(posedge clk_sys) begin
-	reg old_ss1, old_ss2;
-	reg old_ready1, old_ready2;
-	reg [2:0] b_wr;
-	reg       got_ps2 = 0;
-
-	old_ss1 <= CONF_DATA0;
-	old_ss2 <= old_ss1;
-	old_ready1 <= spi_data_ready;
-	old_ready2 <= old_ready1;
-	
-	sd_buff_wr <= b_wr[0];
-	if(b_wr[2] && (~&sd_buff_addr)) sd_buff_addr <= sd_buff_addr + 1'b1;
-	b_wr <= (b_wr<<1);
-
-	if(old_ss2) begin
-		got_ps2      <= 0;
-		sd_ack       <= 0;
-		sd_ack_conf  <= 0;
-		sd_buff_addr <= 0;
-		if(got_ps2) begin
-			if(cmd == 4) ps2_mouse[24] <= ~ps2_mouse[24]; 
-			if(cmd == 5) begin
-				ps2_key <= {~ps2_key[10], pressed, extended, ps2_key_raw[7:0]};
-				if(ps2_key_raw == 'hE012E07C) ps2_key[9:0] <= 'h37C; // prnscr pressed
-				if(ps2_key_raw == 'h7CE0F012) ps2_key[9:0] <= 'h17C; // prnscr released
-				if(ps2_key_raw == 'hF014F077) ps2_key[9:0] <= 'h377; // pause  pressed
-			end
-		end
-	end
-	else
-	if(old_ready2 ^ old_ready1) begin
-
-		if(cmd == 8'h18 && ~&sd_buff_addr) sd_buff_addr <= sd_buff_addr + 1'b1;
-
-		if(byte_cnt < 2) begin
-
-			if (cmd == 8'h19) sd_ack_conf  <= 1;
-			if((cmd == 8'h17) || (cmd == 8'h18)) sd_ack <= 1;
-			mount_strobe <= 0;
-
-			if(cmd == 5) ps2_key_raw <= 0;
-		end else begin
-		
-			case(cmd)
-				// buttons and switches
-				8'h01: but_sw <= spi_data_in; 
-				8'h02: joystick_0 <= spi_data_in;
-				8'h03: joystick_1 <= spi_data_in;
-//				8'h60: if (byte_cnt < 5) joystick_0[(byte_cnt-1)<<3 +:8] <= spi_data_in;
-//				8'h61: if (byte_cnt < 5) joystick_1[(byte_cnt-1)<<3 +:8] <= spi_data_in;
-//				8'h62: if (byte_cnt < 5) joystick_2[(byte_cnt-1)<<3 +:8] <= spi_data_in;
-//				8'h63: if (byte_cnt < 5) joystick_3[(byte_cnt-1)<<3 +:8] <= spi_data_in;
-//				8'h64: if (byte_cnt < 5) joystick_4[(byte_cnt-1)<<3 +:8] <= spi_data_in;
-				// store incoming ps2 mouse bytes 
-				8'h04: begin
-						got_ps2 <= 1;
-						case(byte_cnt)
-							2: ps2_mouse[7:0]   <= spi_data_in;
-							3: ps2_mouse[15:8]  <= spi_data_in;
-							4: ps2_mouse[23:16] <= spi_data_in;
-						endcase 
-						ps2_mouse_fifo[ps2_mouse_wptr] <= spi_data_in; 
-						ps2_mouse_wptr <= ps2_mouse_wptr + 1'd1;
-					end
-
-				// store incoming ps2 keyboard bytes 
-				8'h05: begin
-						got_ps2 <= 1;
-						ps2_key_raw[31:0] <= {ps2_key_raw[23:0], spi_data_in}; 						
-						ps2_kbd_fifo[ps2_kbd_wptr] <= spi_data_in; 
-						ps2_kbd_wptr <= ps2_kbd_wptr + 1'd1;
-					end
-			
-				8'h15: status[7:0] <= spi_data_in;
-			
-				// send SD config IO -> FPGA
-				// flag that download begins
-				// sd card knows data is config if sd_dout_strobe is asserted
-				// with sd_ack still being inactive (low)
-				8'h19,
-				// send sector IO -> FPGA
-				// flag that download begins
-				8'h17: begin
-						sd_buff_dout <= spi_data_in;
-						b_wr <= 1;
-					end
-
-				// joystick analog
-				8'h1a: begin
-						// first byte is joystick index
-						if(byte_cnt == 2) stick_idx <= spi_data_in[2:0];
-						else if(byte_cnt == 3) begin
-							// second byte is x axis
-							if(stick_idx == 0) joystick_analog_0[15:8] <= spi_data_in;
-								else if(stick_idx == 1) joystick_analog_1[15:8] <= spi_data_in;
-						end else if(byte_cnt == 4) begin
-							// third byte is y axis
-							if(stick_idx == 0) joystick_analog_0[7:0] <= spi_data_in;
-								else if(stick_idx == 1) joystick_analog_1[7:0] <= spi_data_in;
-						end
-					end
-
-				// notify image selection
-				8'h1c: mount_strobe[spi_data_in[0]] <= 1;
-
-				// send image info
-				8'h1d: if(byte_cnt<6) img_size[(byte_cnt-2)<<3 +:8] <= spi_data_in;
-
-				// status, 32bit version
-				8'h1e: if(byte_cnt<6) status[(byte_cnt-2)<<3 +:8] <= spi_data_in;
-				default: ;
-			endcase
-		end
-	end
-end
-
-
-///////////////////////////////   PS2   ///////////////////////////////
-// 8 byte fifos to store ps2 bytes
-localparam PS2_FIFO_BITS = 3;
-
-reg clk_ps2;
-always @(negedge clk_sys) begin
-	integer cnt;
-	cnt <= cnt + 1'd1;
-	if(cnt == PS2DIV) begin
-		clk_ps2 <= ~clk_ps2;
-		cnt <= 0;
-	end
-end
-
-// keyboard
-reg [7:0] ps2_kbd_fifo[1<<PS2_FIFO_BITS];
-reg [PS2_FIFO_BITS-1:0] ps2_kbd_wptr;
-reg [PS2_FIFO_BITS-1:0] ps2_kbd_rptr;
-
-// ps2 transmitter state machine
-reg [3:0] ps2_kbd_tx_state;
-reg [7:0] ps2_kbd_tx_byte;
-reg ps2_kbd_parity;
-
-assign ps2_kbd_clk = clk_ps2 || (ps2_kbd_tx_state == 0);
-
-// ps2 transmitter
-// Takes a byte from the FIFO and sends it in a ps2 compliant serial format.
-reg ps2_kbd_r_inc;
-always@(posedge clk_sys) begin
-	reg old_clk;
-	old_clk <= clk_ps2;
-	if(~old_clk & clk_ps2) begin
-		ps2_kbd_r_inc <= 0;
-
-		if(ps2_kbd_r_inc) ps2_kbd_rptr <= ps2_kbd_rptr + 1'd1;
-
-		// transmitter is idle?
-		if(ps2_kbd_tx_state == 0) begin
-			// data in fifo present?
-			if(ps2_kbd_wptr != ps2_kbd_rptr) begin
-				// load tx register from fifo
-				ps2_kbd_tx_byte <= ps2_kbd_fifo[ps2_kbd_rptr];
-				ps2_kbd_r_inc <= 1;
-
-				// reset parity
-				ps2_kbd_parity <= 1;
-
-				// start transmitter
-				ps2_kbd_tx_state <= 1;
-
-				// put start bit on data line
-				ps2_kbd_data <= 0;			// start bit is 0
-			end
-		end else begin
-
-			// transmission of 8 data bits
-			if((ps2_kbd_tx_state >= 1)&&(ps2_kbd_tx_state < 9)) begin
-				ps2_kbd_data <= ps2_kbd_tx_byte[0];	          // data bits
-				ps2_kbd_tx_byte[6:0] <= ps2_kbd_tx_byte[7:1]; // shift down
-				if(ps2_kbd_tx_byte[0]) 
-					ps2_kbd_parity <= !ps2_kbd_parity;
-			end
-
-			// transmission of parity
-			if(ps2_kbd_tx_state == 9) ps2_kbd_data <= ps2_kbd_parity;
-
-			// transmission of stop bit
-			if(ps2_kbd_tx_state == 10) ps2_kbd_data <= 1;    // stop bit is 1
-
-			// advance state machine
-			if(ps2_kbd_tx_state < 11) ps2_kbd_tx_state <= ps2_kbd_tx_state + 1'd1;
-				else ps2_kbd_tx_state <= 0;
-		end
-	end
-end
-
-// mouse
-reg [7:0] ps2_mouse_fifo[1<<PS2_FIFO_BITS];
-reg [PS2_FIFO_BITS-1:0] ps2_mouse_wptr;
-reg [PS2_FIFO_BITS-1:0] ps2_mouse_rptr;
-
-// ps2 transmitter state machine
-reg [3:0] ps2_mouse_tx_state;
-reg [7:0] ps2_mouse_tx_byte;
-reg ps2_mouse_parity;
-
-assign ps2_mouse_clk = clk_ps2 || (ps2_mouse_tx_state == 0);
-
-// ps2 transmitter
-// Takes a byte from the FIFO and sends it in a ps2 compliant serial format.
-reg ps2_mouse_r_inc;
-always@(posedge clk_sys) begin
-	reg old_clk;
-	old_clk <= clk_ps2;
-	if(~old_clk & clk_ps2) begin
-		ps2_mouse_r_inc <= 0;
-
-		if(ps2_mouse_r_inc) ps2_mouse_rptr <= ps2_mouse_rptr + 1'd1;
-
-		// transmitter is idle?
-		if(ps2_mouse_tx_state == 0) begin
-			// data in fifo present?
-			if(ps2_mouse_wptr != ps2_mouse_rptr) begin
-				// load tx register from fifo
-				ps2_mouse_tx_byte <= ps2_mouse_fifo[ps2_mouse_rptr];
-				ps2_mouse_r_inc <= 1;
-
-				// reset parity
-				ps2_mouse_parity <= 1;
-
-				// start transmitter
-				ps2_mouse_tx_state <= 1;
-
-				// put start bit on data line
-				ps2_mouse_data <= 0;			// start bit is 0
-			end
-		end else begin
-
-			// transmission of 8 data bits
-			if((ps2_mouse_tx_state >= 1)&&(ps2_mouse_tx_state < 9)) begin
-				ps2_mouse_data <= ps2_mouse_tx_byte[0];			  // data bits
-				ps2_mouse_tx_byte[6:0] <= ps2_mouse_tx_byte[7:1]; // shift down
-				if(ps2_mouse_tx_byte[0]) 
-					ps2_mouse_parity <= !ps2_mouse_parity;
-			end
-
-			// transmission of parity
-			if(ps2_mouse_tx_state == 9) ps2_mouse_data <= ps2_mouse_parity;
-
-			// transmission of stop bit
-			if(ps2_mouse_tx_state == 10) ps2_mouse_data <= 1;	  // stop bit is 1
-
-			// advance state machine
-			if(ps2_mouse_tx_state < 11) ps2_mouse_tx_state <= ps2_mouse_tx_state + 1'd1;
-				else ps2_mouse_tx_state <= 0;
-		end
-	end
-end
-
-
-///////////////////////////////   DOWNLOADING   ///////////////////////////////
-
-reg  [7:0] data_w;
-reg [24:0] addr_w;
-reg        rclk   = 0;
-
-localparam UIO_FILE_TX      = 8'h53;
-localparam UIO_FILE_TX_DAT  = 8'h54;
-localparam UIO_FILE_INDEX   = 8'h55;
-
-reg        rdownload = 0;
-
-// data_io has its own SPI interface to the io controller
-always@(posedge SPI_SCK, posedge SPI_SS2) begin
-	reg  [6:0] sbuf;
-	reg  [7:0] cmd;
-	reg  [4:0] cnt;
-	reg [24:0] addr;
-
-	if(SPI_SS2) cnt <= 0;
-	else begin
-		// don't shift in last bit. It is evaluated directly
-		// when writing to ram
-		if(cnt != 15) sbuf <= { sbuf[5:0], SPI_DI};
-
-		// count 0-7 8-15 8-15 ... 
-		if(cnt < 15) cnt <= cnt + 1'd1;
-			else cnt <= 8;
-
-		// finished command byte
-      if(cnt == 7) cmd <= {sbuf, SPI_DI};
-
-		// prepare/end transmission
-		if((cmd == UIO_FILE_TX) && (cnt == 15)) begin
-			// prepare 
-			if(SPI_DI) begin
-				case(ioctl_index[4:0]) 
-							1: addr <= 25'h200000; // TRD buffer  at 2MB
-							2: addr <= 25'h400000; // tape buffer at 4MB 
-					default: addr <= 25'h150000; // boot rom
-				endcase
-				rdownload <= 1; 
-			end else begin
-				addr_w <= addr;
-				rdownload <= 0;
-			end
-		end
-
-		// command 0x54: UIO_FILE_TX
-		if((cmd == UIO_FILE_TX_DAT) && (cnt == 15)) begin
-			addr_w <= addr;
-			data_w <= {sbuf, SPI_DI};
-			addr <= addr + 1'd1;
-			rclk <= ~rclk;
-		end
-
-      // expose file (menu) index
-      if((cmd == UIO_FILE_INDEX) && (cnt == 15)) ioctl_index <= {sbuf, SPI_DI};
-	end
-end
-
-// transfer to ioctl_clk domain.
-// ioctl_index is set before ioctl_download, so it's stable already
-always@(posedge clk_sys) begin
-	reg        rclkD, rclkD2;
-
-	if(ioctl_ce) begin
-		ioctl_download <= rdownload;
-
-		rclkD    <= rclk;
-		rclkD2   <= rclkD;
-		ioctl_wr <= 0;
-
-		if(rclkD != rclkD2) begin
-			ioctl_dout <= data_w;
-			ioctl_addr <= addr_w;
-			ioctl_wr   <= 1;
-		end
-	end
-end
-
-endmodule 
\ No newline at end of file
diff --git a/Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/rtl/motion.vhd b/Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/rtl/motion.vhd
index a4951c7e..b47ef3fe 100644
--- a/Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/rtl/motion.vhd	
+++ b/Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/rtl/motion.vhd	
@@ -22,8 +22,8 @@ use IEEE.STD_LOGIC_UNSIGNED.all;
 
 entity motion is 
 port(		
-			CLK6			: in  std_logic; 
 			CLK12			: in  std_logic;
+			CLK6en    : in  std_logic;
 			PHI2			: in  std_logic;
 			DISPLAY		: in  std_logic_vector(7 downto 0);
 			H256_s		: in  std_logic; -- 256H* on schematic
@@ -164,9 +164,9 @@ Shell2_n <= R9_Qb or HShell2Win_n;
 
 
 M9_in <= (L5_reg(4) or H4) & H64 & H32 & H16;
-M9: process(clk6, M9_in)
+M9: process(clk12, M9_in)
 begin
-  if falling_edge(clk6) then
+  if rising_edge(clk12) then
 	case M9_in is
 		when "0000" =>
 			M9_out <= "1111111110";
@@ -220,7 +220,7 @@ generic map(
 		widthad_a => 8,
 		width_a => 4)
 port map(
-		clock => clk6, 
+		clock => clk12, 
 		address => VidROMAdr(7 downto 0),
 		q => VidROMdout(7 downto 4)
 		);
@@ -231,7 +231,7 @@ generic map(
 		widthad_a => 8,
 		width_a => 4)
 port map(
-		clock => clk6, 
+		clock => clk12, 
 		address => VidROMAdr(7 downto 0),
 		q => VidROMdout(3 downto 0)
 		);
@@ -244,10 +244,10 @@ Vid <= VidROMDout(4) & VidROMDout(5) & VidROMDout(6) & VidROMDout(7) & VidROMDou
 	
 
 -- Decoders P8 and F8 generate the LDVxx signals
-LDV_Decoder: process(clk6, clk12, VSP1_n, VSP2_n, HCount)
+LDV_Decoder: process(clk12, VSP1_n, VSP2_n, HCount)
 begin
 	if rising_edge(clk12) then
-		if VSP1_n = '0' and clk6 = '0' then
+		if VSP1_n = '0' and clk6en = '0' then
 			case HCount(1 downto 0) is
 			when "00" => LDV1_dec <= "1110";
 			when "10" => LDV1_dec <= "1101";
@@ -260,7 +260,7 @@ begin
 			LDV1_dec <= "1111";
 		end if;
 		
-		if VSP2_n = '0' and clk6 = '0' then
+		if VSP2_n = '0' and clk6en = '0' then
 			case HCount(1 downto 0) is
 			when "00" => LDV2_dec <= "1110";
 			when "10" => LDV2_dec <= "1101";
@@ -286,13 +286,15 @@ LDV2D_n <= LDV2_dec(3);
 
 -- Ship 1 Horizontal position counter
 -- This combines two 74163s at locations P3 and N3 on the PCB 
-Ship1Count: process(clk6, H256_s, LDH1_n, Display)
+Ship1Count: process(clk12, H256_s, LDH1_n, Display)
 begin
-	if rising_edge(clk6) then
-		if LDH1_n = '0' then -- preload the counter
-			Ship1_Hpos <= Display;
-		elsif H256_s = '1' then -- increment the counter
-			Ship1_Hpos <= Ship1_Hpos + '1';		
+	if rising_edge(clk12) then
+		if clk6en = '1' then
+			if LDH1_n = '0' then -- preload the counter
+				Ship1_Hpos <= Display;
+			elsif H256_s = '1' then -- increment the counter
+				Ship1_Hpos <= Ship1_Hpos + '1';		
+			end if;
 		end if;
 	end if;
 end process;
@@ -300,13 +302,15 @@ ShipWin1_n <= '0' when Ship1_Hpos(7 downto 5) = "111" else '1';
 
 -- Ship 2 Horizontal position counter
 -- This combines two 74163s at locations R3 and M3 on the PCB 
-Ship2Count: process(clk6, H256_s, LDH2_n, Display)
+Ship2Count: process(clk12, H256_s, LDH2_n, Display)
 begin
-	if rising_edge(clk6) then
-		if LDH2_n = '0' then -- preload the counter
-			Ship2_Hpos <= Display;
-		elsif H256_s = '1' then -- increment the counter
-			Ship2_Hpos <= Ship2_Hpos + '1';		
+	if rising_edge(clk12) then
+		if clk6en = '1' then
+			if LDH2_n = '0' then -- preload the counter
+				Ship2_Hpos <= Display;
+			elsif H256_s = '1' then -- increment the counter
+				Ship2_Hpos <= Ship2_Hpos + '1';		
+			end if;
 		end if;
 	end if;
 end process;
@@ -314,18 +318,20 @@ ShipWin2_n <= '0' when Ship2_Hpos(7 downto 5) = "111" else '1';
 
 -- Shell 1 Horizontal position counter
 -- This combines two 74163s at locations R4 and M4 on the PCB 
-Shell1Count: process(clk6, H256_s, LDH3_n, Display)
+Shell1Count: process(clk12, H256_s, LDH3_n, Display)
 begin
-	if rising_edge(clk6) then
-		if LDH3_n = '0' then -- preload the counter
-			Shell1_Hpos <= Display;
-		elsif H256_s = '1' then -- increment the counter
-			Shell1_Hpos <= Shell1_Hpos + '1';		
-		end if;
-		if Shell1_Hpos(7 downto 1) = "1111111" then
-			HShell1Win_n <= '0';
-		else
-			HShell1Win_n <= '1';
+	if rising_edge(clk12) then
+		if clk6en = '1' then
+			if LDH3_n = '0' then -- preload the counter
+				Shell1_Hpos <= Display;
+			elsif H256_s = '1' then -- increment the counter
+				Shell1_Hpos <= Shell1_Hpos + '1';		
+			end if;
+			if Shell1_Hpos(7 downto 1) = "1111111" then
+				HShell1Win_n <= '0';
+			else
+				HShell1Win_n <= '1';
+			end if;
 		end if;
 	end if;
 end process;
@@ -333,18 +339,20 @@ end process;
 
 -- Shell 2 Horizontal position counter
 -- This combines two 74163s at locations P4 and N4 on the PCB 
-Shell2Count: process(clk6, H256_s, LDH4_n, Display)
+Shell2Count: process(clk12, H256_s, LDH4_n, Display)
 begin
-	if rising_edge(clk6) then
-		if LDH4_n = '0' then -- preload the counter
-			Shell2_Hpos <= Display;
-		elsif H256_s = '1' then -- increment the counter
-			Shell2_Hpos <= Shell2_Hpos + '1';		
-		end if;
-		if Shell2_Hpos(7 downto 1) = "1111111" then
-			HShell2Win_n <= '0';
-		else
-			HShell2Win_n <= '1';
+	if rising_edge(clk12) then
+		if clk6en = '1' then
+			if LDH4_n = '0' then -- preload the counter
+				Shell2_Hpos <= Display;
+			elsif H256_s = '1' then -- increment the counter
+				Shell2_Hpos <= Shell2_Hpos + '1';		
+			end if;
+			if Shell2_Hpos(7 downto 1) = "1111111" then
+				HShell2Win_n <= '0';
+			else
+				HShell2Win_n <= '1';
+			end if;
 		end if;
 	end if;
 end process;
@@ -353,18 +361,18 @@ end process;
 
 -- Ship 1 video shift register
 -- This combines four 74165s at locations R7, P7, N7 and M7 on the PCB
-Ship1Shift: process(clk6, ShipWin1_n, LDV1A_n, LDV1B_n, LDV1C_n, LDV1D_n, Vid)
+Ship1Shift: process(clk12, ShipWin1_n, LDV1A_n, LDV1B_n, LDV1C_n, LDV1D_n, Vid)
 begin
-	if LDV1A_n = '0' then
+	if rising_edge(clk12) then
+		if LDV1A_n = '0' then
 			Ship1_reg(31 downto 24) <= Vid(7 downto 0); -- Load the register with data from the video ROMs
-	elsif LDV1B_n = '0' then
+		elsif LDV1B_n = '0' then
 			Ship1_reg(23 downto 16) <= Vid(7 downto 0); 
-	elsif LDV1C_n = '0' then
+		elsif LDV1C_n = '0' then
 			Ship1_reg(15 downto 8) <= Vid(7 downto 0);
-	elsif LDV1D_n = '0' then
+		elsif LDV1D_n = '0' then
 			Ship1_reg(7 downto 0) <= Vid(7 downto 0);
-	elsif rising_edge(clk6) then
-		if ShipWin1_n = '0' then
+		elsif clk6en = '1' and ShipWin1_n = '0' then
 			Ship1_reg <= '0' & Ship1_reg(31 downto 1);
 		end if;
 	end if;
@@ -374,18 +382,18 @@ Ship1_n <= (not Ship1_reg(0)) or ShipWin1_n;
 
 -- Ship 2 video shift register
 -- This combines four 74165s at locations R6, P6, N6 and M6 on the PCB
-Ship2Shift: process(Clk6, ShipWin2_n, LDV2A_n, LDV2B_n, LDV2C_n, LDV2D_n, Vid)
+Ship2Shift: process(Clk12, ShipWin2_n, LDV2A_n, LDV2B_n, LDV2C_n, LDV2D_n, Vid)
 begin
-	if LDV2A_n = '0' then
+	if rising_edge(clk12) then
+		if LDV2A_n = '0' then
 			Ship2_reg(31 downto 24) <= Vid(7 downto 0); -- Load the register with data from the video ROMs
-	elsif LDV2B_n = '0' then
+		elsif LDV2B_n = '0' then
 			Ship2_reg(23 downto 16) <= Vid(7 downto 0); 
-	elsif LDV2C_n = '0' then
+		elsif LDV2C_n = '0' then
 			Ship2_reg(15 downto 8) <= Vid(7 downto 0);
-	elsif LDV2D_n = '0' then
+		elsif LDV2D_n = '0' then
 			Ship2_reg(7 downto 0) <= Vid(7 downto 0);
-	elsif rising_edge(clk6) then
-		if ShipWin2_n = '0' then
+		elsif clk6en = '1' and ShipWin2_n = '0' then
 			Ship2_reg <= '0' & Ship2_reg(31 downto 1);
 		end if;
 	end if;
diff --git a/Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/rtl/motor.vhd b/Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/rtl/motor.vhd
index 59b950f2..2e948cc7 100644
--- a/Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/rtl/motor.vhd	
+++ b/Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/rtl/motor.vhd	
@@ -28,7 +28,7 @@ generic(
 			constant Freq_tune : integer := 50 -- Value from 0-100 used to tune the overall engine sound frequency
 			);
 port(		
-			Clk_6		: in  std_logic; 
+			Clk_12		: in  std_logic; 
 			Ena_3k		: in  std_logic;
 			EngineData	: in	std_logic_vector(3 downto 0);
 			Motor		: out std_logic_vector(5 downto 0)
@@ -37,7 +37,7 @@ end EngineSound;
 
 architecture rtl of EngineSound is
 
-signal RPM_val 			: integer range 1 to 350;
+signal RPM_val 			: integer range 1 to 700;
 signal Ramp_Count 		: integer range 0 to 80000;
 signal Ramp_term		: integer range 1 to 80000;
 signal Freq_mod			: integer range 0 to 400;
@@ -61,9 +61,9 @@ begin
 -- The output of this DAC has a capacitor to smooth out the frequency variation.
 -- The constants assigned to RPM_val can be tweaked to adjust the frequency curve
 
-Speed_select: process(Clk_6)
+Speed_select: process(Clk_12)
 begin
-	if rising_edge(Clk_6) then
+	if rising_edge(Clk_12) then
 		case EngineData is
 			when "0000" => RPM_val <= 280;
 			when "0001" => RPM_val <= 245;
@@ -88,12 +88,12 @@ end process;
 -- Ramp_term terminates the ramp count, the higher this value, the longer the ramp will count up and the lower
 -- the frequency. RPM_val is multiplied by a constant which can be adjusted by changing the value of freq_tune
 -- to simulate the function of the frequency adjustment pot in the original hardware.
-ramp_term <= ((200 - freq_tune) * RPM_val);
+ramp_term <= ((200 - freq_tune) * RPM_val * 2);
 
 -- Variable frequency oscillator roughly approximating the function of a 555 astable oscillator
-Ramp_osc: process(clk_6)
+Ramp_osc: process(clk_12)
 begin
-	if rising_edge(clk_6) then
+	if rising_edge(clk_12) then
 		motor_clk <= '1';
 		ramp_count <= ramp_count + 1;
 		if ramp_count > ramp_term then
@@ -119,9 +119,9 @@ end process;
 motor_prefilter <= ('0' & Counter_B(2)) + ('0' & Counter_B(1)) + ('0' & Counter_A);
 
 -- Very simple low pass filter, borrowed from MikeJ's Asteroids code
-Engine_filter: process(clk_6)
+Engine_filter: process(clk_12)
 begin
-	if rising_edge(clk_6) then
+	if rising_edge(clk_12) then
 		if (ena_3k = '1') then
 			motor_filter_t1 <= ("00" & motor_prefilter) + ("00" & motor_prefilter);
 			motor_filter_t2 <= motor_filter_t1;
diff --git a/Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/rtl/osd.sv b/Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/rtl/osd.sv
deleted file mode 100644
index c62c10af..00000000
--- a/Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/rtl/osd.sv	
+++ /dev/null
@@ -1,179 +0,0 @@
-// A simple OSD implementation. Can be hooked up between a cores
-// VGA output and the physical VGA pins
-
-module osd (
-	// OSDs pixel clock, should be synchronous to cores pixel clock to
-	// avoid jitter.
-	input        clk_sys,
-
-	// SPI interface
-	input        SPI_SCK,
-	input        SPI_SS3,
-	input        SPI_DI,
-
-	// VGA signals coming from core
-	input  [5:0] R_in,
-	input  [5:0] G_in,
-	input  [5:0] B_in,
-	input        HSync,
-	input        VSync,
-	
-	// VGA signals going to video connector
-	output [5:0] R_out,
-	output [5:0] G_out,
-	output [5:0] B_out
-);
-
-parameter OSD_X_OFFSET = 10'd0;
-parameter OSD_Y_OFFSET = 10'd0;
-parameter OSD_COLOR    = 3'd0;
-
-localparam OSD_WIDTH   = 10'd256;
-localparam OSD_HEIGHT  = 10'd128;
-
-// *********************************************************************************
-// spi client
-// *********************************************************************************
-
-// this core supports only the display related OSD commands
-// of the minimig
-reg        osd_enable;
-(* ramstyle = "no_rw_check" *) reg  [7:0] osd_buffer[2047:0];  // the OSD buffer itself
-
-// the OSD has its own SPI interface to the io controller
-always@(posedge SPI_SCK, posedge SPI_SS3) begin
-	reg  [4:0] cnt;
-	reg [10:0] bcnt;
-	reg  [7:0] sbuf;
-	reg  [7:0] cmd;
-
-	if(SPI_SS3) begin
-		cnt  <= 0;
-		bcnt <= 0;
-	end else begin
-		sbuf <= {sbuf[6:0], SPI_DI};
-
-		// 0:7 is command, rest payload
-		if(cnt < 15) cnt <= cnt + 1'd1;
-			else cnt <= 8;
-
-		if(cnt == 7) begin
-			cmd <= {sbuf[6:0], SPI_DI};
-      
-			// lower three command bits are line address
-			bcnt <= {sbuf[1:0], SPI_DI, 8'h00};
-
-			// command 0x40: OSDCMDENABLE, OSDCMDDISABLE
-			if(sbuf[6:3] == 4'b0100) osd_enable <= SPI_DI;
-		end
-
-		// command 0x20: OSDCMDWRITE
-		if((cmd[7:3] == 5'b00100) && (cnt == 15)) begin
-			osd_buffer[bcnt] <= {sbuf[6:0], SPI_DI};
-			bcnt <= bcnt + 1'd1;
-		end
-	end
-end
-
-// *********************************************************************************
-// video timing and sync polarity anaylsis
-// *********************************************************************************
-
-// horizontal counter
-reg  [9:0] h_cnt;
-reg  [9:0] hs_low, hs_high;
-wire       hs_pol = hs_high < hs_low;
-wire [9:0] dsp_width = hs_pol ? hs_low : hs_high;
-
-// vertical counter
-reg  [9:0] v_cnt;
-reg  [9:0] vs_low, vs_high;
-wire       vs_pol = vs_high < vs_low;
-wire [9:0] dsp_height = vs_pol ? vs_low : vs_high;
-
-wire doublescan = (dsp_height>350); 
-
-reg ce_pix;
-always @(negedge clk_sys) begin
-	integer cnt = 0;
-	integer pixsz, pixcnt;
-	reg hs;
-
-	cnt <= cnt + 1;
-	hs <= HSync;
-
-	pixcnt <= pixcnt + 1;
-	if(pixcnt == pixsz) pixcnt <= 0;
-	ce_pix <= !pixcnt;
-
-	if(hs && ~HSync) begin
-		cnt    <= 0;
-		pixsz  <= (cnt >> 9) - 1;
-		pixcnt <= 0;
-		ce_pix <= 1;
-	end
-end
-
-always @(posedge clk_sys) begin
-	reg hsD, hsD2;
-	reg vsD, vsD2;
-
-	if(ce_pix) begin
-		// bring hsync into local clock domain
-		hsD <= HSync;
-		hsD2 <= hsD;
-
-		// falling edge of HSync
-		if(!hsD && hsD2) begin	
-			h_cnt <= 0;
-			hs_high <= h_cnt;
-		end
-
-		// rising edge of HSync
-		else if(hsD && !hsD2) begin	
-			h_cnt <= 0;
-			hs_low <= h_cnt;
-			v_cnt <= v_cnt + 1'd1;
-		end else begin
-			h_cnt <= h_cnt + 1'd1;
-		end
-
-		vsD <= VSync;
-		vsD2 <= vsD;
-
-		// falling edge of VSync
-		if(!vsD && vsD2) begin	
-			v_cnt <= 0;
-			vs_high <= v_cnt;
-		end
-
-		// rising edge of VSync
-		else if(vsD && !vsD2) begin	
-			v_cnt <= 0;
-			vs_low <= v_cnt;
-		end
-	end
-end
-
-// area in which OSD is being displayed
-wire [9:0] h_osd_start = ((dsp_width - OSD_WIDTH)>> 1) + OSD_X_OFFSET;
-wire [9:0] h_osd_end   = h_osd_start + OSD_WIDTH;
-wire [9:0] v_osd_start = ((dsp_height- (OSD_HEIGHT<<doublescan))>> 1) + OSD_Y_OFFSET;
-wire [9:0] v_osd_end   = v_osd_start + (OSD_HEIGHT<<doublescan);
-wire [9:0] osd_hcnt    = h_cnt - h_osd_start + 1'd1;  // one pixel offset for osd_byte register
-wire [9:0] osd_vcnt    = v_cnt - v_osd_start;
-
-wire osd_de = osd_enable && 
-              (HSync != hs_pol) && (h_cnt >= h_osd_start) && (h_cnt < h_osd_end) &&
-              (VSync != vs_pol) && (v_cnt >= v_osd_start) && (v_cnt < v_osd_end);
-
-reg  [7:0] osd_byte; 
-always @(posedge clk_sys) if(ce_pix) osd_byte <= osd_buffer[{doublescan ? osd_vcnt[7:5] : osd_vcnt[6:4], osd_hcnt[7:0]}];
-
-wire osd_pixel = osd_byte[doublescan ? osd_vcnt[4:2] : osd_vcnt[3:1]];
-
-assign R_out = !osd_de ? R_in : {osd_pixel, osd_pixel, OSD_COLOR[2], R_in[5:3]};
-assign G_out = !osd_de ? G_in : {osd_pixel, osd_pixel, OSD_COLOR[1], G_in[5:3]};
-assign B_out = !osd_de ? B_in : {osd_pixel, osd_pixel, OSD_COLOR[0], B_in[5:3]};
-
-endmodule
diff --git a/Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/rtl/playfield.vhd b/Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/rtl/playfield.vhd
index e38015da..12ee6e50 100644
--- a/Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/rtl/playfield.vhd	
+++ b/Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/rtl/playfield.vhd	
@@ -20,7 +20,8 @@ use IEEE.STD_LOGIC_UNSIGNED.all;
 
 entity playfield is 
 port(   
-			clk6				: in		std_logic;
+			clk12				: in		std_logic;
+			clk6en			: in		std_logic;
 			display			: in		std_logic_vector(7 downto 0);
 			HCount			: in  	std_logic_vector(8 downto 0);
 			VCount			: in  	std_logic_vector(7 downto 0);
@@ -97,21 +98,23 @@ generic map(
 		widthad_a => 10,
 		width_a => 4)
 port map(
-		clock => clk6, 
+		clock => clk12,
 		address => char_addr,
 		q => char_data
 		);
 
 -- 74LS195 video shift register	
-R3: process(clk6, SL, VBlank_n_s, char_data, shift_data)
+R3: process(clk12, SL, VBlank_n_s, char_data, shift_data)
 begin
 	if VBlank_n_s = '0' then -- Connected Clear input
 		shift_data <= (others => '0');
-	elsif rising_edge(clk6) then 
-		if SL = '0' then -- Parallel load
-			shift_data <= char_data;
-		else
-			shift_data <= shift_data(2 downto 0) & '0';
+	elsif rising_edge(clk12) then 
+		if clk6en = '1' then
+			if SL = '0' then -- Parallel load
+				shift_data <= char_data;
+			else
+				shift_data <= shift_data(2 downto 0) & '0';
+			end if;
 		end if;
 	end if;
 	QH <= shift_data(3);
@@ -120,10 +123,10 @@ end process;
 
 -- 9316 counter at R2
 -- CEP and CET tied to ground, counter is used only as a synchronous latch
-R2: process(clk6, H1H2, display, H256, CompSync_n, CompBlank_n)
+R2: process(clk12, H1H2, display, H256, CompSync_n, CompBlank_n)
 begin
-	if rising_edge(clk6) then
-		if H1H2 = '0' then
+	if rising_edge(clk12) then
+		if clk6en = '1' and H1H2 = '0' then
 			R2_reg <= (H256 & display(7) & CompBlank_n & CompSync_n);
 		end if;
 	end if;
diff --git a/Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/rtl/pll.v b/Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/rtl/pll.v
index 97fb2680..b71952f3 100644
--- a/Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/rtl/pll.v	
+++ b/Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/rtl/pll.v	
@@ -14,7 +14,7 @@
 // ************************************************************
 // THIS IS A WIZARD-GENERATED FILE. DO NOT EDIT THIS FILE!
 //
-// 13.1.4 Build 182 03/12/2014 SJ Web Edition
+// 13.1.4 Build 182 03/12/2014 Patches 4.26 SJ Web Edition
 // ************************************************************
 
 
@@ -40,30 +40,26 @@ module pll (
 	inclk0,
 	c0,
 	c1,
-	c2,
 	locked);
 
 	input	  inclk0;
 	output	  c0;
 	output	  c1;
-	output	  c2;
 	output	  locked;
 
 	wire [4:0] sub_wire0;
 	wire  sub_wire2;
-	wire [0:0] sub_wire7 = 1'h0;
-	wire [2:2] sub_wire4 = sub_wire0[2:2];
+	wire [0:0] sub_wire6 = 1'h0;
 	wire [0:0] sub_wire3 = sub_wire0[0:0];
 	wire [1:1] sub_wire1 = sub_wire0[1:1];
 	wire  c1 = sub_wire1;
 	wire  locked = sub_wire2;
 	wire  c0 = sub_wire3;
-	wire  c2 = sub_wire4;
-	wire  sub_wire5 = inclk0;
-	wire [1:0] sub_wire6 = {sub_wire7, sub_wire5};
+	wire  sub_wire4 = inclk0;
+	wire [1:0] sub_wire5 = {sub_wire6, sub_wire4};
 
 	altpll	altpll_component (
-				.inclk (sub_wire6),
+				.inclk (sub_wire5),
 				.clk (sub_wire0),
 				.locked (sub_wire2),
 				.activeclock (),
@@ -110,10 +106,6 @@ module pll (
 		altpll_component.clk1_duty_cycle = 50,
 		altpll_component.clk1_multiply_by = 56,
 		altpll_component.clk1_phase_shift = "0",
-		altpll_component.clk2_divide_by = 125,
-		altpll_component.clk2_duty_cycle = 50,
-		altpll_component.clk2_multiply_by = 28,
-		altpll_component.clk2_phase_shift = "0",
 		altpll_component.compensate_clock = "CLK0",
 		altpll_component.inclk0_input_frequency = 37037,
 		altpll_component.intended_device_family = "Cyclone III",
@@ -148,7 +140,7 @@ module pll (
 		altpll_component.port_scanwrite = "PORT_UNUSED",
 		altpll_component.port_clk0 = "PORT_USED",
 		altpll_component.port_clk1 = "PORT_USED",
-		altpll_component.port_clk2 = "PORT_USED",
+		altpll_component.port_clk2 = "PORT_UNUSED",
 		altpll_component.port_clk3 = "PORT_UNUSED",
 		altpll_component.port_clk4 = "PORT_UNUSED",
 		altpll_component.port_clk5 = "PORT_UNUSED",
@@ -189,13 +181,10 @@ endmodule
 // Retrieval info: PRIVATE: DEVICE_SPEED_GRADE STRING "8"
 // Retrieval info: PRIVATE: DIV_FACTOR0 NUMERIC "125"
 // Retrieval info: PRIVATE: DIV_FACTOR1 NUMERIC "125"
-// Retrieval info: PRIVATE: DIV_FACTOR2 NUMERIC "125"
 // Retrieval info: PRIVATE: DUTY_CYCLE0 STRING "50.00000000"
 // Retrieval info: PRIVATE: DUTY_CYCLE1 STRING "50.00000000"
-// Retrieval info: PRIVATE: DUTY_CYCLE2 STRING "50.00000000"
 // Retrieval info: PRIVATE: EFF_OUTPUT_FREQ_VALUE0 STRING "24.191999"
 // Retrieval info: PRIVATE: EFF_OUTPUT_FREQ_VALUE1 STRING "12.096000"
-// Retrieval info: PRIVATE: EFF_OUTPUT_FREQ_VALUE2 STRING "6.048000"
 // Retrieval info: PRIVATE: EXPLICIT_SWITCHOVER_COUNTER STRING "0"
 // Retrieval info: PRIVATE: EXT_FEEDBACK_RADIO STRING "0"
 // Retrieval info: PRIVATE: GLOCKED_COUNTER_EDIT_CHANGED STRING "1"
@@ -217,33 +206,25 @@ endmodule
 // Retrieval info: PRIVATE: LVDS_MODE_DATA_RATE_DIRTY NUMERIC "0"
 // Retrieval info: PRIVATE: LVDS_PHASE_SHIFT_UNIT0 STRING "deg"
 // Retrieval info: PRIVATE: LVDS_PHASE_SHIFT_UNIT1 STRING "ps"
-// Retrieval info: PRIVATE: LVDS_PHASE_SHIFT_UNIT2 STRING "ps"
 // Retrieval info: PRIVATE: MIG_DEVICE_SPEED_GRADE STRING "Any"
 // Retrieval info: PRIVATE: MIRROR_CLK0 STRING "0"
 // Retrieval info: PRIVATE: MIRROR_CLK1 STRING "0"
-// Retrieval info: PRIVATE: MIRROR_CLK2 STRING "0"
 // Retrieval info: PRIVATE: MULT_FACTOR0 NUMERIC "112"
 // Retrieval info: PRIVATE: MULT_FACTOR1 NUMERIC "56"
-// Retrieval info: PRIVATE: MULT_FACTOR2 NUMERIC "28"
 // Retrieval info: PRIVATE: NORMAL_MODE_RADIO STRING "1"
 // Retrieval info: PRIVATE: OUTPUT_FREQ0 STRING "24.19200000"
 // Retrieval info: PRIVATE: OUTPUT_FREQ1 STRING "12.09600000"
-// Retrieval info: PRIVATE: OUTPUT_FREQ2 STRING "6.04800000"
 // Retrieval info: PRIVATE: OUTPUT_FREQ_MODE0 STRING "0"
 // Retrieval info: PRIVATE: OUTPUT_FREQ_MODE1 STRING "0"
-// Retrieval info: PRIVATE: OUTPUT_FREQ_MODE2 STRING "0"
 // Retrieval info: PRIVATE: OUTPUT_FREQ_UNIT0 STRING "MHz"
 // Retrieval info: PRIVATE: OUTPUT_FREQ_UNIT1 STRING "MHz"
-// Retrieval info: PRIVATE: OUTPUT_FREQ_UNIT2 STRING "MHz"
 // Retrieval info: PRIVATE: PHASE_RECONFIG_FEATURE_ENABLED STRING "1"
 // Retrieval info: PRIVATE: PHASE_RECONFIG_INPUTS_CHECK STRING "0"
 // Retrieval info: PRIVATE: PHASE_SHIFT0 STRING "0.00000000"
 // Retrieval info: PRIVATE: PHASE_SHIFT1 STRING "0.00000000"
-// Retrieval info: PRIVATE: PHASE_SHIFT2 STRING "0.00000000"
 // Retrieval info: PRIVATE: PHASE_SHIFT_STEP_ENABLED_CHECK STRING "0"
 // Retrieval info: PRIVATE: PHASE_SHIFT_UNIT0 STRING "deg"
 // Retrieval info: PRIVATE: PHASE_SHIFT_UNIT1 STRING "deg"
-// Retrieval info: PRIVATE: PHASE_SHIFT_UNIT2 STRING "ps"
 // Retrieval info: PRIVATE: PLL_ADVANCED_PARAM_CHECK STRING "0"
 // Retrieval info: PRIVATE: PLL_ARESET_CHECK STRING "0"
 // Retrieval info: PRIVATE: PLL_AUTOPLL_CHECK NUMERIC "1"
@@ -267,16 +248,13 @@ endmodule
 // Retrieval info: PRIVATE: SRC_SYNCH_COMP_RADIO STRING "0"
 // Retrieval info: PRIVATE: STICKY_CLK0 STRING "1"
 // Retrieval info: PRIVATE: STICKY_CLK1 STRING "1"
-// Retrieval info: PRIVATE: STICKY_CLK2 STRING "1"
 // Retrieval info: PRIVATE: SWITCHOVER_COUNT_EDIT NUMERIC "1"
 // Retrieval info: PRIVATE: SWITCHOVER_FEATURE_ENABLED STRING "1"
 // Retrieval info: PRIVATE: SYNTH_WRAPPER_GEN_POSTFIX STRING "0"
 // Retrieval info: PRIVATE: USE_CLK0 STRING "1"
 // Retrieval info: PRIVATE: USE_CLK1 STRING "1"
-// Retrieval info: PRIVATE: USE_CLK2 STRING "1"
 // Retrieval info: PRIVATE: USE_CLKENA0 STRING "0"
 // Retrieval info: PRIVATE: USE_CLKENA1 STRING "0"
-// Retrieval info: PRIVATE: USE_CLKENA2 STRING "0"
 // Retrieval info: PRIVATE: USE_MIL_SPEED_GRADE NUMERIC "0"
 // Retrieval info: PRIVATE: ZERO_DELAY_RADIO STRING "0"
 // Retrieval info: LIBRARY: altera_mf altera_mf.altera_mf_components.all
@@ -289,10 +267,6 @@ endmodule
 // Retrieval info: CONSTANT: CLK1_DUTY_CYCLE NUMERIC "50"
 // Retrieval info: CONSTANT: CLK1_MULTIPLY_BY NUMERIC "56"
 // Retrieval info: CONSTANT: CLK1_PHASE_SHIFT STRING "0"
-// Retrieval info: CONSTANT: CLK2_DIVIDE_BY NUMERIC "125"
-// Retrieval info: CONSTANT: CLK2_DUTY_CYCLE NUMERIC "50"
-// Retrieval info: CONSTANT: CLK2_MULTIPLY_BY NUMERIC "28"
-// Retrieval info: CONSTANT: CLK2_PHASE_SHIFT STRING "0"
 // Retrieval info: CONSTANT: COMPENSATE_CLOCK STRING "CLK0"
 // Retrieval info: CONSTANT: INCLK0_INPUT_FREQUENCY NUMERIC "37037"
 // Retrieval info: CONSTANT: INTENDED_DEVICE_FAMILY STRING "Cyclone III"
@@ -326,7 +300,7 @@ endmodule
 // Retrieval info: CONSTANT: PORT_SCANWRITE STRING "PORT_UNUSED"
 // Retrieval info: CONSTANT: PORT_clk0 STRING "PORT_USED"
 // Retrieval info: CONSTANT: PORT_clk1 STRING "PORT_USED"
-// Retrieval info: CONSTANT: PORT_clk2 STRING "PORT_USED"
+// Retrieval info: CONSTANT: PORT_clk2 STRING "PORT_UNUSED"
 // Retrieval info: CONSTANT: PORT_clk3 STRING "PORT_UNUSED"
 // Retrieval info: CONSTANT: PORT_clk4 STRING "PORT_UNUSED"
 // Retrieval info: CONSTANT: PORT_clk5 STRING "PORT_UNUSED"
@@ -345,14 +319,12 @@ endmodule
 // Retrieval info: USED_PORT: @clk 0 0 5 0 OUTPUT_CLK_EXT VCC "@clk[4..0]"
 // Retrieval info: USED_PORT: c0 0 0 0 0 OUTPUT_CLK_EXT VCC "c0"
 // Retrieval info: USED_PORT: c1 0 0 0 0 OUTPUT_CLK_EXT VCC "c1"
-// Retrieval info: USED_PORT: c2 0 0 0 0 OUTPUT_CLK_EXT VCC "c2"
 // Retrieval info: USED_PORT: inclk0 0 0 0 0 INPUT_CLK_EXT GND "inclk0"
 // Retrieval info: USED_PORT: locked 0 0 0 0 OUTPUT GND "locked"
 // Retrieval info: CONNECT: @inclk 0 0 1 1 GND 0 0 0 0
 // Retrieval info: CONNECT: @inclk 0 0 1 0 inclk0 0 0 0 0
 // Retrieval info: CONNECT: c0 0 0 0 0 @clk 0 0 1 0
 // Retrieval info: CONNECT: c1 0 0 0 0 @clk 0 0 1 1
-// Retrieval info: CONNECT: c2 0 0 0 0 @clk 0 0 1 2
 // Retrieval info: CONNECT: locked 0 0 0 0 @locked 0 0 0 0
 // Retrieval info: GEN_FILE: TYPE_NORMAL pll.v TRUE
 // Retrieval info: GEN_FILE: TYPE_NORMAL pll.ppf TRUE
diff --git a/Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/rtl/scandoubler.sv b/Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/rtl/scandoubler.sv
deleted file mode 100644
index 0213d20c..00000000
--- a/Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/rtl/scandoubler.sv	
+++ /dev/null
@@ -1,195 +0,0 @@
-//
-// scandoubler.v
-// 
-// Copyright (c) 2015 Till Harbaum <till@harbaum.org> 
-// Copyright (c) 2017 Sorgelig
-// 
-// This source file is free software: you can redistribute it and/or modify 
-// it under the terms of the GNU General Public License as published 
-// by the Free Software Foundation, either version 3 of the License, or 
-// (at your option) any later version. 
-// 
-// This source file 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 General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License 
-// along with this program.  If not, see <http://www.gnu.org/licenses/>. 
-
-// TODO: Delay vsync one line
-
-module scandoubler #(parameter LENGTH, parameter HALF_DEPTH)
-(
-	// system interface
-	input             clk_sys,
-	input             ce_pix,
-	input             ce_pix_actual,
-
-	input             hq2x,
-
-	// shifter video interface
-	input             hs_in,
-	input             vs_in,
-	input             line_start,
-
-	input  [DWIDTH:0] r_in,
-	input  [DWIDTH:0] g_in,
-	input  [DWIDTH:0] b_in,
-	input             mono,
-
-	// output interface
-	output reg        hs_out,
-	output            vs_out,
-	output [DWIDTH:0] r_out,
-	output [DWIDTH:0] g_out,
-	output [DWIDTH:0] b_out
-);
-
-
-localparam DWIDTH = HALF_DEPTH ? 2 : 5;
-
-assign vs_out = vs_in;
-
-reg  [2:0] phase;
-reg  [2:0] ce_div;
-reg  [7:0] pix_len = 0;
-wire [7:0] pl = pix_len + 1'b1;
-
-reg ce_x1, ce_x4;
-reg req_line_reset;
-wire ls_in = hs_in | line_start;
-always @(negedge clk_sys) begin
-	reg old_ce;
-	reg [2:0] ce_cnt;
-
-	reg [7:0] pixsz2, pixsz4 = 0;
-
-	old_ce <= ce_pix;
-	if(~&pix_len) pix_len <= pix_len + 1'd1;
-
-	ce_x4 <= 0;
-	ce_x1 <= 0;
-
-	// use such odd comparison to place c_x4 evenly if master clock isn't multiple 4.
-	if((pl == pixsz4) || (pl == pixsz2) || (pl == (pixsz2+pixsz4))) begin
-		phase <= phase + 1'd1;
-		ce_x4 <= 1;
-	end
-
-	if(~old_ce & ce_pix) begin
-		pixsz2 <= {1'b0,  pl[7:1]};
-		pixsz4 <= {2'b00, pl[7:2]};
-		ce_x1 <= 1;
-		ce_x4 <= 1;
-		pix_len <= 0;
-		phase <= phase + 1'd1;
-
-		ce_cnt <= ce_cnt + 1'd1;
-		if(ce_pix_actual) begin
-			phase <= 0;
-			ce_div <= ce_cnt + 1'd1;
-			ce_cnt <= 0;
-			req_line_reset <= 0;
-		end
-
-		if(ls_in) req_line_reset <= 1;
-	end
-end
-
-reg ce_sd;
-always @(*) begin
-	case(ce_div)
-		2: ce_sd = !phase[0];
-		4: ce_sd = !phase[1:0];
-		default: ce_sd <= 1;
-	endcase
-end
-
-`define BITS_TO_FIT(N) ( \
-     N <=   2 ? 0 : \
-     N <=   4 ? 1 : \
-     N <=   8 ? 2 : \
-     N <=  16 ? 3 : \
-     N <=  32 ? 4 : \
-     N <=  64 ? 5 : \
-     N <= 128 ? 6 : \
-     N <= 256 ? 7 : \
-     N <= 512 ? 8 : \
-     N <=1024 ? 9 : 10 )
-
-localparam AWIDTH = `BITS_TO_FIT(LENGTH);
-Hq2x #(.LENGTH(LENGTH), .HALF_DEPTH(HALF_DEPTH)) Hq2x
-(
-	.clk(clk_sys),
-	.ce_x4(ce_x4 & ce_sd),
-	.inputpixel({b_in,g_in,r_in}),
-	.mono(mono),
-	.disable_hq2x(~hq2x),
-	.reset_frame(vs_in),
-	.reset_line(req_line_reset),
-	.read_y(sd_line),
-	.read_x(sd_h_actual),
-	.outpixel({b_out,g_out,r_out})
-);
-
-reg [10:0] sd_h_actual;
-always @(*) begin
-	case(ce_div)
-		2: sd_h_actual = sd_h[10:1];
-		4: sd_h_actual = sd_h[10:2];
-		default: sd_h_actual = sd_h;
-	endcase
-end
-
-reg [10:0] sd_h;
-reg  [1:0] sd_line;
-always @(posedge clk_sys) begin
-
-	reg [11:0] hs_max,hs_rise,hs_ls;
-	reg [10:0] hcnt;
-	reg [11:0] sd_hcnt;
-
-	reg hs, hs2, vs, ls;
-
-	if(ce_x1) begin
-		hs <= hs_in;
-		ls <= ls_in;
-
-		if(ls && !ls_in) hs_ls <= {hcnt,1'b1};
-
-		// falling edge of hsync indicates start of line
-		if(hs && !hs_in) begin
-			hs_max <= {hcnt,1'b1};
-			hcnt <= 0;
-			if(ls && !ls_in) hs_ls <= {10'd0,1'b1};
-		end else begin
-			hcnt <= hcnt + 1'd1;
-		end
-
-		// save position of rising edge
-		if(!hs && hs_in) hs_rise <= {hcnt,1'b1};
-
-		vs <= vs_in;
-		if(vs && ~vs_in) sd_line <= 0;
-	end
-
-	if(ce_x4) begin
-		hs2 <= hs_in;
-
-		// output counter synchronous to input and at twice the rate
-		sd_hcnt <= sd_hcnt + 1'd1;
-		sd_h    <= sd_h    + 1'd1;
-		if(hs2 && !hs_in)     sd_hcnt <= hs_max;
-		if(sd_hcnt == hs_max) sd_hcnt <= 0;
-
-		// replicate horizontal sync at twice the speed
-		if(sd_hcnt == hs_max)  hs_out <= 0;
-		if(sd_hcnt == hs_rise) hs_out <= 1;
-
-		if(sd_hcnt == hs_ls)   sd_h    <= 0;
-		if(sd_hcnt == hs_ls)   sd_line <= sd_line + 1'd1;
-	end
-end
-
-endmodule
diff --git a/Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/rtl/sound.vhd b/Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/rtl/sound.vhd
index 62f43e3e..0d2a65b2 100644
--- a/Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/rtl/sound.vhd	
+++ b/Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/rtl/sound.vhd	
@@ -20,7 +20,7 @@ use IEEE.STD_LOGIC_UNSIGNED.all;
 
 entity audio is 
 port(		
-			Clk_6				: in  std_logic;
+			Clk_12			: in  std_logic;
 			Ena_3k			: in  std_logic;
 			Reset_n			: in	std_logic;
 			Motor1_n			: in	std_logic;
@@ -42,6 +42,7 @@ architecture rtl of audio is
 signal Reset			: std_logic;
 
 signal V2				: std_logic;
+signal V2_D			: std_logic;
 
 signal Noise			: std_logic;
 signal Noise_Shift	: std_logic_vector(15 downto 0);
@@ -75,15 +76,18 @@ V2 <= VCount(1);
 
 -- Explosion --
 -- LFSR that generates pseudo-random noise used by the explosion sound
-Noise_gen: process(Attract1, Attract2, V2)
+Noise_gen: process(Attract1, Attract2, clk_12)
 begin
 	if ((Attract1 nand Attract2) = '0') then
 		noise_shift <= (others => '0');
 		noise <= '0';
-	elsif rising_edge(V2) then
-		shift_in <= not(noise_shift(6) xor noise_shift(8));
-		noise_shift <= shift_in & noise_shift(15 downto 1);
-		noise <= noise_shift(0); 
+	elsif rising_edge(clk_12) then
+		V2_D <= V2;
+		if V2_D = '0' and V2 = '1' then
+			shift_in <= not(noise_shift(6) xor noise_shift(8));
+			noise_shift <= shift_in & noise_shift(15 downto 1);
+			noise <= noise_shift(0); 
+		end if;
 	end if;
 end process;
 
@@ -97,9 +101,9 @@ end process;
 explosion_prefilter <= explosion when noise = '1' else "0000";
 
 -- Very simple low pass filter, borrowed from MikeJ's Asteroids code, should probably be lower cutoff
-explode_filter: process(clk_6)
+explode_filter: process(clk_12)
 begin
-	if rising_edge(clk_6) then
+	if rising_edge(clk_12) then
 		if (ena_3k = '1') then
 			explosion_filter_t1 <= explosion_prefilter;
 			explosion_filter_t2 <= explosion_filter_t1;
@@ -126,7 +130,7 @@ generic map(
 		Freq_tune => 45 -- Tuning pot for engine sound frequency (Range 1-100)
 		)
 port map(		
-		Clk_6 => clk_6, 
+		Clk_12 => clk_12,
 		Ena_3k => ena_3k,
 		EngineData => motor1_speed,
 		Motor => motor1_snd
@@ -144,7 +148,7 @@ generic map(
 		Freq_tune => 47 -- Tuning pot for engine sound frequency (Range 1-100)
 		)
 port map(		
-		Clk_6 => clk_6, 
+		Clk_12 => clk_12,
 		Ena_3k => ena_3k,
 		EngineData => motor2_speed,
 		Motor => motor2_snd
@@ -159,7 +163,7 @@ generic map(
 		Freq_tune => 40 -- Tuning pot for whistle sound frequency (Range 1-100)
 		)
 port map(		
-		Clk_6 => clk_6,			
+		Clk_12 => clk_12,
 		Ena_3k => ena_3k,
 		Whistle_trig => whistle1,
 		Whistle_out => whistle_snd1
@@ -170,7 +174,7 @@ generic map(
 		Freq_tune => 44 -- Tuning pot for whistle sound frequency (Range 1-100)
 		)
 port map(			
-		Clk_6 => clk_6,			
+		Clk_12 => clk_12,
 		Ena_3k => ena_3k,
 		Whistle_trig => whistle2,
 		Whistle_out => whistle_snd2
diff --git a/Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/rtl/sync.vhd b/Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/rtl/sync.vhd
index fff82490..395fb485 100644
--- a/Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/rtl/sync.vhd	
+++ b/Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/rtl/sync.vhd	
@@ -23,6 +23,7 @@ entity synchronizer is
 port(		
 			clk_12		: in		std_logic;
 			clk_6			: out		std_logic;
+			clk_6en		: out		std_logic;
 			hcount		: out		std_logic_vector(8 downto 0);
 			vcount		: out		std_logic_vector(7 downto 0);
 		   hsync			: buffer	std_logic;
@@ -43,9 +44,11 @@ signal H256_n			: std_logic;
 signal H128				: std_logic;
 signal H64				: std_logic;
 signal H32				: std_logic;
+signal H32_EN			: std_logic;
 signal H16				: std_logic;
 signal H8				: std_logic;
 signal H8_n				: std_logic;
+signal H8_EN			: std_logic;
 signal H4				: std_logic;
 signal H4_n				: std_logic;
 signal H2				: std_logic;
@@ -84,13 +87,15 @@ begin
 end process;
 
 -- Vertical counter is 8 bits, clocked by the rising edge of H256 at the end of each horizontal line
-V_count: process(hsync)
+V_count: process(clk_12)
 begin
-	if rising_edge(Hsync) then
-		if vreset_n = '0' then
-			v_counter <= (others => '0');
-		else
-			v_counter <= v_counter + '1';
+	if rising_edge(clk_12) then
+		if H8_EN = '1' and H32 = '1' and hsync = '0' and hblank = '1' then -- rising_edge(hsync)
+			if vreset_n = '0' then
+				v_counter <= (others => '0');
+			else
+				v_counter <= v_counter + '1';
+			end if;
 		end if;
 	end if;
 end process;
@@ -103,16 +108,18 @@ generic map(
 		widthad_a => 8,
 		width_a => 4)
 port map(
-		clock => clk_12, 
+		clock => not clk_12, 
 		address => sync_reg(3) & V128 & V64 & V16 & V8 & V4 & V2 & V1,
 		q => sync_bus
 		);
 
 -- Register fed by the sync PROM, in the original hardware this also creates the complements of these signals
-sync_register: process(hsync)
+sync_register: process(clk_12)
 begin
-	if rising_edge(hsync) then
-		sync_reg <= sync_bus;
+	if rising_edge(clk_12) then
+		if H8_EN = '1' and H32 = '1' and hsync = '0' and hblank = '1' then -- rising_edge(hsync)
+			sync_reg <= sync_bus;
+		end if;
 	end if;
 end process;
 
@@ -125,36 +132,39 @@ vblank <= sync_reg(1);
 vsync <= sync_reg(0);
 
 -- A pair of D type flip-flops that generate the Hsync signal
-Hsync_1: process(H256_n, H32)
+Hsync_1: process(clk_12, H256_n)
 begin	
 	if H256_n = '0' then	
 		hblank <= '0';
 	else
-		if rising_edge(H32) then
-			hblank <= not H64;
+		if rising_edge(clk_12) then
+			if H32_EN = '1' then hblank <= not H64; end if;
 		end if;
 	end if;
 end process;
 
-Hsync_2: process(hblank, H8) 
+Hsync_2: process(clk_12, hblank) 
 begin
 	if hblank = '0' then
 		hsync <= '0';
 	else
-		if rising_edge(H8) then
-			hsync <= H32;
+		if rising_edge(clk_12) then
+			if H8_EN = '1' then hsync <= H32; end if;
 		end if;
 	end if;
 end process;
 
 -- Assign various signals
 clk_6 <= h_counter(0);
+clk_6en <= not h_counter(0);
 H1 <= h_counter(1);
 H2 <= h_counter(2);
 H4 <= h_counter(3);
 H8 <= h_counter(4);
+H8_EN <= '1' when h_counter(4 downto 0) = "01111" else '0';
 H16 <=  h_counter(5);
 H32 <= h_counter(6);
+H32_EN <= '1' when h_counter(6 downto 0) = "0111111" else '0';
 H64 <= h_counter(7);
 H128 <= h_counter(8);
 H256 <= h_counter(9);
diff --git a/Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/rtl/video_mixer.sv b/Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/rtl/video_mixer.sv
deleted file mode 100644
index bb46caaf..00000000
--- a/Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/rtl/video_mixer.sv	
+++ /dev/null
@@ -1,242 +0,0 @@
-//
-//
-// Copyright (c) 2017 Sorgelig
-//
-// This program is GPL Licensed. See COPYING for the full license.
-//
-//
-////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-`timescale 1ns / 1ps
-
-//
-// LINE_LENGTH: Length of  display line in pixels
-//              Usually it's length from HSync to HSync.
-//              May be less if line_start is used.
-//
-// HALF_DEPTH:  If =1 then color dept is 3 bits per component
-//              For half depth 6 bits monochrome is available with
-//              mono signal enabled and color = {G, R}
-
-module video_mixer
-#(
-	parameter LINE_LENGTH  = 768,
-	parameter HALF_DEPTH   = 0,
-
-	parameter OSD_COLOR    = 3'd4,
-	parameter OSD_X_OFFSET = 10'd0,
-	parameter OSD_Y_OFFSET = 10'd0
-)
-(
-	// master clock
-	// it should be multiple by (ce_pix*4).
-	input        clk_sys,
-	
-	// Pixel clock or clock_enable (both are accepted).
-	input        ce_pix,
-
-	// Some systems have multiple resolutions.
-	// ce_pix_actual should match ce_pix where every second or fourth pulse is enabled,
-	// thus half or qurter resolutions can be used without brake video sync while switching resolutions.
-	// For fixed single resolution (or when video sync stability isn't required) ce_pix_actual = ce_pix.
-	input        ce_pix_actual,
-
-	// OSD SPI interface
-	input        SPI_SCK,
-	input        SPI_SS3,
-	input        SPI_DI,
-
-	// scanlines (00-none 01-25% 10-50% 11-75%)
-	input  [1:0] scanlines,
-
-	// 0 = HVSync 31KHz, 1 = CSync 15KHz
-	input        scandoublerD,
-
-	// High quality 2x scaling
-	input        hq2x,
-
-	// YPbPr always uses composite sync
-	input        ypbpr,
-
-	// 0 = 16-240 range. 1 = 0-255 range. (only for YPbPr color space)
-	input        ypbpr_full,
-
-	// color
-	input [DWIDTH:0] R,
-	input [DWIDTH:0] G,
-	input [DWIDTH:0] B,
-
-	// Monochrome mode (for HALF_DEPTH only)
-	input            mono,
-
-	// interlace sync. Positive pulses.
-	input        HSync,
-	input        VSync,
-
-	// Falling of this signal means start of informative part of line.
-	// It can be horizontal blank signal.
-	// This signal can be used to reduce amount of required FPGA RAM for HQ2x scan doubler
-	// If FPGA RAM is not an issue, then simply set it to 0 for whole line processing.
-	// Keep in mind: due to algo first and last pixels of line should be black to avoid side artefacts.
-	// Thus, if blank signal is used to reduce the line, make sure to feed at least one black (or paper) pixel 
-	// before first informative pixel.
-	input        line_start,
-
-	// MiST video output signals
-	output [5:0] VGA_R,
-	output [5:0] VGA_G,
-	output [5:0] VGA_B,
-	output       VGA_VS,
-	output       VGA_HS
-);
-
-localparam DWIDTH = HALF_DEPTH ? 2 : 5;
-
-wire [DWIDTH:0] R_sd;
-wire [DWIDTH:0] G_sd;
-wire [DWIDTH:0] B_sd;
-wire hs_sd, vs_sd;
-
-scandoubler #(.LENGTH(LINE_LENGTH), .HALF_DEPTH(HALF_DEPTH)) scandoubler
-(
-	.*,
-	.hs_in(HSync),
-	.vs_in(VSync),
-	.r_in(R),
-	.g_in(G),
-	.b_in(B),
-
-	.hs_out(hs_sd),
-	.vs_out(vs_sd),
-	.r_out(R_sd),
-	.g_out(G_sd),
-	.b_out(B_sd)
-);
-
-wire [DWIDTH:0] rt  = (scandoublerD ? R : R_sd);
-wire [DWIDTH:0] gt  = (scandoublerD ? G : G_sd);
-wire [DWIDTH:0] bt  = (scandoublerD ? B : B_sd);
-
-generate
-	if(HALF_DEPTH) begin
-		wire [5:0] r  = mono ? {gt,rt} : {rt,rt};
-		wire [5:0] g  = mono ? {gt,rt} : {gt,gt};
-		wire [5:0] b  = mono ? {gt,rt} : {bt,bt};
-	end else begin
-		wire [5:0] r  = rt;
-		wire [5:0] g  = gt;
-		wire [5:0] b  = bt;
-	end
-endgenerate
-
-wire       hs = (scandoublerD ? HSync : hs_sd);
-wire       vs = (scandoublerD ? VSync : vs_sd);
-
-reg scanline = 0;
-always @(posedge clk_sys) begin
-	reg old_hs, old_vs;
-	
-	old_hs <= hs;
-	old_vs <= vs;
-	
-	if(old_hs && ~hs) scanline <= ~scanline;
-	if(old_vs && ~vs) scanline <= 0;
-end
-
-wire [5:0] r_out, g_out, b_out;
-always @(*) begin
-	case(scanlines & {scanline, scanline})
-		1: begin // reduce 25% = 1/2 + 1/4
-			r_out = {1'b0, r[5:1]} + {2'b00, r[5:2]};
-			g_out = {1'b0, g[5:1]} + {2'b00, g[5:2]};
-			b_out = {1'b0, b[5:1]} + {2'b00, b[5:2]};
-		end
-
-		2: begin // reduce 50% = 1/2
-			r_out = {1'b0, r[5:1]};
-			g_out = {1'b0, g[5:1]};
-			b_out = {1'b0, b[5:1]};
-		end
-
-		3: begin // reduce 75% = 1/4
-			r_out = {2'b00, r[5:2]};
-			g_out = {2'b00, g[5:2]};
-			b_out = {2'b00, b[5:2]};
-		end
-
-		default: begin
-			r_out = r;
-			g_out = g;
-			b_out = b;
-		end
-	endcase
-end
-
-wire [5:0] red, green, blue;
-osd #(OSD_X_OFFSET, OSD_Y_OFFSET, OSD_COLOR) osd
-(
-	.*,
-
-	.R_in(r_out),
-	.G_in(g_out),
-	.B_in(b_out),
-	.HSync(hs),
-	.VSync(vs),
-
-	.R_out(red),
-	.G_out(green),
-	.B_out(blue)
-);
-
-wire [5:0] yuv_full[225] = '{
-  6'd0,   6'd0,  6'd0,  6'd0,  6'd1,  6'd1,  6'd1,  6'd1,
-  6'd2,   6'd2,  6'd2,  6'd3,  6'd3,  6'd3,  6'd3,  6'd4,
-  6'd4,   6'd4,  6'd5,  6'd5,  6'd5,  6'd5,  6'd6,  6'd6,
-  6'd6,   6'd7,  6'd7,  6'd7,  6'd7,  6'd8,  6'd8,  6'd8,
-  6'd9,   6'd9,  6'd9,  6'd9, 6'd10, 6'd10, 6'd10, 6'd11,
-  6'd11, 6'd11, 6'd11, 6'd12, 6'd12, 6'd12, 6'd13, 6'd13,
-  6'd13, 6'd13, 6'd14, 6'd14, 6'd14, 6'd15, 6'd15, 6'd15,
-  6'd15, 6'd16, 6'd16, 6'd16, 6'd17, 6'd17, 6'd17, 6'd17,
-  6'd18, 6'd18, 6'd18, 6'd19, 6'd19, 6'd19, 6'd19, 6'd20,
-  6'd20, 6'd20, 6'd21, 6'd21, 6'd21, 6'd21, 6'd22, 6'd22,
-  6'd22, 6'd23, 6'd23, 6'd23, 6'd23, 6'd24, 6'd24, 6'd24,
-  6'd25, 6'd25, 6'd25, 6'd25, 6'd26, 6'd26, 6'd26, 6'd27,
-  6'd27, 6'd27, 6'd27, 6'd28, 6'd28, 6'd28, 6'd29, 6'd29,
-  6'd29, 6'd29, 6'd30, 6'd30, 6'd30, 6'd31, 6'd31, 6'd31,
-  6'd31, 6'd32, 6'd32, 6'd32, 6'd33, 6'd33, 6'd33, 6'd33,
-  6'd34, 6'd34, 6'd34, 6'd35, 6'd35, 6'd35, 6'd35, 6'd36,
-  6'd36, 6'd36, 6'd36, 6'd37, 6'd37, 6'd37, 6'd38, 6'd38,
-  6'd38, 6'd38, 6'd39, 6'd39, 6'd39, 6'd40, 6'd40, 6'd40,
-  6'd40, 6'd41, 6'd41, 6'd41, 6'd42, 6'd42, 6'd42, 6'd42,
-  6'd43, 6'd43, 6'd43, 6'd44, 6'd44, 6'd44, 6'd44, 6'd45,
-  6'd45, 6'd45, 6'd46, 6'd46, 6'd46, 6'd46, 6'd47, 6'd47,
-  6'd47, 6'd48, 6'd48, 6'd48, 6'd48, 6'd49, 6'd49, 6'd49,
-  6'd50, 6'd50, 6'd50, 6'd50, 6'd51, 6'd51, 6'd51, 6'd52,
-  6'd52, 6'd52, 6'd52, 6'd53, 6'd53, 6'd53, 6'd54, 6'd54,
-  6'd54, 6'd54, 6'd55, 6'd55, 6'd55, 6'd56, 6'd56, 6'd56,
-  6'd56, 6'd57, 6'd57, 6'd57, 6'd58, 6'd58, 6'd58, 6'd58,
-  6'd59, 6'd59, 6'd59, 6'd60, 6'd60, 6'd60, 6'd60, 6'd61,
-  6'd61, 6'd61, 6'd62, 6'd62, 6'd62, 6'd62, 6'd63, 6'd63,
-  6'd63
-};
-
-// http://marsee101.blog19.fc2.com/blog-entry-2311.html
-// Y  =  16 + 0.257*R + 0.504*G + 0.098*B (Y  =  0.299*R + 0.587*G + 0.114*B)
-// Pb = 128 - 0.148*R - 0.291*G + 0.439*B (Pb = -0.169*R - 0.331*G + 0.500*B)
-// Pr = 128 + 0.439*R - 0.368*G - 0.071*B (Pr =  0.500*R - 0.419*G - 0.081*B)
-
-wire [18:0]  y_8 = 19'd04096 + ({red, 8'd0} + {red, 3'd0}) + ({green, 9'd0} + {green, 2'd0}) + ({blue, 6'd0} + {blue, 5'd0} + {blue, 2'd0});
-wire [18:0] pb_8 = 19'd32768 - ({red, 7'd0} + {red, 4'd0} + {red, 3'd0}) - ({green, 8'd0} + {green, 5'd0} + {green, 3'd0}) + ({blue, 8'd0} + {blue, 7'd0} + {blue, 6'd0});
-wire [18:0] pr_8 = 19'd32768 + ({red, 8'd0} + {red, 7'd0} + {red, 6'd0}) - ({green, 8'd0} + {green, 6'd0} + {green, 5'd0} + {green, 4'd0} + {green, 3'd0}) - ({blue, 6'd0} + {blue , 3'd0});
-
-wire [7:0] y  = ( y_8[17:8] < 16) ? 8'd16 : ( y_8[17:8] > 235) ? 8'd235 :  y_8[15:8];
-wire [7:0] pb = (pb_8[17:8] < 16) ? 8'd16 : (pb_8[17:8] > 240) ? 8'd240 : pb_8[15:8];
-wire [7:0] pr = (pr_8[17:8] < 16) ? 8'd16 : (pr_8[17:8] > 240) ? 8'd240 : pr_8[15:8];
-
-assign VGA_R  = ypbpr ? (ypbpr_full ? yuv_full[pr-8'd16] : pr[7:2]) :   red;
-assign VGA_G  = ypbpr ? (ypbpr_full ? yuv_full[y -8'd16] :  y[7:2]) : green;
-assign VGA_B  = ypbpr ? (ypbpr_full ? yuv_full[pb-8'd16] : pb[7:2]) :  blue;
-assign VGA_VS = (scandoublerD | ypbpr) ? 1'b1 : ~vs_sd;
-assign VGA_HS = scandoublerD ? ~(HSync ^ VSync) : ypbpr ? ~(hs_sd ^ vs_sd) : ~hs_sd;
-
-endmodule
diff --git a/Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/rtl/whistle.vhd b/Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/rtl/whistle.vhd
index 5d79cef7..89b6eba1 100644
--- a/Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/rtl/whistle.vhd	
+++ b/Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/rtl/whistle.vhd	
@@ -25,7 +25,7 @@ generic(
 			constant Freq_tune : integer := 50 -- Value from 0-100 used to tune the overall whistle sound frequency
 			);
 port(		
-			clk_6				: in  std_logic;  
+			clk_12				: in  std_logic;  
 			Ena_3k			: in  std_logic;	-- Saves some logic since this signal is already used elsewhere
 			Whistle_trig	: in  std_logic;  -- Active-high trigger for whistle sound
 			Whistle_out		: out std_logic_vector(3 downto 0)	-- Whistle output 
@@ -44,11 +44,11 @@ begin
 -- downward as a capacitor discharges through a resistor. This simulates that functionality by
 -- incrementing a value on each cycle of ena_3k, this value is then used to alter the frequency
 -- of the whistle.
-RC_pitchbend: process(clk_6, ena_3k, Whistle_trig)
+RC_pitchbend: process(clk_12, ena_3k, Whistle_trig)
 begin
 	if Whistle_trig = '0' then
 		Pitch_bend <= 0;
-	elsif rising_edge(clk_6) then
+	elsif rising_edge(clk_12) then
 		if ena_3k = '1' then
 			if Pitch_bend < 30000 then
 				Pitch_bend <= pitch_bend + 1;
@@ -62,12 +62,12 @@ end process;
 -- the frequency. This is a constant which can be adjusted by changing the value of freq_tune, here a setting of
 -- 0 to 100 results in a ramp_term value ranging from 1000 to 3000 to simulate the function of the frequency 
 -- adjustment pot in the original hardware.
-Ramp_term <= 2800 - (20 * Freq_tune);
+Ramp_term <= (2800 - (20 * Freq_tune))*2;
 
 -- Variable frequency oscillator roughly approximating the function of a 555 astable oscillator
-Ramp_osc: process(clk_6, pitch_bend)
+Ramp_osc: process(clk_12, pitch_bend)
 begin
-	if rising_edge(clk_6) then
+	if rising_edge(clk_12) then
 		Ramp_count <= Ramp_count + 1;
 		if Ramp_count > Ramp_term + Pitch_bend / 2 then
 			Ramp_count <= 0;