Theme fixes - random typos - bad ordering of styles Change-Id: Iad130212203e4b046fad537d87f5c606d3aa7682