storm theme fixes