awesome: additional changes to widgets

* merge widgets_custom and widgets_main
* try to improve consistency in variable names
* try to improve code readability

screenshot
* update to reflect latest changes