11 files changed, 131 insertions, 93 deletions

diff --git a/_sfp_cage/digitus-10gbps-dn-82211.md b/_sfp_cage/digitus-10gbps-dn-82211.md
index d2d3a52..21acd88 100644
--- a/_sfp_cage/digitus-10gbps-dn-82211.md
+++ b/_sfp_cage/digitus-10gbps-dn-82211.md
@@ -7,14 +7,15 @@ layout: default
 
 # Hardware Specifications
 
-|        |                              |
-| ------ | ---------------------------- |
-| Vendor | DIGITUS                      |
-| Model  | 10Gbps DN-82211              |
-| SFP    | 1 SFP+                       |
-| XGMII  | ✅ (only if eth is 10 Gbps)  |
-| HSGMII | ✅ (only if eth is 2.5 Gbps) |
-| SGMII  | ✅ (only if eth is 1 Gbps)   |
-| Type   | Media Converter              |
+|          |                              |
+| -------- | ---------------------------- |
+| Vendor   | DIGITUS                      |
+| Model    | 10Gbps DN-82211              |
+| SFP      | 1 SFP+                       |
+| Ethernet | 1 10GbE Multigig             |
+| XGMII    | ✅ (only if eth is 10 Gbps)  |
+| HSGMII   | ✅ (only if eth is 2.5 Gbps) |
+| SGMII    | ✅ (only if eth is 1 Gbps)   |
+| Type     | Media Converter              |
 
 - [Come avere i 2.5 Gbps su un unico dispositivo senza il Fastgate](https://forum.fibra.click/d/17836-come-avere-i-25-gbps-su-un-unico-dispositivo-senza-il-fastgate)
diff --git a/_sfp_cage/fiberethernet-media-converter-2.5.md b/_sfp_cage/fiberethernet-media-converter-2.5.md
index b697cea..a9da2c3 100644
--- a/_sfp_cage/fiberethernet-media-converter-2.5.md
+++ b/_sfp_cage/fiberethernet-media-converter-2.5.md
@@ -6,14 +6,21 @@ layout: default
 
 # Hardware Specifications
 
-|        |                              |
-| ------ | ---------------------------- |
-| Vendor | FiberEthernet                |
-| Model  | Media Converter 2.5          |
-| SFP    | 1 SFP+                       |
-| XGMII  | No                           |
-| HSGMII | ✅ (only if eth is 2.5 Gbps) |
-| SGMII  | ✅ (only if eth is 1 Gbps)   |
-| Type   | Media Converter              |
+|          |                               |
+| -------- | ----------------------------- |
+| Vendor   | FiberEthernet                 |
+| Model    | Media Converter 2.5 (Realtek) |
+| SFP      | 1 2.5 SFP                     |
+| Ethernet | 1 2.5GbE                      |
+| XGMII    | No                            |
+| HSGMII   | ✅ (only if eth is 2.5 Gbps)  |
+| SGMII    | ✅ (only if eth is 1 Gbps)    |
+| Type     | Media Converter               |
+
+{% include image.html file="mc-2.5-schemas.png" alt="MC 2.5 Schematic diagram of functionality" caption="MC 2.5 Schematic diagram of functionality" %}
+{% include image.html file="mc-2.5-tetris.png" alt="MC 2.5 in operation" caption="MC 2.5 in operation" %}
+
+
+
 
 - [2.5G Fiber Optic Media Converter Gigabit SFP Transceiver 1000Mbps Compatible With Common E/GPON](https://aliexpress.com/item/1005004340369253.html)
diff --git a/_sfp_cage/macchiatobin.md b/_sfp_cage/macchiatobin.md
index f6fe97e..544c156 100644
--- a/_sfp_cage/macchiatobin.md
+++ b/_sfp_cage/macchiatobin.md
@@ -7,15 +7,16 @@ layout: default
 
 # Hardware Specifications
 
-|        |                        |
-| ------ | ---------------------- |
-| Vendor | MACCHIATObin           |
-| Model  | Single Slot, Dual Shot |
-| SFP    | 2 SFP+, 1 SFP 2.5      |
-| XGMII  | ✅                     |
-| HSGMII | ✅                     |
-| SGMII  | ✅                     |
-| Type   | Switch                 |
+|          |                                                |
+| -------- | ---------------------------------------------- |
+| Vendor   | MACCHIATObin                                   |
+| Model    | Single Slot, Dual Shot                         |
+| SFP      | 2 SFP+, 1 SFP 2.5                              |
+| Ethernet | 2 10GbE Multigig, 1 2.5GbE (only on Dual Shot) |
+| XGMII    | ✅                                             |
+| HSGMII   | ✅                                             |
+| SGMII    | ✅                                             |
+| Type     | Router                                         |
 
 
 - [Come avere i 2.5 Gbps su un unico dispositivo senza il Fastgate](https://forum.fibra.click/d/17836-come-avere-i-25-gbps-su-un-unico-dispositivo-senza-il-fastgate)
diff --git a/_sfp_cage/mikrotik-ccr-2004.md b/_sfp_cage/mikrotik-ccr-2004.md
index dc9bf54..af9a8ce 100644
--- a/_sfp_cage/mikrotik-ccr-2004.md
+++ b/_sfp_cage/mikrotik-ccr-2004.md
@@ -1,19 +1,5 @@
 ---
-title: Mikrotik CCR2004-1G-12S+2XS	
+title: MikroTik Router CCR2004-1G-12S+2XS
 has_children: false
 layout: default
----
-
-# Hardware Specifications
-
-|        |                 |
-| ------ | --------------- |
-| Vendor | Mikrotik        |
-| Model  | CCR2004-1G-12S+2XS	 |
-| SFP    | 2 SFP+          |
-| XGMII  | ✅              |
-| HSGMII | ✅              |
-| SGMII  | ✅              |
-| Type   | Router          |
-
-- [2.5Gb Compatibility](https://github.com/Anime4000/RTL960x/blob/main/Docs/2.5Gb.md)
\ No newline at end of file
+redirect_to: /mikrotik
\ No newline at end of file
diff --git a/_sfp_cage/mikrotik-crs-305.md b/_sfp_cage/mikrotik-crs-305.md
index 3ade9bf..ec2d093 100644
--- a/_sfp_cage/mikrotik-crs-305.md
+++ b/_sfp_cage/mikrotik-crs-305.md
@@ -1,36 +1,6 @@
 ---
-title: Mikrotik CRS305-1G-4S+IN
+title: MikroTik CRS305-1G-4S+IN
 has_children: false
 layout: default
----
-
-# Hardware Specifications
-
-|        |                 |
-| ------ | --------------- |
-| Vendor | Mikrotik        |
-| Model  | CRS305-1G-4S+IN |
-| SFP    | 4 SFP+          |
-| XGMII  | ✅              |
-| HSGMII | ✅              |
-| SGMII  | ✅              |
-| Type   | Switch          |
-
-## Bridge Mode
-
-Bridge mode allows full HSGMII speed without any major issues and seems to work in a mixed mode too.
-
-Positive results in mixed mode with the following hardware:
-
-|    | Huawei MA5671A |
-|----|----------------|
-| [6COM 6C-SFP-10G-T-Intel](https://www.amazon.it/gp/product/B07H9Q91WV/) | ✅ |
-
-## Router Mode
-
-Unfortunately the CPU will have a major impact on end performance with resulting downlink speed topping at ~700Mbps.
-
-Note that when using **Huawei MA5671A with right.com.cn firmware** on a Fastweb Italy IPoE connection you may run into some issues since no VLANs are used. The ONT responds to DHCP requests with **a 802.1Q tag for VLAN 0**, which should be properly handled by bridging properly the WAN as well. Other providers that do rely on VLANs such as 835 won't probably need to resort to the this workaround.
-
-- [2.5Gb Compatibility](https://github.com/Anime4000/RTL960x/blob/main/Docs/2.5Gb.md)
-- [CRS305 Fastweb Italy SFP Router Mode](https://pastebin.com/zRaidTx4)
+redirect_to: /mikrotik
+---
\ No newline at end of file
diff --git a/_sfp_cage/mikrotik.md b/_sfp_cage/mikrotik.md
new file mode 100644
index 0000000..f7e63d0
--- /dev/null
+++ b/_sfp_cage/mikrotik.md
@@ -0,0 +1,44 @@
+---
+title: MikroTik RB5009, CRS305-1G-4S+IN, CCR2004-1G-12S+2XS, CCR2116-12G-4S+	
+has_children: false
+layout: default
+---
+
+# Hardware Specifications
+
+|          | RB5009          | CRS305-1G-4S+IN | CCR2004-1G-12S+2XS | CCR2116-12G-4S+ |
+| -------- | --------------- | --------------- | ------------------ | --------------- |
+| Vendor   | MikroTik        |                 |                    |                 |
+| Model    | RB5009          | CRS305-1G-4S+IN | CCR2004-1G-12S+2XS | CCR2116-12G-4S+ |
+| SFP      | 1 SFP+          | 4 SFP+          | 12 SFP+, 2 SFP28   | 4 SFP+          |
+| Ethernet | 1 2.5GbE, 7 GbE | 1 GbE           | 1 GbE              | 13 GbE          |
+| XGMII    | ✅              | ✅              | ✅                 | ✅              |
+| HSGMII   | ✅              | ✅              | ✅                 | ✅              |
+| SGMII    | ✅              | ✅              | ✅                 | ✅              |
+| Type     | Switch          | Switch          | Switch             | Switch          |
+
+# CRS305-1G-4S+IN
+
+## Bridge Mode
+
+Bridge mode allows full HSGMII speed without any major issues and seems to work in a mixed mode too.
+
+Positive results in mixed mode with the following hardware:
+
+|                                                                         | Huawei MA5671A |
+| ----------------------------------------------------------------------- | -------------- |
+| [6COM 6C-SFP-10G-T-Intel](https://www.amazon.it/gp/product/B07H9Q91WV/) | ✅             |
+
+In any case, the use of a DAC or MikroTik S+RJ10 is always recommended.
+
+
+## Router Mode
+
+Unfortunately the CPU will have a major impact on end performance with resulting downlink speed topping at ~700Mbps.
+
+Note that when using **Huawei MA5671A with right.com.cn firmware** on a Fastweb Italy IPoE connection you may run into some issues since no VLANs are used. The ONT responds to DHCP requests with **a 802.1Q tag for VLAN 0**, which should be properly handled by bridging properly the WAN as well. Other providers that do rely on VLANs such as 835 won't probably need to resort to the this workaround.
+
+- [2.5Gb Compatibility](https://github.com/Anime4000/RTL960x/blob/main/Docs/2.5Gb.md)
+- [CRS305 Fastweb Italy SFP Router Mode](https://pastebin.com/zRaidTx4)
+- [@stich86 tweaks](https://github.com/Anime4000/RTL960x/issues/17#issuecomment-1101435506)
+- [Mikrotik changelogs](https://mikrotik.com/download/changelogs)
diff --git a/_sfp_cage/tp-link.md b/_sfp_cage/tp-link.md
new file mode 100644
index 0000000..f102395
--- /dev/null
+++ b/_sfp_cage/tp-link.md
@@ -0,0 +1,22 @@
+---
+title: TP-Link Router TL-XDR5480, TL-ER2260T 
+has_children: false
+layout: default
+---
+
+
+# Hardware Specifications
+
+|          | TL-XDR5480 | TL-ER2260T -- |
+| -------- | ---------- | ------------- |
+| Vendor   | TP-Link    | TP-Link       |
+| Model    | TL-XDR5480 | TL-ER2260T    |
+| SFP      | 1 SFP 2.5  | 2 SFP+        |
+| Ethernet | 4 2.5GbE   | 4 GbE         |
+| XGMII    | No         | ✅            |
+| HSGMII   | ✅         | ✅            |
+| SGMII    | ✅         | ✅            |
+| Type     | Router     | VPN Router    |
+
+
+- [2.5Gb Compatibility](https://github.com/Anime4000/RTL960x/blob/main/Docs/2.5Gb.md)
diff --git a/_sfp_cage/ubiquiti-switch.md b/_sfp_cage/ubiquiti-switch.md
index 3ef9854..10214d7 100644
--- a/_sfp_cage/ubiquiti-switch.md
+++ b/_sfp_cage/ubiquiti-switch.md
@@ -1,21 +1,6 @@
 ---
-title: Ubiquiti Switch
+title: Ubiquiti UniFi Switch
 has_children: false
 alias: EdgeSwitch ES-16-XG, UniFi US-16-XG, UniFi US-XG-6POE
 layout: default
----
-
-# Hardware Specifications
-
-|        |                      |
-| ------ | -------------------- |
-| Vendor | Ubiquiti             |
-| Model  | EdgeSwitch ES-16-XG, UniFi US-16-XG, UniFi US-XG-6POE                |
-| SFP    | 16 or 6 SFP+               | 
-| XGMII  | ✅                   |
-| HSGMII | ✅                   |
-| SGMII  | ✅                   |
-| Type   | Switch |
-
-
-- [Come avere i 2.5 Gbps su un unico dispositivo senza il Fastgate](https://forum.fibra.click/d/17836-come-avere-i-25-gbps-su-un-unico-dispositivo-senza-il-fastgate)
\ No newline at end of file
+redirect_to: /ubiquiti
\ No newline at end of file
diff --git a/_sfp_cage/ubiquiti.md b/_sfp_cage/ubiquiti.md
new file mode 100644
index 0000000..719582c
--- /dev/null
+++ b/_sfp_cage/ubiquiti.md
@@ -0,0 +1,22 @@
+---
+title: Ubiquiti UniFi Switch
+has_children: false
+alias: EdgeSwitch ES-16-XG, UniFi US-16-XG, UniFi US-XG-6POE
+layout: default
+---
+
+# Hardware Specifications
+
+|          | EdgeSwitch ES-16-XG   | UniFi US-16-XG        | UniFi US-XG-6POE |
+| -------- | --------------------- | --------------------- | ---------------- |
+| Vendor   | Ubiquiti              | Ubiquiti              | Ubiquiti         |
+| Model    | EdgeSwitch ES-16-XG   | UniFi US-16-XG        | UniFi US-XG-6POE |
+| SFP      | 12                    | 16                    | 2 SFP+           |
+| Ethernet | 4 10GbE (No Multigig) | 4 10GbE (No Multigig) | 4 10GbE          |
+| XGMII    | ✅                    | ✅                    | ✅               |
+| HSGMII   | ✅                    | ✅                    | ✅               |
+| SGMII    | ✅                    | ✅                    | ✅               |
+| Type     | Switch                | Switch                | Switch           |
+
+
+- [Come avere i 2.5 Gbps su un unico dispositivo senza il Fastgate](https://forum.fibra.click/d/17836-come-avere-i-25-gbps-su-un-unico-dispositivo-senza-il-fastgate)
\ No newline at end of file
diff --git a/assets/img/mc-2.5-schemas.png b/assets/img/mc-2.5-schemas.png
new file mode 100644
index 0000000..eb51954
--- /dev/null
+++ b/assets/img/mc-2.5-schemas.png
diff --git a/assets/img/mc-2.5-tetris.png b/assets/img/mc-2.5-tetris.png
new file mode 100644
index 0000000..31bae2a
--- /dev/null
+++ b/assets/img/mc-2.5-tetris.png