Initial work for new theme, see http://i.imgur.com/qsDfTH5.png