Merge: Buff redstone mod, refactor broad tools to match

Closes #925