Adjustments for better Theme Integration