Added missing sources, removed annoying bubble and attached it to Windows XP branch