Use new Shine Hook for better loading.
Merge branch 'master' into captainsmode