changed structure, added tint2, .Xdefaults