stashcommit
Merge, Changed layout from black to light, introduced new variables into
the receivers and settings