diff --git a/🔧-Tools.md b/🔧-Tools.md
index 3a546e41..ad714459 100644
--- a/🔧-Tools.md
+++ b/🔧-Tools.md
@@ -726,7 +726,7 @@
 * [Candor](https://candor.co/hiring-freezes/) - Hiring Freezes
 * [GoodJobsFirst](https://www.goodjobsfirst.org/) - Subsidy Tracker
 * [Collaboration Platforms](https://www.reddit.com/r/FREEMEDIAHECKYEAH/wiki/storage#wiki_collaboration_platforms) - Project Management Tools
-* [Airtable](https://www.airtable.com/) or [API Table](https://apitable.com/) - Build Collaborative Apps
+* [Airtable](https://www.airtable.com/) or [API Table](https://apitable.com/) / [GitHub](https://github.com/apitable/apitable) - Build Collaborative Apps
 * [PolyWork](https://www.polywork.com/) - Collaboration Search
 * [PHPCRM](https://www.phpcrm.com/) - Company Management Software
 * [SplitBee](https://splitbee.io/) - Business Analytics Tool
@@ -1784,6 +1784,7 @@ Twitch Stream Tracker
 # ► System Tools
 
 * ⭐ **[PC Building / Shopping](https://www.reddit.com/r/FREEMEDIAHECKYEAH/wiki/misc#wiki_.25BA_shopping)** - Compare Systems and Parts
+* ⭐ **[MechMap](https://www.mechmap.tech/)** / [Guide](https://mechkeys.me/) / [Discord](https://discord.com/invite/mechkeys) - Mechanical Keyboard Recommendations
 * ⭐ **[Windows Piracy Guides](https://github.com/nbats/FMHYedit/blob/main/base64.md#windows-piracy-guides)** - How-to Pirate Windows
 * ⭐ **[Windows ISOs](https://www.reddit.com/r/FREEMEDIAHECKYEAH/wiki/storage#wiki_windows_iso)** - Download Windows
 * ⭐ **[Windows Activators](https://www.reddit.com/r/FREEMEDIAHECKYEAH/wiki/storage#wiki_windows_activation)** - Windows Activation Guides / Scripts / [Rentry](https://rentry.co/win-activate)
@@ -1991,7 +1992,6 @@ Twitch Stream Tracker
 * [Menu11](https://github.com/prateekmedia/Menu11) - Windows 11 Style Launcher
 * [DreyMaR's](https://dreymar.colemak.org/) - Keyboard Tips and Resources
 * [Keyboard University](https://keyboard.university/) or [KDB](http://xahlee.info/kbd/keyboarding.html) - Mechanical Keyboard Building Guides
-* [MechMap](https://www.mechmap.tech/) - Mechanical Keyboard Recommendations
 * [NeatMouse](https://neatdecisions.com/products/neatmouse/) - Mouse / Keyboard Emulator
 * [Keyboard Simulator](https://keyboardsimulator.xyz/) - Design & Test Virtual Keyboards 
 * [WinCompose](http://wincompose.info/) - Windows Special Character Compose Key / [GitHub](https://github.com/samhocevar/wincompose)
@@ -2389,4 +2389,4 @@ Twitch Stream Tracker
 
 ***
 
-## ▷ [iOS Tools](https://www.reddit.com/r/FREEMEDIAHECKYEAH/wiki/android#wiki_.25BA_ios_tools)
\ No newline at end of file
+## ▷ [iOS Tools](https://www.reddit.com/r/FREEMEDIAHECKYEAH/wiki/android#wiki_.25BA_ios_tools)