diff --git a/BOM.md b/BOM.md
index 458dfb8..c937c3d 100644
--- a/BOM.md
+++ b/BOM.md
@@ -4,33 +4,28 @@ XS Computer One - Apple 1 Replica Project
Table Of Contents
-----------------
-1. [Hardware Parts - Power Supply](#1)
- * [Power Transformers](#1-1)
- * [Rectifiers](#1-2)
- * [Capacitors](#1-3)
- * [Voltage Regulators](#1-4)
- * [Heatsinks](#1-5)
- * [Fuses](#1-6)
- * [Connectors](#1-7)
- * [Sockets](#1-8)
-2. [Hardware Parts - Terminal Section](#2)
- * [Capacitors](#2-1)
- * [Crystal](#2-2)
- * [TTL](#2-3)
- * [ICs](#2-4)
-2. [Hardware Parts - Processor Section](#3)
- * [Processor](#3-1)
- * [PIA](#3-2)
- * [Memory](#3-3)
- * [ROM](#3-4)
- * [TTL](#3-5)
-
+ 1. [Power Transformers](#1)
+ 2. [Voltage Regulators](#2)
+ 3. [Diodes](#3)
+ 4. [Capacitors](#4)
+ 5. [Resistors](#5)
+ 6. [Processor](#6)
+ 7. [PIA](#7)
+ 8. [Memory](#8)
+ 9. [ROM](#9)
+ 10. [TTL](#10)
+ 11. [ICs](#11)
+ 12. [Transistors](#12)
+ 13. [Crystal](#13)
+ 14. [Sockets](#14)
+ 15. [Heatsinks](#15)
+ 16. [Fuses](#16)
+ 17. [Connectors](#17)
+ 18. [Switches](#18)
+
-Hardware Parts - Power Supply
------------------------------
-
-
-### Power Transformers
+1 - Power Transformers
+----------------------
| Manufacturer | Part No. | Details | Alternative | Quantity | Found | Status |
|--------------|------------|-------------------------|-------------------------|----------|-------|--------|
@@ -43,31 +38,9 @@ Hardware Parts - Power Supply
[F-31X]: https://ch.mouser.com/Search/ProductDetail.aspx?R=F-31Xvirtualkey55310000virtualkey553-F-31X
[F40X]: https://ch.mouser.com/Search/ProductDetail.aspx?R=F40Xvirtualkey55310000virtualkey553-F40X
-
-### Rectifiers
-
-| Manufacturer | Part No. | Details | Alternative | Quantity | Found | Status |
-|-------------------------|----------|-------------------------|-----------------------|----------|-------|--------|
-| ??? | MR500 | 50 V / 3.0 A | Vishay [UF5400-E3/54] | 4 | Yes | - |
-| Fairchild Semiconductor | [1N4001] | 50 V / 1.0 A | N/A | 4 | Yes | - |
-
-[UF5400-E3/54]: https://ch.mouser.com/Search/ProductDetail.aspx?R=UF5400-E3%2f54virtualkey61370000virtualkey625-UF5400-E3
-[1N4001]: https://ch.mouser.com/Search/ProductDetail.aspx?R=1N4001virtualkey51210000virtualkey512-1N4001
-
-
-### Capacitors
-
-| Manufacturer | Part No. | Details | Alternative | Quantity | Found | Status |
-|--------------|------------------|-----------------------------------------------|-----------------------------------------------------|----------|-------|--------|
-| Sprague | 53D113G025JP6 | Radial Aluminum Electrolytic / 15 V - 5300 uF | ??? | 1 | Yes | - |
-| Sprague | 53D382G050JL6 | Radial Aluminum Electrolytic / 25 V - 2400 uF | ??? | 2 | Yes | - |
-| ??? | ??? | Radial Aluminum Electrolytic / 25 V - 22 uF | Vishay [MAL213826229E3] / Nichicon [TVX1E220MAD1LS] | 4 | Yes | - |
-
-[MAL213826229E3]: https://ch.mouser.com/Search/ProductDetail.aspx?R=MAL213826229E3virtualkey59420000virtualkey594-2222-138-26229
-[TVX1E220MAD1LS]: https://ch.mouser.com/Search/ProductDetail.aspx?R=TVX1E220MAD1LSvirtualkey64700000virtualkey647-TVX1E220MAD1LS
-
-
-### Voltage Regulators
+
+2 - Voltage Regulators
+----------------------
| Manufacturer | Part No. | Details | Alternative | Quantity | Found | Status |
|------------------------|------------------|--------------------------|------------------------------------|----------|-------|--------|
@@ -81,84 +54,111 @@ Hardware Parts - Power Supply
[LM7912CT]: https://ch.mouser.com/Search/ProductDetail.aspx?R=LM7912CTvirtualkey51210000virtualkey512-LM7912CT
[LM7812CT]: https://ch.mouser.com/Search/ProductDetail.aspx?R=LM7812CTvirtualkey51210000virtualkey512-LM7812CT
-
-### Heatsinks
+
+3 - Diodes
+--------------
-| Manufacturer | Part No. | Details | Alternative | Quantity | Found | Status |
-|--------------|------------|---------|---------------|----------|-------|--------|
-| Wakefield | [680-125A] | 1.5 C/W | N/A | 1 | Yes | - |
+| Manufacturer | Part No. | Details | Alternative | Quantity | Found | Status |
+|-------------------------|----------|----------------------|-----------------------|----------|-------|--------|
+| ??? | MR500 | 50 V / 3.0 A / DO-27 | Vishay [UF5400-E3/54] | 4 | Yes | - |
+| Fairchild Semiconductor | [1N4001] | 50 V / 1.0 A / DO-41 | N/A | 4 | Yes | - |
+| Fairchild Semiconductor | [1N914] | 0.3 A / DO-35 | N/A | 4 | Yes | - |
-[680-125A]: https://ch.mouser.com/Search/ProductDetail.aspx?R=680-125Avirtualkey56720000virtualkey567-680-125A
+[UF5400-E3/54]: https://ch.mouser.com/Search/ProductDetail.aspx?R=UF5400-E3%2f54virtualkey61370000virtualkey625-UF5400-E3
+[1N4001]: https://ch.mouser.com/Search/ProductDetail.aspx?R=1N4001virtualkey51210000virtualkey512-1N4001
+[1N914]: https://ch.mouser.com/Search/ProductDetail.aspx?R=1N914virtualkey51210000virtualkey512-1N914
-
-### Fuses
+
+4 - Capacitors
+--------------
-| Manufacturer | Part No. | Details | Alternative | Quantity | Found | Status |
-|--------------|----------|---------------------------------------------|---------------|----------|-------|--------|
-| Littelfuse | 0312.500 | Axial Glass / 3AG Slow Blow / 125 V - 0.5 A | ??? | 1 | Yes | - |
+| Manufacturer | Part No. | Details | Alternative | Quantity | Found | Status |
+|--------------|------------------|-------------------------------------------------|-----------------------------------------------------|----------|-------|--------|
+| Sprague | 53D113G025JP6 | Axial / Aluminum Electrolytic / 15 V - 5300 uF | ??? | 1 | Yes | - |
+| Sprague | 53D382G050JL6 | Axial / Aluminum Electrolytic / 25 V - 2400 uF | ??? | 2 | Yes | - |
+| ??? | ??? | Axial / Aluminum Electrolytic / 25 V - 22 uF | Vishay [MAL213826229E3] / Nichicon [TVX1E220MAD1LS] | 5 | Yes | - |
+| ??? | ??? | Radial / Mica / 47pf | ??? | 1 | No | - |
+| ??? | ??? | Radial / Ceramic Disc / 0.001 uF | ??? | 1 | No | - |
+| ??? | ??? | Radial / Ceramic Disc / 0.01 uF | ??? | 4 | No | - |
+| ??? | ??? | Radial / Ceramic Disc / 1.0 uF | ??? | 17 | No | - |
-
-### Connectors
+[MAL213826229E3]: https://ch.mouser.com/Search/ProductDetail.aspx?R=MAL213826229E3virtualkey59420000virtualkey594-2222-138-26229
+[TVX1E220MAD1LS]: https://ch.mouser.com/Search/ProductDetail.aspx?R=TVX1E220MAD1LSvirtualkey64700000virtualkey647-TVX1E220MAD1LS
-| Manufacturer | Part No. | Details | Alternative | Quantity | Found | Status |
-|--------------|--------------|-------------------------|-------------|----------|-------|--------|
-| Molex | [09-50-1041] | 6-Pin Connector / Power | N/A | 1 | Yes | - |
-| Molex | [09-50-1061] | 4-Pin Connector / Video | N/A | 1 | Yes | - |
-| Cinch | 50-44S-30-1 | 44-Pin Connector / Edge | ??? | 1 | No | - |
+
+5 - Resistors
+-------------
-[09-50-1061]: https://ch.mouser.com/Search/ProductDetail.aspx?R=09-50-1061virtualkey53810000virtualkey538-09-50-1061
-[09-50-1041]: https://ch.mouser.com/Search/ProductDetail.aspx?R=09-50-1041virtualkey53810000virtualkey538-09-50-1041
+| Manufacturer | Part No. | Details | Alternative | Quantity | Found | Status |
+|--------------|----------|-----------------------------------|-------------|----------|-------|--------|
+| ??? | ??? | Axial / 330 Ohms / 1/4 W | ??? | 1 | No | - |
+| ??? | ??? | Axial / 390 Ohms / 1/4 W | ??? | 2 | No | - |
+| ??? | ??? | Axial / 1.5k Ohms / 1/4 W | ??? | 1 | No | - |
+| ??? | ??? | Axial / 3.0k Ohms / 1/4 W | ??? | 12 | No | - |
+| ??? | ??? | Axial / 7.5k Ohms / 1/4 W | ??? | 6 | No | - |
+| ??? | ??? | Axial / 10.0k Ohms / 1/4 W | ??? | 3 | No | - |
+| ??? | ??? | Axial / 27k Ohms / 1/4 W | ??? | 1 | No | - |
+| ??? | ??? | Adjustable Single Turn / 100 Ohms | ??? | 1 | No | - |
-
-### Sockets
+
+6 - Processor
+-------------
-| Manufacturer | Part No. | Details | Alternative | Quantity | Found | Status |
-|--------------|----------|-----------------------------------------|-------------|----------|-------|--------|
-| ??? | ??? | 8-Pin DIP Socket / Wire Wrap / Keyboard | N/A | 1 | Yes | - |
+| Manufacturer | Part No. | Details | Alternative | Quantity | Found | Status |
+|----------------|----------|---------|---------------|----------|-------|--------|
+| MOS Technology | 6502 | 1 MHz | ??? | 1 | Yes | - |
-
-Hardware Parts - Terminal Section
----------------------------------
+
+7 - PIA
+-------
-
-### Capacitors
+| Manufacturer | Part No. | Details | Alternative | Quantity | Found | Status |
+|--------------|----------|------------------------------|---------------|----------|-------|--------|
+| Motorola | MC6820L | Peripheral Interface Adapter | ??? | 1 | Yes | - |
-| Manufacturer | Part No. | Details | Alternative | Quantity | Found | Status |
-|--------------|------------------|-----------------------------------------------|-----------------------------------------------------|----------|-------|--------|
-| ??? | ??? | Radial Aluminum Electrolytic / 25 V - 22 uF | Vishay [MAL213826229E3] / Nichicon [TVX1E220MAD1LS] | 1 | Yes | - |
+
+8 - Memory
+----------
-
-### Crystal
+| Manufacturer | Part No. | Details | Alternative | Quantity | Found | Status |
+|--------------|----------|---------|---------------|----------|-------|--------|
+| ??? | MK4096 | 4K RAM | ??? | 16 | Yes | - |
-| Manufacturer | Part No. | Details | Alternative | Quantity | Found | Status |
-|--------------|----------------|------------------------|---------------|----------|-------|--------|
-| ECS | [ECS-143-S-1X] | HC-49/U / 14.31818 MHz | N/A | 1 | Yes | - |
+
+9 - ROM
+-------
-[ECS-143-S-1X]: https://ch.mouser.com/Search/ProductDetail.aspx?R=ECS-143-S-1Xvirtualkey59070000virtualkey520-HCA1431-SX
+| Manufacturer | Part No. | Details | Alternative | Quantity | Found | Status |
+|--------------|----------|--------------|---------------------------------|----------|-------|--------|
+| Intel | 3601 | Bipolar PROM | Signetics 82S129 / Harris H1024 | 2 | Yes | - |
-
-### TTL
+
+10 - TTL
+--------
| Manufacturer | Part No. | Details | Alternative | Quantity | Found | Status |
|-------------------|----------|----------------------------------------------------------------------------------------|-------------|----------|-------|--------|
| Texas Instruments | 7400 | Quadruple 2-Input NAND Gate | ??? | 3 | Yes | - |
| Texas Instruments | 7402 | Quadruple 2-Input NOR Gate | ??? | 1 | Yes | - |
-| Texas Instruments | 7404 | Hex Inverter | ??? | 2 | Yes | - |
+| Texas Instruments | 7404 | Hex Inverter | ??? | 1 | Yes | - |
| Texas Instruments | 7408 | Quadruple 2-Input AND Gate | ??? | 1 | Yes | - |
| Texas Instruments | 7410 | Triple 3-Input NAND Gate | ??? | 2 | Yes | - |
| Texas Instruments | 7427 | Triple 3-Input NOR Gate | ??? | 1 | Yes | - |
| Texas Instruments | 7432 | Quadruple 2-Input OR Gate | ??? | 1 | Yes | - |
| Texas Instruments | 7450 | Dual 2-Wide 2-Input AND-OR-Invert Gate (One Gate Expandable) | ??? | 1 | Yes | - |
| Texas Instruments | 74123 | Dual Retriggerable Monostable Multivibrator With Clear | ??? | 1 | Yes | - |
+| Texas Instruments | 74154 | 4-Line To 16-Line Decoder/Demultiplexer | ??? | 1 | Yes | - |
| Texas Instruments | 74157 | Quadruple 2-Line to 1-Line Data Selector/Multiplexer (Noninverting) | ??? | 2 | Yes | - |
| Texas Instruments | 74160 | Synchronous 4-bit Decade Counter With Asynchronous Clear | ??? | 1 | Yes | - |
| Texas Instruments | 74161 | Synchronous 4-bit Binary Counter With Asynchronous Clear | ??? | 5 | Yes | - |
| Texas Instruments | 74166 | Parallel-Load 8-bit Shift Register | ??? | 1 | Yes | - |
| Texas Instruments | 74174 | Hex D Flip-Flop With Common Clear | ??? | 1 | Yes | - |
| Texas Instruments | 74175 | Quadruple D Edge-Triggered Flip-Flop With Complementary Outputs And Asynchronous Clear | ??? | 1 | Yes | - |
+| Texas Instruments | 74S257 | Quadruple 2-Line Data Selector/Multiplexer (3-State) | ??? | 4 | Yes | - |
-
-### ICs
+
+11 - ICs
+--------
| Manufacturer | Part No. | Details | Alternative | Quantity | Found | Status |
|----------------|---------------|------------------------------------------|---------------|----------|-------|--------|
@@ -169,45 +169,74 @@ Hardware Parts - Terminal Section
| ??? | 555 | Timer | ??? | 1 | Yes | - |
| ??? | DS0025 | Dual Clock Driver | ??? | 1 | Yes | - |
-
-Hardware Parts - Processor Section
-----------------------------------
+
+12 - Transistors
+----------------
-
-### Processor
+| Manufacturer | Part No. | Details | Alternative | Quantity | Found | Status |
+|--------------|----------|--------------------------------|---------------------------------|----------|-------|--------|
+| ??? | ??? | NPN Bipolar Transistor / TO-92 | Central Semiconductor [MPS3704] | 1 | Yes | - |
-| Manufacturer | Part No. | Details | Alternative | Quantity | Found | Status |
-|----------------|----------|---------|---------------|----------|-------|--------|
-| MOS Technology | 6502 | | ??? | 1 | Yes | - |
+[MPS3704]: https://ch.mouser.com/Search/ProductDetail.aspx?R=MPS3704virtualkey61000000virtualkey610-MPS3704
-
-### PIA
+
+13 - Crystal
+------------
-| Manufacturer | Part No. | Details | Alternative | Quantity | Found | Status |
-|--------------|----------|------------------------------|---------------|----------|-------|--------|
-| Motorola | MC6820L | Peripheral Interface Adapter | ??? | 1 | Yes | - |
+| Manufacturer | Part No. | Details | Alternative | Quantity | Found | Status |
+|--------------|----------|------------------------|--------------------|----------|-------|--------|
+| ??? | ??? | HC-49/U / 14.31818 MHz | ECS [ECS-143-S-1X] | 1 | Yes | - |
-
-### Memory
+[ECS-143-S-1X]: https://ch.mouser.com/Search/ProductDetail.aspx?R=ECS-143-S-1Xvirtualkey59070000virtualkey520-HCA1431-SX
-| Manufacturer | Part No. | Details | Alternative | Quantity | Found | Status |
-|--------------|----------|---------|---------------|----------|-------|--------|
-| ??? | MK4096 | 4K RAM | ??? | 16 | Yes | - |
+
+14 - Sockets
+------------
-
-### ROM
+| Manufacturer | Part No. | Details | Alternative | Quantity | Found | Status |
+|--------------|----------|-----------------------------------------|-------------|----------|-------|--------|
+| ??? | ??? | 8-Pin DIP Socket / Wire Wrap / Keyboard | N/A | 1 | Yes | - |
-| Manufacturer | Part No. | Details | Alternative | Quantity | Found | Status |
-|--------------|----------|--------------|---------------------------------|----------|-------|--------|
-| Intel | 3601 | Bipolar PROM | Signetics 82S129 / Harris H1024 | 2 | Yes | - |
+
+15 - Heatsinks
+--------------
-
-### TTL
+| Manufacturer | Part No. | Details | Alternative | Quantity | Found | Status |
+|--------------|------------|---------|---------------|----------|-------|--------|
+| Wakefield | [680-125A] | 1.5 C/W | N/A | 1 | Yes | - |
-| Manufacturer | Part No. | Details | Alternative | Quantity | Found | Status |
-|-------------------|----------|------------------------------------------------------|-------------|----------|-------|--------|
-| Texas Instruments | 74154 | 4-Line To 16-Line Decoder/Demultiplexer | ??? | 1 | Yes | - |
-| Texas Instruments | 74S257 | Quadruple 2-Line Data Selector/Multiplexer (3-State) | ??? | 4 | Yes | - |
+[680-125A]: https://ch.mouser.com/Search/ProductDetail.aspx?R=680-125Avirtualkey56720000virtualkey567-680-125A
+
+
+16 - Fuses
+----------
+
+| Manufacturer | Part No. | Details | Alternative | Quantity | Found | Status |
+|--------------|----------|---------------------------------------------|---------------|----------|-------|--------|
+| Littelfuse | 0312.500 | Axial Glass / 3AG Slow Blow / 125 V - 0.5 A | ??? | 1 | Yes | - |
+
+
+17 - Connectors
+---------------
+
+| Manufacturer | Part No. | Details | Alternative | Quantity | Found | Status |
+|--------------|--------------|-------------------------|-------------|----------|-------|--------|
+| Molex | [09-50-1041] | 6-Pin Connector / Power | N/A | 1 | Yes | - |
+| Molex | [09-50-1061] | 4-Pin Connector / Video | N/A | 1 | Yes | - |
+| Cinch | 50-44S-30-1 | 44-Pin Connector / Edge | ??? | 1 | No | - |
+
+[09-50-1061]: https://ch.mouser.com/Search/ProductDetail.aspx?R=09-50-1061virtualkey53810000virtualkey538-09-50-1061
+[09-50-1041]: https://ch.mouser.com/Search/ProductDetail.aspx?R=09-50-1041virtualkey53810000virtualkey538-09-50-1041
+
+
+18 - Switches
+-------------
+
+| Manufacturer | Part No. | Details | Alternative | Quantity | Found | Status |
+|----------------------|----------|---------------|---------------------------------------|----------|-------|--------|
+| Carling Technologies | ??? | On/Off Switch | Carling Technologies [62116919-0-9-V] | 1 | Yes | - |
+
+[62116919-0-9-V]: https://ch.mouser.com/Search/ProductDetail.aspx?R=62116919-0-9-Vvirtualkey69100000virtualkey691-62116919-0-9-V
Repository Infos
----------------