re-work on theme. git mal-usage