Budspencer theme improvements

Changes to keep command history clean