more niah work / theme changes