In order to enhance the theme feature as per your requirement, you can simply create a child theme and customize it.