More patchwork for TMO Theme Engine