Adjust skeleton template

Need a skeleton that matches better my workflow