Styles improvements, Themelinks better order