Improved my Theme