theme cleanups

Change-Id: I38a9261b6eb7448ec909cdeeca20d9768061283a
style fixes

Change-Id: I88309a4edf0e3faf27642d3fa11bb66079ff212c
fix bad style on pre ics

Change-Id: I31ae26438f015fab980f6bc3fbccd8536066737a
derp