Final Theme Modifications

Unless there is some modifications.