Base theme improvements, making theme more transparent