Revert a failed attempt at modularizing. I'll need hard dependencies on
layman overlays.
.
Latest long-term nvidia driver causes problems