Changed theme applications to new structur