Changed key files to new theme style