diff --git a/res/layout/custom_commands_item.xml b/res/layout/custom_commands_item.xml
index 74edabf..08ae6b8 100644
--- a/res/layout/custom_commands_item.xml
+++ b/res/layout/custom_commands_item.xml
@@ -44,16 +44,16 @@
         android:layout_alignParentStart="true" />
 
     <Button
+        android:id="@+id/runCommand"
         style="?android:attr/buttonStyleSmall"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Run"
-        android:id="@+id/runCommand"
-        android:layout_marginRight="@dimen/base_listItem_LR"
-        android:layout_marginTop="@dimen/base_listItem_LR"
-        android:textColor="#ff95ff84"
         android:layout_alignParentTop="true"
-        android:layout_alignParentEnd="true" />
+        android:layout_alignParentEnd="true"
+        android:layout_marginTop="@dimen/base_listItem_LR"
+        android:layout_marginRight="@dimen/base_listItem_LR"
+        android:text="Run"
+        android:textColor="@android:color/holo_blue_dark" />
 
     <TextView
         android:layout_width="wrap_content"
diff --git a/res/layout/custon_commands_dialog.xml b/res/layout/custon_commands_dialog.xml
index 09f544c..cc9701f 100644
--- a/res/layout/custon_commands_dialog.xml
+++ b/res/layout/custon_commands_dialog.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:orientation="vertical" android:layout_width="match_parent"
     android:layout_height="wrap_content" android:padding="10dp"
     android:weightSum="1">
@@ -19,13 +20,16 @@
                 android:layout_height="wrap_content"
                 android:text="@string/add_lauchner_btn_label"
 
-                android:textAppearance="?android:attr/textAppearanceLarge" />
+                android:textAppearance="?android:attr/textAppearanceLarge"
+                android:textColor="@android:color/white" />
 
             <EditText
                 android:id="@+id/editText_launcher_btn_label"
                 android:layout_width="match_parent"
 
-                android:layout_height="wrap_content" >
+                android:layout_height="wrap_content"
+                android:textColor="@android:color/white">
+
                 <requestFocus />
             </EditText>
 
@@ -34,45 +38,47 @@
                 android:layout_height="wrap_content"
 
                 android:text="@string/add_lauchner_btn_command"
-                android:textAppearance="?android:attr/textAppearanceLarge" />
+                android:textAppearance="?android:attr/textAppearanceLarge"
+                android:textColor="@android:color/white" />
 
             <EditText
                 android:id="@+id/editText_launcher_command"
                 android:layout_width="match_parent"
 
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="10dp"/>
+                android:layout_marginBottom="10dp"
+                android:textColor="@android:color/white" />
 
             <RelativeLayout
                 android:orientation="horizontal"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 >
+
                 <TextView
                     android:id="@+id/run_in_shell_text"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
-                    android:text="Send to:"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
                     android:layout_above="@+id/add_lauchner_btn_execmode_text"
+                    android:layout_alignEnd="@+id/add_lauchner_btn_execmode_text"
                     android:layout_alignParentStart="true"
-                    android:layout_alignEnd="@+id/add_lauchner_btn_execmode_text" />
-
-
-
+                    android:text="Send to:"
+                    android:textAppearance="?android:attr/textAppearanceLarge"
+                    android:textColor="@android:color/white" />
 
 
                 <TextView
                     android:id="@+id/add_lauchner_btn_execmode_text"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="Exec mode: "
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:layout_gravity="center_vertical"
                     android:layout_alignTop="@+id/spinnerExecMode"
+                    android:layout_alignParentStart="true"
+                    android:layout_gravity="center_vertical"
                     android:paddingTop="5dp"
+                    android:text="Exec mode: "
 
-                    android:layout_alignParentStart="true" />
+                    android:textAppearance="?android:attr/textAppearanceLarge"
+                    android:textColor="@android:color/white" />
                 <Spinner
                     android:id="@+id/spinnerRun_in_shell"
                     android:layout_width="wrap_content"
@@ -102,13 +108,14 @@
                 android:layout_height="match_parent">
 
                 <TextView
+                    android:id="@+id/textView10"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:text="Run at boot:"
-                    android:id="@+id/textView10"
+                    android:layout_alignParentStart="true"
                     android:layout_alignParentBottom="true"
-                    android:layout_alignParentStart="true" />
+                    android:text="Run at boot:"
+                    android:textAppearance="?android:attr/textAppearanceLarge"
+                    android:textColor="@android:color/white" />
 
                 <CheckBox
                     android:layout_width="wrap_content"
diff --git a/res/layout/searchsploit_item.xml b/res/layout/searchsploit_item.xml
index feb77a2..90b5be0 100644
--- a/res/layout/searchsploit_item.xml
+++ b/res/layout/searchsploit_item.xml
@@ -4,20 +4,22 @@
     android:layout_height="match_parent"
     android:longClickable="true"
     android:paddingBottom="5dp">
+
     <TextView
+        android:id="@+id/description"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceLarge"
-        android:text="description"
-        android:id="@+id/description"
-        android:paddingLeft="@dimen/base_listItem_LR"
-        android:paddingRight="@dimen/base_listItem_LR"
-        android:layout_alignParentTop="true"
         android:layout_alignParentStart="true"
-        android:gravity="center_vertical"
-        android:layout_marginBottom="18dp"
+        android:layout_alignParentTop="true"
         android:layout_marginTop="18dp"
-        android:layout_toStartOf="@+id/searchsploit_sendhid_button" />
+        android:layout_marginBottom="18dp"
+        android:layout_toStartOf="@+id/searchsploit_sendhid_button"
+        android:gravity="center_vertical"
+        android:paddingLeft="@dimen/base_listItem_LR"
+        android:paddingRight="@dimen/base_listItem_LR"
+        android:text="description"
+        android:textAppearance="?android:attr/textAppearanceLarge"
+        android:textColor="@android:color/white" />
 
     <TextView
         android:layout_width="wrap_content"
@@ -53,16 +55,17 @@
         android:paddingRight="@dimen/base_listItem_LR"
         android:layout_below="@+id/textView9"
         android:layout_alignParentStart="true" />
+
     <Button
+        android:id="@+id/viewSource"
         style="?android:attr/buttonStyleSmall"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="View Source"
-        android:id="@+id/viewSource"
-        android:layout_marginRight="@dimen/base_listItem_LR"
-        android:textColor="#ff95ff84"
         android:layout_below="@+id/searchsploit_sendhid_button"
-        android:layout_alignStart="@+id/openWeb" />
+        android:layout_alignStart="@+id/openWeb"
+        android:layout_marginRight="@dimen/base_listItem_LR"
+        android:text="View Source"
+        android:textColor="@android:color/holo_blue_dark" />
 
     <TextView
         android:layout_width="wrap_content"
@@ -115,25 +118,25 @@
         android:layout_alignStart="@+id/author" />
 
     <Button
+        android:id="@+id/openWeb"
         style="?android:attr/buttonStyleSmall"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="View in www"
-        android:id="@+id/openWeb"
-        android:layout_marginRight="@dimen/base_listItem_LR"
-        android:textColor="#ff95ff84"
         android:layout_below="@+id/viewSource"
-        android:layout_alignParentEnd="true" />
+        android:layout_alignParentEnd="true"
+        android:layout_marginRight="@dimen/base_listItem_LR"
+        android:text="View in www"
+        android:textColor="@android:color/holo_blue_dark" />
 
     <Button
+        android:id="@+id/searchsploit_sendhid_button"
         style="?android:attr/buttonStyleSmall"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="SEND HID"
-        android:textColor="#ff95ff84"
-        android:id="@+id/searchsploit_sendhid_button"
-        android:layout_alignParentTop="true"
         android:layout_alignStart="@+id/viewSource"
-        android:layout_alignEnd="@+id/viewSource" />
+        android:layout_alignEnd="@+id/viewSource"
+        android:layout_alignParentTop="true"
+        android:text="SEND HID"
+        android:textColor="@android:color/holo_blue_dark" />
 
 </RelativeLayout>
diff --git a/src/com/offsec/nethunter/SearchSploitSQL.java b/src/com/offsec/nethunter/SearchSploitSQL.java
index 01ad257..8328047 100644
--- a/src/com/offsec/nethunter/SearchSploitSQL.java
+++ b/src/com/offsec/nethunter/SearchSploitSQL.java
@@ -29,7 +29,7 @@ class SearchSploitSQL extends SQLiteOpenHelper {
     }
 
     public void onCreate(SQLiteDatabase database) {
-        String CREATE_SEARCHSPLOIT_TABLE = "CREATE TABLE  IF NOT EXISTS " + SearchSploit.TABLE +
+        String CREATE_SEARCHSPLOIT_TABLE = "CREATE TABLE IF NOT EXISTS " + SearchSploit.TABLE +
                 " (" + SearchSploit.ID + " INTEGER PRIMARY KEY, " +
                 SearchSploit.FILE + " TEXT," +
                 SearchSploit.DESCRIPTION + " TEXT," +
@@ -37,7 +37,7 @@ public void onCreate(SQLiteDatabase database) {
                 SearchSploit.AUTHOR + " TEXT," +
                 SearchSploit.PLATFORM + " TEXT," +
                 SearchSploit.TYPE + " TEXT," +
-                SearchSploit.PORT + " INTEGER)";
+                SearchSploit.PORT + " INTEGER DEFAULT 0)";
         database.execSQL(CREATE_SEARCHSPLOIT_TABLE);
         database.disableWriteAheadLogging();
     }
@@ -58,7 +58,9 @@ public void doDrop() {
 
     Boolean doDbFeed() {
         // copy csv to /sdcard as temp (so we can read it)
-        String _cmd = "su -c bootkali custom_cmd csv2sqlite.py /usr/share/exploitdb/files.csv /sdcard/nh_files/SearchSploit " + SearchSploit.TABLE;
+        String _cmd = "su -c bootkali\n" + "csv2sqlite.py /usr/share/exploitdb/files_exploits.csv SearchSploit " + SearchSploit.TABLE + "\n" +
+                "sqlite3 SearchSploit 'UPDATE " + SearchSploit.TABLE + " SET " +  SearchSploit.PORT + " = 0 WHERE " + SearchSploit.PORT + " IS NULL;'\n" +
+                "mv SearchSploit /sdcard/nh_files/SearchSploit\n";
         // move to app db folder
         exe.RunAsRootOutput(_cmd);
         return true;
@@ -118,8 +120,8 @@ private List<SearchSploit> createExploitList(Cursor cursor) {
                 _exploit.setDescription(cursor.getString(2));      // desc
                 _exploit.setDate(cursor.getString(3));             // date
                 _exploit.setAuthor(cursor.getString(4));           // author
-                _exploit.setPlatform(cursor.getString(5));         // platform
-                _exploit.setType(cursor.getString(6));             // type
+                _exploit.setType(cursor.getString(5));             // type
+                _exploit.setPlatform(cursor.getString(6));         // platform
                 _exploit.setPort(cursor.getInt(7));                // port
                 commandList.add(_exploit);
             } while (cursor.moveToNext());