I love the idea of System76. But the low budget keyboards on their rebranded hardware don’t do it for me. I heard they planned to manufacture their own machine

I love the idea of System76. But the low budget keyboards on their rebranded hardware don’t do it for me. I heard they planned to manufacture their own machines recently, but I’d rather buy a ThinkPad for the awesome keyboard than gamble on whatever keyboard they’re using now.