Github: The returning

Includes some fixes. Nothing much. And removal of the custom drinking glasses. :( Maybe i'll fix them later.