moved functionality to include directory / added theme wrapper