Backport of classic theme

Attempt at backporting the classic theme from master. Here for shadowm's review.