diff --git a/app/src/main/res/drawable-night/bg_expandable_edge_shadow.xml b/app/src/main/res/drawable-night/bg_expandable_edge_shadow.xml
new file mode 100644
index 00000000..ac1af32f
--- /dev/null
+++ b/app/src/main/res/drawable-night/bg_expandable_edge_shadow.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2016 Jorge Ruesga
+
+     Licensed under the Apache License, ServerVersion 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <gradient android:angle="270" android:startColor="#00424242" android:endColor="#ff424242" />
+</shape>
diff --git a/app/src/main/res/drawable-night/ic_account_circle.xml b/app/src/main/res/drawable-night/ic_account_circle.xml
new file mode 100644
index 00000000..f8fbbd11
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_account_circle.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#ffffffff"
+        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,5c1.66,0 3,1.34 3,3s-1.34,3 -3,3 -3,-1.34 -3,-3 1.34,-3 3,-3zM12,19.2c-2.5,0 -4.71,-1.28 -6,-3.22 0.03,-1.99 4,-3.08 6,-3.08 1.99,0 5.97,1.09 6,3.08 -1.29,1.94 -3.5,3.22 -6,3.22z"/>
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-night/ic_add_circle_outline.xml b/app/src/main/res/drawable-night/ic_add_circle_outline.xml
new file mode 100644
index 00000000..faa1bfc2
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_add_circle_outline.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#ffffffff"
+        android:pathData="M13,7h-2v4L7,11v2h4v4h2v-4h4v-2h-4L13,7zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8z"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_arrow_drop_down.xml b/app/src/main/res/drawable-night/ic_arrow_drop_down.xml
new file mode 100644
index 00000000..496e4ffd
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_arrow_drop_down.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#ffffffff"
+        android:pathData="M7,10l5,5 5,-5z"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_arrow_drop_up.xml b/app/src/main/res/drawable-night/ic_arrow_drop_up.xml
new file mode 100644
index 00000000..31296667
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_arrow_drop_up.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#ffffffff"
+        android:pathData="M7,14l5,-5 5,5z"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_chevron_down.xml b/app/src/main/res/drawable-night/ic_chevron_down.xml
new file mode 100644
index 00000000..3caf39a1
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_chevron_down.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#ffffffff"
+        android:pathData="M7.41,7.84L12,12.42l4.59,-4.58L18,9.25l-6,6 -6,-6z"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_chevron_left_disabled.xml b/app/src/main/res/drawable-night/ic_chevron_left_disabled.xml
new file mode 100644
index 00000000..47697410
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_chevron_left_disabled.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#80ffffff"
+        android:pathData="M15.41,7.41L14,6l-6,6 6,6 1.41,-1.41L10.83,12z"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_chevron_left_normal.xml b/app/src/main/res/drawable-night/ic_chevron_left_normal.xml
new file mode 100644
index 00000000..595e4c96
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_chevron_left_normal.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#ffffffff"
+        android:pathData="M15.41,7.41L14,6l-6,6 6,6 1.41,-1.41L10.83,12z"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_chevron_right_disabled.xml b/app/src/main/res/drawable-night/ic_chevron_right_disabled.xml
new file mode 100644
index 00000000..8ed9a0d8
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_chevron_right_disabled.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#80ffffff"
+        android:pathData="M10,6L8.59,7.41 13.17,12l-4.58,4.59L10,18l6,-6z"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_chevron_right_normal.xml b/app/src/main/res/drawable-night/ic_chevron_right_normal.xml
new file mode 100644
index 00000000..8f0c40c6
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_chevron_right_normal.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#ffffffff"
+        android:pathData="M10,6L8.59,7.41 13.17,12l-4.58,4.59L10,18l6,-6z"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_modify_circle_outline.xml b/app/src/main/res/drawable-night/ic_modify_circle_outline.xml
new file mode 100644
index 00000000..31f3b1e2
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_modify_circle_outline.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2016 Jorge Ruesga
+     Licensed under the Apache License, ServerVersion 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+          http://www.apache.org/licenses/LICENSE-2.0
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#ffffffff"
+        android:pathData="M 12,2 C 6.48,2 2,6.48 2,12 2,17.52 6.48,22 12,22 17.52,22 22,17.52 22,12
+22,6.48 17.52,2 12,2 Z m 0,18 C 7.59,20 4,16.41 4,12 4,7.59 7.59,4 12,4 c 4.41,0
+8,3.59 8,8 0,4.41 -3.59,8 -8,8 z" />
+    <path
+        android:fillColor="#ffffffff"
+        android:pathData="M 7.0594860234,14.854901061 l -0.00907914,2.054647001 2.0546470027,0.0090791 L
+15.191670199,10.88556569 13.146102339,8.8218395433 7.0594860267,14.854901017 Z M
+16.787618414,9.3036599221 c 0.21462752,-0.2127390574 0.216152816,-0.5579197539
+0.0034138,-0.7725472731 L 15.514597827,7.2433475341 C 15.30185877,7.028720015
+14.956678074,7.0271947189 14.742050555,7.2399337762 l -1.007098359,0.9982371153
+2.045567859,2.0637261465 1.007098359,-0.9982371159 z" />
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_remove_circle_outline.xml b/app/src/main/res/drawable-night/ic_remove_circle_outline.xml
new file mode 100644
index 00000000..4f1274fe
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_remove_circle_outline.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#ffffffff"
+        android:pathData="M7,11v2h10v-2L7,11zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8z"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_rename_circle_outline.xml b/app/src/main/res/drawable-night/ic_rename_circle_outline.xml
new file mode 100644
index 00000000..71717731
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_rename_circle_outline.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2016 Jorge Ruesga
+     Licensed under the Apache License, ServerVersion 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+          http://www.apache.org/licenses/LICENSE-2.0
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M12,2C6.48,2 2,6.48 2,12 2,17.52 6.48,22 12,22 17.52,22 22,17.52 22,12 22,6.48 17.52,2 12,2ZM12,20C7.59,20 4,16.41 4,12 4,7.59 7.59,4 12,4c4.41,0 8,3.59 8,8 0,4.41 -3.59,8 -8,8z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M6.365,10.915H15.841v2.357H6.365Z"/>
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="m12.882,9.094 l4.78,2.949 -4.78,2.949"/>
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
new file mode 100644
index 00000000..06f512fc
--- /dev/null
+++ b/app/src/main/res/values-night/colors.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2016 Jorge Ruesga
+
+     Licensed under the Apache License, ServerVersion 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources>
+    <color name="primary">#05668d</color>
+    <color name="primaryDark">#044c69</color>
+    <color name="primaryDarkForeground">#05668d</color>
+    <color name="accent">#f44336</color>
+    <color name="alert">#f57f17</color>
+    <!--
+    <color name="secondaryIconColor">#757575</color>
+    <color name="approved">#2e7d32</color>
+    <color name="rejected">#c62828</color>
+    -->
+    <color name="noscore">#ff616161</color>
+    <color name="unscored">#ff303030</color>
+    <color name="primaryBackgroundColor">#212121</color>
+    <color name="selectedItem">#424242</color>
+    <!--
+    <color name="translucentStatusBarColor">#50000000</color>
+    -->
+
+    <color name="messageWithPositiveReview">#3000ff00</color>
+    <color name="messageWithNegativeReview">#30ff0000</color>
+
+    <color name="diffLineBackgroundColor">#212121</color>
+    <color name="diffAddedBackgroundColor">#4c00ff00</color>
+    <color name="diffDeletedBackgroundColor">#4cff0000</color>
+    <color name="diffAddedForegroundColor">#4c00ff00</color>
+    <color name="diffDeletedForegroundColor">#4cff0000</color>
+    <color name="diffSkipBackgroundColor">#000000</color>
+    <color name="diffNoDiffBackgroundColor">#303030</color>
+    <color name="diffCommentBackgroundColor">#827717</color>
+    <color name="diffHighlightColor">#d32f2f</color>
+
+    <color name="stats_open">#05668d</color>
+    <color name="stats_merged">#558b2f</color>
+    <color name="stats_abandoned">#c62828</color>
+    <color name="stats_line_text">#b3ffffff</color>
+
+    <color name="tab_text">#b3ffffff</color>
+    <color name="tab_selected_text">@android:color/white</color>
+    <color name="tab_indicator">@android:color/white</color>
+
+    <color name="starred">#ffeb3b</color>
+
+    <color name="quote">#40ffffff</color>
+    <!--
+
+    <color name="empty_state">#9e9e9e</color>
+    -->
+
+    <color name="wizard_navbar">#ff424242</color>
+    <color name="wizard_text_secondary">#ffffffff</color>
+</resources>
diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml
new file mode 100644
index 00000000..c23a086e
--- /dev/null
+++ b/app/src/main/res/values-night/styles.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2016 Jorge Ruesga
+
+     Licensed under the Apache License, ServerVersion 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+<resources>
+    <style name="AppThemeBase" parent="Theme.AppCompat.NoActionBar">
+        <item name="colorPrimary">#05668d</item>
+        <item name="colorPrimaryDark">#044c69</item>
+        <item name="colorAccent">#f44336</item>
+        <item name="android:windowNoTitle">true</item>
+        <!--
+        <item name="android:textColorPrimary">#00ff00</item>
+        <item name="android:textColorSecondary">#0000ff</item>
+        -->
+        <!-- Diff options title -->
+        <item name="android:textColorPrimaryInverse">@android:color/white</item>
+        <!-- Pre-exposure tabs text -->
+        <item name="android:textColorSecondaryInverse">#b3ffffff</item>
+        <!-- Account name in nav drawer -->
+        <item name="android:textColorTertiaryInverse">#b3ffffff</item>
+    </style>
+    <style name="SearchView">
+        <item name="floatingSearch_suggestionRightIconColor">#f44336</item>
+        <item name="floatingSearch_searchBarTextSize">12sp</item>
+        <item name="floatingSearch_searchSuggestionTextSize">10sp</item>
+
+        <item name="floatingSearch_backgroundColor">#ff424242</item>
+        <item name="floatingSearch_viewTextColor">#ffffffff</item>
+        <item name="floatingSearch_hintTextColor">#80ffffff</item>
+        <item name="floatingSearch_dividerColor">#ff616161</item>
+        <item name="floatingSearch_clearBtnColor">#ffffffff</item>
+        <item name="floatingSearch_leftActionColor">#ffffffff</item>
+        <item name="floatingSearch_menuItemIconColor">#ffffffff</item>
+        <item name="floatingSearch_actionMenuOverflowColor">#ffffffff</item>
+    </style>
+</resources>