done separation of theme and plugin