Completed implementation of themes support, added Madonna theme