Clean ups. As well as fixes for slash theme problems