Adding ATC theme and base features