Add move-border
Add move-border
Remove outdated stuff