You know what folks, a lot of Mercurial merges failed, and I just now figured out why. So now all changes from stable are permanently synced in.

.panel_wrapper div.current {
	height: 100px;
}

#width, #height {
	width: 50px;
}

#file {
	width: 250px;
}