update - merge with default skin, cleanup and fancontrol