diff --git a/config/common.mk b/config/common.mk
index 14c3b9e..cbf5aaa 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -151,9 +151,9 @@
 # Optional CM packages
 PRODUCT_PACKAGES += \
     libemoji \
-    Terminal \
     LiveWallpapersPicker \
-    PhotoTable
+    PhotoTable \
+    Terminal
 
 # Include librsjni explicitly to workaround GMS issue
 PRODUCT_PACKAGES += \
@@ -161,21 +161,22 @@
 
 # Custom CM packages
 PRODUCT_PACKAGES += \
-    Launcher3 \
-    Trebuchet \
     AudioFX \
-    CMWallpapers \
     CMFileManager \
-    Eleven \
-    LockClock \
-    CMUpdater \
-    CyanogenSetupWizard \
     CMSettingsProvider \
+    CMUpdater \
+    CMWallpapers \
+    CyanogenSetupWizard \
+    Eleven \
     ExactCalculator \
+    Launcher3 \
     LiveLockScreenService \
-    WeatherProvider \
+    LockClock \
+    Screencast \
     SoundRecorder \
-    Screencast
+    Trebuchet \
+    WallpaperPicker \
+    WeatherProvider
 
 # Exchange support
 PRODUCT_PACKAGES += \
@@ -183,26 +184,25 @@
 
 # Extra tools in CM
 PRODUCT_PACKAGES += \
-    libsepol \
-    mke2fs \
-    tune2fs \
-    nano \
-    htop \
-    mkfs.ntfs \
-    fsck.ntfs \
-    mount.ntfs \
-    gdbserver \
-    micro_bench \
-    oprofiled \
-    sqlite3 \
-    strace \
-    pigz \
     7z \
-    lib7z \
     bash \
     bzip2 \
     curl \
+    fsck.ntfs \
+    gdbserver \
+    htop \
+    lib7z \
+    libsepol \
+    micro_bench \
+    mke2fs \
+    mkfs.ntfs \
+    mount.ntfs \
+    oprofiled \
+    pigz \
     powertop \
+    sqlite3 \
+    strace \
+    tune2fs \
     unrar \
     unzip \
     vim \