restructure desktop theme