Unfinished changes to main theme files.