moved the theme into the matrix