More changes
Merging with desktop
Added st config.h