Added removal of Thunderbird and moved some lines around.