update theme: merge rednok changes