Move two more style elements to theme folder