Adds preliminary support for "themes;" bug fixes.