fix themes array
merge