diff --git a/app/build.gradle b/app/build.gradle
index 8be04ea1..6b60db3a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -42,7 +42,7 @@ android {
         applicationId "org.secfirst.umbrella"
         minSdkVersion 16
         compileSdkVersion 28
-        targetSdkVersion 28
+        targetSdkVersion 31
         versionCode 56
         versionName "1.0.32"
         multiDexEnabled true
@@ -89,6 +89,9 @@ dependencies {
     implementation "org.apache.commons:commons-text:$commonsText"
     implementation "org.apache.commons:commons-lang3:$commonsLang"
 
+    //Material Design for Light/ Dark mode
+    implementation "com.google.android.material:material:$material_version"
+
 
     //Framework for replacing fragments
     implementation "com.bluelinelabs:conductor:$conductor_version"
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b7b44218..2d122fac 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -3,6 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="org.secfirst.umbrella">
 
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
diff --git a/app/src/main/java/org/secfirst/umbrella/component/WebViewController.kt b/app/src/main/java/org/secfirst/umbrella/component/WebViewController.kt
index f41aebd2..412e6f44 100644
--- a/app/src/main/java/org/secfirst/umbrella/component/WebViewController.kt
+++ b/app/src/main/java/org/secfirst/umbrella/component/WebViewController.kt
@@ -13,6 +13,7 @@ import android.webkit.WebResourceError
 import android.webkit.WebResourceRequest
 import android.webkit.WebView
 import android.webkit.WebViewClient
+import kotlinx.android.synthetic.main.segment_detail.*
 import kotlinx.android.synthetic.main.web_view.*
 import org.secfirst.umbrella.R
 import org.secfirst.umbrella.feature.base.view.BaseController
@@ -86,9 +87,10 @@ class WebViewController(bundle: Bundle) : BaseController(bundle) {
 
     private fun setUpToolbar() {
         webViewToolbar?.let {
-            mainActivity.setSupportActionBar(it)
+            it.title = markdownView.title
+            /*mainActivity.setSupportActionBar(it)
             mainActivity.supportActionBar?.setDisplayShowHomeEnabled(true)
-            mainActivity.supportActionBar?.setDisplayHomeAsUpEnabled(true)
+            mainActivity.supportActionBar?.setDisplayHomeAsUpEnabled(true)*/
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/secfirst/umbrella/data/database/AppDatabase.kt b/app/src/main/java/org/secfirst/umbrella/data/database/AppDatabase.kt
index 5a4596ab..8a343e94 100644
--- a/app/src/main/java/org/secfirst/umbrella/data/database/AppDatabase.kt
+++ b/app/src/main/java/org/secfirst/umbrella/data/database/AppDatabase.kt
@@ -2,9 +2,11 @@ package org.secfirst.umbrella.data.database
 
 import com.raizlabs.android.dbflow.annotation.Database
 
-@Database(version = AppDatabase.VERSION,
-        generatedClassSeparator = "_",
-        foreignKeyConstraintsEnforced = true)
+@Database(
+    version = AppDatabase.VERSION,
+    generatedClassSeparator = "_",
+    foreignKeyConstraintsEnforced = true
+)
 
 object AppDatabase {
 
diff --git a/app/src/main/java/org/secfirst/umbrella/data/database/BaseDao.kt b/app/src/main/java/org/secfirst/umbrella/data/database/BaseDao.kt
index 153de87f..a82c41a9 100644
--- a/app/src/main/java/org/secfirst/umbrella/data/database/BaseDao.kt
+++ b/app/src/main/java/org/secfirst/umbrella/data/database/BaseDao.kt
@@ -28,19 +28,21 @@ interface BaseDao {
     fun initDatabase(userToken: String) {
 
         val dbConfig = FlowConfig.Builder(UmbrellaApplication.instance)
-                .addDatabaseConfig(DatabaseConfig
-                        .Builder(AppDatabase::class.java)
-                        .databaseName(AppDatabase.NAME)
-                        .openHelper { databaseDefinition, helperListener ->
-                            SQLCipherHelperImpl(databaseDefinition, helperListener, userToken)
-                        }.build())
-                .build()
+            .addDatabaseConfig(DatabaseConfig
+                .Builder(AppDatabase::class.java)
+                .databaseName(AppDatabase.NAME)
+                .openHelper { databaseDefinition, helperListener ->
+                    SQLCipherHelperImpl(databaseDefinition, helperListener, userToken)
+                }.build()
+            )
+            .build()
         FlowManager.init(dbConfig)
     }
 
     fun changeDatabaseAccess(userToken: String): Boolean {
         return try {
-            FlowManager.getWritableDatabase(AppDatabase.NAME).execSQL("PRAGMA rekey = '$userToken';")
+            FlowManager.getWritableDatabase(AppDatabase.NAME)
+                .execSQL("PRAGMA rekey = '$userToken';")
             true
         } catch (exception: Exception) {
             Log.e("test", "Error when try to change the password. ${exception.message}")
@@ -51,68 +53,68 @@ interface BaseDao {
     fun isDatabaseOK() = FlowManager.getDatabase(AppDatabase.NAME).isDatabaseIntegrityOk
 
     suspend fun saveModules(modules: List<Module>) =
-            withContext(ioContext) { modelAdapter<Module>().updateAll(modules) }
+        withContext(ioContext) { modelAdapter<Module>().updateAll(modules) }
 
     suspend fun saveSubjects(subjects: List<Subject>) =
-            withContext(ioContext) { modelAdapter<Subject>().saveAll(subjects) }
+        withContext(ioContext) { modelAdapter<Subject>().saveAll(subjects) }
 
     suspend fun saveDifficulties(difficulties: List<Difficulty>) =
-            withContext(ioContext) { modelAdapter<Difficulty>().saveAll(difficulties) }
+        withContext(ioContext) { modelAdapter<Difficulty>().saveAll(difficulties) }
 
     suspend fun saveMarkdowns(markdowns: List<Markdown>) =
-            withContext(ioContext) { modelAdapter<Markdown>().saveAll(markdowns) }
+        withContext(ioContext) { modelAdapter<Markdown>().saveAll(markdowns) }
 
     suspend fun saveChecklists(checklists: List<Checklist>) =
-            withContext(ioContext) { modelAdapter<Checklist>().saveAll(checklists) }
+        withContext(ioContext) { modelAdapter<Checklist>().saveAll(checklists) }
 
 
     suspend fun getModule(id: String) =
-            withContext(ioContext) {
-                SQLite.select()
-                        .from(Module::class.java)
-                        .where(Module_Table.id.`is`(id))
-                        .querySingle()
-            }
+        withContext(ioContext) {
+            SQLite.select()
+                .from(Module::class.java)
+                .where(Module_Table.id.`is`(id))
+                .querySingle()
+        }
 
     suspend fun getSubject(id: String) =
-            withContext(ioContext) {
-                SQLite.select()
-                        .from(Subject::class.java)
-                        .where(Subject_Table.id.`is`(id))
-                        .querySingle()
-            }
+        withContext(ioContext) {
+            SQLite.select()
+                .from(Subject::class.java)
+                .where(Subject_Table.id.`is`(id))
+                .querySingle()
+        }
 
     suspend fun getDifficulty(id: String) =
-            withContext(ioContext) {
-                SQLite.select()
-                        .from(Difficulty::class.java)
-                        .where(Difficulty_Table.id.`is`(id))
-                        .querySingle()
-            }
+        withContext(ioContext) {
+            SQLite.select()
+                .from(Difficulty::class.java)
+                .where(Difficulty_Table.id.`is`(id))
+                .querySingle()
+        }
 
     suspend fun getChecklist(id: String) =
-            withContext(ioContext) {
-                SQLite.select()
-                        .from(Checklist::class.java)
-                        .where(Checklist_Table.id.`is`(id))
-                        .querySingle()
-            }
+        withContext(ioContext) {
+            SQLite.select()
+                .from(Checklist::class.java)
+                .where(Checklist_Table.id.`is`(id))
+                .querySingle()
+        }
 
     suspend fun getMarkdown(id: String) =
-            withContext(ioContext) {
-                SQLite.select()
-                        .from(Markdown::class.java)
-                        .where(Markdown_Table.id.`is`(id))
-                        .querySingle()
-            }
+        withContext(ioContext) {
+            SQLite.select()
+                .from(Markdown::class.java)
+                .where(Markdown_Table.id.`is`(id))
+                .querySingle()
+        }
 
     suspend fun getForm(id: String) =
-            withContext(ioContext) {
-                SQLite.select()
-                        .from(Form::class.java)
-                        .where(Form_Table.path.`is`(id))
-                        .querySingle()
-            }
+        withContext(ioContext) {
+            SQLite.select()
+                .from(Form::class.java)
+                .where(Form_Table.path.`is`(id))
+                .querySingle()
+        }
 
     suspend fun saveForms(forms: List<Form>) {
         withContext(ioContext) {
diff --git a/app/src/main/java/org/secfirst/umbrella/data/database/SQLCipherHelperImpl.kt b/app/src/main/java/org/secfirst/umbrella/data/database/SQLCipherHelperImpl.kt
index e8d2e795..f7c1dd17 100644
--- a/app/src/main/java/org/secfirst/umbrella/data/database/SQLCipherHelperImpl.kt
+++ b/app/src/main/java/org/secfirst/umbrella/data/database/SQLCipherHelperImpl.kt
@@ -7,9 +7,10 @@ import org.secfirst.umbrella.data.database.AppDatabase.DEFAULT
 
 
 class SQLCipherHelperImpl(
-        databaseDefinition: DatabaseDefinition,
-        databaseHelperListener: DatabaseHelperListener?,
-        private val userToken: String? = null) : SQLCipherOpenHelper(databaseDefinition, databaseHelperListener) {
+    databaseDefinition: DatabaseDefinition,
+    databaseHelperListener: DatabaseHelperListener?,
+    private val userToken: String? = null
+) : SQLCipherOpenHelper(databaseDefinition, databaseHelperListener) {
 
     override fun getCipherSecret(): String {
         return userToken ?: DEFAULT
diff --git a/app/src/main/java/org/secfirst/umbrella/data/database/account/AccountDao.kt b/app/src/main/java/org/secfirst/umbrella/data/database/account/AccountDao.kt
index 7f8b267a..c0c662a3 100644
--- a/app/src/main/java/org/secfirst/umbrella/data/database/account/AccountDao.kt
+++ b/app/src/main/java/org/secfirst/umbrella/data/database/account/AccountDao.kt
@@ -26,14 +26,14 @@ interface AccountDao : BaseDao {
 
     suspend fun getAllFeedSource(): List<FeedSource> = withContext(ioContext) {
         SQLite.select()
-                .from(FeedSource::class.java)
-                .queryList()
+            .from(FeedSource::class.java)
+            .queryList()
     }
 
     suspend fun getFeedLocation() = withContext(ioContext) {
         SQLite.select()
-                .from(FeedLocation::class.java)
-                .querySingle()
+            .from(FeedLocation::class.java)
+            .querySingle()
     }
 
     suspend fun deleteMainContent(): Boolean {
diff --git a/app/src/main/java/org/secfirst/umbrella/data/database/account/AccountRepo.kt b/app/src/main/java/org/secfirst/umbrella/data/database/account/AccountRepo.kt
index 0a51b425..0ef485b4 100644
--- a/app/src/main/java/org/secfirst/umbrella/data/database/account/AccountRepo.kt
+++ b/app/src/main/java/org/secfirst/umbrella/data/database/account/AccountRepo.kt
@@ -17,5 +17,5 @@ interface AccountRepo {
 
     suspend fun saveFeedLocation(feedLocation: FeedLocation)
 
-    suspend fun wipeMainContent() : Boolean
+    suspend fun wipeMainContent(): Boolean
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/secfirst/umbrella/data/database/account/AccountRepository.kt b/app/src/main/java/org/secfirst/umbrella/data/database/account/AccountRepository.kt
index b444b111..64ce9aad 100644
--- a/app/src/main/java/org/secfirst/umbrella/data/database/account/AccountRepository.kt
+++ b/app/src/main/java/org/secfirst/umbrella/data/database/account/AccountRepository.kt
@@ -12,9 +12,11 @@ class AccountRepository @Inject constructor(private val accountDao: AccountDao)
 
     override suspend fun changeToken(userToken: String) = accountDao.changeDatabaseAccess(userToken)
 
-    override suspend fun saveFeedLocation(feedLocation: FeedLocation) = accountDao.saveFeedLocation(feedLocation)
+    override suspend fun saveFeedLocation(feedLocation: FeedLocation) =
+        accountDao.saveFeedLocation(feedLocation)
 
-    override suspend fun saveAllFeedSources(feedSources: List<FeedSource>) = accountDao.saveAllFeedSource(feedSources)
+    override suspend fun saveAllFeedSources(feedSources: List<FeedSource>) =
+        accountDao.saveAllFeedSource(feedSources)
 
     override suspend fun getFeedLocation() = accountDao.getFeedLocation()
 
diff --git a/app/src/main/java/org/secfirst/umbrella/data/database/checklist/ChecklistDao.kt b/app/src/main/java/org/secfirst/umbrella/data/database/checklist/ChecklistDao.kt
index cb5607f0..ba9ddb84 100644
--- a/app/src/main/java/org/secfirst/umbrella/data/database/checklist/ChecklistDao.kt
+++ b/app/src/main/java/org/secfirst/umbrella/data/database/checklist/ChecklistDao.kt
@@ -35,9 +35,9 @@ interface ChecklistDao {
     suspend fun deleteChecklist(checklist: Checklist) {
         withContext(ioContext) {
             SQLite.delete()
-                    .from(Checklist::class.java)
-                    .where(Checklist_Table.id.`is`(checklist.id))
-                    .execute()
+                .from(Checklist::class.java)
+                .where(Checklist_Table.id.`is`(checklist.id))
+                .execute()
         }
     }
 
@@ -49,80 +49,80 @@ interface ChecklistDao {
 
     suspend fun getChecklist(checklistId: String): Checklist? = withContext(ioContext) {
         SQLite.select()
-                .from(Checklist::class.java)
-                .where(Checklist_Table.id.`is`(checklistId))
-                .querySingle()
+            .from(Checklist::class.java)
+            .where(Checklist_Table.id.`is`(checklistId))
+            .querySingle()
     }
 
     suspend fun getAllChecklistFavorite(): List<Checklist> = withContext(ioContext) {
         SQLite.select()
-                .from(Checklist::class.java)
-                .where(Checklist_Table.favorite.`is`(true))
-                .and(Checklist_Table.pathways.`is`(false))
-                .queryList()
+            .from(Checklist::class.java)
+            .where(Checklist_Table.favorite.`is`(true))
+            .and(Checklist_Table.pathways.`is`(false))
+            .queryList()
     }
 
     suspend fun getChecklistCount(): Long = withContext(ioContext) {
         SQLite.select()
-                .from(Checklist::class.java)
-                .queryList().size.toLong()
+            .from(Checklist::class.java)
+            .queryList().size.toLong()
     }
 
     suspend fun getAllChecklist(): List<Checklist> = withContext(ioContext) {
         SQLite.select()
-                .from(Checklist::class.java)
-                .queryList()
+            .from(Checklist::class.java)
+            .queryList()
     }
 
     suspend fun getAllPathways(): List<Checklist> = withContext(ioContext) {
         SQLite.select()
-                .from(Checklist::class.java)
-                .where(Checklist_Table.pathways.`is`(true))
-                .queryList()
+            .from(Checklist::class.java)
+            .where(Checklist_Table.pathways.`is`(true))
+            .queryList()
     }
 
-    suspend fun getFavoritePathways() : List<Checklist> = withContext(ioContext){
+    suspend fun getFavoritePathways(): List<Checklist> = withContext(ioContext) {
         SQLite.select()
-                .from(Checklist::class.java)
-                .where(Checklist_Table.pathways.`is`(true))
-                .and(Checklist_Table.favorite.`is`(true))
-                .queryList()
+            .from(Checklist::class.java)
+            .where(Checklist_Table.pathways.`is`(true))
+            .and(Checklist_Table.favorite.`is`(true))
+            .queryList()
     }
 
     suspend fun getSubjectById(subjectId: String) = withContext(ioContext) {
         SQLite.select()
-                .from(Subject::class.java)
-                .where(Subject_Table.id.`is`(subjectId))
-                .querySingle()
+            .from(Subject::class.java)
+            .where(Subject_Table.id.`is`(subjectId))
+            .querySingle()
     }
 
     suspend fun getDifficultyById(difficultyId: String): Difficulty? = withContext(ioContext) {
         SQLite.select()
-                .from(Difficulty::class.java)
-                .where(Difficulty_Table.id.`is`(difficultyId))
-                .querySingle()
+            .from(Difficulty::class.java)
+            .where(Difficulty_Table.id.`is`(difficultyId))
+            .querySingle()
     }
 
     suspend fun getAllChecklistInProgress(): List<Checklist> = withContext(ioContext) {
         SQLite.select()
-                .from(Checklist::class.java)
-                .where(Checklist_Table.progress.greaterThanOrEq(1))
-                .and(Checklist_Table.favorite.`is`(false))
-                .queryList()
+            .from(Checklist::class.java)
+            .where(Checklist_Table.progress.greaterThanOrEq(1))
+            .and(Checklist_Table.favorite.`is`(false))
+            .queryList()
     }
 
     suspend fun getAllCustomChecklistInProgress(): List<Checklist> = withContext(ioContext) {
         SQLite.select()
-                .from(Checklist::class.java)
-                .where(Checklist_Table.custom.`is`(true))
-                .queryList()
+            .from(Checklist::class.java)
+            .where(Checklist_Table.custom.`is`(true))
+            .queryList()
     }
 
     suspend fun getModuleByName(moduleName: String): Module? = withContext(ioContext) {
         SQLite.select()
-                .from(Module::class.java)
-                .where(Module_Table.rootDir.`is`(moduleName))
-                .querySingle()
+            .from(Module::class.java)
+            .where(Module_Table.rootDir.`is`(moduleName))
+            .querySingle()
     }
 }
 
diff --git a/app/src/main/java/org/secfirst/umbrella/data/database/checklist/ChecklistRepo.kt b/app/src/main/java/org/secfirst/umbrella/data/database/checklist/ChecklistRepo.kt
index a8d2337d..23a7392a 100644
--- a/app/src/main/java/org/secfirst/umbrella/data/database/checklist/ChecklistRepo.kt
+++ b/app/src/main/java/org/secfirst/umbrella/data/database/checklist/ChecklistRepo.kt
@@ -36,5 +36,5 @@ interface ChecklistRepo {
 
     suspend fun loadAllPathways(): List<Checklist>
 
-    suspend fun loadFavoritePathways() : List<Checklist>
+    suspend fun loadFavoritePathways(): List<Checklist>
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/secfirst/umbrella/data/database/checklist/ChecklistRepository.kt b/app/src/main/java/org/secfirst/umbrella/data/database/checklist/ChecklistRepository.kt
index 416d19f8..3bd9db5a 100644
--- a/app/src/main/java/org/secfirst/umbrella/data/database/checklist/ChecklistRepository.kt
+++ b/app/src/main/java/org/secfirst/umbrella/data/database/checklist/ChecklistRepository.kt
@@ -2,23 +2,29 @@ package org.secfirst.umbrella.data.database.checklist
 
 import javax.inject.Inject
 
-class ChecklistRepository @Inject constructor(private val checklistDao: ChecklistDao) : ChecklistRepo {
+class ChecklistRepository @Inject constructor(private val checklistDao: ChecklistDao) :
+    ChecklistRepo {
 
     override suspend fun loadModule(moduleName: String) = checklistDao.getModuleByName(moduleName)
 
     override suspend fun loadChecklist(checklistId: String) = checklistDao.getChecklist(checklistId)
 
-    override suspend fun loadAllCustomChecklistInProgress() = checklistDao.getAllCustomChecklistInProgress()
+    override suspend fun loadAllCustomChecklistInProgress() =
+        checklistDao.getAllCustomChecklistInProgress()
 
-    override suspend fun deleteChecklistContent(checklistContent: Content) = checklistDao.deleteChecklistContent(checklistContent)
+    override suspend fun deleteChecklistContent(checklistContent: Content) =
+        checklistDao.deleteChecklistContent(checklistContent)
 
-    override suspend fun deleteChecklist(checklist: Checklist) = checklistDao.deleteChecklist(checklist)
+    override suspend fun deleteChecklist(checklist: Checklist) =
+        checklistDao.deleteChecklist(checklist)
 
-    override suspend fun disableChecklistContent(checklistContent: Content) = checklistDao.disable(checklistContent)
+    override suspend fun disableChecklistContent(checklistContent: Content) =
+        checklistDao.disable(checklistContent)
 
     override suspend fun loadAllChecklistInProgress() = checklistDao.getAllChecklistInProgress()
 
-    override suspend fun loadDifficultyById(difficultyId: String) = checklistDao.getDifficultyById(difficultyId)
+    override suspend fun loadDifficultyById(difficultyId: String) =
+        checklistDao.getDifficultyById(difficultyId)
 
     override suspend fun loadSubjectById(subjectId: String) = checklistDao.getSubjectById(subjectId)
 
@@ -30,9 +36,11 @@ class ChecklistRepository @Inject constructor(private val checklistDao: Checklis
 
     override suspend fun insertChecklist(checklist: Checklist) = checklistDao.save(checklist)
 
-    override suspend fun insertChecklistContent(checklistContent: Content) = checklistDao.save(checklistContent)
+    override suspend fun insertChecklistContent(checklistContent: Content) =
+        checklistDao.save(checklistContent)
 
     override suspend fun loadAllPathways(): List<Checklist> = checklistDao.getAllPathways()
 
-    override suspend fun loadFavoritePathways(): List<Checklist> = checklistDao.getFavoritePathways()
+    override suspend fun loadFavoritePathways(): List<Checklist> =
+        checklistDao.getFavoritePathways()
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/secfirst/umbrella/data/database/checklist/entity.kt b/app/src/main/java/org/secfirst/umbrella/data/database/checklist/entity.kt
index 9f2b2bbe..9ce96ccf 100644
--- a/app/src/main/java/org/secfirst/umbrella/data/database/checklist/entity.kt
+++ b/app/src/main/java/org/secfirst/umbrella/data/database/checklist/entity.kt
@@ -14,39 +14,40 @@ import org.secfirst.umbrella.data.database.lesson.Subject
 @Parcelize
 @Table(database = AppDatabase::class, useBooleanGetterSetters = false, cachingEnabled = true)
 data class Checklist(
-        @JsonProperty("list")
-        var content: MutableList<Content> = arrayListOf(),
-        @Column
-        var custom: Boolean = false,
-        @Column
-        var title: String = "",
-        @PrimaryKey
-        var id: String = "",
-        @Column
-        var index: Int = 0,
-        @Column
-        var favorite: Boolean = false,
-        @Column
-        var progress: Int = 0,
-        @Column
-        var pathways: Boolean = false,
-        @ForeignKey(stubbedRelationship = true)
-        var module: Module? = null,
+    @JsonProperty("list")
+    var content: MutableList<Content> = arrayListOf(),
+    @Column
+    var custom: Boolean = false,
+    @Column
+    var title: String = "",
+    @PrimaryKey
+    var id: String = "",
+    @Column
+    var index: Int = 0,
+    @Column
+    var favorite: Boolean = false,
+    @Column
+    var progress: Int = 0,
+    @Column
+    var pathways: Boolean = false,
+    @ForeignKey(stubbedRelationship = true)
+    var module: Module? = null,
 
-        @ForeignKey(stubbedRelationship = true)
-        var subject: Subject? = null,
+    @ForeignKey(stubbedRelationship = true)
+    var subject: Subject? = null,
 
-        @ForeignKey(stubbedRelationship = true)
-        var difficulty: Difficulty? = null) : Parcelable {
+    @ForeignKey(stubbedRelationship = true)
+    var difficulty: Difficulty? = null
+) : Parcelable {
 
 
     @OneToMany(methods = [(OneToMany.Method.ALL)], variableName = "content")
     fun oneToManyContent(): MutableList<Content> {
         if (content.isEmpty()) {
             content = SQLite.select()
-                    .from(Content::class.java)
-                    .where(Content_Table.checklist_id.eq(id))
-                    .queryList()
+                .from(Content::class.java)
+                .where(Content_Table.checklist_id.eq(id))
+                .queryList()
         }
         return content
     }
@@ -55,39 +56,45 @@ data class Checklist(
 @Parcelize
 @Table(database = AppDatabase::class, useBooleanGetterSetters = false)
 class Content(
-        @Column
-        var check: String = "",
-        @PrimaryKey(autoincrement = true)
-        var id: Long = 0,
-        @ForeignKey(stubbedRelationship = true, onDelete = ForeignKeyAction.CASCADE)
-        var checklist: Checklist? = null,
-        @Column
-        var label: String = "",
-        @Column
-        var disable: Boolean = false,
-        @Column
-        var value: Boolean = false) : Parcelable
+    @Column
+    var check: String = "",
+    @PrimaryKey(autoincrement = true)
+    var id: Long = 0,
+    @ForeignKey(stubbedRelationship = true, onDelete = ForeignKeyAction.CASCADE)
+    var checklist: Checklist? = null,
+    @Column
+    var label: String = "",
+    @Column
+    var disable: Boolean = false,
+    @Column
+    var value: Boolean = false
+) : Parcelable
 
 class Dashboard(var items: List<Item> = listOf()) {
 
-    data class Item(var title: String = "",
-                    var id: Long = 0,
-                    var progress: Int = 0,
-                    var label: String = "",
-                    var levelLabel: Int = 0,
-                    var checklist: Checklist? = null,
-                    var difficulty: Difficulty? = null,
-                    var footer : Boolean = false) {
+    data class Item(
+        var title: String = "",
+        var id: Long = 0,
+        var progress: Int = 0,
+        var label: String = "",
+        var levelLabel: Int = 0,
+        var checklist: Checklist? = null,
+        var difficulty: Difficulty? = null,
+        var footer: Boolean = false
+    ) {
 
-        constructor(progress: Int, label: String,
-                    checklist: Checklist?,
-                    difficulty: Difficulty?,
-                    levelLabel: Int = 0) : this("", 0, progress, label, levelLabel, checklist, difficulty)
+        constructor(
+            progress: Int, label: String,
+            checklist: Checklist?,
+            difficulty: Difficulty?,
+            levelLabel: Int = 0
+        ) : this("", 0, progress, label, levelLabel, checklist, difficulty)
     }
 }
 
 fun Checklist.covertToHTML(): String {
-    var body = "<html><head><meta Content-Type: text/html; charset=\"UTF-8\"></head><body style=\"font-family: Roboto; font-size:16px; font-weight: normal;\" >"
+    var body =
+        "<html><head><meta Content-Type: text/html; charset=\"UTF-8\"></head><body style=\"font-family: Roboto; font-size:16px; font-weight: normal;\" >"
     this.content.forEach { content ->
         if (content.check.isNotEmpty()) {
             body += if (content.value) "✓ ${content.check}" else "✗ ${content.check}"
@@ -100,7 +107,7 @@ fun Checklist.covertToHTML(): String {
 fun String.convertToMarkdown(): String {
     val andDown = AndDown()
     return andDown.markdownToHtml(this, AndDown.HOEDOWN_EXT_QUOTE, 0)
-    }
+}
 
 interface ContentMonitor {
     fun onContentProgress(percentage: Int)
diff --git a/app/src/main/java/org/secfirst/umbrella/data/database/content/ContentDao.kt b/app/src/main/java/org/secfirst/umbrella/data/database/content/ContentDao.kt
index e043abb8..404f0f6d 100644
--- a/app/src/main/java/org/secfirst/umbrella/data/database/content/ContentDao.kt
+++ b/app/src/main/java/org/secfirst/umbrella/data/database/content/ContentDao.kt
@@ -106,7 +106,7 @@ interface ContentDao : BaseDao, ContentMonitor {
     }
 
     private fun calculatePercentage(fileCount: Int, listSize: Int) {
-        val percentage = if(listSize != 0) fileCount * 100 / listSize else 0
+        val percentage = if (listSize != 0) fileCount * 100 / listSize else 0
         onContentProgress(percentage)
     }
 }
diff --git a/app/src/main/java/org/secfirst/umbrella/data/database/content/ContentRepo.kt b/app/src/main/java/org/secfirst/umbrella/data/database/content/ContentRepo.kt
index 5244df84..5400f9f8 100644
--- a/app/src/main/java/org/secfirst/umbrella/data/database/content/ContentRepo.kt
+++ b/app/src/main/java/org/secfirst/umbrella/data/database/content/ContentRepo.kt
@@ -42,5 +42,5 @@ interface ContentRepo {
 
     suspend fun getForm(formId: String): Form?
 
-    suspend fun resetContent() : Boolean
+    suspend fun resetContent(): Boolean
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/secfirst/umbrella/data/database/content/ContentRepository.kt b/app/src/main/java/org/secfirst/umbrella/data/database/content/ContentRepository.kt
index 6fd43c5c..f9ca628a 100644
--- a/app/src/main/java/org/secfirst/umbrella/data/database/content/ContentRepository.kt
+++ b/app/src/main/java/org/secfirst/umbrella/data/database/content/ContentRepository.kt
@@ -18,7 +18,8 @@ class ContentRepository @Inject constructor(private val contentDao: ContentDao)
 
     override suspend fun getSubject(subjectId: String) = contentDao.getSubject(subjectId)
 
-    override suspend fun getDifficulty(difficultyId: String) = contentDao.getDifficulty(difficultyId)
+    override suspend fun getDifficulty(difficultyId: String) =
+        contentDao.getDifficulty(difficultyId)
 
     override suspend fun getModule(moduleId: String) = contentDao.getModule(moduleId)
 
@@ -28,20 +29,26 @@ class ContentRepository @Inject constructor(private val contentDao: ContentDao)
 
     override suspend fun getForm(formId: String) = contentDao.getForm(formId)
 
-    override suspend fun saveAllChecklists(checklists: List<Checklist>) = contentDao.saveChecklists(checklists)
+    override suspend fun saveAllChecklists(checklists: List<Checklist>) =
+        contentDao.saveChecklists(checklists)
 
-    override suspend fun saveAllMarkdowns(markdowns: List<Markdown>) = contentDao.saveMarkdowns(markdowns)
+    override suspend fun saveAllMarkdowns(markdowns: List<Markdown>) =
+        contentDao.saveMarkdowns(markdowns)
 
     override suspend fun saveAllModule(modules: List<Module>) = contentDao.saveModules(modules)
 
-    override suspend fun saveAllDifficulties(difficulties: List<Difficulty>) = contentDao.saveDifficulties(difficulties)
+    override suspend fun saveAllDifficulties(difficulties: List<Difficulty>) =
+        contentDao.saveDifficulties(difficulties)
 
     override suspend fun saveAllForms(forms: List<Form>) = contentDao.saveForms(forms)
 
-    override suspend fun saveAllSubjects(subjects: List<Subject>) = contentDao.saveSubjects(subjects)
+    override suspend fun saveAllSubjects(subjects: List<Subject>) =
+        contentDao.saveSubjects(subjects)
 
-    override suspend fun insertFeedSource(feedSources: List<FeedSource>) = contentDao.insertFeedSource(feedSources)
+    override suspend fun insertFeedSource(feedSources: List<FeedSource>) =
+        contentDao.insertFeedSource(feedSources)
 
-    override suspend fun insertAllLessons(contentData: ContentData) = contentDao.insertAllContent(contentData)
+    override suspend fun insertAllLessons(contentData: ContentData) =
+        contentDao.insertAllContent(contentData)
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/secfirst/umbrella/data/database/content/entity.kt b/app/src/main/java/org/secfirst/umbrella/data/database/content/entity.kt
index 97c9854b..00cbd18a 100644
--- a/app/src/main/java/org/secfirst/umbrella/data/database/content/entity.kt
+++ b/app/src/main/java/org/secfirst/umbrella/data/database/content/entity.kt
@@ -12,11 +12,15 @@ import org.secfirst.umbrella.data.database.lesson.Module
 import org.secfirst.umbrella.data.database.reader.FeedSource
 import org.secfirst.umbrella.data.database.reader.RSS
 
-class ContentData(val modules: MutableList<Module> = arrayListOf(), val forms: MutableList<Form> = arrayListOf())
+class ContentData(
+    val modules: MutableList<Module> = arrayListOf(),
+    val forms: MutableList<Form> = arrayListOf()
+)
 
 fun Content.toSearchResult(): SearchResult {
     val segments = this.checklist?.id.orEmpty().split("/")
-    return SearchResult("${WordUtils.capitalizeFully(segments[1])} - ${WordUtils.capitalizeFully(segments[2])}", ""
+    return SearchResult(
+        "${WordUtils.capitalizeFully(segments[1])} - ${WordUtils.capitalizeFully(segments[2])}", ""
     ) { c: Context ->
         val withoutLanguage = this.checklist?.id?.split("/")?.drop(1)?.joinToString("/")
         c.startActivity(Intent(Intent.ACTION_VIEW, Uri.parse("umbrella://$withoutLanguage")))
diff --git a/app/src/main/java/org/secfirst/umbrella/data/database/difficulty/DifficultyDao.kt b/app/src/main/java/org/secfirst/umbrella/data/database/difficulty/DifficultyDao.kt
index a73bb4a3..3f99c44f 100644
--- a/app/src/main/java/org/secfirst/umbrella/data/database/difficulty/DifficultyDao.kt
+++ b/app/src/main/java/org/secfirst/umbrella/data/database/difficulty/DifficultyDao.kt
@@ -15,24 +15,26 @@ interface DifficultyDao {
         }
     }
 
-    suspend fun getSubjectByModule(modulePathId: String): Subject? = withContext(AppExecutors.ioContext) {
-        SQLite.select()
+    suspend fun getSubjectByModule(modulePathId: String): Subject? =
+        withContext(AppExecutors.ioContext) {
+            SQLite.select()
                 .from(Subject::class.java)
                 .where(Subject_Table.module_id.`is`(modulePathId))
                 .querySingle()
-    }
+        }
 
-    suspend fun getSubjectBy(subjectPathId: String): Subject? = withContext(AppExecutors.ioContext) {
-        SQLite.select()
+    suspend fun getSubjectBy(subjectPathId: String): Subject? =
+        withContext(AppExecutors.ioContext) {
+            SQLite.select()
                 .from(Subject::class.java)
                 .where(Subject_Table.id.`is`(subjectPathId))
                 .querySingle()
-    }
+        }
 
     suspend fun getDifficultyBy(pathId: String): Difficulty? = withContext(AppExecutors.ioContext) {
         SQLite.select()
-                .from(Difficulty::class.java)
-                .where(Difficulty_Table.id.`is`(pathId))
-                .querySingle()
+            .from(Difficulty::class.java)
+            .where(Difficulty_Table.id.`is`(pathId))
+            .querySingle()
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/secfirst/umbrella/data/database/difficulty/DifficultyRepository.kt b/app/src/main/java/org/secfirst/umbrella/data/database/difficulty/DifficultyRepository.kt
index 486aa1a0..1d507a9b 100644
--- a/app/src/main/java/org/secfirst/umbrella/data/database/difficulty/DifficultyRepository.kt
+++ b/app/src/main/java/org/secfirst/umbrella/data/database/difficulty/DifficultyRepository.kt
@@ -2,13 +2,16 @@ package org.secfirst.umbrella.data.database.difficulty
 
 import javax.inject.Inject
 
-class DifficultyRepository @Inject constructor(private val diffDao: DifficultyDao) : DifficultyRepo {
+class DifficultyRepository @Inject constructor(private val diffDao: DifficultyDao) :
+    DifficultyRepo {
 
-    override suspend fun loadSubjectByModule(moduleSha1ID: String) = diffDao.getSubjectByModule(moduleSha1ID)
+    override suspend fun loadSubjectByModule(moduleSha1ID: String) =
+        diffDao.getSubjectByModule(moduleSha1ID)
 
     override suspend fun loadDifficultyBy(sha1ID: String) = diffDao.getDifficultyBy(sha1ID)
 
     override suspend fun loadSubjectBy(subjectSha1ID: String) = diffDao.getSubjectBy(subjectSha1ID)
 
-    override suspend fun saveTopicPreferred(difficultyPreferred: DifficultyPreferred) = diffDao.save(difficultyPreferred)
+    override suspend fun saveTopicPreferred(difficultyPreferred: DifficultyPreferred) =
+        diffDao.save(difficultyPreferred)
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/secfirst/umbrella/data/database/difficulty/entity.kt b/app/src/main/java/org/secfirst/umbrella/data/database/difficulty/entity.kt
index c0b4be50..3b162e75 100644
--- a/app/src/main/java/org/secfirst/umbrella/data/database/difficulty/entity.kt
+++ b/app/src/main/java/org/secfirst/umbrella/data/database/difficulty/entity.kt
@@ -15,30 +15,31 @@ import org.secfirst.umbrella.data.database.segment.Markdown_Table
 @Parcelize
 @Table(database = AppDatabase::class)
 data class Difficulty(
-        @PrimaryKey
-        var id: String = "",
-        @ForeignKey(stubbedRelationship = true)
-        var subject: Subject? = null,
-        @Column
-        var index: Int = 0,
-        @Column
-        var title: String = "",
-        @Column
-        var description: String = "",
-        var markdowns: MutableList<Markdown> = arrayListOf(),
-        var checklist: MutableList<Checklist> = arrayListOf(),
-        @Column
-        var rootDir: String = "",
-        @JsonIgnore
-        var layoutColor: String = "") : Parcelable {
+    @PrimaryKey
+    var id: String = "",
+    @ForeignKey(stubbedRelationship = true)
+    var subject: Subject? = null,
+    @Column
+    var index: Int = 0,
+    @Column
+    var title: String = "",
+    @Column
+    var description: String = "",
+    var markdowns: MutableList<Markdown> = arrayListOf(),
+    var checklist: MutableList<Checklist> = arrayListOf(),
+    @Column
+    var rootDir: String = "",
+    @JsonIgnore
+    var layoutColor: String = ""
+) : Parcelable {
 
     @OneToMany(methods = [(OneToMany.Method.ALL)], variableName = "markdowns")
     fun oneToManyMarkdowns(): MutableList<Markdown> {
         if (markdowns.isEmpty()) {
             markdowns = SQLite.select()
-                    .from(Markdown::class.java)
-                    .where(Markdown_Table.difficulty_id.eq(id))
-                    .queryList()
+                .from(Markdown::class.java)
+                .where(Markdown_Table.difficulty_id.eq(id))
+                .queryList()
         }
         return markdowns
     }
@@ -47,9 +48,9 @@ data class Difficulty(
     fun oneToManyChecklist(): MutableList<Checklist> {
         if (checklist.isEmpty()) {
             checklist = SQLite.select()
-                    .from(Checklist::class.java)
-                    .where(Checklist_Table.difficulty_id.eq(id))
-                    .queryList()
+                .from(Checklist::class.java)
+                .where(Checklist_Table.difficulty_id.eq(id))
+                .queryList()
         }
         return checklist
     }
@@ -95,7 +96,9 @@ fun MutableList<Difficulty>.withColors(): List<Difficulty> {
 }
 
 @Table(database = AppDatabase::class)
-data class DifficultyPreferred(@PrimaryKey
-                               var subjectId: String = "",
-                               @ForeignKey
-                               var difficulty: Difficulty? = null)
\ No newline at end of file
+data class DifficultyPreferred(
+    @PrimaryKey
+    var subjectId: String = "",
+    @ForeignKey
+    var difficulty: Difficulty? = null
+)
\ No newline at end of file
diff --git a/app/src/main/java/org/secfirst/umbrella/data/database/form/FormDao.kt b/app/src/main/java/org/secfirst/umbrella/data/database/form/FormDao.kt
index 4fc1b6de..1f3b9975 100644
--- a/app/src/main/java/org/secfirst/umbrella/data/database/form/FormDao.kt
+++ b/app/src/main/java/org/secfirst/umbrella/data/database/form/FormDao.kt
@@ -14,7 +14,10 @@ interface FormDao {
             try {
                 modelAdapter<Answer>().insert(answer)
             } catch (e: Exception) {
-                Log.e(FormDao::class.simpleName, "Error when tried to insert a answer - ${e.stackTrace}")
+                Log.e(
+                    FormDao::class.simpleName,
+                    "Error when tried to insert a answer - ${e.stackTrace}"
+                )
             }
         }
     }
@@ -34,7 +37,10 @@ interface FormDao {
             try {
                 res = modelAdapter<ActiveForm>().save(activeForm)
             } catch (e: Exception) {
-                Log.e(FormDao::class.simpleName, "Error when tried to insert a activeForm - ${e.stackTrace}")
+                Log.e(
+                    FormDao::class.simpleName,
+                    "Error when tried to insert a activeForm - ${e.stackTrace}"
+                )
             }
         }
         return res
@@ -42,34 +48,34 @@ interface FormDao {
 
     suspend fun getAnswerBy(formId: Long): List<Answer> = withContext(ioContext) {
         SQLite.select()
-                .from(Answer::class.java)
-                .where(Answer_Table.activeForm_id.`is`(formId))
-                .queryList()
+            .from(Answer::class.java)
+            .where(Answer_Table.activeForm_id.`is`(formId))
+            .queryList()
     }
 
     suspend fun getAllFormModel(): List<Form> = withContext(ioContext) {
         SQLite.select()
-                .from(Form::class.java)
-                .queryList()
+            .from(Form::class.java)
+            .queryList()
     }
 
     suspend fun getForm(formTitle: String): Form? = withContext(ioContext) {
         SQLite.select()
-                .from(Form::class.java)
-                .where(Form_Table.deeplinkTitle.`is`(formTitle))
-                .querySingle()
+            .from(Form::class.java)
+            .where(Form_Table.deeplinkTitle.`is`(formTitle))
+            .querySingle()
     }
 
     suspend fun getAllActiveForms(): List<ActiveForm> = withContext(ioContext) {
         SQLite.select()
-                .from(ActiveForm::class.java)
-                .queryList()
+            .from(ActiveForm::class.java)
+            .queryList()
     }
 
     suspend fun getScreenBy(pathID: String): List<Screen> = withContext(ioContext) {
         SQLite.select()
-                .from(Screen::class.java)
-                .where(Screen_Table.form_path.`is`(pathID))
-                .queryList()
+            .from(Screen::class.java)
+            .where(Screen_Table.form_path.`is`(pathID))
+            .queryList()
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/secfirst/umbrella/data/database/form/FormRepo.kt b/app/src/main/java/org/secfirst/umbrella/data/database/form/FormRepo.kt
index a362418d..594a55e5 100644
--- a/app/src/main/java/org/secfirst/umbrella/data/database/form/FormRepo.kt
+++ b/app/src/main/java/org/secfirst/umbrella/data/database/form/FormRepo.kt
@@ -16,5 +16,5 @@ interface FormRepo {
 
     suspend fun loadForm(formTitle: String): Form?
 
-    suspend fun loadScreenBy(sh1ID : String): List<Screen>
+    suspend fun loadScreenBy(sh1ID: String): List<Screen>
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/secfirst/umbrella/data/database/form/FormRepository.kt b/app/src/main/java/org/secfirst/umbrella/data/database/form/FormRepository.kt
index bf2c187d..6ff5be48 100644
--- a/app/src/main/java/org/secfirst/umbrella/data/database/form/FormRepository.kt
+++ b/app/src/main/java/org/secfirst/umbrella/data/database/form/FormRepository.kt
@@ -10,7 +10,8 @@ class FormRepository @Inject constructor(private val formDao: FormDao) : FormRep
 
     override suspend fun loadScreenBy(sh1ID: String): List<Screen> = formDao.getScreenBy(sh1ID)
 
-    override suspend fun persistActiveForm(activeForm: ActiveForm) = formDao.saveActiveForm(activeForm)
+    override suspend fun persistActiveForm(activeForm: ActiveForm) =
+        formDao.saveActiveForm(activeForm)
 
     override suspend fun persistFormData(answer: Answer) = formDao.insertAnswer(answer)
 
diff --git a/app/src/main/java/org/secfirst/umbrella/data/database/form/entity.kt b/app/src/main/java/org/secfirst/umbrella/data/database/form/entity.kt
index a0135c51..bab00b8b 100644
--- a/app/src/main/java/org/secfirst/umbrella/data/database/form/entity.kt
+++ b/app/src/main/java/org/secfirst/umbrella/data/database/form/entity.kt
@@ -17,21 +17,22 @@ import java.io.Serializable
 
 @Table(database = AppDatabase::class, useBooleanGetterSetters = false)
 data class Form(
-        @PrimaryKey
-        var path: String = "",
-        @Column
-        var title: String = "",
-        @Column
-        var deeplinkTitle: String = "",
-        var screens: MutableList<Screen> = arrayListOf()) : BaseModel(), Serializable {
+    @PrimaryKey
+    var path: String = "",
+    @Column
+    var title: String = "",
+    @Column
+    var deeplinkTitle: String = "",
+    var screens: MutableList<Screen> = arrayListOf()
+) : BaseModel(), Serializable {
 
     @OneToMany(methods = [(OneToMany.Method.ALL)], variableName = "screens")
     fun oneToManyScreens(): MutableList<Screen> {
         if (screens.isEmpty()) {
             screens = SQLite.select()
-                    .from(Screen::class.java)
-                    .where(Screen_Table.form_path.eq(path))
-                    .queryList()
+                .from(Screen::class.java)
+                .where(Screen_Table.form_path.eq(path))
+                .queryList()
         }
         return screens
     }
@@ -39,22 +40,23 @@ data class Form(
 
 @Table(database = AppDatabase::class)
 data class Screen(
-        @PrimaryKey(autoincrement = true)
-        var id: Long = 0,
-        @Column
-        var title: String = "",
-        @JsonIgnore
-        @ForeignKey(stubbedRelationship = true)
-        var form: Form? = null,
-        var items: MutableList<Item> = arrayListOf()) : BaseModel(), Serializable {
+    @PrimaryKey(autoincrement = true)
+    var id: Long = 0,
+    @Column
+    var title: String = "",
+    @JsonIgnore
+    @ForeignKey(stubbedRelationship = true)
+    var form: Form? = null,
+    var items: MutableList<Item> = arrayListOf()
+) : BaseModel(), Serializable {
 
     @OneToMany(methods = [(OneToMany.Method.ALL)], variableName = "items")
     fun oneToManyItems(): MutableList<Item> {
         if (items.isEmpty()) {
             items = SQLite.select()
-                    .from(Item::class.java)
-                    .where(Item_Table.screen_id.eq(id))
-                    .queryList()
+                .from(Item::class.java)
+                .where(Item_Table.screen_id.eq(id))
+                .queryList()
         }
         return items
     }
@@ -63,29 +65,30 @@ data class Screen(
 
 @Table(database = AppDatabase::class)
 data class Item(
-        @PrimaryKey(autoincrement = true)
-        var id: Long = 0,
-        @Column
-        var name: String = "",
-        @Column
-        var type: String = "",
-        @Column
-        var label: String = "",
-        @ForeignKey(stubbedRelationship = true)
-        var screen: Screen? = null,
-        var options: MutableList<Option> = arrayListOf(),
-        @Column
-        var value: String = "",
-        @Column
-        var hint: String = "") : Serializable {
+    @PrimaryKey(autoincrement = true)
+    var id: Long = 0,
+    @Column
+    var name: String = "",
+    @Column
+    var type: String = "",
+    @Column
+    var label: String = "",
+    @ForeignKey(stubbedRelationship = true)
+    var screen: Screen? = null,
+    var options: MutableList<Option> = arrayListOf(),
+    @Column
+    var value: String = "",
+    @Column
+    var hint: String = ""
+) : Serializable {
 
     @OneToMany(methods = [(OneToMany.Method.ALL)], variableName = "options")
     fun oneToManyOptions(): MutableList<Option> {
         if (options.isEmpty()) {
             options = SQLite.select()
-                    .from(Option::class.java)
-                    .where(Option_Table.item_id.eq(id))
-                    .queryList()
+                .from(Option::class.java)
+                .where(Option_Table.item_id.eq(id))
+                .queryList()
         }
         return options
     }
@@ -94,35 +97,38 @@ data class Item(
 
 @Table(database = AppDatabase::class, allFields = false)
 data class Option(
-        @PrimaryKey(autoincrement = true)
-        var id: Long = 0,
-        @Column
-        var label: String = "",
-        @ForeignKey(stubbedRelationship = true)
-        var item: Item? = null,
-        @Column
-        var value: String = "") : BaseModel(), Serializable
+    @PrimaryKey(autoincrement = true)
+    var id: Long = 0,
+    @Column
+    var label: String = "",
+    @ForeignKey(stubbedRelationship = true)
+    var item: Item? = null,
+    @Column
+    var value: String = ""
+) : BaseModel(), Serializable
 
 @Table(database = AppDatabase::class)
-data class ActiveForm(@PrimaryKey(autoincrement = true)
-                      var id: Long = 0,
-                      var form: Form = Form(),
-                      @Column(name = "form_sha1")
-                      var sha1Form: String = "",
-                      @Column
-                      var date: String = "",
-                      @Column
-                      var title: String = "",
-                      var answers: MutableList<Answer>? = arrayListOf()) : BaseModel(), Serializable {
+data class ActiveForm(
+    @PrimaryKey(autoincrement = true)
+    var id: Long = 0,
+    var form: Form = Form(),
+    @Column(name = "form_sha1")
+    var sha1Form: String = "",
+    @Column
+    var date: String = "",
+    @Column
+    var title: String = "",
+    var answers: MutableList<Answer>? = arrayListOf()
+) : BaseModel(), Serializable {
 
     @OneToMany(methods = [(OneToMany.Method.ALL)], variableName = "answers")
     fun oneToManyAnswers(): MutableList<Answer>? {
         answers?.let {
             if (it.isEmpty()) {
                 answers = SQLite.select()
-                        .from(Answer::class.java)
-                        .where(Answer_Table.activeForm_id.eq(id))
-                        .queryList()
+                    .from(Answer::class.java)
+                    .where(Answer_Table.activeForm_id.eq(id))
+                    .queryList()
             }
         }
         return answers
@@ -131,20 +137,23 @@ data class ActiveForm(@PrimaryKey(autoincrement = true)
 
 @Table(database = AppDatabase::class, useBooleanGetterSetters = false)
 data class Answer(
-        @PrimaryKey(autoincrement = true)
-        var id: Long = 0,
-        @Column
-        var textInput: String = "",
-        @Column
-        var choiceInput: Boolean = false,
-        @Column
-        var itemId: Long = 0,
-        @Column
-        var optionId: Long = 0,
-        @ForeignKey(onUpdate = ForeignKeyAction.CASCADE,
-                onDelete = ForeignKeyAction.CASCADE,
-                deleteForeignKeyModel = false, stubbedRelationship = true)
-        var activeForm: ActiveForm? = null) : Serializable
+    @PrimaryKey(autoincrement = true)
+    var id: Long = 0,
+    @Column
+    var textInput: String = "",
+    @Column
+    var choiceInput: Boolean = false,
+    @Column
+    var itemId: Long = 0,
+    @Column
+    var optionId: Long = 0,
+    @ForeignKey(
+        onUpdate = ForeignKeyAction.CASCADE,
+        onDelete = ForeignKeyAction.CASCADE,
+        deleteForeignKeyModel = false, stubbedRelationship = true
+    )
+    var activeForm: ActiveForm? = null
+) : Serializable
 
 fun ActiveForm.asHTML(): String {
     var fileName = this.title.replace("[^a-zA-Z0-9.-]", "_")
@@ -204,7 +213,8 @@ fun MutableList<Form>.associateFormForeignKey() {
 }
 
 fun Form.toSearchResult(): SearchResult {
-    return SearchResult(this.title, "Summary of ${this.title}"
+    return SearchResult(
+        this.title, "Summary of ${this.title}"
     ) { c: Context ->
         val withoutLanguage = this.path.split("/").drop(1).joinToString("/")
         c.startActivity(Intent(Intent.ACTION_VIEW, Uri.parse("umbrella://forms/$withoutLanguage")))
diff --git a/app/src/main/java/org/secfirst/umbrella/data/database/lesson/LessonDao.kt b/app/src/main/java/org/secfirst/umbrella/data/database/lesson/LessonDao.kt
index 4fcde627..af6771fb 100644
--- a/app/src/main/java/org/secfirst/umbrella/data/database/lesson/LessonDao.kt
+++ b/app/src/main/java/org/secfirst/umbrella/data/database/lesson/LessonDao.kt
@@ -14,59 +14,62 @@ interface LessonDao {
 
     suspend fun getAllLesson(): List<Module> = withContext(ioContext) {
         val modules = SQLite.select()
-                .from(ModuleModelView::class.java)
-                .orderBy(ModuleModelView_ViewTable.index, true)
-                .queryList()
+            .from(ModuleModelView::class.java)
+            .orderBy(ModuleModelView_ViewTable.index, true)
+            .queryList()
         val subjects = SQLite.select()
-                .from(SubjectModelView::class.java)
-                .where(SubjectModelView_ViewTable.module_id.`in`(modules.map { it.id }))
-                .orderBy(SubjectModelView_ViewTable.index, true)
-                .queryList()
+            .from(SubjectModelView::class.java)
+            .where(SubjectModelView_ViewTable.module_id.`in`(modules.map { it.id }))
+            .orderBy(SubjectModelView_ViewTable.index, true)
+            .queryList()
         val markdowns = SQLite.select()
-                .from(Markdown::class.java)
-                .where(Markdown_Table.module_id.`in`(modules.map { it.id }))
-                .orderBy(Markdown_Table.index, true)
-                .queryList()
+            .from(Markdown::class.java)
+            .where(Markdown_Table.module_id.`in`(modules.map { it.id }))
+            .orderBy(Markdown_Table.index, true)
+            .queryList()
         modules.map {
             it.toModule().apply {
-                this.subjects = subjects.filter { it.module_id == this.id }.map { it.toSubject() }.toMutableList()
+                this.subjects = subjects.filter { it.module_id == this.id }.map { it.toSubject() }
+                    .toMutableList()
                 this.markdowns = markdowns.filter { it.module!!.id == this.id }.toMutableList()
             }
         }
     }
 
-    suspend fun getDifficultyBySubject(subjectId: String): List<Difficulty> = withContext(ioContext) {
-        SQLite.select()
+    suspend fun getDifficultyBySubject(subjectId: String): List<Difficulty> =
+        withContext(ioContext) {
+            SQLite.select()
                 .from(Difficulty::class.java)
                 .where(Difficulty_Table.subject_id.`is`(subjectId))
                 .queryList()
-    }
+        }
 
     suspend fun getMarkdownBySubject(subjectId: String): List<Markdown> = withContext(ioContext) {
         SQLite.select()
-                .from(Markdown::class.java)
-                .where(Markdown_Table.subject_id.`is`(subjectId))
-                .queryList()
+            .from(Markdown::class.java)
+            .where(Markdown_Table.subject_id.`is`(subjectId))
+            .queryList()
     }
 
-    suspend fun getDifficultyPreferred(subjectId: String): DifficultyPreferred? = withContext(ioContext) {
-        SQLite.select()
+    suspend fun getDifficultyPreferred(subjectId: String): DifficultyPreferred? =
+        withContext(ioContext) {
+            SQLite.select()
                 .from(DifficultyPreferred::class.java)
                 .where(DifficultyPreferred_Table.subjectId.`is`(subjectId))
                 .querySingle()
-    }
+        }
 
     suspend fun getLessonBy(moduleId: String): Module? = withContext(ioContext) {
         SQLite.select()
-                .from(Module::class.java)
-                .where(Module_Table.id.`is`(moduleId))
-                .querySingle()
+            .from(Module::class.java)
+            .where(Module_Table.id.`is`(moduleId))
+            .querySingle()
     }
 
     suspend fun getFavoriteMarkdown(): List<Markdown> = withContext(ioContext) {
         SQLite.select()
-                .from(Markdown::class.java)
-                .where(Markdown_Table.favorite.`is`(true))
-                .queryList()
+            .from(Markdown::class.java)
+            .where(Markdown_Table.favorite.`is`(true))
+            .queryList()
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/secfirst/umbrella/data/database/lesson/LessonRepository.kt b/app/src/main/java/org/secfirst/umbrella/data/database/lesson/LessonRepository.kt
index 54a4230d..7310fa83 100644
--- a/app/src/main/java/org/secfirst/umbrella/data/database/lesson/LessonRepository.kt
+++ b/app/src/main/java/org/secfirst/umbrella/data/database/lesson/LessonRepository.kt
@@ -4,15 +4,18 @@ import javax.inject.Inject
 
 class LessonRepository @Inject constructor(private val lessonDao: LessonDao) : LessonRepo {
 
-    override suspend fun loadDifficultyBySubject(subjectId: String) = lessonDao.getDifficultyBySubject(subjectId)
+    override suspend fun loadDifficultyBySubject(subjectId: String) =
+        lessonDao.getDifficultyBySubject(subjectId)
 
     override suspend fun loadAllFavoriteSubjects() = lessonDao.getFavoriteMarkdown()
 
-    override suspend fun loadMarkdownBySubject(subjectId: String) = lessonDao.getMarkdownBySubject(subjectId)
+    override suspend fun loadMarkdownBySubject(subjectId: String) =
+        lessonDao.getMarkdownBySubject(subjectId)
 
     override suspend fun loadLessonBy(sha1ID: String) = lessonDao.getLessonBy(sha1ID)
 
-    override suspend fun loadDifficultyPreferredBy(subjectId: String) = lessonDao.getDifficultyPreferred(subjectId)
+    override suspend fun loadDifficultyPreferredBy(subjectId: String) =
+        lessonDao.getDifficultyPreferred(subjectId)
 
     override suspend fun loadAllModules() = lessonDao.getAllLesson()
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/secfirst/umbrella/data/database/lesson/entity.kt b/app/src/main/java/org/secfirst/umbrella/data/database/lesson/entity.kt
index 2a8e9b88..c8b0a254 100644
--- a/app/src/main/java/org/secfirst/umbrella/data/database/lesson/entity.kt
+++ b/app/src/main/java/org/secfirst/umbrella/data/database/lesson/entity.kt
@@ -3,7 +3,9 @@ package org.secfirst.umbrella.data.database.lesson
 import android.os.Parcelable
 import com.fasterxml.jackson.annotation.JsonIgnore
 import com.raizlabs.android.dbflow.annotation.*
+import com.raizlabs.android.dbflow.sql.Query
 import com.raizlabs.android.dbflow.sql.language.SQLite
+import com.raizlabs.android.dbflow.structure.BaseModelView
 import kotlinx.android.parcel.Parcelize
 import org.secfirst.umbrella.data.database.AppDatabase
 import org.secfirst.umbrella.data.database.checklist.Checklist
@@ -13,101 +15,104 @@ import org.secfirst.umbrella.data.database.difficulty.Difficulty_Table
 import org.secfirst.umbrella.data.database.segment.Markdown
 import org.secfirst.umbrella.data.database.segment.Markdown_Table
 import org.secfirst.umbrella.misc.appContext
-import com.raizlabs.android.dbflow.annotation.Column
-import com.raizlabs.android.dbflow.annotation.ModelViewQuery
-import com.raizlabs.android.dbflow.annotation.ModelView
-import com.raizlabs.android.dbflow.sql.Query
-import com.raizlabs.android.dbflow.structure.BaseModelView
 
 
-data class Lesson(var moduleId: String,
-                  var moduleTitle: String = "",
-                  var pathIcon: String = "",
-                  var markdowns: MutableList<Markdown> = mutableListOf(),
-                  var topics: List<Subject> = listOf())
+data class Lesson(
+    var moduleId: String,
+    var moduleTitle: String = "",
+    var pathIcon: String = "",
+    var markdowns: MutableList<Markdown> = mutableListOf(),
+    var topics: List<Subject> = listOf()
+)
 
 
 @ModelView(database = AppDatabase::class, name = "Module")
-open class ModuleModelView(@Column
-                      var id: String = "",
-                           @Column
-                      var index: Int = 0,
-                           @Column
-                      var title: String = "",
-                           @Column
-                      var template: String = "",
-                           @Column
-                      var description: String = "",
-                           var markdowns: MutableList<Markdown> = mutableListOf(),
-                           var subjects: MutableList<Subject> = mutableListOf(),
-                           var checklist: MutableList<Checklist> = mutableListOf(),
-                           @Column
-                      var rootDir: String = "",
-                           @Column
-                      var icon: String = "",
-                           @Column
-                      var resourcePath: String = ""): BaseModelView() {
+open class ModuleModelView(
+    @Column
+    var id: String = "",
+    @Column
+    var index: Int = 0,
+    @Column
+    var title: String = "",
+    @Column
+    var template: String = "",
+    @Column
+    var description: String = "",
+    var markdowns: MutableList<Markdown> = mutableListOf(),
+    var subjects: MutableList<Subject> = mutableListOf(),
+    var checklist: MutableList<Checklist> = mutableListOf(),
+    @Column
+    var rootDir: String = "",
+    @Column
+    var icon: String = "",
+    @Column
+    var resourcePath: String = ""
+) : BaseModelView() {
 
     fun toModule(): Module {
         return Module(
-                id = this.id,
-                index = this.index,
-                title = this.title,
-                template = this.template,
-                description = this.description,
-                markdowns = this.markdowns,
-                subjects = this.subjects,
-                checklist = this.checklist,
-                rootDir = this.rootDir,
-                icon = this.icon,
-                resourcePath = this.resourcePath
+            id = this.id,
+            index = this.index,
+            title = this.title,
+            template = this.template,
+            description = this.description,
+            markdowns = this.markdowns,
+            subjects = this.subjects,
+            checklist = this.checklist,
+            rootDir = this.rootDir,
+            icon = this.icon,
+            resourcePath = this.resourcePath
         )
     }
 
     companion object {
-        @ModelViewQuery @JvmField
+        @ModelViewQuery
+        @JvmField
         val query: Query = SQLite.select().from(Module::class.java).queryBuilderBase
     }
 }
 
 @ModelView(database = AppDatabase::class, name = "Subject")
 data class SubjectModelView(
-        @Column
-        var index: Int = 0,
-        @Column
-        var title: String = "",
-        @Column
-        var description: String = "",
-        var markdowns: MutableList<Markdown> = arrayListOf(),
-        var difficulties: MutableList<Difficulty> = arrayListOf(),
-        var checklist: MutableList<Checklist> = arrayListOf(),
-        @Column
-        var rootDir: String = "",
-        @Column
-        var id: String = "",
-        @Column
-        var module_id: String = "",
-        @Column
-        var icon: String = "") : BaseModelView() {
+    @Column
+    var index: Int = 0,
+    @Column
+    var title: String = "",
+    @Column
+    var description: String = "",
+    var markdowns: MutableList<Markdown> = arrayListOf(),
+    var difficulties: MutableList<Difficulty> = arrayListOf(),
+    var checklist: MutableList<Checklist> = arrayListOf(),
+    @Column
+    var rootDir: String = "",
+    @Column
+    var id: String = "",
+    @Column
+    var module_id: String = "",
+    @Column
+    var icon: String = ""
+) : BaseModelView() {
 
     fun toSubject(): Subject {
         return Subject(
-                id = this.id,
-                index = this.index,
-                title = this.title,
-                description = this.description,
-                markdowns = this.markdowns,
-                difficulties = this.difficulties,
-                checklist = this.checklist,
-                rootDir = this.rootDir,
-                icon = this.icon,
-                module = Module(id = this.module_id)
+            id = this.id,
+            index = this.index,
+            title = this.title,
+            description = this.description,
+            markdowns = this.markdowns,
+            difficulties = this.difficulties,
+            checklist = this.checklist,
+            rootDir = this.rootDir,
+            icon = this.icon,
+            module = Module(id = this.module_id)
         )
     }
 
     companion object {
-        @ModelViewQuery @JvmField
-        val query: Query = SQLite.select().from(SubjectModelView_ViewTable::class.java).queryBuilderBase
+        @ModelViewQuery
+        @JvmField
+        val query: Query =
+            SQLite.select().from(SubjectModelView_ViewTable::class.java).queryBuilderBase
     }
 
 }
@@ -115,33 +120,34 @@ data class SubjectModelView(
 @Table(database = AppDatabase::class)
 @Parcelize
 open class Module(
-        @PrimaryKey
-        var id: String = "",
-        @Column
-        var index: Int = 0,
-        @Column
-        var title: String = "",
-        @Column
-        var template: String = "",
-        @Column
-        var description: String = "",
-        var markdowns: MutableList<Markdown> = arrayListOf(),
-        var subjects: MutableList<Subject> = arrayListOf(),
-        var checklist: MutableList<Checklist> = arrayListOf(),
-        @Column
-        var rootDir: String = "",
-        var icon: String = "",
-        @Column
-        @JsonIgnore
-        var resourcePath: String = "") : Parcelable {
+    @PrimaryKey
+    var id: String = "",
+    @Column
+    var index: Int = 0,
+    @Column
+    var title: String = "",
+    @Column
+    var template: String = "",
+    @Column
+    var description: String = "",
+    var markdowns: MutableList<Markdown> = arrayListOf(),
+    var subjects: MutableList<Subject> = arrayListOf(),
+    var checklist: MutableList<Checklist> = arrayListOf(),
+    @Column
+    var rootDir: String = "",
+    var icon: String = "",
+    @Column
+    @JsonIgnore
+    var resourcePath: String = ""
+) : Parcelable {
 
     @OneToMany(methods = [(OneToMany.Method.ALL)], variableName = "markdowns")
     fun oneToManyMarkdowns(): MutableList<Markdown> {
         if (markdowns.isEmpty()) {
             markdowns = SQLite.select()
-                    .from(Markdown::class.java)
-                    .where(Markdown_Table.module_id.eq(id))
-                    .queryList()
+                .from(Markdown::class.java)
+                .where(Markdown_Table.module_id.eq(id))
+                .queryList()
         }
         return markdowns
     }
@@ -150,9 +156,9 @@ open class Module(
     fun oneToManySubcategory(): MutableList<Subject> {
         if (subjects.isEmpty()) {
             subjects = SQLite.select()
-                    .from(Subject::class.java)
-                    .where(Subject_Table.module_id.eq(id))
-                    .queryList()
+                .from(Subject::class.java)
+                .where(Subject_Table.module_id.eq(id))
+                .queryList()
         }
         return subjects
     }
@@ -161,9 +167,9 @@ open class Module(
     fun oneToManyChecklist(): MutableList<Checklist> {
         if (checklist.isEmpty()) {
             checklist = SQLite.select()
-                    .from(Checklist::class.java)
-                    .where(Checklist_Table.module_id.eq(id))
-                    .queryList()
+                .from(Checklist::class.java)
+                .where(Checklist_Table.module_id.eq(id))
+                .queryList()
         }
         return checklist
     }
@@ -176,30 +182,31 @@ open class Module(
 @Table(database = AppDatabase::class)
 @Parcelize
 data class Subject(
-        @Column
-        var index: Int = 0,
-        @Column
-        var title: String = "",
-        @Column
-        var description: String = "",
-        var markdowns: MutableList<Markdown> = arrayListOf(),
-        var difficulties: MutableList<Difficulty> = arrayListOf(),
-        var checklist: MutableList<Checklist> = arrayListOf(),
-        @Column
-        var rootDir: String = "",
-        @PrimaryKey
-        var id: String = "",
-        var icon: String = "",
-        @ForeignKey(stubbedRelationship = true)
-        var module: Module? = null) : Parcelable {
+    @Column
+    var index: Int = 0,
+    @Column
+    var title: String = "",
+    @Column
+    var description: String = "",
+    var markdowns: MutableList<Markdown> = arrayListOf(),
+    var difficulties: MutableList<Difficulty> = arrayListOf(),
+    var checklist: MutableList<Checklist> = arrayListOf(),
+    @Column
+    var rootDir: String = "",
+    @PrimaryKey
+    var id: String = "",
+    var icon: String = "",
+    @ForeignKey(stubbedRelationship = true)
+    var module: Module? = null
+) : Parcelable {
 
     @OneToMany(methods = [(OneToMany.Method.ALL)], variableName = "markdowns")
     fun oneToManyMarkdowns(): MutableList<Markdown> {
         if (markdowns.isEmpty()) {
             markdowns = SQLite.select()
-                    .from(Markdown::class.java)
-                    .where(Markdown_Table.subject_id.eq(id))
-                    .queryList()
+                .from(Markdown::class.java)
+                .where(Markdown_Table.subject_id.eq(id))
+                .queryList()
         }
         return markdowns
     }
@@ -208,9 +215,9 @@ data class Subject(
     fun oneToManyChildren(): MutableList<Difficulty> {
         if (difficulties.isEmpty()) {
             difficulties = SQLite.select()
-                    .from(Difficulty::class.java)
-                    .where(Difficulty_Table.subject_id.eq(id))
-                    .queryList()
+                .from(Difficulty::class.java)
+                .where(Difficulty_Table.subject_id.eq(id))
+                .queryList()
         }
         return difficulties
     }
@@ -220,9 +227,9 @@ data class Subject(
     fun oneToManyChecklist(): MutableList<Checklist> {
         if (checklist.isEmpty()) {
             checklist = SQLite.select()
-                    .from(Checklist::class.java)
-                    .where(Checklist_Table.module_id.eq(id))
-                    .queryList()
+                .from(Checklist::class.java)
+                .where(Checklist_Table.module_id.eq(id))
+                .queryList()
         }
         return checklist
     }
diff --git a/app/src/main/java/org/secfirst/umbrella/data/database/login/LoginRepo.kt b/app/src/main/java/org/secfirst/umbrella/data/database/login/LoginRepo.kt
index f5fd172c..78ef82f1 100644
--- a/app/src/main/java/org/secfirst/umbrella/data/database/login/LoginRepo.kt
+++ b/app/src/main/java/org/secfirst/umbrella/data/database/login/LoginRepo.kt
@@ -6,5 +6,5 @@ interface LoginRepo {
 
     suspend fun changeToken(userToken: String): Boolean
 
-    fun verifyDatabaseIntegrity() : Boolean
+    fun verifyDatabaseIntegrity(): Boolean
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/secfirst/umbrella/data/database/reader/ReaderDao.kt b/app/src/main/java/org/secfirst/umbrella/data/database/reader/ReaderDao.kt
index 5b40093c..171b07fe 100644
--- a/app/src/main/java/org/secfirst/umbrella/data/database/reader/ReaderDao.kt
+++ b/app/src/main/java/org/secfirst/umbrella/data/database/reader/ReaderDao.kt
@@ -45,19 +45,19 @@ interface ReaderDao : BaseDao {
 
     suspend fun getAllRss(): List<RSS> = withContext(ioContext) {
         SQLite.select()
-                .from(RSS::class.java)
-                .queryList()
+            .from(RSS::class.java)
+            .queryList()
     }
 
     suspend fun getAllFeedSource(): List<FeedSource> = withContext(ioContext) {
         SQLite.select()
-                .from(FeedSource::class.java)
-                .queryList()
+            .from(FeedSource::class.java)
+            .queryList()
     }
 
     suspend fun getFeedLocation() = withContext(ioContext) {
         SQLite.select()
-                .from(FeedLocation::class.java)
-                .querySingle()
+            .from(FeedLocation::class.java)
+            .querySingle()
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/secfirst/umbrella/data/database/reader/ReaderRepository.kt b/app/src/main/java/org/secfirst/umbrella/data/database/reader/ReaderRepository.kt
index f121dbab..3f252063 100644
--- a/app/src/main/java/org/secfirst/umbrella/data/database/reader/ReaderRepository.kt
+++ b/app/src/main/java/org/secfirst/umbrella/data/database/reader/ReaderRepository.kt
@@ -8,9 +8,11 @@ class ReaderRepository @Inject constructor(private val readerDao: ReaderDao) : R
 
     override suspend fun deleteLocation() = readerDao.deleteLocation()
 
-    override suspend fun saveFeedLocation(feedLocation: FeedLocation) = readerDao.saveFeedLocation(feedLocation)
+    override suspend fun saveFeedLocation(feedLocation: FeedLocation) =
+        readerDao.saveFeedLocation(feedLocation)
 
-    override suspend fun saveAllFeedSources(feedSources: List<FeedSource>) = readerDao.saveAllFeedSource(feedSources)
+    override suspend fun saveAllFeedSources(feedSources: List<FeedSource>) =
+        readerDao.saveAllFeedSource(feedSources)
 
     override suspend fun getFeedLocation() = readerDao.getFeedLocation()
 
diff --git a/app/src/main/java/org/secfirst/umbrella/data/database/reader/entity.kt b/app/src/main/java/org/secfirst/umbrella/data/database/reader/entity.kt
index 8168024c..9430ae86 100644
--- a/app/src/main/java/org/secfirst/umbrella/data/database/reader/entity.kt
+++ b/app/src/main/java/org/secfirst/umbrella/data/database/reader/entity.kt
@@ -19,17 +19,19 @@ data class RefRSS(var items: MutableList<RefRSSItem> = mutableListOf())
 data class RefRSSItem(val link: String)
 
 @Table(database = AppDatabase::class)
-data class RSS(@PrimaryKey(autoincrement = true)
-               var id: Long = 0,
-               @Column
-               var url_: String = "",
-               var title_: String = "",
-               var description_: String = "",
-               var publicationDate_: Date = Date(),
-               var imageLink_: String = "",
-               var copyRight_: String = "",
-               var author_: String = "",
-               var items_: MutableList<Article> = mutableListOf()) : Feed, Serializable {
+data class RSS(
+    @PrimaryKey(autoincrement = true)
+    var id: Long = 0,
+    @Column
+    var url_: String = "",
+    var title_: String = "",
+    var description_: String = "",
+    var publicationDate_: Date = Date(),
+    var imageLink_: String = "",
+    var copyRight_: String = "",
+    var author_: String = "",
+    var items_: MutableList<Article> = mutableListOf()
+) : Feed, Serializable {
 
     override fun getLink(): String = url_
 
@@ -52,10 +54,12 @@ data class RSS(@PrimaryKey(autoincrement = true)
 }
 
 
-data class Article(var url_: String = "", var title_: String = "",
-                   var description_: String = "", var publicationDate_: Date = Date(),
-                   var imageLink_: String = "", var copyRight_: String = "",
-                   var author_: String = "", var enclosures_: MutableList<out Enclosure> = mutableListOf()) : Item, Serializable {
+data class Article(
+    var url_: String = "", var title_: String = "",
+    var description_: String = "", var publicationDate_: Date = Date(),
+    var imageLink_: String = "", var copyRight_: String = "",
+    var author_: String = "", var enclosures_: MutableList<out Enclosure> = mutableListOf()
+) : Item, Serializable {
 
     override fun getLink() = url_
 
@@ -87,12 +91,15 @@ fun Feed.updateRSS(rss: RSS, rssFeed: RSSFeed?): RSS {
     val articleList = mutableListOf<Article>()
     items.forEach {
         var imageUrl = ""
-        if(it.imageLink != null) imageUrl = it.imageLink.toString()
-        else if (rssFeed!!.items[items.indexOf(it)].media != null) imageUrl = rssFeed.items[items.indexOf(it)].media!!.contents[0].url.toString()
-        val article = Article(it.link
+        if (it.imageLink != null) imageUrl = it.imageLink.toString()
+        else if (rssFeed!!.items[items.indexOf(it)].media != null) imageUrl =
+            rssFeed.items[items.indexOf(it)].media!!.contents[0].url.toString()
+        val article = Article(
+            it.link
                 ?: "", it.title ?: "", it.description
                 ?: "", it.publicationDate!!, imageUrl, "", it.author
-                ?: "", it.enclosures)
+                ?: "", it.enclosures
+        )
         articleList.add(article)
     }
     rss.items_ = articleList
@@ -104,23 +111,28 @@ const val RSS_FILE_NAME: String = "default_rss.json"
 @Table(database = AppDatabase::class, allFields = true)
 @Parcelize
 data class FeedLocation(
-        @PrimaryKey
-        var id: Long = 1,
-        var location: String = "",
-        var iso2: String = "") : Parcelable
+    @PrimaryKey
+    var id: Long = 1,
+    var location: String = "",
+    var iso2: String = ""
+) : Parcelable
 
 @Table(database = AppDatabase::class, allFields = true, useBooleanGetterSetters = false)
 @Parcelize
 data class FeedSource(
-        @PrimaryKey(autoincrement = true)
-        var id: Long = 0,
-        var name: String = "",
-        var lastChecked: Boolean = false,
-        var code: Int = 0) : Parcelable {
+    @PrimaryKey(autoincrement = true)
+    var id: Long = 0,
+    var name: String = "",
+    var lastChecked: Boolean = false,
+    var code: Int = 0
+) : Parcelable {
 
     constructor(name: String, lastChecked: Boolean, code: Int) : this(0, name, lastChecked, code)
 }
 
-data class LocationInfo(val locationNames: List<String> = mutableListOf(), val countryCode: String = "") {
+data class LocationInfo(
+    val locationNames: List<String> = mutableListOf(),
+    val countryCode: String = ""
+) {
     constructor() : this(mutableListOf(), "")
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/secfirst/umbrella/data/database/segment/SegmentDao.kt b/app/src/main/java/org/secfirst/umbrella/data/database/segment/SegmentDao.kt
index 1e977477..49b2c961 100644
--- a/app/src/main/java/org/secfirst/umbrella/data/database/segment/SegmentDao.kt
+++ b/app/src/main/java/org/secfirst/umbrella/data/database/segment/SegmentDao.kt
@@ -34,26 +34,27 @@ interface SegmentDao : BaseDao {
         }
     }
 
-    suspend fun getDifficultyBySubjectId(subjectId: String): List<Difficulty> = withContext(ioContext) {
-        SQLite.select()
+    suspend fun getDifficultyBySubjectId(subjectId: String): List<Difficulty> =
+        withContext(ioContext) {
+            SQLite.select()
                 .from(Difficulty::class.java)
                 .where(Difficulty_Table.subject_id.`is`(subjectId))
                 .queryList()
-    }
+        }
 
     suspend fun getSubjectByRootDir(rootDir: String): Subject? = withContext(ioContext) {
         SQLite.select()
-                .from(Subject::class.java)
-                .where(Subject_Table.rootDir.`is`(rootDir))
-                .querySingle()
+            .from(Subject::class.java)
+            .where(Subject_Table.rootDir.`is`(rootDir))
+            .querySingle()
     }
 
     suspend fun getModuleByRootDir(rootDir: String) =
-            withContext(ioContext) {
-                SQLite.select()
-                        .from(Module::class.java)
-                        .where(Module_Table.rootDir.`is`(rootDir))
-                        .querySingle()
-            }
+        withContext(ioContext) {
+            SQLite.select()
+                .from(Module::class.java)
+                .where(Module_Table.rootDir.`is`(rootDir))
+                .querySingle()
+        }
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/secfirst/umbrella/data/database/segment/SegmentRepository.kt b/app/src/main/java/org/secfirst/umbrella/data/database/segment/SegmentRepository.kt
index 8107b7e8..b234f4e9 100644
--- a/app/src/main/java/org/secfirst/umbrella/data/database/segment/SegmentRepository.kt
+++ b/app/src/main/java/org/secfirst/umbrella/data/database/segment/SegmentRepository.kt
@@ -6,19 +6,24 @@ import javax.inject.Inject
 
 class SegmentRepository @Inject constructor(private val segmentDao: SegmentDao) : SegmentRepo {
 
-    override suspend fun loadSubjectByRootDir(rootDir: String) = segmentDao.getSubjectByRootDir(rootDir)
+    override suspend fun loadSubjectByRootDir(rootDir: String) =
+        segmentDao.getSubjectByRootDir(rootDir)
 
-    override suspend fun loadDifficultyBySubjectId(subjectId: String) = segmentDao.getDifficultyBySubjectId(subjectId)
+    override suspend fun loadDifficultyBySubjectId(subjectId: String) =
+        segmentDao.getDifficultyBySubjectId(subjectId)
 
-    override suspend fun loadModuleByRootdir(moduleName: String) = segmentDao.getModuleByRootDir(moduleName)
+    override suspend fun loadModuleByRootdir(moduleName: String) =
+        segmentDao.getModuleByRootDir(moduleName)
 
     override suspend fun loadMarkdown(markdownId: String) = segmentDao.getMarkdown(markdownId)
 
     override suspend fun loadChecklist(checklistId: String) = segmentDao.getChecklist(checklistId)
 
-    override suspend fun loadDifficulty(difficultyId: String) = segmentDao.getDifficulty(difficultyId)
+    override suspend fun loadDifficulty(difficultyId: String) =
+        segmentDao.getDifficulty(difficultyId)
 
-    override suspend fun saveDifficultySelect(subjectId: String, difficulty: Difficulty) = segmentDao.save(subjectId, difficulty)
+    override suspend fun saveDifficultySelect(subjectId: String, difficulty: Difficulty) =
+        segmentDao.save(subjectId, difficulty)
 
     override suspend fun saveMarkdown(markdown: Markdown) = segmentDao.save(markdown)
 
diff --git a/app/src/main/java/org/secfirst/umbrella/data/database/segment/entity.kt b/app/src/main/java/org/secfirst/umbrella/data/database/segment/entity.kt
index f89f2245..0f56b8e0 100644
--- a/app/src/main/java/org/secfirst/umbrella/data/database/segment/entity.kt
+++ b/app/src/main/java/org/secfirst/umbrella/data/database/segment/entity.kt
@@ -26,30 +26,33 @@ import org.secfirst.umbrella.misc.removeSpecialCharacter
 @Parcelize
 @Table(database = AppDatabase::class, useBooleanGetterSetters = false, cachingEnabled = true)
 data class Markdown(
-        @PrimaryKey
-        var id: String = "",
-        @Column
-        var text: String = "",
-        @Column
-        var title: String = "",
-        @Column
-        var index: String = "",
-        @Column
-        var favorite: Boolean = false,
-        @Column
-        var identifier: String = "",
-        @ForeignKey(stubbedRelationship = true)
-        var module: Module? = null,
-        @ForeignKey(stubbedRelationship = true)
-        var subject: Subject? = null,
-        @ForeignKey(stubbedRelationship = true)
-        var difficulty: Difficulty? = null,
-        var isRemove: Boolean = false) : Parcelable {
+    @PrimaryKey
+    var id: String = "",
+    @Column
+    var text: String = "",
+    @Column
+    var title: String = "",
+    @Column
+    var index: String = "",
+    @Column
+    var favorite: Boolean = false,
+    @Column
+    var identifier: String = "",
+    @ForeignKey(stubbedRelationship = true)
+    var module: Module? = null,
+    @ForeignKey(stubbedRelationship = true)
+    var subject: Subject? = null,
+    @ForeignKey(stubbedRelationship = true)
+    var difficulty: Difficulty? = null,
+    var isRemove: Boolean = false
+) : Parcelable {
 
-    constructor(id: String, text: String) : this(id, text, recoveryTitleOrIndex(text, TAG_TITLE),
-            recoveryTitleOrIndex(text, TAG_INDEX),
-            false,
-            recoveryTitleOrIndex(text, TAG_TITLE).removeSpecialCharacter())
+    constructor(id: String, text: String) : this(
+        id, text, recoveryTitleOrIndex(text, TAG_TITLE),
+        recoveryTitleOrIndex(text, TAG_INDEX),
+        false,
+        recoveryTitleOrIndex(text, TAG_TITLE).removeSpecialCharacter()
+    )
 
     companion object {
         const val FAVORITE_INDEX = "1"
@@ -76,10 +79,15 @@ fun List<Markdown>.ids(): ArrayList<String> {
     return res
 }
 
-fun List<Markdown>.toSegmentController(pChecklist: List<Checklist>, isFromDashboard: Boolean = false): SegmentController {
+fun List<Markdown>.toSegmentController(
+    pChecklist: List<Checklist>,
+    isFromDashboard: Boolean = false
+): SegmentController {
     val checklist = if (pChecklist.isEmpty()) null else pChecklist.last()
-    return SegmentController(ArrayList(this.ids()), checklist?.id
-            ?: "", isFromDashboard)
+    return SegmentController(
+        ArrayList(this.ids()), checklist?.id
+            ?: "", isFromDashboard
+    )
 }
 
 fun List<Markdown>.toSegmentDetailControllers(): List<SegmentDetailController> {
@@ -108,8 +116,8 @@ fun Markdown.toSearchResult(): SearchResult {
     val andDown = AndDown()
     val result = andDown.markdownToHtml(text, AndDown.HOEDOWN_EXT_QUOTE, 0)
     return SearchResult(
-            title,
-            result
+        title,
+        result
     )
     { c: Context ->
         val withoutLanguage = id.split("/").drop(1).joinToString("/")
@@ -122,8 +130,10 @@ fun String.replaceMarkdownImage(pwd: String): String {
     val pathSplit = absolutePath.split("/").toMutableList()
     pathSplit[0] = defaultContent()
     val defaultImagePath = "${getPathRepository()}${pathSplit.joinToString("/")}"
-    return this.replace(Markdown.MARKDOWN_IMAGE_TAG,
-            "${Markdown.MARKDOWN_IMAGE_TAG}file://$defaultImagePath")
+    return this.replace(
+        Markdown.MARKDOWN_IMAGE_TAG,
+        "${Markdown.MARKDOWN_IMAGE_TAG}file://$defaultImagePath"
+    )
 }
 
 interface HostSegmentTabControl {
diff --git a/app/src/main/java/org/secfirst/umbrella/data/disk/TentDao.kt b/app/src/main/java/org/secfirst/umbrella/data/disk/TentDao.kt
index f3fc6d17..e05a902e 100644
--- a/app/src/main/java/org/secfirst/umbrella/data/disk/TentDao.kt
+++ b/app/src/main/java/org/secfirst/umbrella/data/disk/TentDao.kt
@@ -24,27 +24,29 @@ interface TentDao {
             withContext(ioContext) {
                 if (isNotRepository()) {
                     Git.cloneRepository()
-                            .setURI(url)
-                            .setDirectory(File(getPathRepository()))
-                            .setBranchesToClone(Arrays.asList(BRANCH_NAME))
-                            .setProgressMonitor(TextProgressMonitor(PrintWriter(System.out)))
-                            .setBranch(BRANCH_NAME)
-                            .call()
+                        .setURI(url)
+                        .setDirectory(File(getPathRepository()))
+                        .setBranchesToClone(Arrays.asList(BRANCH_NAME))
+                        .setProgressMonitor(TextProgressMonitor(PrintWriter(System.out)))
+                        .setBranch(BRANCH_NAME)
+                        .call()
                 }
             }
         } catch (e: Exception) {
             result = false
             File(getPathRepository()).deleteRecursively()
-            Log.i(TentDao::class.java.name,
-                    "Repository wasn't created - ${isNotRepository()} " +
-                            "id - ${getPathRepository()}")
+            Log.i(
+                TentDao::class.java.name,
+                "Repository wasn't created - ${isNotRepository()} " +
+                        "id - ${getPathRepository()}"
+            )
         }
         return result
     }
 
     suspend fun rebaseBranch(): List<Pair<String, File>> {
         val files = mutableListOf<Pair<String, File>>()
-        val git : Git? = try {
+        val git: Git? = try {
             Git.open(File("${getPathRepository()}/.git"))
         } catch (e: Exception) {
             null
@@ -52,7 +54,8 @@ interface TentDao {
         withContext(ioContext) {
             try {
                 git?.checkout()?.setName("master")?.call()
-                val branches = git?.branchList()?.setListMode(ListBranchCommand.ListMode.ALL)?.call()
+                val branches =
+                    git?.branchList()?.setListMode(ListBranchCommand.ListMode.ALL)?.call()
                 branches?.forEach { branch ->
                     if (BRANCH_NAME == branch.name) {
                         git.pull().setRemoteBranchName("master").setRebase(true).call()
@@ -94,36 +97,36 @@ interface TentDao {
 
     fun filterElements(path: String): List<File> {
         return File(path)
-                .walk()
-                .filter { !it.path.contains(".git") }
-                .filter {
-                    val prefix = it.nameWithoutExtension.substringBeforeLast("_")
-                    prefix == TypeFile.SEGMENT.value || prefix == TypeFile.CHECKLIST.value
-                }
-                .toList()
-                .reversed()
+            .walk()
+            .filter { !it.path.contains(".git") }
+            .filter {
+                val prefix = it.nameWithoutExtension.substringBeforeLast("_")
+                prefix == TypeFile.SEGMENT.value || prefix == TypeFile.CHECKLIST.value
+            }
+            .toList()
+            .reversed()
 
     }
 
     fun filterForms(path: String): List<File> {
         return File(path)
-                .walk()
-                .filter { !it.path.contains(".git") }
-                .filter {
-                    val prefix = it.nameWithoutExtension.substringBeforeLast("_")
-                    prefix == TypeFile.FORM.value
-                }
-                .toList()
+            .walk()
+            .filter { !it.path.contains(".git") }
+            .filter {
+                val prefix = it.nameWithoutExtension.substringBeforeLast("_")
+                prefix == TypeFile.FORM.value
+            }
+            .toList()
     }
 
     suspend fun filterCategories(path: String): List<File> {
         return File(path)
-                .walkBottomUp()
-                .filter { !it.path.contains(".git") }
-                .filter { it.nameWithoutExtension == TypeFile.CATEGORY.value }
-                .toList()
-                .reversed()
-                .sorted()
+            .walkBottomUp()
+            .filter { !it.path.contains(".git") }
+            .filter { it.nameWithoutExtension == TypeFile.CATEGORY.value }
+            .toList()
+            .reversed()
+            .sorted()
     }
 
     private fun getDiffEntry(): List<DiffEntry> {
@@ -159,10 +162,10 @@ fun filterSegmentFiles(path: String): List<File> {
 
 fun String.filterImageCategoryFile(): String {
     val imgFile = File(getPathRepository())
-            .walk()
-            .filter { file -> !file.path.contains(".git") }
-            .filter { file -> file.name == this }
-            .filter { it.isFile }
-            .toList()
+        .walk()
+        .filter { file -> !file.path.contains(".git") }
+        .filter { file -> file.name == this }
+        .filter { it.isFile }
+        .toList()
     return if (imgFile.isNotEmpty()) imgFile.last().path else ""
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/secfirst/umbrella/data/disk/TentLoader.kt b/app/src/main/java/org/secfirst/umbrella/data/disk/TentLoader.kt
index 0ade7c5e..e0a7c661 100644
--- a/app/src/main/java/org/secfirst/umbrella/data/disk/TentLoader.kt
+++ b/app/src/main/java/org/secfirst/umbrella/data/disk/TentLoader.kt
@@ -19,7 +19,10 @@ import java.io.File
 import javax.inject.Inject
 
 
-class TentLoader @Inject constructor(private val tentRepo: TentRepo, contentService: ContentService? = null) {
+class TentLoader @Inject constructor(
+    private val tentRepo: TentRepo,
+    contentService: ContentService? = null
+) {
 
     private val contentData = ContentData()
     private val elementMonitor: ElementSerializeMonitor? = contentService
@@ -56,7 +59,8 @@ class TentLoader @Inject constructor(private val tentRepo: TentRepo, contentServ
         updateCategories(module, file)
         filterSegmentFiles(pwd).forEach {
             val markdownText = it.readText().replaceMarkdownImage(pwd)
-            val markdown = Markdown(it.path.substringAfterLast(getPathRepository()), markdownText).removeHead()
+            val markdown =
+                Markdown(it.path.substringAfterLast(getPathRepository()), markdownText).removeHead()
             markdown.module = module
             module.markdowns.add(markdown)
         }
@@ -77,7 +81,8 @@ class TentLoader @Inject constructor(private val tentRepo: TentRepo, contentServ
         updateCategories(subject, file)
         filterSegmentFiles(pwd).forEach {
             val markdownText = it.readText().replaceMarkdownImage(pwd)
-            val markdown = Markdown(it.path.substringAfterLast(getPathRepository()), markdownText).removeHead()
+            val markdown =
+                Markdown(it.path.substringAfterLast(getPathRepository()), markdownText).removeHead()
             markdown.subject = subject
             subject.markdowns.add(markdown)
         }
@@ -97,7 +102,8 @@ class TentLoader @Inject constructor(private val tentRepo: TentRepo, contentServ
         updateCategories(difficulty, file)
         filterSegmentFiles(pwd).forEach {
             val markdownText = it.readText().replaceMarkdownImage(pwd)
-            val markdown = Markdown(it.path.substringAfterLast(getPathRepository()), markdownText).removeHead()
+            val markdown =
+                Markdown(it.path.substringAfterLast(getPathRepository()), markdownText).removeHead()
             markdown.difficulty = difficulty
             difficulty.markdowns.add(markdown)
         }
diff --git a/app/src/main/java/org/secfirst/umbrella/data/disk/TentMonitor.kt b/app/src/main/java/org/secfirst/umbrella/data/disk/TentMonitor.kt
index 84dbce87..c2692557 100644
--- a/app/src/main/java/org/secfirst/umbrella/data/disk/TentMonitor.kt
+++ b/app/src/main/java/org/secfirst/umbrella/data/disk/TentMonitor.kt
@@ -42,8 +42,10 @@ abstract class TentMonitor(private val out: Writer) : BatchingProgressMonitor()
         send(s)
     }
 
-    private fun format(s: StringBuilder, taskName: String, cmp: Int,
-                       totalWork: Int, pcnt: Int) {
+    private fun format(
+        s: StringBuilder, taskName: String, cmp: Int,
+        totalWork: Int, pcnt: Int
+    ) {
         s.append("\r") //$NON-NLS-1$
         s.append(taskName)
         s.append(": ") //$NON-NLS-1$
diff --git a/app/src/main/java/org/secfirst/umbrella/data/disk/TentRepo.kt b/app/src/main/java/org/secfirst/umbrella/data/disk/TentRepo.kt
index 8fe3b07a..1a708cb2 100644
--- a/app/src/main/java/org/secfirst/umbrella/data/disk/TentRepo.kt
+++ b/app/src/main/java/org/secfirst/umbrella/data/disk/TentRepo.kt
@@ -9,7 +9,7 @@ interface TentRepo {
 
     suspend fun updateRepository(): List<Pair<String, File>>
 
-    suspend fun loadElementsFile(path : String): List<File>
+    suspend fun loadElementsFile(path: String): List<File>
 
-    fun loadFormFile(path : String): List<File>
+    fun loadFormFile(path: String): List<File>
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/secfirst/umbrella/data/disk/TentRepository.kt b/app/src/main/java/org/secfirst/umbrella/data/disk/TentRepository.kt
index 91033add..c2e38d68 100644
--- a/app/src/main/java/org/secfirst/umbrella/data/disk/TentRepository.kt
+++ b/app/src/main/java/org/secfirst/umbrella/data/disk/TentRepository.kt
@@ -6,11 +6,11 @@ import javax.inject.Inject
 class TentRepository @Inject constructor(private val tentDao: TentDao) : TentRepo {
 
 
-    override fun loadFormFile(path : String): List<File> = tentDao.filterForms(path)
+    override fun loadFormFile(path: String): List<File> = tentDao.filterForms(path)
 
     override suspend fun updateRepository() = tentDao.rebaseBranch()
 
-    override suspend fun loadElementsFile(path : String) = tentDao.filterCategories(path)
+    override suspend fun loadElementsFile(path: String) = tentDao.filterCategories(path)
 
     override suspend fun fetchRepository(url: String) = tentDao.cloneRepository(url)
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/secfirst/umbrella/data/disk/entity.kt b/app/src/main/java/org/secfirst/umbrella/data/disk/entity.kt
index 9193e1b7..c95c8a69 100644
--- a/app/src/main/java/org/secfirst/umbrella/data/disk/entity.kt
+++ b/app/src/main/java/org/secfirst/umbrella/data/disk/entity.kt
@@ -9,19 +9,20 @@ import org.secfirst.umbrella.data.database.segment.Markdown
 
 
 data class Element(
-        var pathId: String = "",
-        var index: Int = 0,
-        var title: String = "",
-        var template: String = "",
-        var description: String = "",
-        var markdowns: MutableList<Markdown> = arrayListOf(),
-        var children: MutableList<Element> = arrayListOf(),
-        var checklist: MutableList<Checklist> = arrayListOf(),
-        var rootDir: String = "",
-        var icon: String = "",
-        var path: String = "",
-        @JsonIgnore
-        var resourcePath: String = "")
+    var pathId: String = "",
+    var index: Int = 0,
+    var title: String = "",
+    var template: String = "",
+    var description: String = "",
+    var markdowns: MutableList<Markdown> = arrayListOf(),
+    var children: MutableList<Element> = arrayListOf(),
+    var checklist: MutableList<Checklist> = arrayListOf(),
+    var rootDir: String = "",
+    var icon: String = "",
+    var path: String = "",
+    @JsonIgnore
+    var resourcePath: String = ""
+)
 
 
 val Element.convertToModule: Module
diff --git a/app/src/main/java/org/secfirst/umbrella/data/disk/tent_config.kt b/app/src/main/java/org/secfirst/umbrella/data/disk/tent_config.kt
index 87841b04..535ff5bf 100644
--- a/app/src/main/java/org/secfirst/umbrella/data/disk/tent_config.kt
+++ b/app/src/main/java/org/secfirst/umbrella/data/disk/tent_config.kt
@@ -59,11 +59,11 @@ enum class ExtensionFile(val value: String) {
 fun tentLanguages(): List<String> {
     val languages = mutableListOf<String>()
     File(repoPath)
-            .walk()
-            .filter { !it.path.contains(".git") }
-            .filter { it.name.length == 2 || it.name.contains("zh", true) }
-            .filter { it.isDirectory }
-            .forEach { languages.add(it.name) }
+        .walk()
+        .filter { !it.path.contains(".git") }
+        .filter { it.name.length == 2 || it.name.contains("zh", true) }
+        .filter { it.isDirectory }
+        .forEach { languages.add(it.name) }
     return languages
 }
 
diff --git a/app/src/main/java/org/secfirst/umbrella/data/network/NetworkDataObj.kt b/app/src/main/java/org/secfirst/umbrella/data/network/NetworkDataObj.kt
index 58fe609f..81c34f6e 100644
--- a/app/src/main/java/org/secfirst/umbrella/data/network/NetworkDataObj.kt
+++ b/app/src/main/java/org/secfirst/umbrella/data/network/NetworkDataObj.kt
@@ -4,26 +4,28 @@ import com.google.gson.annotations.Expose
 import com.google.gson.annotations.SerializedName
 
 @SuppressWarnings
-data class Blog(@Expose
-                @SerializedName("blog_url")
-                var blogUrl: String? = null,
+data class Blog(
+    @Expose
+    @SerializedName("blog_url")
+    var blogUrl: String? = null,
 
-                @Expose
-                @SerializedName("img_url")
-                var coverImgUrl: String? = null,
+    @Expose
+    @SerializedName("img_url")
+    var coverImgUrl: String? = null,
 
-                @Expose
-                @SerializedName("title")
-                var title: String? = null,
+    @Expose
+    @SerializedName("title")
+    var title: String? = null,
 
-                @Expose
-                @SerializedName("description")
-                var description: String? = null,
+    @Expose
+    @SerializedName("description")
+    var description: String? = null,
 
-                @Expose
-                @SerializedName("author")
-                var author: String? = null,
+    @Expose
+    @SerializedName("author")
+    var author: String? = null,
 
-                @Expose
-                @SerializedName("published_at")
-                var date: String? = null)
\ No newline at end of file
+    @Expose
+    @SerializedName("published_at")
+    var date: String? = null
+)
\ No newline at end of file
diff --git a/app/src/main/java/org/secfirst/umbrella/data/network/NetworkHelper.kt b/app/src/main/java/org/secfirst/umbrella/data/network/NetworkHelper.kt
index 55b62507..5c20e9e6 100644
--- a/app/src/main/java/org/secfirst/umbrella/data/network/NetworkHelper.kt
+++ b/app/src/main/java/org/secfirst/umbrella/data/network/NetworkHelper.kt
@@ -15,10 +15,12 @@ import javax.inject.Inject
  */
 class ApiHeader @Inject constructor(internal val publicApiHeader: PublicApiHeader) {
 
-    class PublicApiHeader @Inject constructor(@ApiKeyInfo
-                                              @Expose
-                                              @SerializedName
-                                              ("api_key") val apiKey: String)
+    class PublicApiHeader @Inject constructor(
+        @ApiKeyInfo
+        @Expose
+        @SerializedName
+            ("api_key") val apiKey: String
+    )
 }
 
 /**
@@ -31,9 +33,11 @@ interface ApiHelper {
 
     @GET(NetworkEndPoint.FEED_LIST)
     @Wrapped
-    fun getFeedList(@Query("country") countryCode: String,
-                    @Query("sources") sources: String,
-                    @Query("since") since: String): Deferred<ResponseBody>
+    fun getFeedList(
+        @Query("country") countryCode: String,
+        @Query("sources") sources: String,
+        @Query("since") since: String
+    ): Deferred<ResponseBody>
 
     @GET
     fun getRss(@Url url: String): Deferred<ResponseBody>
diff --git a/app/src/main/java/org/secfirst/umbrella/data/network/NetworkReponse.kt b/app/src/main/java/org/secfirst/umbrella/data/network/NetworkReponse.kt
index d76d30d9..1271e668 100644
--- a/app/src/main/java/org/secfirst/umbrella/data/network/NetworkReponse.kt
+++ b/app/src/main/java/org/secfirst/umbrella/data/network/NetworkReponse.kt
@@ -9,29 +9,32 @@ import kotlinx.android.parcel.Parcelize
 
 
 @Suppress("MatchingDeclarationName")
-data class BlogResponse(@Expose
-                        @SerializedName("status_code")
-                        private var statusCode: String? = null,
+data class BlogResponse(
+    @Expose
+    @SerializedName("status_code")
+    private var statusCode: String? = null,
 
-                        @Expose
-                        @SerializedName("message")
-                        private var message: String? = null,
+    @Expose
+    @SerializedName("message")
+    private var message: String? = null,
 
-                        @Expose
-                        @SerializedName("date")
-                        var data: List<Blog>? = null)
+    @Expose
+    @SerializedName("date")
+    var data: List<Blog>? = null
+)
 
 @Parcelize
 data class FeedItemResponse(
-        @SerializedName("title")
-        var title: String = "",
-        @SerializedName("description")
-        var description: String = "",
-        @SerializedName("url")
-        var url: String = "",
-        @field:Json(name = "")
-        @SerializedName("updated_at")
-        var updatedAt: Long = 0) : Parcelable
+    @SerializedName("title")
+    var title: String = "",
+    @SerializedName("description")
+    var description: String = "",
+    @SerializedName("url")
+    var url: String = "",
+    @field:Json(name = "")
+    @SerializedName("updated_at")
+    var updatedAt: Long = 0
+) : Parcelable
 
 @Retention(AnnotationRetention.RUNTIME)
 @JsonQualifier
diff --git a/app/src/main/java/org/secfirst/umbrella/data/preferences/AppPreferenceHelper.kt b/app/src/main/java/org/secfirst/umbrella/data/preferences/AppPreferenceHelper.kt
index 901c3878..bf314766 100644
--- a/app/src/main/java/org/secfirst/umbrella/data/preferences/AppPreferenceHelper.kt
+++ b/app/src/main/java/org/secfirst/umbrella/data/preferences/AppPreferenceHelper.kt
@@ -6,15 +6,20 @@ import org.secfirst.umbrella.data.disk.IsoCountry
 import org.secfirst.umbrella.di.PreferenceInfo
 import javax.inject.Inject
 
-class AppPreferenceHelper @Inject constructor(context: Context, @PreferenceInfo private val prefFileName: String) : PreferenceHelper {
+class AppPreferenceHelper @Inject constructor(
+    context: Context,
+    @PreferenceInfo private val prefFileName: String
+) : PreferenceHelper {
 
-    private val prefs: SharedPreferences = context.getSharedPreferences(prefFileName, Context.MODE_PRIVATE)
+    private val prefs: SharedPreferences =
+        context.getSharedPreferences(prefFileName, Context.MODE_PRIVATE)
 
     companion object {
         private const val EXTRA_REFRESH_INTERVAL = "refresh_interval"
         private const val EXTRA_SKIP_PASSWORD = "skip_password"
         private const val UPDATE_CONTENT = "update_content"
         private const val STATE_PW_BANNER = "pw_banner"
+        private const val IS_DARK_MODE = "dark_mode"
         const val EXTRA_MASK_APP = "mask_app"
         const val PREF_NAME = "umbrella.preference"
         const val EXTRA_LOGGED_IN = "is_logged_in"
@@ -23,15 +28,18 @@ class AppPreferenceHelper @Inject constructor(context: Context, @PreferenceInfo
         const val SKIP_PATHWAYS = "skip_pathways"
     }
 
-    override fun setMockView(result: Boolean) = prefs.edit().putBoolean(EXTRA_SHOW_MOCK_VIEW, result).commit()
+    override fun setMockView(result: Boolean) =
+        prefs.edit().putBoolean(EXTRA_SHOW_MOCK_VIEW, result).commit()
 
     override fun isShowMockView(): Boolean = prefs.getBoolean(EXTRA_SHOW_MOCK_VIEW, false)
 
-    override fun setLanguage(isoCountry: String) = prefs.edit().putString(EXTRA_LANGUAGE, isoCountry).commit()
+    override fun setLanguage(isoCountry: String) =
+        prefs.edit().putString(EXTRA_LANGUAGE, isoCountry).commit()
 
     override fun getLanguage() = prefs.getString(EXTRA_LANGUAGE, "") ?: IsoCountry.ENGLISH.value
 
-    override fun enablePasswordBanner(enableBanner: Boolean) = prefs.edit().putBoolean(STATE_PW_BANNER, enableBanner).commit()
+    override fun enablePasswordBanner(enableBanner: Boolean) =
+        prefs.edit().putBoolean(STATE_PW_BANNER, enableBanner).commit()
 
     override fun isPasswordBanner() = prefs.getBoolean(STATE_PW_BANNER, false)
 
@@ -43,21 +51,30 @@ class AppPreferenceHelper @Inject constructor(context: Context, @PreferenceInfo
 
     override fun isMaskApp() = prefs.getBoolean(EXTRA_MASK_APP, false)
 
-    override fun setMaskApp(isMaskApp: Boolean) = prefs.edit().putBoolean(EXTRA_MASK_APP, isMaskApp).commit()
+    override fun setMaskApp(isMaskApp: Boolean) =
+        prefs.edit().putBoolean(EXTRA_MASK_APP, isMaskApp).commit()
 
     override fun isLoggedIn() = prefs.getBoolean(EXTRA_LOGGED_IN, false)
 
-    override fun setLoggedIn(isLoggedIn: Boolean) = prefs.edit().putBoolean(EXTRA_LOGGED_IN, isLoggedIn).commit()
+    override fun setLoggedIn(isLoggedIn: Boolean) =
+        prefs.edit().putBoolean(EXTRA_LOGGED_IN, isLoggedIn).commit()
 
-    override fun setSkipPassword(isSkip: Boolean) = prefs.edit().putBoolean(EXTRA_SKIP_PASSWORD, isSkip).commit()
+    override fun getDarkMode(): Boolean = prefs.getBoolean(IS_DARK_MODE, false)
+
+    override fun setDarkMode(state: Boolean) = prefs.edit().putBoolean(IS_DARK_MODE, state).commit()
+
+    override fun setSkipPassword(isSkip: Boolean) =
+        prefs.edit().putBoolean(EXTRA_SKIP_PASSWORD, isSkip).commit()
 
     override fun getSkipPassword() = prefs.getBoolean(EXTRA_SKIP_PASSWORD, false)
 
-    override fun setRefreshInterval(position: Int) = prefs.edit().putInt(EXTRA_REFRESH_INTERVAL, position).commit()
+    override fun setRefreshInterval(position: Int) =
+        prefs.edit().putInt(EXTRA_REFRESH_INTERVAL, position).commit()
 
     override fun getRefreshInterval() = prefs.getInt(EXTRA_REFRESH_INTERVAL, 30)
 
-    override fun setSkipPathways(skip: Boolean) = prefs.edit().putBoolean(SKIP_PATHWAYS, skip).commit()
+    override fun setSkipPathways(skip: Boolean) =
+        prefs.edit().putBoolean(SKIP_PATHWAYS, skip).commit()
 
     override fun getSkipPathways() = prefs.getBoolean(SKIP_PATHWAYS, false)
 
@@ -69,6 +86,10 @@ interface PreferenceHelper {
 
     fun setLoggedIn(isLoggedIn: Boolean): Boolean
 
+    fun setDarkMode(state: Boolean): Boolean
+
+    fun getDarkMode(): Boolean
+
     fun isMaskApp(): Boolean
 
     fun setMaskApp(isMaskApp: Boolean): Boolean
diff --git a/app/src/main/java/org/secfirst/umbrella/di/component/AppComponent.kt b/app/src/main/java/org/secfirst/umbrella/di/component/AppComponent.kt
index 36042c68..397e0dbb 100644
--- a/app/src/main/java/org/secfirst/umbrella/di/component/AppComponent.kt
+++ b/app/src/main/java/org/secfirst/umbrella/di/component/AppComponent.kt
@@ -13,12 +13,14 @@ import org.secfirst.umbrella.di.module.TentContentModule
 import javax.inject.Singleton
 
 @Singleton
-@Component(modules = [(AndroidInjectionModule::class),
-    (AppModule::class),
-    (RepositoryModule::class),
-    (NetworkModule::class),
-    (TentContentModule::class),
-    (ActivityBuilder::class)])
+@Component(
+    modules = [(AndroidInjectionModule::class),
+        (AppModule::class),
+        (RepositoryModule::class),
+        (NetworkModule::class),
+        (TentContentModule::class),
+        (ActivityBuilder::class)]
+)
 
 interface AppComponent {
 
diff --git a/app/src/main/java/org/secfirst/umbrella/di/module/AppModule.kt b/app/src/main/java/org/secfirst/umbrella/di/module/AppModule.kt
index cac9cdee..679e7132 100644
--- a/app/src/main/java/org/secfirst/umbrella/di/module/AppModule.kt
+++ b/app/src/main/java/org/secfirst/umbrella/di/module/AppModule.kt
@@ -127,7 +127,8 @@ class RepositoryModule {
 
     @Provides
     @Singleton
-    internal fun provideVirtualStorage(application: Application): VirtualStorage = VirtualStorage(application)
+    internal fun provideVirtualStorage(application: Application): VirtualStorage =
+        VirtualStorage(application)
 
     @Provides
     @Singleton
@@ -167,9 +168,9 @@ class NetworkModule {
     @Reusable
     internal fun provideRetrofitInterface(): Retrofit {
         return Retrofit.Builder()
-                .baseUrl(BASE_URL)
-                .addConverterFactory(MoshiConverterFactory.create())
-                .addCallAdapterFactory(CoroutineCallAdapterFactory())
-                .build()
+            .baseUrl(BASE_URL)
+            .addConverterFactory(MoshiConverterFactory.create())
+            .addCallAdapterFactory(CoroutineCallAdapterFactory())
+            .build()
     }
 }
diff --git a/app/src/main/java/org/secfirst/umbrella/feature/account/presenter/AccountBasePresenter.kt b/app/src/main/java/org/secfirst/umbrella/feature/account/presenter/AccountBasePresenter.kt
index b6547088..b4c81da2 100644
--- a/app/src/main/java/org/secfirst/umbrella/feature/account/presenter/AccountBasePresenter.kt
+++ b/app/src/main/java/org/secfirst/umbrella/feature/account/presenter/AccountBasePresenter.kt
@@ -14,6 +14,10 @@ interface AccountBasePresenter<V : AccountView, I : AccountBaseInteractor> : Bas
 
     fun setUserLogIn()
 
+    fun changeDarkMode(value: Boolean)
+
+    fun getDarkMode(): Boolean
+
     fun setSkipPassword(value: Boolean)
 
     fun submitSkippPassword()
diff --git a/app/src/main/java/org/secfirst/umbrella/feature/account/presenter/AccountPresenterImp.kt b/app/src/main/java/org/secfirst/umbrella/feature/account/presenter/AccountPresenterImp.kt
index 30a9f7ab..a8e22cb5 100644
--- a/app/src/main/java/org/secfirst/umbrella/feature/account/presenter/AccountPresenterImp.kt
+++ b/app/src/main/java/org/secfirst/umbrella/feature/account/presenter/AccountPresenterImp.kt
@@ -1,5 +1,9 @@
 package org.secfirst.umbrella.feature.account.presenter
 
+import android.content.res.Configuration
+import androidx.appcompat.app.AppCompatDelegate
+import androidx.appcompat.app.AppCompatDelegate.MODE_NIGHT_NO
+import androidx.appcompat.app.AppCompatDelegate.MODE_NIGHT_YES
 import com.raizlabs.android.dbflow.config.FlowManager
 import org.secfirst.umbrella.data.database.AppDatabase.EXTENSION
 import org.secfirst.umbrella.data.database.AppDatabase.NAME
@@ -154,6 +158,25 @@ class AccountPresenterImp<V : AccountView, I : AccountBaseInteractor> @Inject co
         }
     }
 
+    override fun getDarkMode(): Boolean {
+        return interactor!!.isDarkMode()
+    }
+
+    override fun changeDarkMode(value: Boolean) {
+            AppCompatDelegate.setDefaultNightMode(
+                when(value){
+                    false -> {
+                        MODE_NIGHT_NO
+                    }
+                    else -> {
+                        MODE_NIGHT_YES
+                    }
+                })
+           interactor!!.setDarkMode(value)
+
+
+    }
+
     override fun submitChangeDatabaseAccess(userToken: String) {
         launchSilent(uiContext) {
             interactor?.let {
@@ -167,4 +190,5 @@ class AccountPresenterImp<V : AccountView, I : AccountBaseInteractor> @Inject co
             }
         }
     }
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/secfirst/umbrella/feature/account/view/AccountController.kt b/app/src/main/java/org/secfirst/umbrella/feature/account/view/AccountController.kt
index e870dfa0..0e012232 100644
--- a/app/src/main/java/org/secfirst/umbrella/feature/account/view/AccountController.kt
+++ b/app/src/main/java/org/secfirst/umbrella/feature/account/view/AccountController.kt
@@ -63,6 +63,7 @@ class AccountController : BaseController(), AccountView {
         maskAppView = inflater.inflate(R.layout.mask_app_info_view, container, false)
         resetPasswordView = inflater.inflate(R.layout.account_reset_password_alert, container, false)
 
+
         maskAppAlertDialog = AlertDialog
                 .Builder(activity)
                 .setView(maskAppView)
@@ -83,6 +84,7 @@ class AccountController : BaseController(), AccountView {
         presenter.onAttach(this)
         presenter.submitIsMaskApp()
 
+
         accountView.accountSettings.setOnClickListener { clickOnSettings() }
         accountView.accountPassword.setOnClickListener { passwordAlertDialog.show() }
         accountView.accountMask.setOnClickListener { clickOnMaskApp() }
@@ -174,8 +176,8 @@ class AccountController : BaseController(), AccountView {
 
     private fun setUpToolbar() {
         accountToolbar?.let {
-            mainActivity.setSupportActionBar(it)
-            mainActivity.supportActionBar?.title = context.getString(R.string.settings_title)
+            //mainActivity.setSupportActionBar(it)
+            it.title = context.getString(R.string.account_title)
         }
     }
 
diff --git a/app/src/main/java/org/secfirst/umbrella/feature/account/view/SettingsController.kt b/app/src/main/java/org/secfirst/umbrella/feature/account/view/SettingsController.kt
index 5ea303c6..3ab2f4db 100644
--- a/app/src/main/java/org/secfirst/umbrella/feature/account/view/SettingsController.kt
+++ b/app/src/main/java/org/secfirst/umbrella/feature/account/view/SettingsController.kt
@@ -10,6 +10,7 @@ import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
 import android.content.pm.PackageManager
+import android.content.res.Configuration
 import android.os.Bundle
 import android.os.Handler
 import android.view.LayoutInflater
@@ -207,6 +208,12 @@ class SettingsController : BaseController(),
         mainView.settingsSkipPassword.setOnCheckedChangeListener { _, isChecked ->
             skipPasswordTip(isChecked)
         }
+
+        mainView.settingsDarkMode.isChecked = getDarkMode()
+
+        mainView.settingsDarkMode.setOnCheckedChangeListener { _, isChecked ->
+            setDarkMode(isChecked)
+        }
         presenter.submitDefaultLanguage()
         presenter.submitSkippPassword()
         presenter.prepareView()
@@ -355,6 +362,13 @@ class SettingsController : BaseController(),
         if (isChecked) presenter.setSkipPassword(true) else presenter.setSkipPassword(false)
     }
 
+
+    private fun setDarkMode(isChecked: Boolean) {
+        presenter.changeDarkMode(isChecked)
+    }
+
+    private fun getDarkMode(): Boolean = presenter.getDarkMode()
+
     private fun feedSourceClick() = feedSourceDialog.show()
 
     private fun refreshIntervalClick() = refreshIntervalDialog.show()
diff --git a/app/src/main/java/org/secfirst/umbrella/feature/base/interactor/BaseInteractor.kt b/app/src/main/java/org/secfirst/umbrella/feature/base/interactor/BaseInteractor.kt
index b6d621b9..2a1bba29 100644
--- a/app/src/main/java/org/secfirst/umbrella/feature/base/interactor/BaseInteractor.kt
+++ b/app/src/main/java/org/secfirst/umbrella/feature/base/interactor/BaseInteractor.kt
@@ -10,9 +10,13 @@ interface BaseInteractor {
 
     fun setSkipPassword(isSkip: Boolean): Boolean
 
+    fun setDarkMode(value: Boolean)
+
+    fun isDarkMode(): Boolean
+
     fun isSkippPassword(): Boolean
 
-    fun setDefaultLanguage(isoCountry: String) : Boolean
+    fun setDefaultLanguage(isoCountry: String): Boolean
 
     fun getDefaultLanguage(): String
 
diff --git a/app/src/main/java/org/secfirst/umbrella/feature/base/interactor/BaseInteractorImp.kt b/app/src/main/java/org/secfirst/umbrella/feature/base/interactor/BaseInteractorImp.kt
index 0f77259d..b4fd021c 100644
--- a/app/src/main/java/org/secfirst/umbrella/feature/base/interactor/BaseInteractorImp.kt
+++ b/app/src/main/java/org/secfirst/umbrella/feature/base/interactor/BaseInteractorImp.kt
@@ -11,7 +11,11 @@ open class BaseInteractorImp() : BaseInteractor {
     protected lateinit var preferenceHelper: AppPreferenceHelper
     protected lateinit var contentRepo: ContentRepo
 
-    constructor(apiHelper: ApiHelper, preferenceHelper: AppPreferenceHelper, contentRepo: ContentRepo) : this() {
+    constructor(
+        apiHelper: ApiHelper,
+        preferenceHelper: AppPreferenceHelper,
+        contentRepo: ContentRepo
+    ) : this() {
         this.apiHelper = apiHelper
         this.preferenceHelper = preferenceHelper
         this.contentRepo = contentRepo
@@ -29,11 +33,18 @@ open class BaseInteractorImp() : BaseInteractor {
 
     override fun getDefaultLanguage() = preferenceHelper.getLanguage()
 
+    override fun setDarkMode(value: Boolean) {
+        preferenceHelper.setDarkMode(value)
+    }
+
+    override fun isDarkMode(): Boolean = preferenceHelper.getDarkMode()
+
     override fun setSkipPassword(isSkip: Boolean) = preferenceHelper.setSkipPassword(isSkip)
 
     override fun isSkippPassword(): Boolean = preferenceHelper.getSkipPassword()
 
-    override fun enablePasswordBanner(enableBanner: Boolean) = preferenceHelper.enablePasswordBanner(enableBanner)
+    override fun enablePasswordBanner(enableBanner: Boolean) =
+        preferenceHelper.enablePasswordBanner(enableBanner)
 
     override fun isUserLoggedIn() = preferenceHelper.isLoggedIn()
 
diff --git a/app/src/main/java/org/secfirst/umbrella/feature/base/view/BaseController.kt b/app/src/main/java/org/secfirst/umbrella/feature/base/view/BaseController.kt
index 243e9828..39910892 100644
--- a/app/src/main/java/org/secfirst/umbrella/feature/base/view/BaseController.kt
+++ b/app/src/main/java/org/secfirst/umbrella/feature/base/view/BaseController.kt
@@ -34,5 +34,5 @@ abstract class BaseController(bundle: Bundle = Bundle()) : Controller(bundle), L
     }
 
     fun enableNavigation(isNavigation: Boolean) =
-            if (isNavigation) mainActivity.showNavigation() else mainActivity.hideNavigation()
+        if (isNavigation) mainActivity.showNavigation() else mainActivity.hideNavigation()
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/secfirst/umbrella/feature/base/view/BaseView.kt b/app/src/main/java/org/secfirst/umbrella/feature/base/view/BaseView.kt
index e5ac9965..3b4a6450 100644
--- a/app/src/main/java/org/secfirst/umbrella/feature/base/view/BaseView.kt
+++ b/app/src/main/java/org/secfirst/umbrella/feature/base/view/BaseView.kt
@@ -1,4 +1,3 @@
 package org.secfirst.umbrella.feature.base.view
 
-interface BaseView {
-}
\ No newline at end of file
+interface BaseView
\ No newline at end of file
diff --git a/app/src/main/java/org/secfirst/umbrella/feature/checklist/view/controller/ChecklistController.kt b/app/src/main/java/org/secfirst/umbrella/feature/checklist/view/controller/ChecklistController.kt
index 2c30c349..ed622b42 100644
--- a/app/src/main/java/org/secfirst/umbrella/feature/checklist/view/controller/ChecklistController.kt
+++ b/app/src/main/java/org/secfirst/umbrella/feature/checklist/view/controller/ChecklistController.kt
@@ -173,9 +173,9 @@ class ChecklistController(bundle: Bundle) : BaseController(bundle), ChecklistVie
 
     private fun setUpToolbar() {
         checklistView.checklistToolbar.let {
-            mainActivity.setSupportActionBar(it)
-            mainActivity.supportActionBar?.setDisplayHomeAsUpEnabled(true)
-            mainActivity.supportActionBar?.title = getTitle()
+            /*mainActivity.setSupportActionBar(it)
+            mainActivity.supportActionBar?.setDisplayHomeAsUpEnabled(true)*/
+            it.title = getTitle()
         }
     }
 }
diff --git a/app/src/main/java/org/secfirst/umbrella/feature/checklist/view/controller/ChecklistCustomController.kt b/app/src/main/java/org/secfirst/umbrella/feature/checklist/view/controller/ChecklistCustomController.kt
index cfe3a963..5b3381e0 100644
--- a/app/src/main/java/org/secfirst/umbrella/feature/checklist/view/controller/ChecklistCustomController.kt
+++ b/app/src/main/java/org/secfirst/umbrella/feature/checklist/view/controller/ChecklistCustomController.kt
@@ -93,9 +93,9 @@ class ChecklistCustomController(bundle: Bundle) : BaseController(bundle), Checkl
 
     private fun setUpToolbar() {
         customChecklistToolbar?.let {
-            mainActivity.setSupportActionBar(it)
-            mainActivity.supportActionBar?.setDisplayHomeAsUpEnabled(true)
-            mainActivity.supportActionBar?.title = checklistName
+            /*mainActivity.setSupportActionBar(it)
+            mainActivity.supportActionBar?.setDisplayHomeAsUpEnabled(true)*/
+            it.title = checklistName
         }
     }
 
diff --git a/app/src/main/java/org/secfirst/umbrella/feature/checklist/view/controller/DashboardController.kt b/app/src/main/java/org/secfirst/umbrella/feature/checklist/view/controller/DashboardController.kt
index 3af3fe2a..98de30cf 100644
--- a/app/src/main/java/org/secfirst/umbrella/feature/checklist/view/controller/DashboardController.kt
+++ b/app/src/main/java/org/secfirst/umbrella/feature/checklist/view/controller/DashboardController.kt
@@ -277,7 +277,7 @@ class DashboardController(bundle: Bundle) : BaseController(bundle), ChecklistVie
     private fun shareDocument(fileToShare: File) {
         val pm = context.packageManager
         val uri = FileProvider.getUriForFile(context, BuildConfig.APPLICATION_ID, fileToShare)
-        val shareIntent = ShareCompat.IntentBuilder.from(activity)
+        val shareIntent = ShareCompat.IntentBuilder.from(activity!!)
                 .setType(context.contentResolver.getType(uri))
                 .setStream(uri)
                 .intent
diff --git a/app/src/main/java/org/secfirst/umbrella/feature/checklist/view/controller/HostChecklistController.kt b/app/src/main/java/org/secfirst/umbrella/feature/checklist/view/controller/HostChecklistController.kt
index f2558832..35f872d3 100644
--- a/app/src/main/java/org/secfirst/umbrella/feature/checklist/view/controller/HostChecklistController.kt
+++ b/app/src/main/java/org/secfirst/umbrella/feature/checklist/view/controller/HostChecklistController.kt
@@ -47,8 +47,7 @@ class HostChecklistController(bundle: Bundle) : BaseController(bundle), Checklis
         presenter.onAttach(this)
         if (uriString.isNotBlank()) presenter.submitChecklistById(uriString)
         view.toolbar.let {
-            mainActivity.setSupportActionBar(it)
-            mainActivity.supportActionBar?.title = context.getString(R.string.checklist_title)
+            it.title = context.getString(R.string.checklist_title)
         }
         mainActivity.navigationPositionToCenter()
         return view
diff --git a/app/src/main/java/org/secfirst/umbrella/feature/difficulty/view/DifficultyController.kt b/app/src/main/java/org/secfirst/umbrella/feature/difficulty/view/DifficultyController.kt
index cf1df003..b4f40a64 100644
--- a/app/src/main/java/org/secfirst/umbrella/feature/difficulty/view/DifficultyController.kt
+++ b/app/src/main/java/org/secfirst/umbrella/feature/difficulty/view/DifficultyController.kt
@@ -74,9 +74,10 @@ class DifficultyController(bundle: Bundle) : BaseController(bundle), DifficultyV
 
     private fun setUpToolbar(toolbarTitle: String) {
         difficultyToolbar?.let {
-            mainActivity.setSupportActionBar(it)
-            mainActivity.supportActionBar?.title = toolbarTitle
-            mainActivity.supportActionBar?.setDisplayHomeAsUpEnabled(true)
+            /*mainActivity.setSupportActionBar(it)
+            mainActivity.supportActionBar?.setDisplayHomeAsUpEnabled(true)*/
+            it.title = toolbarTitle
+
         }
     }
 
diff --git a/app/src/main/java/org/secfirst/umbrella/feature/form/view/FormUI.kt b/app/src/main/java/org/secfirst/umbrella/feature/form/view/FormUI.kt
index 9eba0a15..459d8a9e 100644
--- a/app/src/main/java/org/secfirst/umbrella/feature/form/view/FormUI.kt
+++ b/app/src/main/java/org/secfirst/umbrella/feature/form/view/FormUI.kt
@@ -1,17 +1,20 @@
 package org.secfirst.umbrella.feature.form.view
 
 
-import android.graphics.drawable.ColorDrawable
+import android.graphics.Color
+import android.os.Build
 import android.view.Gravity
 import android.widget.CheckBox
 import android.widget.EditText
 import android.widget.RadioButton
-import androidx.core.content.ContextCompat
+import androidx.annotation.RequiresApi
+import com.google.android.material.color.MaterialColors
 import com.stepstone.stepper.Step
 import com.stepstone.stepper.VerificationError
 import org.jetbrains.anko.*
 import org.jetbrains.anko.appcompat.v7.themedTintedCheckBox
 import org.jetbrains.anko.appcompat.v7.themedTintedRadioButton
+import org.jetbrains.anko.design.themedTextInputEditText
 import org.secfirst.umbrella.R
 import org.secfirst.umbrella.data.database.form.Answer
 import org.secfirst.umbrella.data.database.form.Screen
@@ -22,12 +25,11 @@ import org.secfirst.umbrella.feature.form.view.controller.FormController
 
 class FormUI(private val screen: Screen, private val answers: List<Answer>?) : AnkoComponent<FormController>, Step {
 
+    @RequiresApi(Build.VERSION_CODES.LOLLIPOP)
     override fun createView(ui: AnkoContext<FormController>) = ui.apply {
         val size = 16f
-        val formTextColor = ContextCompat.getColor(ui.ctx, R.color.default_umbrella_black)
 
         scrollView {
-            background = ColorDrawable(ContextCompat.getColor(context, R.color.form_background))
             verticalLayout {
 
                 padding = dip(10)
@@ -35,51 +37,42 @@ class FormUI(private val screen: Screen, private val answers: List<Answer>?) : A
                     when (item.type) {
 
                         FieldType.LABEL.value ->
-                            textView(item.label) {
+                            themedTextView(item.label,  theme = R.style.textViewTheme) {
                                 textSize = 18f
-                                textColor = formTextColor
                             }.lparams { gravity = Gravity.CENTER }
 
                         FieldType.TEXT_AREA.value -> {
                             val answer = item.hasAnswer(answers)
-                            textView(item.label) {
+                            themedTextView(item.label, theme = R.style.textViewTheme) {
                                 textSize = size
-                                textColor = formTextColor
                             }.lparams { topMargin = dip(5) }
-                            val editText = themedEditText(theme = R.style.EditTextStyle) {
+                            val editText = themedTextInputEditText(theme = R.style.EditTextStyle) {
                                 hint = item.hint
                                 setText(answer.textInput)
-                                textColor = formTextColor
-
                             }.lparams(width = matchParent)
                             answer.itemId = item.id
                             bindEditText(answer, editText, ui)
                         }
                         FieldType.TEXT_INPUT.value -> {
                             val answer = item.hasAnswer(answers)
-                            textView(item.label) {
-                                textSize = size
+                            themedTextView(item.label, theme = R.style.textViewTheme) {
                                 textSize = size
-                                textColor = formTextColor
                             }.lparams { topMargin = dip(5) }
-                            val editText = themedEditText(theme = R.style.EditTextStyle) {
+                            val editText = themedTextInputEditText(theme = R.style.EditTextStyle) {
                                 hint = item.hint
                                 setText(answer.textInput)
-                                textColor = formTextColor
                             }.lparams(width = matchParent)
                             answer.itemId = item.id
                             answer.run { bindEditText(answer, editText, ui) }
                         }
                         FieldType.MULTIPLE_CHOICE.value -> {
-                            textView(item.label) {
+                            themedTextView(item.label, theme = R.style.textViewTheme) {
                                 textSize = size
-                                textColor = formTextColor
                             }.lparams { topMargin = dip(5) }
                             item.options.forEach { formOption ->
                                 val answer = formOption.hasAnswer(answers)
                                 val checkBox = themedTintedCheckBox(R.style.checkBoxStyle) {
                                     text = formOption.label
-                                    textColor = formTextColor
                                     isChecked = answer.choiceInput
                                 }.lparams { topMargin = dip(5) }
                                 answer.optionId = formOption.id
@@ -87,9 +80,8 @@ class FormUI(private val screen: Screen, private val answers: List<Answer>?) : A
                             }
                         }
                         FieldType.SINGLE_CHOICE.value -> {
-                            textView(item.label) {
+                            themedTextView(item.label, theme = R.style.textViewTheme) {
                                 textSize = size
-                                textColor = formTextColor
                             }
                             radioGroup {
                                 item.options.forEach { formOption ->
@@ -98,7 +90,6 @@ class FormUI(private val screen: Screen, private val answers: List<Answer>?) : A
                                         text = formOption.label
                                         isChecked = answer.choiceInput
                                         textSize = size
-                                        textColor = formTextColor
                                     }
                                     answer.optionId = formOption.id
                                     bindRadioButton(answer, radioButton, ui)
diff --git a/app/src/main/java/org/secfirst/umbrella/feature/form/view/adapter/FormAdapter.kt b/app/src/main/java/org/secfirst/umbrella/feature/form/view/adapter/FormAdapter.kt
index 5364e84c..5fef0a9d 100644
--- a/app/src/main/java/org/secfirst/umbrella/feature/form/view/adapter/FormAdapter.kt
+++ b/app/src/main/java/org/secfirst/umbrella/feature/form/view/adapter/FormAdapter.kt
@@ -1,9 +1,11 @@
 package org.secfirst.umbrella.feature.form.view.adapter
 
+import android.os.Build.VERSION_CODES.LOLLIPOP
 import android.util.SparseArray
 import android.view.View
 import android.view.ViewGroup
 import androidx.annotation.IntRange
+import androidx.annotation.RequiresApi
 import com.stepstone.stepper.Step
 import com.stepstone.stepper.adapter.AbstractStepAdapter
 import com.stepstone.stepper.viewmodel.StepViewModel
@@ -22,6 +24,7 @@ class FormAdapter(private val form: Form, private val controller: FormController
             .setTitle(form.screens[position].title)
             .create()
 
+    @RequiresApi(LOLLIPOP)
     override fun instantiateItem(container: ViewGroup, position: Int): View {
         var step: Step? = pages.get(position)
         if (step == null) {
diff --git a/app/src/main/java/org/secfirst/umbrella/feature/form/view/controller/FormController.kt b/app/src/main/java/org/secfirst/umbrella/feature/form/view/controller/FormController.kt
index b6c2af48..30967fc9 100644
--- a/app/src/main/java/org/secfirst/umbrella/feature/form/view/controller/FormController.kt
+++ b/app/src/main/java/org/secfirst/umbrella/feature/form/view/controller/FormController.kt
@@ -8,7 +8,6 @@ import android.view.ViewGroup
 import android.widget.CheckBox
 import android.widget.EditText
 import android.widget.RadioButton
-import androidx.core.content.ContextCompat
 import com.bluelinelabs.conductor.RouterTransaction
 import com.stepstone.stepper.StepperLayout
 import com.stepstone.stepper.VerificationError
@@ -52,9 +51,6 @@ class FormController(bundle: Bundle) : BaseController(bundle), FormView, Stepper
         enableNavigation(false)
         stepperLayout?.adapter = FormAdapter(activeForm.form, this, listOfViews)
         stepperLayout?.setListener(this)
-        stepperLayout?.setNextButtonColor(ContextCompat.getColor(context, R.color.white))
-        stepperLayout?.setBackButtonColor(ContextCompat.getColor(context, R.color.white))
-        stepperLayout?.setCompleteButtonColor(ContextCompat.getColor(context, R.color.white))
         presenter.onAttach(this)
         setUpToolbar()
     }
diff --git a/app/src/main/java/org/secfirst/umbrella/feature/form/view/controller/HostFormController.kt b/app/src/main/java/org/secfirst/umbrella/feature/form/view/controller/HostFormController.kt
index a0fa60b7..297699f2 100644
--- a/app/src/main/java/org/secfirst/umbrella/feature/form/view/controller/HostFormController.kt
+++ b/app/src/main/java/org/secfirst/umbrella/feature/form/view/controller/HostFormController.kt
@@ -135,8 +135,8 @@ class HostFormController(bundle: Bundle) : BaseController(bundle), FormView {
 
     private fun setUpToolbar() {
         hostFormToolbar?.let {
-            mainActivity.setSupportActionBar(it)
-            mainActivity.supportActionBar?.title = context.getString(R.string.form_title)
+//            mainActivity.setSupportActionBar(it)
+            it.title = context.getString(R.string.form_title)
         }
     }
 
diff --git a/app/src/main/java/org/secfirst/umbrella/feature/lesson/view/LessonController.kt b/app/src/main/java/org/secfirst/umbrella/feature/lesson/view/LessonController.kt
index ddf901df..21535e3a 100644
--- a/app/src/main/java/org/secfirst/umbrella/feature/lesson/view/LessonController.kt
+++ b/app/src/main/java/org/secfirst/umbrella/feature/lesson/view/LessonController.kt
@@ -92,7 +92,7 @@ class LessonController : BaseController(), LessonView {
     private fun setUpToolbar(view: View) {
         view.lessonToolbar.let {
             mainActivity.setSupportActionBar(it)
-            mainActivity.supportActionBar?.title = context.getString(R.string.lesson_title)
+            it.title = context.getString(R.string.lesson_title)
         }
     }
 
diff --git a/app/src/main/java/org/secfirst/umbrella/feature/lesson/view/LessonGroup.kt b/app/src/main/java/org/secfirst/umbrella/feature/lesson/view/LessonGroup.kt
index 53919123..db2a8949 100644
--- a/app/src/main/java/org/secfirst/umbrella/feature/lesson/view/LessonGroup.kt
+++ b/app/src/main/java/org/secfirst/umbrella/feature/lesson/view/LessonGroup.kt
@@ -40,8 +40,7 @@ class LessonGroup(private val lesson: Lesson,
             } else {
                 setImageResource(R.drawable.ic_keyboard_arrow_up_black)
                 viewHolder.iconHeader.clearColorFilter()
-                viewHolder.subHeaderText
-                        .setTextColor(ContextCompat.getColor(appContext(), android.R.color.black))
+
             }
         }
     }
diff --git a/app/src/main/java/org/secfirst/umbrella/feature/login/view/LoginController.kt b/app/src/main/java/org/secfirst/umbrella/feature/login/view/LoginController.kt
index 0198ebc5..c5ee2148 100644
--- a/app/src/main/java/org/secfirst/umbrella/feature/login/view/LoginController.kt
+++ b/app/src/main/java/org/secfirst/umbrella/feature/login/view/LoginController.kt
@@ -96,8 +96,8 @@ class LoginController : BaseController(), LoginView {
 
     private fun setUpToolbar() {
         loginToolbar?.let {
-            mainActivity.setSupportActionBar(it)
-            mainActivity.supportActionBar?.setDisplayHomeAsUpEnabled(false)
+            /*mainActivity.setSupportActionBar(it)
+            mainActivity.supportActionBar?.setDisplayHomeAsUpEnabled(false)*/
         }
     }
 
diff --git a/app/src/main/java/org/secfirst/umbrella/feature/main/MainActivity.kt b/app/src/main/java/org/secfirst/umbrella/feature/main/MainActivity.kt
index ab3322f6..1b0902e2 100644
--- a/app/src/main/java/org/secfirst/umbrella/feature/main/MainActivity.kt
+++ b/app/src/main/java/org/secfirst/umbrella/feature/main/MainActivity.kt
@@ -33,6 +33,7 @@ import org.secfirst.umbrella.data.preferences.AppPreferenceHelper.Companion.EXTR
 import org.secfirst.umbrella.data.preferences.AppPreferenceHelper.Companion.EXTRA_SHOW_MOCK_VIEW
 import org.secfirst.umbrella.data.preferences.AppPreferenceHelper.Companion.PREF_NAME
 import org.secfirst.umbrella.feature.account.view.AccountController
+import org.secfirst.umbrella.feature.account.view.SettingsController
 import org.secfirst.umbrella.feature.checklist.view.controller.HostChecklistController
 import org.secfirst.umbrella.feature.form.view.controller.HostFormController
 import org.secfirst.umbrella.feature.lesson.view.LessonController
@@ -59,6 +60,7 @@ class MainActivity : AppCompatActivity(), AdvancedSearchPresenter {
         super.onCreate(savedInstanceState)
         setLanguage()
         setContentView(R.layout.main_view)
+        switchDarkMode()
         router = attachRouter(baseContainer, savedInstanceState)
         performDI()
         isDeepLink()
@@ -66,6 +68,13 @@ class MainActivity : AppCompatActivity(), AdvancedSearchPresenter {
         showNavigation()
     }
 
+    private fun switchDarkMode() {
+
+        val controller = SettingsController()
+        val darkState = controller.presenter.getDarkMode()
+        controller.presenter.changeDarkMode(darkState)
+    }
+
     override fun getCriteria(): List<SearchCriteria> {
         return searchProvider?.getCriteria()
                 ?: throw UnsupportedOperationException("The SearchProvider should be registered in the MainActivity")
@@ -110,8 +119,6 @@ class MainActivity : AppCompatActivity(), AdvancedSearchPresenter {
         (menuItem.actionView as SearchView).apply {
             menuItem.isVisible = !disableSearch
             val searchEditText = this.findViewById<View>(androidx.appcompat.R.id.search_src_text) as EditText
-            searchEditText.setTextColor(resources.getColor(R.color.white))
-            searchEditText.setHintTextColor(resources.getColor(R.color.white))
             // Assumes current activity is the searchable activity
             if (componentName!=null && searchManager.getSearchableInfo(componentName) != null)
                 setSearchableInfo(searchManager.getSearchableInfo(componentName))
diff --git a/app/src/main/java/org/secfirst/umbrella/feature/maskapp/view/CalculatorController.kt b/app/src/main/java/org/secfirst/umbrella/feature/maskapp/view/CalculatorController.kt
index 7259257d..c3550398 100644
--- a/app/src/main/java/org/secfirst/umbrella/feature/maskapp/view/CalculatorController.kt
+++ b/app/src/main/java/org/secfirst/umbrella/feature/maskapp/view/CalculatorController.kt
@@ -108,9 +108,9 @@ class CalculatorController : BaseController(), MaskAppView {
         }
 
         view.buttonClear.setOnClickListener {
-            if (editTextCalc.text.isNotEmpty()) {
+            if (editTextCalc.text!!.isNotEmpty()) {
                 val currentText = editTextCalc.text
-                editTextCalc.setText(currentText.subSequence(0, currentText.length - 1))
+                editTextCalc.setText(currentText!!.subSequence(0, currentText.length - 1))
             } else {
                 valueOne = Double.NaN
                 valueTwo = Double.NaN
diff --git a/app/src/main/java/org/secfirst/umbrella/feature/reader/view/HostReaderController.kt b/app/src/main/java/org/secfirst/umbrella/feature/reader/view/HostReaderController.kt
index 8b23ec7d..d9987a9b 100644
--- a/app/src/main/java/org/secfirst/umbrella/feature/reader/view/HostReaderController.kt
+++ b/app/src/main/java/org/secfirst/umbrella/feature/reader/view/HostReaderController.kt
@@ -24,8 +24,8 @@ class HostReaderController : BaseController() {
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup, savedViewState: Bundle?): View {
         val view = inflater.inflate(R.layout.host_reader_view, container, false)
         view.toolbar.let {
-            mainActivity.setSupportActionBar(it)
-            mainActivity.supportActionBar?.title = context.getString(R.string.feed_title)
+            //mainActivity.setSupportActionBar(it)
+            it.title = context.getString(R.string.feed_title)
         }
         return view
     }
diff --git a/app/src/main/java/org/secfirst/umbrella/feature/reader/view/feed/FeedSettingsController.kt b/app/src/main/java/org/secfirst/umbrella/feature/reader/view/feed/FeedSettingsController.kt
index 37fbe0d3..6d30715a 100644
--- a/app/src/main/java/org/secfirst/umbrella/feature/reader/view/feed/FeedSettingsController.kt
+++ b/app/src/main/java/org/secfirst/umbrella/feature/reader/view/feed/FeedSettingsController.kt
@@ -158,7 +158,6 @@ class FeedSettingsController : BaseController(), ReaderView, FeedLocationDialog.
         feedsChecked.forEach { if (it.lastChecked) feedCheckInString += "- ${it.name}\n" }
         this.feedsCheckbox = feedsChecked
         if (feedCheckInString.isEmpty()) {
-            feedSource?.textColor = ContextCompat.getColor(context, R.color.feedSources_color)
             feedSource?.text = context.getString(R.string.feed_source_label)
         } else {
             feedSource?.textColor = ContextCompat.getColor(context, R.color.umbrella_green)
diff --git a/app/src/main/java/org/secfirst/umbrella/feature/reader/view/feed/FeedSourceUI.kt b/app/src/main/java/org/secfirst/umbrella/feature/reader/view/feed/FeedSourceUI.kt
index 0f602e43..6b4fe408 100644
--- a/app/src/main/java/org/secfirst/umbrella/feature/reader/view/feed/FeedSourceUI.kt
+++ b/app/src/main/java/org/secfirst/umbrella/feature/reader/view/feed/FeedSourceUI.kt
@@ -3,7 +3,6 @@ package org.secfirst.umbrella.feature.reader.view.feed
 import android.view.View
 import android.widget.LinearLayout
 import android.widget.ListView
-import androidx.core.content.ContextCompat
 import org.jetbrains.anko.*
 import org.secfirst.umbrella.R
 import org.secfirst.umbrella.misc.medium
@@ -19,7 +18,6 @@ class FeedSourceUI(private val sourcesAdapter: SourcesAdapter) : AnkoComponent<F
 
             textView(ctx.getString(R.string.feed_source_name)) {
                 typeface = medium
-                textColor = 0xde000000.toInt()
                 textSize = 20f
 
             }.lparams(width = wrapContent, height = wrapContent) {
@@ -39,13 +37,12 @@ class FeedSourceUI(private val sourcesAdapter: SourcesAdapter) : AnkoComponent<F
                 }
                 checkBox("Select All") {
                     typeface = medium
-                    textColor = ContextCompat.getColor(ctx, R.color.feedSources_color)
                     textSize = 16f
                     setOnClickListener { sourcesAdapter.selectAllSources(isChecked) }
                 }.lparams(width = wrapContent, height = wrapContent) {
                     topMargin = dip(10)
                 }
-                include<View>(R.layout.alert_control) {
+                this.include<View>(R.layout.alert_control) {
                 }.lparams(width = wrapContent, height = wrapContent) {
                     topMargin = dip(40)
                     leftMargin = dip(140)
diff --git a/app/src/main/java/org/secfirst/umbrella/feature/reader/view/feed/SourcesAdapter.kt b/app/src/main/java/org/secfirst/umbrella/feature/reader/view/feed/SourcesAdapter.kt
index f34c3b3e..e67650ee 100644
--- a/app/src/main/java/org/secfirst/umbrella/feature/reader/view/feed/SourcesAdapter.kt
+++ b/app/src/main/java/org/secfirst/umbrella/feature/reader/view/feed/SourcesAdapter.kt
@@ -19,7 +19,6 @@ class SourcesAdapter(val feedSources: List<FeedSource>) : BaseAdapter() {
                 orientation = LinearLayout.VERTICAL
                 checkBox(feedSources[position].name) {
                     typeface = medium
-                    textColor = ContextCompat.getColor(this@with, R.color.feedSources_color)
                     textSize = 16f
                     isChecked = feedSources[position].lastChecked
                     setOnClickListener { updateChecked(feedSources[position].name, isChecked) }
diff --git a/app/src/main/java/org/secfirst/umbrella/feature/reader/view/rss/ArticleController.kt b/app/src/main/java/org/secfirst/umbrella/feature/reader/view/rss/ArticleController.kt
index 312d4cad..47fbba64 100644
--- a/app/src/main/java/org/secfirst/umbrella/feature/reader/view/rss/ArticleController.kt
+++ b/app/src/main/java/org/secfirst/umbrella/feature/reader/view/rss/ArticleController.kt
@@ -100,10 +100,10 @@ class ArticleController(bundle: Bundle) : BaseController(bundle) {
 
     private fun setUpToolbar() {
         articleToolbar?.let {
-            mainActivity.title = rss.title_
-            mainActivity.setSupportActionBar(it)
+            it.title = rss.title_
+            /*mainActivity.setSupportActionBar(it)
             mainActivity.supportActionBar?.setDisplayShowHomeEnabled(true)
-            mainActivity.supportActionBar?.setDisplayHomeAsUpEnabled(true)
+            mainActivity.supportActionBar?.setDisplayHomeAsUpEnabled(true)*/
         }
     }
 }
diff --git a/app/src/main/java/org/secfirst/umbrella/feature/reader/view/rss/RssController.kt b/app/src/main/java/org/secfirst/umbrella/feature/reader/view/rss/RssController.kt
index 9604bc06..1c5a1871 100644
--- a/app/src/main/java/org/secfirst/umbrella/feature/reader/view/rss/RssController.kt
+++ b/app/src/main/java/org/secfirst/umbrella/feature/reader/view/rss/RssController.kt
@@ -83,7 +83,6 @@ class RssController : BaseController(), ReaderView {
         val snackView = snackBar?.view
         snackView?.setBackgroundColor(ContextCompat.getColor(context, R.color.umbrella_purple_dark))
         val textView = snackView?.findViewById<TextView>(com.google.android.material.R.id.snackbar_text)
-        textView?.setTextColor(ContextCompat.getColor(context, R.color.white))
     }
 
     override fun showNewestRss(rss: RSS) = rssAdapter.add(rss)
diff --git a/app/src/main/java/org/secfirst/umbrella/feature/segment/view/controller/HostSegmentController.kt b/app/src/main/java/org/secfirst/umbrella/feature/segment/view/controller/HostSegmentController.kt
index 89c635f9..7ceff2fe 100644
--- a/app/src/main/java/org/secfirst/umbrella/feature/segment/view/controller/HostSegmentController.kt
+++ b/app/src/main/java/org/secfirst/umbrella/feature/segment/view/controller/HostSegmentController.kt
@@ -1,5 +1,6 @@
 package org.secfirst.umbrella.feature.segment.view.controller
 
+import android.content.Context
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -7,8 +8,12 @@ import android.view.View.INVISIBLE
 import android.view.View.VISIBLE
 import android.view.ViewGroup
 import android.widget.AdapterView
+import androidx.core.content.ContextCompat
+import com.codekidlabs.storagechooser.Content
 import kotlinx.android.synthetic.main.host_segment_view.*
 import kotlinx.android.synthetic.main.host_segment_view.view.*
+import kotlinx.android.synthetic.main.segment_detail.*
+import kotlinx.android.synthetic.main.simple_article_view.view.*
 import org.secfirst.umbrella.R
 import org.secfirst.umbrella.UmbrellaApplication
 import org.secfirst.umbrella.data.database.checklist.Checklist
diff --git a/app/src/main/java/org/secfirst/umbrella/feature/segment/view/controller/SegmentController.kt b/app/src/main/java/org/secfirst/umbrella/feature/segment/view/controller/SegmentController.kt
index d11723fb..333ecb03 100644
--- a/app/src/main/java/org/secfirst/umbrella/feature/segment/view/controller/SegmentController.kt
+++ b/app/src/main/java/org/secfirst/umbrella/feature/segment/view/controller/SegmentController.kt
@@ -193,7 +193,7 @@ class SegmentController(bundle: Bundle) : BaseController(bundle), SegmentView {
     private fun shareDocument(fileToShare: File) {
         val pm = context.packageManager
         val uri = FileProvider.getUriForFile(context, APPLICATION_ID, fileToShare)
-        val shareIntent = ShareCompat.IntentBuilder.from(activity)
+        val shareIntent = ShareCompat.IntentBuilder.from(activity!!)
                 .setType(context.contentResolver.getType(uri))
                 .setStream(uri)
                 .intent
diff --git a/app/src/main/java/org/secfirst/umbrella/feature/tour/view/TourController.kt b/app/src/main/java/org/secfirst/umbrella/feature/tour/view/TourController.kt
index e3b93291..c5120d95 100644
--- a/app/src/main/java/org/secfirst/umbrella/feature/tour/view/TourController.kt
+++ b/app/src/main/java/org/secfirst/umbrella/feature/tour/view/TourController.kt
@@ -155,14 +155,12 @@ class TourController : BaseController(), ContentView {
     private fun errorNoConnectionMessage(view: View) {
         val snackBar = view.longSnackbar(context.resources.getString(R.string.error_connection_tour_message))
         val snackView = snackBar.view
-        snackView.setBackgroundColor(ContextCompat.getColor(context, R.color.white))
     }
 
     private fun errorLostConnectionMessage() {
         tourView?.let {
             val snackBar = it.longSnackbar(context.resources.getString(R.string.notification_lost_connection))
             val snackView = snackBar.view
-            snackView.setBackgroundColor(ContextCompat.getColor(context, R.color.white))
         }
         if (progressDialog.isShowing && !mainActivity.isFinishing)
             progressDialog.dismiss()
diff --git a/app/src/main/java/org/secfirst/umbrella/feature/tour/view/TourUI.kt b/app/src/main/java/org/secfirst/umbrella/feature/tour/view/TourUI.kt
index f9c5ff64..863bea24 100644
--- a/app/src/main/java/org/secfirst/umbrella/feature/tour/view/TourUI.kt
+++ b/app/src/main/java/org/secfirst/umbrella/feature/tour/view/TourUI.kt
@@ -31,7 +31,6 @@ class TourUI(private val color: Int,
             textView {
                 textResource = textTourSource
                 textSize = 24f
-                textColor = Color.WHITE
                 gravity = Gravity.CENTER
                 padding = dip(20)
             }.lparams { gravity = Gravity.CENTER }
diff --git a/app/src/main/java/org/secfirst/umbrella/misc/AboutController.kt b/app/src/main/java/org/secfirst/umbrella/misc/AboutController.kt
index 3a2c5d95..8a2e853c 100644
--- a/app/src/main/java/org/secfirst/umbrella/misc/AboutController.kt
+++ b/app/src/main/java/org/secfirst/umbrella/misc/AboutController.kt
@@ -33,15 +33,19 @@ class AboutController(bundle: Bundle) : BaseController(bundle) {
         setUpToolbar()
     }
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup, savedViewState: Bundle?): View {
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup,
+        savedViewState: Bundle?
+    ): View {
         return inflater.inflate(R.layout.about, container, false)
     }
 
     private fun setUpToolbar() {
         aboutToolbar?.let {
-            mainActivity.setSupportActionBar(it)
-            mainActivity.supportActionBar?.setDisplayHomeAsUpEnabled(true)
-            mainActivity.supportActionBar?.title = markdown.title
+            /*mainActivity.setSupportActionBar(it)
+            mainActivity.supportActionBar?.setDisplayHomeAsUpEnabled(true)*/
+            it.title = markdown.title
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/secfirst/umbrella/misc/CoroutineExt.kt b/app/src/main/java/org/secfirst/umbrella/misc/CoroutineExt.kt
index 2de7b87d..b1940711 100644
--- a/app/src/main/java/org/secfirst/umbrella/misc/CoroutineExt.kt
+++ b/app/src/main/java/org/secfirst/umbrella/misc/CoroutineExt.kt
@@ -15,8 +15,10 @@ import kotlin.coroutines.EmptyCoroutineContext
  * }
  * ```
  */
-fun launchSilent(context: CoroutineContext = Dispatchers.Default,
-                 block: suspend CoroutineScope.() -> Unit) {
+fun launchSilent(
+    context: CoroutineContext = Dispatchers.Default,
+    block: suspend CoroutineScope.() -> Unit
+) {
 
     GlobalScope.launch(context, CoroutineStart.DEFAULT, block)
 }
@@ -32,7 +34,10 @@ fun launchSilent(context: CoroutineContext = Dispatchers.Default,
  * }
  * ```
  */
-fun <T> runBlockingSilent(context: CoroutineContext = EmptyCoroutineContext, block: suspend CoroutineScope.() -> T) {
+fun <T> runBlockingSilent(
+    context: CoroutineContext = EmptyCoroutineContext,
+    block: suspend CoroutineScope.() -> T
+) {
     runBlocking(context, block)
 }
 
diff --git a/app/src/main/java/org/secfirst/umbrella/misc/CountryHelper.kt b/app/src/main/java/org/secfirst/umbrella/misc/CountryHelper.kt
index e66d6a22..71c3cfb7 100644
--- a/app/src/main/java/org/secfirst/umbrella/misc/CountryHelper.kt
+++ b/app/src/main/java/org/secfirst/umbrella/misc/CountryHelper.kt
@@ -1,11 +1,13 @@
 package org.secfirst.umbrella.misc
 
-data class Country(val name: String,
-                   val codeAlpha2: String,
-                   val codeAlpha3: String,
-                   val numericCode: Int,
-                   val latitude: Double,
-                   val longitude: Double)
+data class Country(
+    val name: String,
+    val codeAlpha2: String,
+    val codeAlpha3: String,
+    val numericCode: Int,
+    val latitude: Double,
+    val longitude: Double
+)
 
 fun countryList(): ArrayList<Country> {
 
@@ -143,7 +145,16 @@ fun countryList(): ArrayList<Country> {
     countries.add(Country("Lithuania", "LT", "LTU", 440, 56.0, 24.0))
     countries.add(Country("Luxembourg", "LU", "LUX", 442, 49.75, 6.1667))
     countries.add(Country("Macao", "MO", "MAC", 446, 22.1667, 113.55))
-    countries.add(Country("Macedonia, the former Yugoslav Republic of", "MK", "MKD", 807, 41.8333, 22.0))
+    countries.add(
+        Country(
+            "Macedonia, the former Yugoslav Republic of",
+            "MK",
+            "MKD",
+            807,
+            41.8333,
+            22.0
+        )
+    )
     countries.add(Country("Madagascar", "MG", "MDG", 450, -20.0, 47.0))
     countries.add(Country("Malawi", "MW", "MWI", 454, -13.5, 34.0))
     countries.add(Country("Malaysia", "MY", "MYS", 458, 2.5, 112.5))
@@ -199,7 +210,16 @@ fun countryList(): ArrayList<Country> {
     countries.add(Country("Russian Federation", "RU", "RUS", 643, 60.0, 100.0))
     countries.add(Country("Russia", "RU", "RUS", 643, 60.0, 100.0))
     countries.add(Country("Rwanda", "RW", "RWA", 646, -2.0, 30.0))
-    countries.add(Country("Saint Helena, Ascension and Tristan da Cunha", "SH", "SHN", 654, -15.9333, -5.7))
+    countries.add(
+        Country(
+            "Saint Helena, Ascension and Tristan da Cunha",
+            "SH",
+            "SHN",
+            654,
+            -15.9333,
+            -5.7
+        )
+    )
     countries.add(Country("Saint Kitts and Nevis", "KN", "KNA", 659, 17.3333, -62.75))
     countries.add(Country("Saint Lucia", "LC", "LCA", 662, 13.8833, -61.1333))
     countries.add(Country("Saint Pierre and Miquelon", "PM", "SPM", 666, 46.8333, -56.3333))
@@ -220,7 +240,16 @@ fun countryList(): ArrayList<Country> {
     countries.add(Country("Solomon Islands", "SB", "SLB", 90, -8.0, 159.0))
     countries.add(Country("Somalia", "SO", "SOM", 706, 10.0, 49.0))
     countries.add(Country("South Africa", "ZA", "ZAF", 710, -29.0, 24.0))
-    countries.add(Country("South Georgia and the South Sandwich Islands", "GS", "SGS", 239, -54.5, -37.0))
+    countries.add(
+        Country(
+            "South Georgia and the South Sandwich Islands",
+            "GS",
+            "SGS",
+            239,
+            -54.5,
+            -37.0
+        )
+    )
     countries.add(Country("Spain", "ES", "ESP", 724, 40.0, -4.0))
     countries.add(Country("Sri Lanka", "LK", "LKA", 144, 7.0, 81.0))
     countries.add(Country("Sudan", "SD", "SDN", 736, 15.0, 30.0))
diff --git a/app/src/main/java/org/secfirst/umbrella/misc/Extensions.kt b/app/src/main/java/org/secfirst/umbrella/misc/Extensions.kt
index 054337f0..df60872f 100644
--- a/app/src/main/java/org/secfirst/umbrella/misc/Extensions.kt
+++ b/app/src/main/java/org/secfirst/umbrella/misc/Extensions.kt
@@ -11,7 +11,6 @@ import android.content.res.Resources
 import android.net.ConnectivityManager
 import android.os.Build
 import android.util.Base64
-import androidx.annotation.RequiresApi
 import androidx.core.app.ActivityCompat
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory
@@ -41,14 +40,17 @@ const val PERMISSION_REQUEST_EXTERNAL_STORAGE = 1
 
 fun MainActivity.requestExternalStoragePermission() {
 
-    ActivityCompat.requestPermissions(this,
-            arrayOf(Manifest.permission.WRITE_EXTERNAL_STORAGE),
-            PERMISSION_REQUEST_EXTERNAL_STORAGE)
+    ActivityCompat.requestPermissions(
+        this,
+        arrayOf(Manifest.permission.WRITE_EXTERNAL_STORAGE),
+        PERMISSION_REQUEST_EXTERNAL_STORAGE
+    )
 }
 
 fun doRestartApplication(context: Context) {
     val tourIntent = Intent(context, MainActivity::class.java)
-    tourIntent.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
+    tourIntent.flags =
+        Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
     ProcessPhoenix.triggerRebirth(context, tourIntent)
 }
 
@@ -72,13 +74,15 @@ fun setMaskMode(activity: Activity, masked: Boolean) {
     val activeName = disableNames.removeAt(if (masked) 1 else 0)
 
     activity.packageManager.setComponentEnabledSetting(
-            ComponentName(packageName, activeName),
-            PackageManager.COMPONENT_ENABLED_STATE_ENABLED, PackageManager.DONT_KILL_APP)
+        ComponentName(packageName, activeName),
+        PackageManager.COMPONENT_ENABLED_STATE_ENABLED, PackageManager.DONT_KILL_APP
+    )
 
     for (i in disableNames.indices) {
         activity.packageManager.setComponentEnabledSetting(
-                ComponentName(packageName, disableNames[i]),
-                PackageManager.COMPONENT_ENABLED_STATE_DISABLED, PackageManager.DONT_KILL_APP)
+            ComponentName(packageName, disableNames[i]),
+            PackageManager.COMPONENT_ENABLED_STATE_DISABLED, PackageManager.DONT_KILL_APP
+        )
     }
 }
 
@@ -97,13 +101,24 @@ fun htmlToPdf(doc: org.jsoup.nodes.Document, file: FileOutputStream) {
     val htmlContext = HtmlPipelineContext(cssAppliers)
     htmlContext.setTagFactory(Tags.getHtmlTagProcessorFactory())
 
-    XMLWorkerHelper.getInstance().parseXHtml(writer, document, ByteArrayInputStream(doc.toString().toByteArray(Charsets.UTF_8)), Charset.forName("UTF-8"), fontProvider)
+    XMLWorkerHelper.getInstance().parseXHtml(
+        writer,
+        document,
+        ByteArrayInputStream(doc.toString().toByteArray(Charsets.UTF_8)),
+        Charset.forName("UTF-8"),
+        fontProvider
+    )
 
     document.close()
     file.close()
 }
 
-fun createDocument(doc: org.jsoup.nodes.Document, filename: String, type: String, context: Context): File {
+fun createDocument(
+    doc: org.jsoup.nodes.Document,
+    filename: String,
+    type: String,
+    context: Context
+): File {
     val img: Elements = doc.getElementsByTag("img")
     doc.body().attr("style", "font-family: Roboto")
     lateinit var src: String
@@ -137,7 +152,8 @@ fun createDocument(doc: org.jsoup.nodes.Document, filename: String, type: String
 
 fun appContext(): Context = UmbrellaApplication.instance.applicationContext
 
-fun encodeToBase64(file: File) = Base64.encodeToString(FileUtils.readFileToByteArray(file), Base64.DEFAULT)
+fun encodeToBase64(file: File) =
+    Base64.encodeToString(FileUtils.readFileToByteArray(file), Base64.DEFAULT)
         ?: ""
 
 @Suppress("DEPRECATION")
@@ -152,7 +168,7 @@ fun Context.setLocale(lang: String) {
 @SuppressLint("NewApi")
 @Suppress("DEPRECATION")
 fun deviceLanguage(): String {
-    val defaultLanguage = when(Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+    val defaultLanguage = when (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
         true -> Resources.getSystem().configuration.locales.get(0).language
         false -> Resources.getSystem().configuration.locale.language
     }
@@ -169,7 +185,7 @@ fun TextNode.wrapTextWithElement(strToWrap: String, wrapperHTML: String) {
     while (textNode.text().toLowerCase().contains(strToWrap.toLowerCase())) {
         val indexPosition: Int = textNode.text().toLowerCase().indexOf(strToWrap.toLowerCase())
         val rightNodeFromSplit =
-                textNode.splitText(indexPosition)
+            textNode.splitText(indexPosition)
         if (rightNodeFromSplit.text().length > strToWrap.length) {
             textNode = rightNodeFromSplit.splitText(strToWrap.length)
             rightNodeFromSplit.wrap(wrapperHTML)
diff --git a/app/src/main/java/org/secfirst/umbrella/misc/StringEtx.kt b/app/src/main/java/org/secfirst/umbrella/misc/StringEtx.kt
index 08a9fed5..7b53e743 100644
--- a/app/src/main/java/org/secfirst/umbrella/misc/StringEtx.kt
+++ b/app/src/main/java/org/secfirst/umbrella/misc/StringEtx.kt
@@ -39,7 +39,7 @@ fun String?.hostURL(): String {
 fun Long?.timestampToStringFormat(): String {
     val timestamp = this ?: 0
     return DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT)
-            .format(Date(timestamp * 1000))
+        .format(Date(timestamp * 1000))
 }
 
 fun String.checkPasswordStrength(context: Context): Boolean {
diff --git a/app/src/main/java/org/secfirst/umbrella/misc/ViewExt.kt b/app/src/main/java/org/secfirst/umbrella/misc/ViewExt.kt
index a2e6bfd9..3f986bcb 100644
--- a/app/src/main/java/org/secfirst/umbrella/misc/ViewExt.kt
+++ b/app/src/main/java/org/secfirst/umbrella/misc/ViewExt.kt
@@ -15,8 +15,16 @@ import kotlinx.android.synthetic.main.head_section.view.*
 import org.secfirst.umbrella.R
 import org.secfirst.umbrella.feature.base.view.BaseController
 
-val TextView.regular: Typeface get() = Typeface.createFromAsset(context.assets, "fonts/Roboto-Regular.ttf")
-val TextView.medium: Typeface get() = Typeface.createFromAsset(context.assets, "fonts/Roboto-Medium.ttf")
+val TextView.regular: Typeface
+    get() = Typeface.createFromAsset(
+        context.assets,
+        "fonts/Roboto-Regular.ttf"
+    )
+val TextView.medium: Typeface
+    get() = Typeface.createFromAsset(
+        context.assets,
+        "fonts/Roboto-Medium.ttf"
+    )
 
 fun Context.shareLink(link: String) {
     val sendIntent = Intent()
@@ -26,21 +34,25 @@ fun Context.shareLink(link: String) {
     this.startActivity(Intent.createChooser(sendIntent, this.resources.getText(R.string.send_to)))
 }
 
-fun RecyclerView.initRecyclerView(adapter: RecyclerView.Adapter<out RecyclerView.ViewHolder>,
-                                  layoutManager: RecyclerView.LayoutManager = LinearLayoutManager(context),
-                                  hasFixedSize: Boolean = true) {
+fun RecyclerView.initRecyclerView(
+    adapter: RecyclerView.Adapter<out RecyclerView.ViewHolder>,
+    layoutManager: RecyclerView.LayoutManager = LinearLayoutManager(context),
+    hasFixedSize: Boolean = true
+) {
     this.layoutManager = layoutManager
     this.adapter = adapter
     setHasFixedSize(hasFixedSize)
 }
 
 fun BaseController.hideKeyboard() {
-    val inputMethodManager = this.activity?.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
+    val inputMethodManager =
+        this.activity?.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
     inputMethodManager.hideSoftInputFromWindow(this.view?.windowToken, 0)
 }
 
 fun Activity.hideKeyboard() {
-    val inputMethodManager = this.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
+    val inputMethodManager =
+        this.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
     inputMethodManager.hideSoftInputFromWindow(this.currentFocus?.windowToken, 0)
 }
 
@@ -54,8 +66,8 @@ const val ITEM_VIEW_TYPE_FOOTER = 2
 
 fun Spinner.init(array: Int) {
     ArrayAdapter.createFromResource(
-            this.context, array,
-            android.R.layout.simple_spinner_item
+        this.context, array,
+        android.R.layout.simple_spinner_item
     ).also { adapter ->
         adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
         this.adapter = adapter
diff --git a/app/src/main/java/org/secfirst/umbrella/misc/umbrella_uri.kt b/app/src/main/java/org/secfirst/umbrella/misc/umbrella_uri.kt
index 228593f9..af549e17 100644
--- a/app/src/main/java/org/secfirst/umbrella/misc/umbrella_uri.kt
+++ b/app/src/main/java/org/secfirst/umbrella/misc/umbrella_uri.kt
@@ -43,11 +43,11 @@ suspend fun isLessonDeepLink(pathSplitted: List<String>): Boolean {
 }
 
 fun String.deepLinkIdentifier() = this.removePrefix("s_")
-        .removePrefix("f_")
-        .removePrefix("c_")
-        .substringBeforeLast(".md")
-        .substringBeforeLast(".yml")
-        .removeSpecialCharacter().toLowerCase()
+    .removePrefix("f_")
+    .removePrefix("c_")
+    .substringBeforeLast(".md")
+    .substringBeforeLast(".yml")
+    .removeSpecialCharacter().toLowerCase()
 
 private fun getUriSplitted(path: String) = path.split("/")
 
@@ -78,7 +78,14 @@ fun openDifficultyByUrl(router: Router, navigation: BottomNavigationView, path:
         val module = getModuleBy(moduleName)
         module?.subjects?.forEach { subject ->
             if (subject.rootDir == subjectName.decapitalize())
-                router.pushController(RouterTransaction.with(DifficultyController(subject.id, true)))
+                router.pushController(
+                    RouterTransaction.with(
+                        DifficultyController(
+                            subject.id,
+                            true
+                        )
+                    )
+                )
 
             navigation.menu.getItem(3).isChecked = true
         }
@@ -86,23 +93,23 @@ fun openDifficultyByUrl(router: Router, navigation: BottomNavigationView, path:
 }
 
 private suspend fun getModuleBy(rootDir: String) =
-        withContext(ioContext) {
-            SQLite.select()
-                    .from(Module::class.java)
-                    .where(Module_Table.rootDir.`is`(rootDir))
-                    .querySingle()
-        }
+    withContext(ioContext) {
+        SQLite.select()
+            .from(Module::class.java)
+            .where(Module_Table.rootDir.`is`(rootDir))
+            .querySingle()
+    }
 
 suspend fun getDifficultyBySubjectId(subjectId: String): List<Difficulty> = withContext(ioContext) {
     SQLite.select()
-            .from(Difficulty::class.java)
-            .where(Difficulty_Table.subject_id.`is`(subjectId))
-            .queryList()
+        .from(Difficulty::class.java)
+        .where(Difficulty_Table.subject_id.`is`(subjectId))
+        .queryList()
 }
 
 suspend fun getSubjectByRootDir(rootDir: String): Subject? = withContext(ioContext) {
     SQLite.select()
-            .from(Subject::class.java)
-            .where(Subject_Table.rootDir.`is`(rootDir))
-            .querySingle()
+        .from(Subject::class.java)
+        .where(Subject_Table.rootDir.`is`(rootDir))
+        .querySingle()
 }
diff --git a/app/src/main/res/drawable-xxhdpi/ic_keyboard_arrow_down_black.xml b/app/src/main/res/drawable-xxhdpi/ic_keyboard_arrow_down_black.xml
index c7ba4028..fa22e154 100644
--- a/app/src/main/res/drawable-xxhdpi/ic_keyboard_arrow_down_black.xml
+++ b/app/src/main/res/drawable-xxhdpi/ic_keyboard_arrow_down_black.xml
@@ -2,8 +2,9 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
+    android:viewportHeight="24.0"
+    android:tint="?attr/colorControlNormal">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/white"
         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-xxhdpi/ic_keyboard_arrow_up_black.xml b/app/src/main/res/drawable-xxhdpi/ic_keyboard_arrow_up_black.xml
index 57387ee4..9e3fc55d 100644
--- a/app/src/main/res/drawable-xxhdpi/ic_keyboard_arrow_up_black.xml
+++ b/app/src/main/res/drawable-xxhdpi/ic_keyboard_arrow_up_black.xml
@@ -2,8 +2,9 @@
         android:width="24dp"
         android:height="24dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+        android:viewportHeight="24.0"
+    android:tint="?attr/colorControlNormal">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/white"
         android:pathData="M7.41,15.41L12,10.83l4.59,4.58L18,14l-6,-6 -6,6z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_action_back.xml b/app/src/main/res/drawable/ic_action_back.xml
index d10319e2..35a67d5d 100644
--- a/app/src/main/res/drawable/ic_action_back.xml
+++ b/app/src/main/res/drawable/ic_action_back.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="#FFFFFF"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/white"
         android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_dashboard_black_24dp.xml b/app/src/main/res/drawable/ic_dashboard_black_24dp.xml
index ae6a4468..7fb59897 100644
--- a/app/src/main/res/drawable/ic_dashboard_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_dashboard_black_24dp.xml
@@ -2,8 +2,9 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportHeight="24.0"
-    android:viewportWidth="24.0">
+    android:viewportWidth="24.0"
+    android:tint="?attr/colorControlNormal">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/white"
         android:pathData="M3,13h8L11,3L3,3v10zM3,21h8v-6L3,15v6zM13,21h8L21,11h-8v10zM13,3v6h8L21,3h-8z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_home_black_24dp.xml b/app/src/main/res/drawable/ic_home_black_24dp.xml
index 0c36320f..3c087cdb 100644
--- a/app/src/main/res/drawable/ic_home_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_home_black_24dp.xml
@@ -2,8 +2,9 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportHeight="24.0"
-    android:viewportWidth="24.0">
+    android:viewportWidth="24.0"
+    android:tint="?attr/colorControlNormal">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/white"
         android:pathData="M10,20v-6h4v6h5v-8h3L12,3 2,12h3v8z" />
 </vector>
diff --git a/app/src/main/res/layout/about.xml b/app/src/main/res/layout/about.xml
index cd3f17ae..d9f5a397 100644
--- a/app/src/main/res/layout/about.xml
+++ b/app/src/main/res/layout/about.xml
@@ -8,13 +8,15 @@
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/segmentBarLayout"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:theme="@style/ActionBarStyle">
 
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/aboutToolbar"
             android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" />
+            android:layout_height="?actionBarSize"
+            android:background="?colorPrimary" />
+
     </com.google.android.material.appbar.AppBarLayout>
 
     <br.tiagohm.markdownview.MarkdownView
diff --git a/app/src/main/res/layout/account_language_dialog.xml b/app/src/main/res/layout/account_language_dialog.xml
index 7c6ee06d..a6c59bf8 100644
--- a/app/src/main/res/layout/account_language_dialog.xml
+++ b/app/src/main/res/layout/account_language_dialog.xml
@@ -15,7 +15,6 @@
         android:layout_marginTop="20dp"
         android:fontFamily="sans-serif-medium"
         android:text="@string/account_language_dialog_title"
-        android:textColor="#de000000"
         android:textSize="@dimen/font_larger"
         android:textStyle="normal"
         app:layout_constraintStart_toStartOf="parent"
@@ -43,7 +42,6 @@
             android:fontFamily="sans-serif"
             android:lineSpacingExtra="8sp"
             android:text="@string/english_language_title"
-            android:textColor="@color/feedSources_color"
             android:textSize="@dimen/text_size_smaller"
             android:textStyle="normal" />
 
@@ -58,7 +56,6 @@
             android:drawablePadding="@dimen/recycler_view_margin_bottom"
             android:lineSpacingExtra="8sp"
             android:text="@string/spanish_language_title"
-            android:textColor="#8a000000"
             android:textSize="@dimen/text_size_smaller" />
 
         <RadioButton
@@ -71,7 +68,6 @@
             android:drawablePadding="@dimen/recycler_view_margin_bottom"
             android:lineSpacingExtra="8sp"
             android:text="@string/chinese_language_title"
-            android:textColor="#8a000000"
             android:textSize="@dimen/text_size_smaller" />
 
         <RadioButton
@@ -84,7 +80,6 @@
             android:drawablePadding="@dimen/recycler_view_margin_bottom"
             android:lineSpacingExtra="8sp"
             android:text="@string/arabic_language_title"
-            android:textColor="#8a000000"
             android:textSize="@dimen/text_size_smaller" />
 
         <RadioButton
@@ -97,7 +92,6 @@
             android:drawablePadding="@dimen/recycler_view_margin_bottom"
             android:lineSpacingExtra="8sp"
             android:text="@string/farsi_language_title"
-            android:textColor="#8a000000"
             android:textSize="@dimen/text_size_smaller" />
 
         <RadioButton
@@ -110,7 +104,6 @@
             android:drawablePadding="@dimen/recycler_view_margin_bottom"
             android:lineSpacingExtra="8sp"
             android:text="@string/russian_language_title"
-            android:textColor="#8a000000"
             android:textSize="@dimen/text_size_smaller" />
 
         <RadioButton
@@ -123,7 +116,6 @@
             android:drawablePadding="@dimen/recycler_view_margin_bottom"
             android:lineSpacingExtra="8sp"
             android:text="@string/french_language_title"
-            android:textColor="#8a000000"
             android:textSize="@dimen/text_size_smaller" />
 
     </RadioGroup>
diff --git a/app/src/main/res/layout/account_password_alert.xml b/app/src/main/res/layout/account_password_alert.xml
index fefef83a..226e0131 100644
--- a/app/src/main/res/layout/account_password_alert.xml
+++ b/app/src/main/res/layout/account_password_alert.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_gravity="start"
@@ -13,7 +12,6 @@
         android:layout_height="wrap_content"
         android:fontFamily="sans-serif-medium"
         android:text="@string/account_password_alert_title"
-        android:textColor="#de000000"
         android:textSize="22sp"
         android:textStyle="normal"
         app:layout_constraintStart_toStartOf="parent"
@@ -30,24 +28,27 @@
         app:layout_constraintTop_toBottomOf="@+id/alertPwTitle" />
 
 
-    <EditText
+    <com.google.android.material.textfield.TextInputEditText
         android:id="@+id/alertPwText"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
+        android:autofillHints=""
         android:hint="@string/account_password_alert_password"
         android:imeOptions="actionDone"
         android:inputType="textPassword"
+        android:minHeight="48dp"
         app:layout_constraintStart_toStartOf="@+id/alertPwDescription"
         app:layout_constraintTop_toBottomOf="@+id/alertPwDescription" />
 
-    <EditText
+    <com.google.android.material.textfield.TextInputEditText
         android:id="@+id/alertPwConfirm"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:hint="@string/account_password_alert_confirm"
         android:imeOptions="actionDone"
         android:inputType="textPassword"
+        android:minHeight="48dp"
         app:layout_constraintStart_toStartOf="@+id/alertPwText"
         app:layout_constraintTop_toBottomOf="@+id/alertPwText" />
 
diff --git a/app/src/main/res/layout/account_reset_password_alert.xml b/app/src/main/res/layout/account_reset_password_alert.xml
index ad174ba6..201517eb 100644
--- a/app/src/main/res/layout/account_reset_password_alert.xml
+++ b/app/src/main/res/layout/account_reset_password_alert.xml
@@ -10,7 +10,6 @@
         android:layout_height="wrap_content"
         android:fontFamily="sans-serif-medium"
         android:text="@string/reset_password_title"
-        android:textColor="#de000000"
         android:textSize="18sp" />
 
     <TextView
@@ -18,7 +17,6 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="20dp"
         android:text="@string/reset_password_text"
-        android:textColor="#de000000"
         android:textSize="18sp"
         android:textStyle="normal" />
 
diff --git a/app/src/main/res/layout/account_settings_view.xml b/app/src/main/res/layout/account_settings_view.xml
index d21a6a1c..832a3663 100644
--- a/app/src/main/res/layout/account_settings_view.xml
+++ b/app/src/main/res/layout/account_settings_view.xml
@@ -10,13 +10,16 @@
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/segmentBarLayout"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:theme="@style/ActionBarStyle">
 
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/settingsToolbar"
             android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" />
+            android:layout_height="wrap_content"
+            android:background="?colorPrimary"
+            android:foregroundTint="@color/white"
+            tools:targetApi="lollipop" />
     </com.google.android.material.appbar.AppBarLayout>
 
 
@@ -30,7 +33,7 @@
             android:layout_height="wrap_content">
 
             <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/SkipContainer"
+                android:id="@+id/DarkModeContainer"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:padding="@dimen/settings_vertical_margin"
@@ -49,18 +52,43 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
 
+
                 <TextView
-                    android:id="@+id/labelSkipPw"
+                    android:id="@+id/labelDarkMode"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:fontFamily="sans-serif"
+                    android:lineSpacingExtra="6sp"
+                    android:text="@string/settings_label_dark_mode"
+                    android:textSize="@dimen/text_size_smallest"
+                    android:textStyle="normal"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/settingsDarkMode" />
+
+                <Switch
+                    android:id="@+id/settingsDarkMode"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
                     android:layout_marginTop="@dimen/settings_normal_padding"
                     android:fontFamily="sans-serif"
                     android:lineSpacingExtra="8sp"
-                    android:text="@string/settings_title_skip_pw"
+                    android:text="@string/settings_title_dark_mode"
                     android:textSize="@dimen/text_size_small"
                     android:textStyle="normal"
+                    app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/general" />
+                    app:layout_constraintTop_toBottomOf="@+id/general"
+                    tools:ignore="UseSwitchCompatOrMaterialXml,TouchTargetSizeCheck" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/SkipContainer"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:padding="@dimen/settings_vertical_margin"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/DarkModeContainer">
+
 
                 <TextView
                     android:id="@+id/labelSkipPwMessage"
@@ -69,24 +97,24 @@
                     android:fontFamily="sans-serif"
                     android:lineSpacingExtra="6sp"
                     android:text="@string/settings_label_skip_pw"
-                    android:textColor="@color/subtitle_settings_color"
                     android:textSize="@dimen/text_size_smallest"
                     android:textStyle="normal"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/labelSkipPw" />
+                    app:layout_constraintTop_toBottomOf="@+id/settingsSkipPassword" />
 
                 <Switch
                     android:id="@+id/settingsSkipPassword"
-                    android:layout_width="wrap_content"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/settings_bigger_padding"
                     android:fontFamily="sans-serif"
                     android:lineSpacingExtra="8sp"
-                    android:textColor="#de000000"
+                    android:text="@string/settings_title_skip_pw"
                     android:textSize="@dimen/text_size_small"
                     android:textStyle="normal"
                     app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    tools:ignore="UseSwitchCompatOrMaterialXml,TouchTargetSizeCheck" />
             </androidx.constraintlayout.widget.ConstraintLayout>
 
             <androidx.constraintlayout.widget.ConstraintLayout
@@ -105,7 +133,6 @@
                     android:fontFamily="sans-serif"
                     android:lineSpacingExtra="8sp"
                     android:text="@string/settings_refresh_from_the_server"
-                    android:textColor="#de000000"
                     android:textSize="@dimen/text_size_small"
                     android:textStyle="normal"
                     app:layout_constraintStart_toStartOf="parent"
@@ -117,7 +144,6 @@
                     android:fontFamily="sans-serif"
                     android:lineSpacingExtra="6sp"
                     android:text="@string/settings_refresh_from_the_server"
-                    android:textColor="@color/subtitle_settings_color"
                     android:textSize="@dimen/text_size_smallest"
                     android:textStyle="normal"
                     app:layout_constraintStart_toStartOf="parent"
@@ -141,7 +167,6 @@
                     android:fontFamily="sans-serif"
                     android:lineSpacingExtra="8sp"
                     android:text="@string/settings_switch_server"
-                    android:textColor="#de000000"
                     android:textSize="@dimen/text_size_small"
                     android:textStyle="normal"
                     app:layout_constraintStart_toStartOf="parent"
@@ -153,7 +178,6 @@
                     android:fontFamily="sans-serif"
                     android:lineSpacingExtra="6sp"
                     android:text="@string/settings_switch_server"
-                    android:textColor="@color/subtitle_settings_color"
                     android:textSize="@dimen/text_size_smallest"
                     android:textStyle="normal"
                     app:layout_constraintStart_toStartOf="parent"
@@ -208,7 +232,6 @@
                     android:fontFamily="sans-serif"
                     android:lineSpacingExtra="6sp"
                     android:text="@string/settings_english"
-                    android:textColor="@color/subtitle_settings_color"
                     android:textSize="@dimen/text_size_smallest"
                     android:textStyle="normal"
                     app:layout_constraintStart_toEndOf="@+id/imageLanguage"
@@ -243,7 +266,6 @@
                     android:fontFamily="sans-serif"
                     android:lineSpacingExtra="6sp"
                     android:text="@string/settings_import_your_data"
-                    android:textColor="@color/subtitle_settings_color"
                     android:textSize="@dimen/text_size_smallest"
                     android:textStyle="normal"
                     app:layout_constraintStart_toStartOf="parent"
@@ -277,7 +299,6 @@
                     android:fontFamily="sans-serif"
                     android:lineSpacingExtra="6sp"
                     android:text="@string/settings_export_your_data"
-                    android:textColor="@color/subtitle_settings_color"
                     android:textSize="@dimen/text_size_smallest"
                     android:textStyle="normal"
                     app:layout_constraintStart_toStartOf="parent"
@@ -289,7 +310,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="2dp"
                 android:layout_marginTop="@dimen/settings_bigger_padding"
-                android:background="@color/color_line_settings"
+                android:background="?android:attr/listDivider"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/settingsExportData" />
 
@@ -333,7 +354,6 @@
                     android:layout_height="wrap_content"
                     android:fontFamily="sans-serif"
                     android:lineSpacingExtra="6sp"
-                    android:textColor="@color/subtitle_settings_color"
                     android:textSize="@dimen/text_size_smallest"
                     android:textStyle="normal"
                     app:layout_constraintStart_toStartOf="parent"
@@ -369,7 +389,6 @@
                     android:fontFamily="sans-serif"
                     android:lineSpacingExtra="6sp"
                     android:text="@string/settings_your_location"
-                    android:textColor="@color/subtitle_settings_color"
                     android:textSize="@dimen/text_size_smallest"
                     android:textStyle="normal"
                     app:layout_constraintStart_toStartOf="parent"
@@ -404,7 +423,6 @@
                     android:fontFamily="sans-serif"
                     android:lineSpacingExtra="6sp"
                     android:text="@string/settings_security_feed_sources"
-                    android:textColor="@color/subtitle_settings_color"
                     android:textSize="@dimen/text_size_smallest"
                     android:textStyle="normal"
                     app:layout_constraintStart_toStartOf="parent"
@@ -416,7 +434,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="2dp"
                 android:layout_marginTop="@dimen/settings_bigger_padding"
-                android:background="@color/color_line_settings"
+                android:background="?android:attr/listDivider"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/settingsSecurityFeed" />
 
@@ -441,18 +459,6 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
 
-                <TextView
-                    android:id="@+id/maskModeTitle"
-                    android:layout_width="300dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/settings_vertical_margin"
-                    android:ellipsize="end"
-                    android:fontFamily="sans-serif"
-                    android:text="@string/settings_show_updates_as_notification"
-                    android:textSize="@dimen/text_size_small"
-                    android:textStyle="normal"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/notificationLabel" />
 
                 <TextView
                     android:id="@+id/maskModeLabel"
@@ -461,23 +467,22 @@
                     android:fontFamily="sans-serif"
                     android:lineSpacingExtra="6sp"
                     android:text="@string/settings_show_updates_as_notification"
-                    android:textColor="@color/subtitle_settings_color"
                     android:textSize="@dimen/text_size_smallest"
                     android:textStyle="normal"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/maskModeTitle" />
+                    app:layout_constraintTop_toBottomOf="@+id/switchMaskMode" />
 
                 <Switch
                     android:id="@+id/switchMaskMode"
-                    android:layout_width="wrap_content"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/settings_normal_padding"
                     android:fontFamily="sans-serif"
-                    android:lineSpacingExtra="8sp"
+                    android:text="@string/settings_show_updates_as_notification"
                     android:textSize="@dimen/text_size_small"
-                    android:textStyle="normal"
                     app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
+                    app:layout_constraintTop_toBottomOf="@+id/notificationLabel"
+                    app:layout_goneMarginTop="@dimen/settings_vertical_margin"
+                    tools:ignore="UseSwitchCompatOrMaterialXml,TouchTargetSizeCheck" />
 
             </androidx.constraintlayout.widget.ConstraintLayout>
         </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/account_skip_alert.xml b/app/src/main/res/layout/account_skip_alert.xml
index de0b131a..933ad2cd 100644
--- a/app/src/main/res/layout/account_skip_alert.xml
+++ b/app/src/main/res/layout/account_skip_alert.xml
@@ -10,7 +10,6 @@
         android:layout_height="wrap_content"
         android:fontFamily="sans-serif-medium"
         android:text="@string/skip_password_warning"
-        android:textColor="#de000000"
         android:textSize="18sp"
         android:textStyle="normal" />
 
diff --git a/app/src/main/res/layout/account_switch_server_view.xml b/app/src/main/res/layout/account_switch_server_view.xml
index 5da6dd31..fafbe8d8 100644
--- a/app/src/main/res/layout/account_switch_server_view.xml
+++ b/app/src/main/res/layout/account_switch_server_view.xml
@@ -7,7 +7,7 @@
     android:padding="15dp"
     tools:layout_editor_absoluteY="25dp">
 
-    <EditText
+    <com.google.android.material.textfield.TextInputEditText
         android:id="@+id/editServer"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/account_view.xml b/app/src/main/res/layout/account_view.xml
index 164e1120..af278f86 100644
--- a/app/src/main/res/layout/account_view.xml
+++ b/app/src/main/res/layout/account_view.xml
@@ -4,19 +4,19 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#e5e5e5"
     android:orientation="vertical">
 
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/segmentBarLayout"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:theme="@style/ActionBarStyle">
 
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/accountToolbar"
             android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" />
+            android:layout_height="?actionBarSize"
+            android:background="?colorPrimary" />
     </com.google.android.material.appbar.AppBarLayout>
 
     <LinearLayout
@@ -25,154 +25,126 @@
         android:orientation="vertical"
         android:padding="10dp">
 
-        <androidx.cardview.widget.CardView
-            android:id="@+id/empty_dashboard"
+        <com.google.android.material.card.MaterialCardView
+            android:id="@+id/accountSettings"
             android:layout_width="match_parent"
             android:layout_height="50dp"
             android:layout_gravity="top"
             android:layout_marginTop="@dimen/feed_empty_big_margin_top"
-            android:background="#fafafa"
             card_view:cardCornerRadius="@dimen/feed_empty_card_view"
             card_view:cardUseCompatPadding="true">
 
-            <FrameLayout
-                android:id="@+id/accountSettings"
-                android:layout_width="match_parent"
+            <TextView
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_gravity="start|center_vertical"
                 android:layout_marginStart="10dp"
                 android:layout_marginLeft="10dp"
-                android:layout_marginTop="10dp">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:fontFamily="sans-serif"
-                    android:text="@string/account_settings"
-                    android:textColor="#4a4a4a"
-                    android:textSize="18sp"
-                    android:textStyle="normal"
-                    tools:text="Settings" />
-            </FrameLayout>
-        </androidx.cardview.widget.CardView>
-
-
-        <androidx.cardview.widget.CardView
+                android:fontFamily="sans-serif"
+                android:text="@string/account_settings"
+                android:textSize="18sp"
+                android:textStyle="normal"
+                tools:text="Settings" />
+
+        </com.google.android.material.card.MaterialCardView>
+
+
+        <com.google.android.material.card.MaterialCardView
             android:id="@+id/accountMask"
             android:layout_width="match_parent"
             android:layout_height="50dp"
-            android:layout_gravity="top"
+            android:layout_gravity="center_vertical|start"
             android:layout_marginTop="@dimen/feed_empty_big_margin_top"
-            android:background="#fafafa"
             card_view:cardCornerRadius="@dimen/feed_empty_card_view"
             card_view:cardUseCompatPadding="true">
 
-            <FrameLayout
-                android:layout_width="match_parent"
+            <TextView
+                android:id="@+id/maskModeTitle"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_gravity="start|center_vertical"
                 android:layout_marginStart="10dp"
                 android:layout_marginLeft="10dp"
-                android:layout_marginTop="10dp">
-
-                <TextView
-                    android:id="@+id/maskModeTitle"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:fontFamily="sans-serif"
-                    android:textColor="#4a4a4a"
-                    android:textSize="18sp"
-                    android:textStyle="normal"
-                    tools:text="@string/enable_masking_mode" />
-            </FrameLayout>
-        </androidx.cardview.widget.CardView>
-
-        <androidx.cardview.widget.CardView
+                android:fontFamily="sans-serif"
+                android:textSize="18sp"
+                android:textStyle="normal"
+                tools:text="@string/enable_masking_mode" />
+
+        </com.google.android.material.card.MaterialCardView>
+
+        <com.google.android.material.card.MaterialCardView
             android:id="@+id/accountPassword"
             android:layout_width="match_parent"
             android:layout_height="50dp"
             android:layout_gravity="top"
             android:layout_marginTop="@dimen/feed_empty_big_margin_top"
-            android:background="#fafafa"
             card_view:cardCornerRadius="@dimen/feed_empty_card_view"
             card_view:cardUseCompatPadding="true">
 
-            <FrameLayout
-                android:layout_width="match_parent"
+
+            <TextView
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_gravity="start|center_vertical"
                 android:layout_marginStart="10dp"
                 android:layout_marginLeft="10dp"
-                android:layout_marginTop="10dp">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:fontFamily="sans-serif"
-                    android:text="@string/account_set_password"
-                    android:textColor="#4a4a4a"
-                    android:textSize="18sp"
-                    android:textStyle="normal"
-                    tools:text="Set password" />
-            </FrameLayout>
-
-        </androidx.cardview.widget.CardView>
-
-        <androidx.cardview.widget.CardView
+                android:fontFamily="sans-serif"
+                android:text="@string/account_set_password"
+                android:textSize="18sp"
+                android:textStyle="normal"
+                tools:text="Set password" />
+
+
+        </com.google.android.material.card.MaterialCardView>
+
+        <com.google.android.material.card.MaterialCardView
             android:id="@+id/resetPassword"
             android:layout_width="match_parent"
             android:layout_height="50dp"
             android:layout_gravity="top"
             android:layout_marginTop="@dimen/feed_empty_big_margin_top"
-            android:background="#fafafa"
             android:visibility="gone"
             card_view:cardCornerRadius="@dimen/feed_empty_card_view"
             card_view:cardUseCompatPadding="true">
 
-            <FrameLayout
-                android:layout_width="match_parent"
+
+            <TextView
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_gravity="start|center_vertical"
                 android:layout_marginStart="10dp"
                 android:layout_marginLeft="10dp"
-                android:layout_marginTop="10dp">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:fontFamily="sans-serif"
-                    android:text="@string/account_reset_password"
-                    android:textColor="#4a4a4a"
-                    android:textSize="18sp"
-                    android:textStyle="normal"
-                    tools:text="Reset password" />
-            </FrameLayout>
-        </androidx.cardview.widget.CardView>
-
-        <androidx.cardview.widget.CardView
+                android:fontFamily="sans-serif"
+                android:text="@string/account_reset_password"
+                android:textSize="18sp"
+                android:textStyle="normal"
+                tools:text="Reset password" />
+
+        </com.google.android.material.card.MaterialCardView>
+
+        <com.google.android.material.card.MaterialCardView
             android:id="@+id/logout"
             android:layout_width="match_parent"
             android:layout_height="50dp"
             android:layout_gravity="top"
             android:layout_marginTop="@dimen/feed_empty_big_margin_top"
-            android:background="#fafafa"
             card_view:cardCornerRadius="@dimen/feed_empty_card_view"
             card_view:cardUseCompatPadding="true">
 
-            <FrameLayout
-                android:layout_width="match_parent"
+
+            <TextView
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_gravity="start|center_vertical"
                 android:layout_marginStart="10dp"
                 android:layout_marginLeft="10dp"
-                android:layout_marginTop="10dp">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:fontFamily="sans-serif"
-                    android:text="@string/logout"
-                    android:textColor="#4a4a4a"
-                    android:textSize="18sp"
-                    android:textStyle="normal"
-                    tools:text="Logout" />
-            </FrameLayout>
-        </androidx.cardview.widget.CardView>
+                android:fontFamily="sans-serif"
+                android:text="@string/logout"
+                android:textSize="18sp"
+                android:textStyle="normal"
+                tools:text="Logout" />
+
+        </com.google.android.material.card.MaterialCardView>
     </LinearLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/active_form_item_view.xml b/app/src/main/res/layout/active_form_item_view.xml
index 9d65ac0e..73590181 100644
--- a/app/src/main/res/layout/active_form_item_view.xml
+++ b/app/src/main/res/layout/active_form_item_view.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/checklistCardItemView"
-    style="@style/CardView.Light"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginStart="8dp"
@@ -53,6 +52,7 @@
             android:layout_marginEnd="14dp"
             android:layout_marginRight="14dp"
             android:src="@drawable/ic_share"
+            android:tint="?colorControlNormal"
             app:layout_constraintEnd_toStartOf="@+id/editForm"
             app:layout_constraintTop_toBottomOf="@id/titleActiveForm" />
 
@@ -64,6 +64,7 @@
             android:layout_marginEnd="12dp"
             android:layout_marginRight="12dp"
             android:src="@drawable/ic_mode_edit"
+            android:tint="?colorControlNormal"
             app:layout_constraintEnd_toStartOf="@+id/deleteForm"
             app:layout_constraintTop_toBottomOf="@id/titleActiveForm" />
 
@@ -75,7 +76,8 @@
             android:layout_marginEnd="10dp"
             android:layout_marginRight="10dp"
             android:src="@drawable/ic_delete"
+            android:tint="?colorControlNormal"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toBottomOf="@id/titleActiveForm" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</androidx.cardview.widget.CardView>
+</com.google.android.material.card.MaterialCardView>
diff --git a/app/src/main/res/layout/add_rss_dialog.xml b/app/src/main/res/layout/add_rss_dialog.xml
index 91fcd8ba..7e658eea 100644
--- a/app/src/main/res/layout/add_rss_dialog.xml
+++ b/app/src/main/res/layout/add_rss_dialog.xml
@@ -18,6 +18,7 @@
             android:layout_width="52dp"
             android:layout_height="52dp"
             android:background="@drawable/ic_cast_connected"
+            app:tint="?attr/colorControlNormal"
             tools:ignore="ContentDescription" />
     </LinearLayout>
 
@@ -25,7 +26,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_weight="1"
-        android:background="@android:color/white"
         android:orientation="vertical"
         android:padding="10dp">
 
@@ -38,11 +38,11 @@
             android:layout_marginRight="15dp"
             app:hintTextAppearance="@style/TextAppearence.App.TextInputLayout">
 
-            <androidx.appcompat.widget.AppCompatEditText
+            <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/rssEditText"
-                fontPath="fonts/Roboto-Regular.ttf"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:fontFamily="fonts/Roboto-Regular.ttf"
                 android:hint="@string/feed_source"
                 android:imeOptions="actionDone"
                 android:inputType="textNoSuggestions"
@@ -57,7 +57,7 @@
             android:paddingLeft="20dp"
             android:paddingRight="20dp">
 
-            <androidx.appcompat.widget.AppCompatTextView
+            <TextView
                 android:id="@+id/rssCancel"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -70,9 +70,8 @@
                 android:text="@android:string/cancel"
                 android:textColor="@color/umbrella_green" />
 
-            <androidx.appcompat.widget.AppCompatTextView
+            <TextView
                 android:id="@+id/rssOk"
-                fontPath="fonts/Roboto-Medium.ttf"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentTop="true"
@@ -81,6 +80,7 @@
                 android:background="?android:attr/selectableItemBackground"
                 android:clickable="true"
                 android:focusable="true"
+                android:fontFamily="fonts/Roboto-Medium.ttf"
                 android:padding="10dp"
                 android:text="@android:string/ok"
                 android:textColor="@color/umbrella_green" />
diff --git a/app/src/main/res/layout/alert_control.xml b/app/src/main/res/layout/alert_control.xml
index 49e2f546..e47873d2 100644
--- a/app/src/main/res/layout/alert_control.xml
+++ b/app/src/main/res/layout/alert_control.xml
@@ -19,7 +19,6 @@
         android:padding="10dp"
         android:text="@android:string/cancel"
         android:textAllCaps="true"
-        android:textColor="#9b9b9b"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         tools:text="ACEITAR" />
diff --git a/app/src/main/res/layout/all_form_item_view.xml b/app/src/main/res/layout/all_form_item_view.xml
index aa560c53..9616fbb7 100644
--- a/app/src/main/res/layout/all_form_item_view.xml
+++ b/app/src/main/res/layout/all_form_item_view.xml
@@ -1,35 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/checklistCardItemView"
-    style="@style/CardView.Light"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginStart="@dimen/form_layout_small_margin"
     android:layout_marginTop="@dimen/form_layout_small_margin"
     android:layout_marginEnd="@dimen/form_layout_small_margin">
 
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:padding="5dp"
-        app:layout_constraintBottom_toBottomOf="@+id/titleActiveForm"
-        app:layout_constraintTop_toBottomOf="@+id/titleActiveForm">
+    <TextView
+        android:id="@+id/titleAllForm"
+        android:layout_width="wrap_content"
+        android:layout_height="@dimen/form_title_height"
+        android:ellipsize="end"
+        android:gravity="center"
+        android:maxLines="1"
+        android:textSize="@dimen/font_list_item"
+        tools:text="Digital Security Incident" />
 
-        <TextView
-            android:id="@+id/titleAllForm"
-            android:layout_width="wrap_content"
-            android:layout_height="@dimen/form_title_height"
-            android:ellipsize="end"
-            android:gravity="center"
-            android:maxLines="1"
-            android:textSize="@dimen/font_list_item"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintVertical_bias="0.057"
-            tools:text="Digital Security Incident" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</androidx.cardview.widget.CardView>
+</com.google.android.material.card.MaterialCardView>
diff --git a/app/src/main/res/layout/article_view.xml b/app/src/main/res/layout/article_view.xml
index f734ee13..860c534d 100644
--- a/app/src/main/res/layout/article_view.xml
+++ b/app/src/main/res/layout/article_view.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -11,6 +10,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginBottom="7dp"
+        android:theme="@style/ActionBarStyle"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
@@ -18,10 +18,8 @@
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/articleToolbar"
             android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
-
-        </androidx.appcompat.widget.Toolbar>
+            android:layout_height="?actionBarSize"
+            android:background="?colorPrimary" />
     </com.google.android.material.appbar.AppBarLayout>
 
     <androidx.recyclerview.widget.RecyclerView
diff --git a/app/src/main/res/layout/calculator_view.xml b/app/src/main/res/layout/calculator_view.xml
index d8ef7bfe..8ad1ed9e 100644
--- a/app/src/main/res/layout/calculator_view.xml
+++ b/app/src/main/res/layout/calculator_view.xml
@@ -17,7 +17,7 @@
         android:layout_marginBottom="30dp"
         android:textSize="30sp" />
 
-    <EditText
+    <com.google.android.material.textfield.TextInputEditText
         android:id="@+id/editTextCalc"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/card_article_view.xml b/app/src/main/res/layout/card_article_view.xml
index f0d4a598..e20c2287 100644
--- a/app/src/main/res/layout/card_article_view.xml
+++ b/app/src/main/res/layout/card_article_view.xml
@@ -4,7 +4,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/light_grey"
     android:padding="5dp"
     tools:ignore="MissingPrefix">
 
@@ -14,7 +13,6 @@
         android:layout_height="match_parent"
         android:layout_gravity="center"
         android:layout_marginBottom="2dp"
-        android:background="@color/light_white"
         card_view:cardCornerRadius="3dp"
         card_view:contentPadding="8dp">
 
@@ -29,7 +27,6 @@
                 android:layout_height="176dp"
                 android:background="@drawable/default_image"
                 android:scaleType="centerCrop"
-                android:src="#b1b1b1"
                 card_view:layout_constraintStart_toStartOf="parent"
                 card_view:layout_constraintTop_toTopOf="parent" />
 
@@ -41,7 +38,6 @@
                 android:layout_marginBottom="8dp"
                 android:ellipsize="end"
                 android:lines="1"
-                android:textColor="@android:color/white"
                 android:textSize="24sp"
                 card_view:layout_constraintBottom_toBottomOf="@+id/cardImage"
                 card_view:layout_constraintStart_toStartOf="parent"
@@ -49,13 +45,12 @@
 
             <TextView
                 android:id="@+id/cardLastUpdate"
-                fontPath="fonts/Roboto-Regular.ttf"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="10dp"
                 android:ellipsize="end"
+                android:fontFamily="fonts/Roboto-Regular.ttf"
                 android:maxLines="3"
-                android:textColor="@android:color/black"
                 android:textSize="13sp"
                 card_view:layout_constraintStart_toStartOf="@+id/cardTitle"
                 card_view:layout_constraintTop_toBottomOf="@+id/cardTitle"
@@ -63,10 +58,10 @@
 
             <TextView
                 android:id="@+id/cardDescription"
-                fontPath="fonts/Roboto-Regular.ttf"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="10dp"
+                android:fontFamily="fonts/Roboto-Regular.ttf"
                 android:maxLines="3"
                 android:textSize="12sp"
                 card_view:layout_constraintStart_toStartOf="@+id/cardLastUpdate"
@@ -75,12 +70,12 @@
 
             <TextView
                 android:id="@+id/cardShare"
-                fontPath="fonts/Roboto-Regular.ttf"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="10dp"
                 android:clickable="true"
                 android:focusable="true"
+                android:fontFamily="fonts/Roboto-Regular.ttf"
                 android:text="@string/share_carpsLk"
                 android:textColor="@color/blue"
                 card_view:layout_constraintStart_toStartOf="@+id/cardDescription"
@@ -88,11 +83,11 @@
 
             <TextView
                 android:id="@+id/cardOpenLink"
-                fontPath="fonts/Roboto-Regular.ttf"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="15dp"
                 android:layout_marginLeft="15dp"
+                android:fontFamily="`fonts/Roboto-Regular.ttf"
                 android:text="@string/learn_more"
                 android:textColor="@color/blue"
                 card_view:layout_constraintStart_toEndOf="@+id/cardShare"
diff --git a/app/src/main/res/layout/checklist_action_dialog.xml b/app/src/main/res/layout/checklist_action_dialog.xml
index 914aafe0..db4500e8 100644
--- a/app/src/main/res/layout/checklist_action_dialog.xml
+++ b/app/src/main/res/layout/checklist_action_dialog.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -15,7 +14,6 @@
         android:layout_marginLeft="10dp"
         android:layout_marginTop="10dp"
         android:text="@string/title_dialog"
-        android:textColor="@color/coachmark_background_dark"
         android:textSize="20sp"
         android:textStyle="bold"
         app:layout_constraintStart_toStartOf="parent"
@@ -27,10 +25,10 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="25dp"
         android:layout_marginLeft="25dp"
+        android:paddingBottom="10dp"
         android:text="@string/checklist_dialog_delete"
         android:textColor="@color/umbrella_green"
         android:textStyle="bold"
-        android:paddingBottom="10dp"
         app:layout_constraintBaseline_toBaselineOf="@+id/checklistDialogCancel"
         app:layout_constraintStart_toStartOf="parent" />
 
@@ -40,10 +38,10 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="38dp"
         android:layout_marginLeft="38dp"
+        android:paddingBottom="10dp"
         android:text="@string/checklist_dialog_cancel"
         android:textColor="@color/umbrella_green"
         android:textStyle="bold"
-        android:paddingBottom="10dp"
         app:layout_constraintBaseline_toBaselineOf="@+id/checklistDialogDisable"
         app:layout_constraintStart_toEndOf="@+id/checklistDialogDelete" />
 
@@ -54,11 +52,11 @@
         android:layout_marginStart="35dp"
         android:layout_marginLeft="35dp"
         android:layout_marginTop="20dp"
+        android:paddingBottom="10dp"
         android:text="@string/checklist_dialog_disable"
         android:textColor="@color/umbrella_green"
         android:textStyle="bold"
         app:layout_constraintStart_toEndOf="@+id/checklistDialogCancel"
-        app:layout_constraintTop_toBottomOf="@+id/textView6"
-        android:paddingBottom="10dp"/>
+        app:layout_constraintTop_toBottomOf="@+id/textView6" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/checklist_add_item_dialog.xml b/app/src/main/res/layout/checklist_add_item_dialog.xml
index b9a15ec9..fca26fda 100644
--- a/app/src/main/res/layout/checklist_add_item_dialog.xml
+++ b/app/src/main/res/layout/checklist_add_item_dialog.xml
@@ -1,19 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:padding="10dp">
 
-    <androidx.appcompat.widget.AppCompatTextView
+    <TextView
         android:id="@+id/checklistDialogTitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="5dp"
         android:layout_marginLeft="5dp"
         android:text="@string/checklist_add_item_title"
-        android:textColor="@color/coachmark_background_dark"
         android:textSize="20sp"
         android:textStyle="bold"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/checklist_custom_dialog.xml b/app/src/main/res/layout/checklist_custom_dialog.xml
index 6355d581..954b19d8 100644
--- a/app/src/main/res/layout/checklist_custom_dialog.xml
+++ b/app/src/main/res/layout/checklist_custom_dialog.xml
@@ -6,7 +6,7 @@
     android:layout_height="wrap_content"
     android:padding="10dp">
 
-    <androidx.appcompat.widget.AppCompatTextView
+    <TextView
         android:id="@+id/checklistDialogTitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -30,7 +30,6 @@
         android:fontFamily="sans-serif"
         android:lineSpacingExtra="8sp"
         android:text="@string/name_your_checklist"
-        android:textColor="#8a000000"
         android:textSize="16sp"
         android:textStyle="normal"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/checklist_custom_item.xml b/app/src/main/res/layout/checklist_custom_item.xml
index 4e0a81aa..274adf71 100644
--- a/app/src/main/res/layout/checklist_custom_item.xml
+++ b/app/src/main/res/layout/checklist_custom_item.xml
@@ -13,11 +13,10 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:layout_marginBottom="2dp"
-        android:background="@color/light_white"
         card_view:cardCornerRadius="2dp"
         card_view:contentPadding="5dp">
 
-        <EditText
+        <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/checkCustomItem"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -26,7 +25,6 @@
             android:layout_marginTop="5dp"
             android:background="@android:color/transparent"
             android:fontFamily="sans-serif"
-            android:textColor="#4a4a4a"
             android:textStyle="normal"
             tools:text="Understand local kidnapping threat" />
 
diff --git a/app/src/main/res/layout/checklist_custom_view.xml b/app/src/main/res/layout/checklist_custom_view.xml
index 438fbb1e..65ec54b3 100644
--- a/app/src/main/res/layout/checklist_custom_view.xml
+++ b/app/src/main/res/layout/checklist_custom_view.xml
@@ -4,13 +4,13 @@
     xmlns:card_view="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="#e5e5e5">
+    android:layout_height="match_parent">
 
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/segmentBarLayout"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:theme="@style/ActionBarStyle"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
@@ -18,8 +18,8 @@
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/customChecklistToolbar"
             android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" />
+            android:layout_height="?actionBarSize"
+            android:background="?colorPrimary" />
     </com.google.android.material.appbar.AppBarLayout>
 
     <LinearLayout
@@ -34,10 +34,9 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:background="@color/light_white"
             card_view:cardCornerRadius="2dp">
 
-            <EditText
+            <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/checklistContent"
                 android:layout_width="match_parent"
                 android:layout_height="48dp"
@@ -46,7 +45,6 @@
                 android:hint="@string/custom_checklist_hint_add_checklistItem"
                 android:imeOptions="actionNext"
                 android:padding="5dp"
-                android:textColor="#9b9b9b"
                 android:textSize="18sp"
                 android:textStyle="normal"
                 app:hintTextAppearance="@style/TextAppearence.App.TextInputLayout"
diff --git a/app/src/main/res/layout/checklist_dashboard.xml b/app/src/main/res/layout/checklist_dashboard.xml
index 89b0530f..364db0de 100644
--- a/app/src/main/res/layout/checklist_dashboard.xml
+++ b/app/src/main/res/layout/checklist_dashboard.xml
@@ -4,8 +4,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="#e5e5e5">
+    android:layout_height="match_parent">
 
     <FrameLayout
         android:id="@+id/customChecklistContainer"
diff --git a/app/src/main/res/layout/checklist_dashboard_header.xml b/app/src/main/res/layout/checklist_dashboard_header.xml
index fab769e4..5c2274a8 100644
--- a/app/src/main/res/layout/checklist_dashboard_header.xml
+++ b/app/src/main/res/layout/checklist_dashboard_header.xml
@@ -11,7 +11,6 @@
     android:paddingStart="5dp"
     android:paddingEnd="5dp"
     android:singleLine="true"
-    android:textColor="#999999"
     android:textSize="14sp"
     android:textStyle="normal"
     tools:text="Checklist Total" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/checklist_dashboard_item.xml b/app/src/main/res/layout/checklist_dashboard_item.xml
index f2283e75..11fc9970 100644
--- a/app/src/main/res/layout/checklist_dashboard_item.xml
+++ b/app/src/main/res/layout/checklist_dashboard_item.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:card_view="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -12,7 +13,6 @@
         android:layout_height="48dp"
         android:layout_gravity="center"
         android:layout_marginBottom="2dp"
-        android:background="@color/light_white"
         card_view:cardCornerRadius="2dp">
 
         <androidx.constraintlayout.widget.ConstraintLayout
@@ -42,7 +42,6 @@
                 android:layout_marginLeft="10dp"
                 android:layout_marginTop="12dp"
                 android:fontFamily="sans-serif"
-                android:textColor="#4a4a4a"
                 android:textSize="@dimen/font_list_item"
                 android:textStyle="normal"
                 card_view:layout_constraintStart_toEndOf="@+id/levelColor"
@@ -67,7 +66,8 @@
                     android:layout_marginStart="10dp"
                     android:layout_marginLeft="10dp"
                     android:layout_marginTop="5dp"
-                    android:src="@drawable/ic_share_segment" />
+                    android:src="@drawable/ic_share_segment"
+                    app:tint="?attr/colorControlNormal" />
             </LinearLayout>
 
             <LinearLayout
@@ -88,7 +88,8 @@
                     android:layout_marginStart="16dp"
                     android:layout_marginLeft="16dp"
                     android:layout_marginTop="5dp"
-                    android:src="@drawable/ic_star_selected" />
+                    android:src="@drawable/ic_star_selected"
+                    app:tint="?attr/colorControlNormal" />
             </LinearLayout>
 
 
diff --git a/app/src/main/res/layout/checklist_header.xml b/app/src/main/res/layout/checklist_header.xml
index e01af659..20afa05f 100644
--- a/app/src/main/res/layout/checklist_header.xml
+++ b/app/src/main/res/layout/checklist_header.xml
@@ -10,7 +10,6 @@
     android:paddingStart="16dp"
     android:paddingLeft="16dp"
     android:paddingRight="16dp"
-    android:textColor="#999999"
     android:textSize="15sp"
     android:textStyle="bold"
     tools:text="3 QUESTIONS TO ASK BEFORE YOU SHARE ALL THE INFORMATION" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/checklist_item.xml b/app/src/main/res/layout/checklist_item.xml
index 0af05673..d509cebd 100644
--- a/app/src/main/res/layout/checklist_item.xml
+++ b/app/src/main/res/layout/checklist_item.xml
@@ -5,14 +5,12 @@
     android:layout_height="wrap_content"
     android:paddingBottom="5dp">
 
-    <androidx.cardview.widget.CardView
-        xmlns:card_view="http://schemas.android.com/apk/res-auto"
+    <androidx.cardview.widget.CardView xmlns:card_view="http://schemas.android.com/apk/res-auto"
         android:id="@+id/checklistCardItemView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:layout_marginBottom="2dp"
-        android:background="@color/light_white"
         android:padding="2dp"
         card_view:cardCornerRadius="2dp"
         card_view:contentPadding="5dp">
@@ -25,7 +23,6 @@
             android:layout_marginLeft="5dp"
             android:layout_marginTop="5dp"
             android:fontFamily="sans-serif"
-            android:textColor="#4a4a4a"
             android:textStyle="normal" />
 
         <androidx.appcompat.widget.AppCompatTextView
@@ -37,7 +34,6 @@
             android:layout_marginTop="5dp"
             android:fontFamily="sans-serif"
             android:padding="2dp"
-            android:textColor="@color/black_38"
             android:textSize="16sp"
             android:textStyle="normal"
             tools:text="Understand local kidnapping threat" />
diff --git a/app/src/main/res/layout/checklist_progress.xml b/app/src/main/res/layout/checklist_progress.xml
index 2ee41ff8..52a0591f 100644
--- a/app/src/main/res/layout/checklist_progress.xml
+++ b/app/src/main/res/layout/checklist_progress.xml
@@ -4,8 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:gravity="center"
-    android:orientation="vertical"
-    >
+    android:orientation="vertical">
 
     <ProgressBar
         android:id="@+id/progressAnswer"
diff --git a/app/src/main/res/layout/checklist_view.xml b/app/src/main/res/layout/checklist_view.xml
index c35b6ea3..9994d0df 100644
--- a/app/src/main/res/layout/checklist_view.xml
+++ b/app/src/main/res/layout/checklist_view.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:background="#e5e5e5"
     android:orientation="vertical">
 
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/checklistBarLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:theme="@style/ActionBarStyle"
         android:visibility="gone">
 
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/checklistToolbar"
             android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" />
+            android:layout_height="?actionBarSize"
+            android:background="?colorPrimary" />
     </com.google.android.material.appbar.AppBarLayout>
 
     <include
@@ -28,26 +28,26 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent">
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/checklistRecyclerView"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_marginBottom="@dimen/recycler_view_margin_bottom"
-        android:padding="10dp" />
 
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/checklistRecyclerView"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginBottom="@dimen/recycler_view_margin_bottom"
+            android:padding="10dp" />
 
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/addNewItemChecklist"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom"
-        android:layout_marginEnd="16dp"
-        android:layout_marginRight="16dp"
-        android:layout_marginBottom="16dp"
-        android:src="@drawable/ic_add_white"
-        android:visibility="invisible"
-        app:backgroundTint="@color/umbrella_green"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"/>
+
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
+            android:id="@+id/addNewItemChecklist"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom"
+            android:layout_marginEnd="16dp"
+            android:layout_marginRight="16dp"
+            android:layout_marginBottom="16dp"
+            android:visibility="invisible"
+            app:backgroundTint="@color/umbrella_green"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/difficulty_item_view.xml b/app/src/main/res/layout/difficulty_item_view.xml
index 21240053..b19da4f5 100644
--- a/app/src/main/res/layout/difficulty_item_view.xml
+++ b/app/src/main/res/layout/difficulty_item_view.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/mainLayout"
@@ -26,7 +25,6 @@
             android:layout_marginLeft="10dp"
             android:layout_marginTop="10dp"
             android:fontFamily="sans-serif"
-            android:textColor="@color/ms_white"
             android:textSize="24sp"
             android:textStyle="normal"
             tools:text="Beginner" />
@@ -35,7 +33,6 @@
     <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="76dp"
-        android:background="@color/ms_white"
         android:padding="10dp"
         app:layout_constraintTop_toBottomOf="@id/difficultLayout"
         tools:layout_editor_absoluteX="-16dp"
@@ -48,7 +45,6 @@
             android:ellipsize="end"
             android:fontFamily="sans-serif"
             android:maxLines="2"
-            android:textColor="#4d4d4d"
             android:textSize="16sp"
             android:textStyle="normal"
             tools:text="I need to know what to do in case people force me to hard over my password" />
diff --git a/app/src/main/res/layout/difficulty_spinner_view.xml b/app/src/main/res/layout/difficulty_spinner_view.xml
index 340a828b..d3bf3bbe 100644
--- a/app/src/main/res/layout/difficulty_spinner_view.xml
+++ b/app/src/main/res/layout/difficulty_spinner_view.xml
@@ -6,6 +6,5 @@
     android:layout_height="wrap_content"
     android:ellipsize="end"
     android:maxLines="2"
-    android:textColor="@color/ms_white"
     android:textSize="18sp"
     tools:text="Dangerous Assigments Advanced" />
diff --git a/app/src/main/res/layout/difficulty_view.xml b/app/src/main/res/layout/difficulty_view.xml
index 87ad301b..b364b863 100644
--- a/app/src/main/res/layout/difficulty_view.xml
+++ b/app/src/main/res/layout/difficulty_view.xml
@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="#e5e5e5">
+    android:layout_height="match_parent">
 
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/segmentBarLayout"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginBottom="7dp"
+        android:theme="@style/ActionBarStyle"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
@@ -18,10 +17,9 @@
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/difficultyToolbar"
             android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
+            android:layout_height="?actionBarSize"
+            android:background="?colorPrimary" />
 
-        </androidx.appcompat.widget.Toolbar>
     </com.google.android.material.appbar.AppBarLayout>
 
     <androidx.recyclerview.widget.RecyclerView
diff --git a/app/src/main/res/layout/empty_view.xml b/app/src/main/res/layout/empty_view.xml
index dc7b0c0c..6d71c050 100644
--- a/app/src/main/res/layout/empty_view.xml
+++ b/app/src/main/res/layout/empty_view.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -16,7 +15,6 @@
         android:layout_height="wrap_content"
         android:fontFamily="sans-serif"
         android:gravity="center_horizontal"
-        android:textColor="#757575"
         android:textSize="18sp"
         android:textStyle="normal"
         tools:layout_editor_absoluteX="105dp"
diff --git a/app/src/main/res/layout/feed_empty_view.xml b/app/src/main/res/layout/feed_empty_view.xml
index cd229acf..2ead232d 100644
--- a/app/src/main/res/layout/feed_empty_view.xml
+++ b/app/src/main/res/layout/feed_empty_view.xml
@@ -4,12 +4,11 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#e5e5e5"
     android:padding="@dimen/feed_empty_normal_padding"
     tools:ignore="MissingPrefix">
 
     <androidx.cardview.widget.CardView
-        android:id="@+id/empty_dashboard"
+        android:id="@+id/accountSettings"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="top"
@@ -24,44 +23,42 @@
             android:padding="@dimen/feed_empty_normal_padding">
 
             <TextView
-                fontPath="fonts/Roboto-Medium.ttf"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/feed_empty_smallest_margin_top"
+                android:fontFamily="fonts/Roboto-Medium.ttf"
                 android:text="@string/empty_dashboard_title"
-                android:textColor="#000000"
                 android:textSize="@dimen/text_size_large" />
 
             <TextView
                 android:id="@+id/feedEmptyTitle"
-                fontPath="fonts/Roboto-Medium.ttf"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/feed_empty_smallest_margin_top"
                 android:ellipsize="end"
+                android:fontFamily="fonts/Roboto-Medium.ttf"
                 android:maxLines="1"
                 android:textColor="@color/umbrella_purple"
                 android:textSize="@dimen/text_size_large"
                 tools:text="Brazil" />
 
             <TextView
-                fontPath="fonts/Roboto-Regular.ttf"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/feed_empty_small_margin_top"
+                android:fontFamily="fonts/Roboto-Regular.ttf"
                 android:lineSpacingExtra="7sp"
                 android:padding="@dimen/feed_empty_small_padding"
                 android:text="@string/dashboard_empty_text"
-                android:textColor="#000000"
                 android:textSize="@dimen/text_size_like_really_small" />
 
             <TextView
                 android:id="@+id/feedEmptyChangeLocation"
-                fontPath="fonts/Roboto-Medium.ttf"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="end|bottom"
                 android:layout_marginBottom="@dimen/feed_empty_smallest_margin_bottom"
+                android:fontFamily="fonts/Roboto-Medium.ttf"
                 android:gravity="right"
                 android:padding="@dimen/feed_empty_small_padding"
                 android:singleLine="true"
diff --git a/app/src/main/res/layout/feed_header.xml b/app/src/main/res/layout/feed_header.xml
index 32bbfa50..51a86cb6 100644
--- a/app/src/main/res/layout/feed_header.xml
+++ b/app/src/main/res/layout/feed_header.xml
@@ -6,8 +6,7 @@
     android:padding="5dp"
     tools:ignore="MissingPrefix">
 
-    <androidx.cardview.widget.CardView
-        xmlns:card_view="http://schemas.android.com/apk/res-auto"
+    <com.google.android.material.card.MaterialCardView xmlns:card_view="http://schemas.android.com/apk/res-auto"
         android:id="@+id/feedHeadCard"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -26,7 +25,6 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/feed_location_header"
-                android:textColor="@color/ms_black"
                 android:textSize="24sp"
                 android:textStyle="bold" />
 
@@ -59,5 +57,5 @@
                 android:textSize="14sp"
                 android:textStyle="normal" />
         </LinearLayout>
-    </androidx.cardview.widget.CardView>
+    </com.google.android.material.card.MaterialCardView>
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/feed_interval_dialog.xml b/app/src/main/res/layout/feed_interval_dialog.xml
index cdb3b5c9..2a00b8e7 100644
--- a/app/src/main/res/layout/feed_interval_dialog.xml
+++ b/app/src/main/res/layout/feed_interval_dialog.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:layout_weight="2"
@@ -25,7 +24,6 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="5dp"
         android:layout_weight="1"
-        android:background="@color/ms_white"
         android:orientation="vertical"
         android:padding="10dp">
 
@@ -40,17 +38,16 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent">
 
-            <androidx.appcompat.widget.AppCompatEditText
+            <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/feedInterval"
                 fontPath="fonts/Roboto-Regular.ttf"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:digits="0123456789"
                 android:hint="@string/feed_choose_refresh_interval"
                 android:imeOptions="actionDone"
-                android:textSize="16sp"
-                android:digits="0123456789"
                 android:inputType="phone"
-                />
+                android:textSize="16sp" />
         </com.google.android.material.textfield.TextInputLayout>
 
         <include
diff --git a/app/src/main/res/layout/feed_item_view.xml b/app/src/main/res/layout/feed_item_view.xml
index ebae0117..ddf9c75a 100644
--- a/app/src/main/res/layout/feed_item_view.xml
+++ b/app/src/main/res/layout/feed_item_view.xml
@@ -1,19 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:padding="5dp"
     tools:ignore="MissingPrefix">
 
-    <androidx.cardview.widget.CardView
-        xmlns:card_view="http://schemas.android.com/apk/res-auto"
+    <androidx.cardview.widget.CardView xmlns:card_view="http://schemas.android.com/apk/res-auto"
         android:id="@+id/feedItemCard"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        card_view:cardCornerRadius="@dimen/feed_list_card_view_radius">
+        card_view:cardCornerRadius="@dimen/feed_list_card_view_radius"
+        tools:ignore="MissingConstraints">
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -28,7 +27,6 @@
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="@dimen/feed_list_small_margin_bottom"
                 android:gravity="start"
-                android:textColor="@color/ms_black"
                 android:textSize="@dimen/text_size_smaller"
                 android:textStyle="bold"
                 tools:text="UNICEF Sudan Humanitarian Situation Report" />
@@ -43,7 +41,6 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/feed_list_via"
-                    android:textColor="@color/feed_list_site_name"
                     android:textSize="@dimen/text_size_like_really_small" />
 
                 <TextView
@@ -51,7 +48,6 @@
                     fontPath="fonts/Roboto-Medium.ttf"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textColor="#828282"
                     android:textSize="@dimen/text_size_like_really_small"
                     tools:text="Relief" />
 
@@ -62,7 +58,6 @@
                     android:layout_height="wrap_content"
                     android:layout_marginStart="@dimen/feed_list_smallest_margin_left"
                     android:layout_marginLeft="@dimen/feed_list_smallest_margin_left"
-                    android:textColor="@color/coachmark_background_dark"
                     android:textSize="@dimen/text_size_like_really_small"
                     tools:text="11/7/20127 4:22 PM" />
             </LinearLayout>
@@ -75,7 +70,6 @@
                 android:layout_marginTop="@dimen/feed_list_small_margin_top"
                 android:ellipsize="end"
                 android:maxLines="3"
-                android:textColor="@color/dark_grey"
                 android:textSize="@dimen/text_size_smallest"
                 tools:text="In the tumultuous business of cutting-in and attending to a whale, there is much running backwards. In the tumultuous business of cutting-in and attending to a whale, there is much running backwards. In the tumultuous business of cutting-in and attending to a whale, there is much running backwards." />
 
diff --git a/app/src/main/res/layout/feed_location_dialog.xml b/app/src/main/res/layout/feed_location_dialog.xml
index 650be80b..243b370c 100644
--- a/app/src/main/res/layout/feed_location_dialog.xml
+++ b/app/src/main/res/layout/feed_location_dialog.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:layout_weight="2"
@@ -23,8 +22,10 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:layout_marginLeft="8dp"
+        android:layout_marginTop="8dp"
         android:layout_weight="1"
-        android:background="@color/ms_white"
         android:orientation="vertical"
         android:padding="10dp">
 
@@ -43,12 +44,12 @@
                 android:id="@+id/location"
                 fontPath="fonts/Roboto-Regular.ttf"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="?actionBarSize"
+                android:dropDownHeight="100dp"
                 android:hint="@string/feed_location_enter_location"
                 android:imeOptions="actionDone"
                 android:inputType="textCapSentences"
-                android:textSize="16sp"
-                android:dropDownHeight="100dp"/>
+                android:textSize="16sp" />
         </com.google.android.material.textfield.TextInputLayout>
 
         <include
diff --git a/app/src/main/res/layout/feed_settings_view.xml b/app/src/main/res/layout/feed_settings_view.xml
index f34f173f..e83f241a 100644
--- a/app/src/main/res/layout/feed_settings_view.xml
+++ b/app/src/main/res/layout/feed_settings_view.xml
@@ -4,7 +4,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#e5e5e5"
     android:padding="10dp">
 
     <ScrollView
@@ -20,7 +19,7 @@
             android:focusableInTouchMode="true"
             android:orientation="vertical">
 
-            <androidx.cardview.widget.CardView
+            <com.google.android.material.card.MaterialCardView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="top"
@@ -44,7 +43,6 @@
                         android:layout_marginLeft="14dp"
                         android:fontFamily="sans-serif-medium"
                         android:text="@string/set_your_feed"
-                        android:textColor="#000000"
                         android:textSize="24sp"
                         android:textStyle="normal" />
 
@@ -58,7 +56,6 @@
                         android:lineSpacingExtra="7sp"
                         android:padding="5dp"
                         android:text="@string/set_your_feed_label"
-                        android:textColor="#000000"
                         android:textSize="13sp"
                         android:textStyle="normal" />
 
@@ -73,9 +70,9 @@
                 </LinearLayout>
 
 
-            </androidx.cardview.widget.CardView>
+            </com.google.android.material.card.MaterialCardView>
 
-            <androidx.cardview.widget.CardView
+            <com.google.android.material.card.MaterialCardView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="top"
@@ -99,7 +96,6 @@
                         android:layout_marginTop="@dimen/dashboard_feed_small_margin_top"
                         android:fontFamily="sans-serif-medium"
                         android:text="@string/feed_interval"
-                        android:textColor="#000000"
                         android:textSize="24sp"
                         android:textStyle="normal" />
 
@@ -139,9 +135,9 @@
                 </LinearLayout>
 
 
-            </androidx.cardview.widget.CardView>
+            </com.google.android.material.card.MaterialCardView>
 
-            <androidx.cardview.widget.CardView
+            <com.google.android.material.card.MaterialCardView
                 android:layout_width="fill_parent"
                 android:layout_height="120dp"
                 android:layout_gravity="top"
@@ -164,7 +160,6 @@
                         android:layout_marginLeft="14dp"
                         android:fontFamily="sans-serif-medium"
                         android:text="@string/location"
-                        android:textColor="#000000"
                         android:textSize="24sp"
                         android:textStyle="normal" />
 
@@ -178,7 +173,6 @@
                         android:fontFamily="sans-serif"
                         android:lineSpacingExtra="7sp"
                         android:text="@string/feed_location_label"
-                        android:textColor="#000000"
                         android:textSize="13sp"
                         android:textStyle="normal" />
 
@@ -199,9 +193,9 @@
                 </LinearLayout>
 
 
-            </androidx.cardview.widget.CardView>
+            </com.google.android.material.card.MaterialCardView>
 
-            <androidx.cardview.widget.CardView
+            <com.google.android.material.card.MaterialCardView
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="top"
@@ -224,7 +218,6 @@
                         android:layout_marginLeft="14dp"
                         android:fontFamily="sans-serif-medium"
                         android:text="@string/feed_sources"
-                        android:textColor="#000000"
                         android:textSize="24sp"
                         android:textStyle="normal" />
 
@@ -238,7 +231,6 @@
                         android:fontFamily="sans-serif"
                         android:lineSpacingExtra="7sp"
                         android:text="@string/feed_source_label"
-                        android:textColor="#000000"
                         android:textSize="13sp"
                         android:textStyle="normal" />
 
@@ -257,7 +249,7 @@
                         android:textStyle="normal" />
 
                 </LinearLayout>
-            </androidx.cardview.widget.CardView>
+            </com.google.android.material.card.MaterialCardView>
         </LinearLayout>
     </ScrollView>
 
diff --git a/app/src/main/res/layout/feed_view.xml b/app/src/main/res/layout/feed_view.xml
index c8e913f4..f7413f78 100644
--- a/app/src/main/res/layout/feed_view.xml
+++ b/app/src/main/res/layout/feed_view.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#e5e5e5"
     android:padding="10dp">
 
     <androidx.recyclerview.widget.RecyclerView
diff --git a/app/src/main/res/layout/form_host_view.xml b/app/src/main/res/layout/form_host_view.xml
index 75e0caa9..d260eca2 100644
--- a/app/src/main/res/layout/form_host_view.xml
+++ b/app/src/main/res/layout/form_host_view.xml
@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="#e5e5e5">
+    android:layout_height="match_parent">
 
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/segmentBarLayout"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginBottom="7dp"
+        android:theme="@style/ActionBarStyle"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
@@ -18,10 +17,9 @@
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/hostFormToolbar"
             android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
+            android:layout_height="?actionBarSize"
+            android:background="?colorPrimary" />
 
-        </androidx.appcompat.widget.Toolbar>
     </com.google.android.material.appbar.AppBarLayout>
 
     <androidx.recyclerview.widget.RecyclerView
diff --git a/app/src/main/res/layout/form_view.xml b/app/src/main/res/layout/form_view.xml
index 8cd5abe1..e7e9a68c 100644
--- a/app/src/main/res/layout/form_view.xml
+++ b/app/src/main/res/layout/form_view.xml
@@ -11,6 +11,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginBottom="7dp"
+        android:theme="@style/ActionBarStyle"
         app:layout_constraintBottom_toTopOf="@+id/stepperLayout"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -19,10 +20,10 @@
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/formToolbar"
             android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
+            android:layout_height="?actionBarSize"
+            android:background="?colorPrimary"
+            tools:targetApi="lollipop" />
 
-        </androidx.appcompat.widget.Toolbar>
     </com.google.android.material.appbar.AppBarLayout>
 
     <com.stepstone.stepper.StepperLayout
@@ -38,8 +39,7 @@
         app:layout_constraintVertical_bias="1.0"
         app:ms_showErrorState="true"
         app:ms_showErrorStateOnBack="true"
-        app:ms_stepperType="tabs"
-        tools:theme="@style/AppTheme" />
+        app:ms_stepperType="tabs" />
 
     <include
         android:id="@+id/include"
diff --git a/app/src/main/res/layout/head_section.xml b/app/src/main/res/layout/head_section.xml
index 5b7e6daa..a3beea23 100644
--- a/app/src/main/res/layout/head_section.xml
+++ b/app/src/main/res/layout/head_section.xml
@@ -4,9 +4,9 @@
     android:id="@+id/sectionText"
     android:layout_width="match_parent"
     android:layout_height="35dp"
-    android:layout_marginTop="3dp"
     android:layout_marginStart="10dp"
     android:layout_marginLeft="10dp"
+    android:layout_marginTop="3dp"
     android:background="@android:color/transparent"
     android:gravity="center_vertical"
     android:singleLine="true"
diff --git a/app/src/main/res/layout/host_checklist.xml b/app/src/main/res/layout/host_checklist.xml
index 82994c91..e385331b 100644
--- a/app/src/main/res/layout/host_checklist.xml
+++ b/app/src/main/res/layout/host_checklist.xml
@@ -1,31 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical">
 
+
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
-        android:background="@color/colorPrimary"
-        app:titleTextColor="@color/white"
         android:layout_width="match_parent"
-        android:theme="@style/ToolBarTheme"
-        android:layout_height="wrap_content" />
+        android:layout_height="?actionBarSize"
+        android:background="?colorPrimary" />
+
 
     <com.google.android.material.tabs.TabLayout
         android:id="@+id/hostChecklistTab"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="?attr/colorPrimary"
-        android:elevation="6dp"
-        android:minHeight="?attr/actionBarSize"
-        android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
+        android:background="?colorPrimary"
+        android:elevation="@dimen/dialog_elevation"
+        android:minHeight="?actionBarSize"
+        app:tabIndicatorColor="@color/umbrella_green"
+        app:tabIndicatorGravity="bottom"
+        app:tabSelectedTextColor="@color/white"
+        app:tabTextColor="@color/white_transparent"
+        tools:ignore="SpeakableTextPresentCheck"
         tools:targetApi="lollipop" />
 
     <androidx.viewpager.widget.ViewPager
         android:id="@+id/hostChecklistPager"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        android:layout_height="match_parent"
+        tools:ignore="SpeakableTextPresentCheck" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/host_reader_view.xml b/app/src/main/res/layout/host_reader_view.xml
index 94ec24e7..d01e1abe 100644
--- a/app/src/main/res/layout/host_reader_view.xml
+++ b/app/src/main/res/layout/host_reader_view.xml
@@ -1,27 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical">
 
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
-        android:background="@color/colorPrimary"
-        app:titleTextColor="@color/white"
         android:layout_width="match_parent"
-        android:theme="@style/ToolBarTheme"
-        android:layout_height="wrap_content" />
+        android:layout_height="?actionBarSize"
+        android:background="?colorPrimary" />
 
     <com.google.android.material.tabs.TabLayout
         android:id="@+id/feedTab"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="?attr/colorPrimary"
-        android:elevation="6dp"
-        android:minHeight="?attr/actionBarSize"
-        android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
+        android:background="?colorPrimary"
+        android:elevation="@dimen/dialog_elevation"
+        android:minHeight="?actionBarSize"
+        app:tabIndicatorColor="@color/umbrella_green"
+        app:tabIndicatorGravity="bottom"
+        app:tabSelectedTextColor="@color/white"
+        app:tabTextColor="@color/white_transparent"
         tools:targetApi="lollipop" />
 
     <androidx.viewpager.widget.ViewPager
diff --git a/app/src/main/res/layout/host_segment_view.xml b/app/src/main/res/layout/host_segment_view.xml
index 18562bf2..01d374f8 100644
--- a/app/src/main/res/layout/host_segment_view.xml
+++ b/app/src/main/res/layout/host_segment_view.xml
@@ -9,19 +9,21 @@
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/segmentBarLayout"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:theme="@style/ActionBarStyle">
 
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/hostSegmentToolbar"
             android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
+            android:layout_height="?actionBarSize"
+            android:background="?colorPrimary"
+            tools:targetApi="lollipop">
 
             <Spinner
                 android:id="@+id/hostSegmentSpinner"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:popupBackground="@color/white" />
+                android:layout_height="wrap_content" />
+
         </androidx.appcompat.widget.Toolbar>
     </com.google.android.material.appbar.AppBarLayout>
 
@@ -29,11 +31,14 @@
         android:id="@+id/hostSegmentTab"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/colorPrimary"
-        android:elevation="6dp"
-        android:minHeight="?attr/actionBarSize"
-        android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
+        android:background="?colorPrimary"
+        android:elevation="@dimen/dialog_elevation"
+        android:minHeight="?actionBarSize"
+        app:tabIndicatorColor="@color/umbrella_green"
+        app:tabIndicatorGravity="bottom"
         app:tabMode="scrollable"
+        app:tabSelectedTextColor="@color/white"
+        app:tabTextColor="@color/white_transparent"
         tools:targetApi="lollipop" />
 
     <androidx.viewpager.widget.ViewPager
diff --git a/app/src/main/res/layout/lesson_decorator_line.xml b/app/src/main/res/layout/lesson_decorator_line.xml
index 3acea2ca..4cdda1e2 100644
--- a/app/src/main/res/layout/lesson_decorator_line.xml
+++ b/app/src/main/res/layout/lesson_decorator_line.xml
@@ -3,4 +3,4 @@
     android:id="@+id/lessonItemLayout"
     android:layout_width="match_parent"
     android:layout_height="2dp"
-    android:background="@color/very_light_pink" />
\ No newline at end of file
+    android:background="?android:attr/listDivider" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/lesson_menu_head.xml b/app/src/main/res/layout/lesson_menu_head.xml
index 7f01c481..e8740abd 100644
--- a/app/src/main/res/layout/lesson_menu_head.xml
+++ b/app/src/main/res/layout/lesson_menu_head.xml
@@ -5,7 +5,7 @@
     android:id="@+id/lessonHeaderLayout"
     android:layout_width="match_parent"
     android:layout_height="50dp"
-    android:background="?attr/selectableItemBackground"
+    android:background="?selectableItemBackground"
     android:clickable="true"
     android:focusable="true"
     android:gravity="center"
@@ -24,7 +24,7 @@
             android:layout_centerVertical="true"
             android:adjustViewBounds="true"
             android:scaleType="fitXY"
-            android:tint="@android:color/black"
+            android:tint="?colorControlNormal"
             app:srcCompat="@drawable/ic_fav_selected" />
 
         <TextView
@@ -36,7 +36,6 @@
             android:layout_marginLeft="40dp"
             android:fontFamily="sans-serif"
             android:lineSpacingExtra="8sp"
-            android:textColor="#de000000"
             android:textSize="16sp"
             android:textStyle="normal"
             app:layout_constraintTop_toTopOf="parent"
@@ -52,7 +51,7 @@
             android:layout_centerVertical="true"
             android:adjustViewBounds="true"
             android:scaleType="fitXY"
-            android:layout_alignRight="@id/subHeaderText"
+            android:tint="?colorControlNormal"
             app:layout_constraintEnd_toEndOf="parent"
             app:srcCompat="@drawable/ic_keyboard_arrow_down_black" />
 
diff --git a/app/src/main/res/layout/lesson_menu_item.xml b/app/src/main/res/layout/lesson_menu_item.xml
index 8207ab99..ceab92f3 100644
--- a/app/src/main/res/layout/lesson_menu_item.xml
+++ b/app/src/main/res/layout/lesson_menu_item.xml
@@ -15,7 +15,6 @@
         android:fontFamily="sans-serif"
         android:gravity="center"
         android:padding="5dp"
-        android:textColor="#de000000"
         android:textSize="16sp"
         android:textStyle="normal"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout/lesson_view.xml b/app/src/main/res/layout/lesson_view.xml
index ecccc199..a5715259 100644
--- a/app/src/main/res/layout/lesson_view.xml
+++ b/app/src/main/res/layout/lesson_view.xml
@@ -9,6 +9,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginBottom="7dp"
+        android:theme="@style/ActionBarStyle"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
@@ -16,8 +17,8 @@
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/lessonToolbar"
             android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" />
+            android:layout_height="?actionBarSize"
+            android:background="?colorPrimary" />
 
     </com.google.android.material.appbar.AppBarLayout>
 
diff --git a/app/src/main/res/layout/login_view.xml b/app/src/main/res/layout/login_view.xml
index fc7a6e2a..310f6f6e 100644
--- a/app/src/main/res/layout/login_view.xml
+++ b/app/src/main/res/layout/login_view.xml
@@ -1,21 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#ffffff"
     android:orientation="vertical">
 
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/loginBarLayout"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:theme="@style/ActionBarStyle">
 
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/loginToolbar"
             android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
+            android:layout_height="?actionBarSize"
+            android:background="?colorPrimary"
             app:title="@string/app_name" />
 
     </com.google.android.material.appbar.AppBarLayout>
@@ -39,11 +40,10 @@
             android:layout_marginTop="40dp"
             android:fontFamily="sans-serif-medium"
             android:text="@string/login_your_password"
-            android:textColor="#000000"
             android:textSize="20sp"
             android:textStyle="normal" />
 
-        <EditText
+        <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/loginPwText"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -51,35 +51,24 @@
             android:hint="@string/login_enter_pw"
             android:inputType="textWebPassword" />
 
-        <androidx.cardview.widget.CardView
-            xmlns:card_view="http://schemas.android.com/apk/res-auto"
+        <androidx.cardview.widget.CardView xmlns:card_view="http://schemas.android.com/apk/res-auto"
             android:id="@+id/loginButton"
             android:layout_width="93dp"
             android:layout_height="39dp"
             android:layout_marginTop="60dp"
             card_view:cardCornerRadius="2dp">
 
-            <LinearLayout
+            <Button
                 android:id="@+id/location_layout"
-                android:layout_width="fill_parent"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:background="@color/umbrella_green"
-                android:orientation="vertical"
-                android:padding="10dp">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="20dp"
-                    android:layout_marginLeft="20dp"
-                    android:fontFamily="sans-serif-medium"
-                    android:gravity="center_horizontal"
-                    android:text="@string/login_message_button"
-                    android:textColor="@color/ms_white"
-                    android:textSize="14sp"
-                    android:textStyle="normal" />
+                android:backgroundTint="@color/umbrella_green"
+                android:fontFamily="sans-serif-medium"
+                android:text="@string/login_message_button"
+                android:textSize="14sp"
+                android:textStyle="normal"
+                tools:targetApi="lollipop" />
 
-            </LinearLayout>
         </androidx.cardview.widget.CardView>
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/mask_app_info_view.xml b/app/src/main/res/layout/mask_app_info_view.xml
index c41e2230..466659c4 100644
--- a/app/src/main/res/layout/mask_app_info_view.xml
+++ b/app/src/main/res/layout/mask_app_info_view.xml
@@ -29,7 +29,6 @@
             android:layout_marginTop="28dp"
             android:gravity="center"
             android:text="@string/enable_masking_mode"
-            android:textColor="@color/coachmark_background_dark"
             android:textSize="@dimen/text_size_large" />
 
         <TextView
@@ -40,7 +39,6 @@
             android:layout_marginTop="28dp"
             android:gravity="start"
             android:text="@string/hands_shake_info_description"
-            android:textColor="@color/coachmark_background_dark"
             android:textSize="13sp" />
 
 
@@ -54,7 +52,7 @@
         android:gravity="right"
         android:orientation="horizontal">
 
-        <androidx.appcompat.widget.ContentFrameLayout
+        <FrameLayout
             android:id="@+id/handsShakeCancel"
             android:layout_width="wrap_content"
             android:layout_height="36dp">
@@ -68,9 +66,9 @@
                 android:text="@string/cancel"
                 android:textColor="@color/hands_shake_info_text_color"
                 android:textSize="@dimen/text_size_smallest" />
-        </androidx.appcompat.widget.ContentFrameLayout>
+        </FrameLayout>
 
-        <androidx.appcompat.widget.ContentFrameLayout
+        <FrameLayout
             android:id="@+id/handsShakeOk"
             android:layout_width="60dp"
             android:layout_height="36dp"
@@ -86,7 +84,7 @@
                 android:text="@string/ok"
                 android:textColor="@color/umbrella_green"
                 android:textSize="@dimen/text_size_smallest" />
-        </androidx.appcompat.widget.ContentFrameLayout>
+        </FrameLayout>
 
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/pathways.xml b/app/src/main/res/layout/pathways.xml
index 97107c2c..7a4dadcd 100644
--- a/app/src/main/res/layout/pathways.xml
+++ b/app/src/main/res/layout/pathways.xml
@@ -1,63 +1,59 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/colorPrimary">
+    android:background="?colorPrimary"
+    android:orientation="vertical">
 
-    <androidx.appcompat.widget.AppCompatTextView
+    <TextView
         android:id="@+id/pathways_title"
-        android:layout_marginTop="@dimen/segment_item_title_margin_top"
-        android:layout_marginLeft="@dimen/feed_empty_big_margin_top"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text = "@string/pathways_title"
+        android:layout_marginStart="@dimen/feed_empty_big_margin_top"
+        android:layout_marginLeft="@dimen/feed_empty_big_margin_top"
+        android:layout_marginTop="@dimen/segment_item_title_margin_top"
+        android:text="@string/pathways_title"
         android:textSize="@dimen/font_large"
-        android:textColor="@color/white"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"/>
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
-    <androidx.appcompat.widget.AppCompatTextView
+    <TextView
         android:id="@+id/pathways_text"
-        android:layout_marginTop="@dimen/decorator_card_padding"
-        android:layout_marginLeft="@dimen/feed_empty_big_margin_top"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/feed_empty_big_margin_top"
+        android:layout_marginLeft="@dimen/feed_empty_big_margin_top"
+        android:layout_marginTop="@dimen/decorator_card_padding"
         android:text="@string/pathways_text"
         android:textSize="@dimen/font_small"
-        android:textColor="@color/white"
-        app:layout_constraintTop_toBottomOf="@id/pathways_title"
-        app:layout_constraintLeft_toLeftOf="parent"/>
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/pathways_title" />
 
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/pathwaysRecyclerView"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:padding="10dp"
-            app:layout_constraintTop_toBottomOf="@id/pathways_text"
-            app:layout_constraintLeft_toLeftOf="parent"/>
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/pathwaysRecyclerView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:padding="10dp"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/pathways_text" />
 
 
     <androidx.appcompat.widget.AppCompatButton
-        android:id = "@+id/show_me_button"
+        android:id="@+id/show_me_button"
         android:layout_width="match_parent"
         android:layout_height="48dp"
-        app:layout_constraintTop_toBottomOf="@id/pathwaysRecyclerView"
-        app:layout_constraintLeft_toLeftOf="parent"
-        android:text = "@string/show_me_button"
-        android:textColor="@color/white"
         android:background="@color/umbrella_green"
-        />
+        android:text="@string/show_me_button"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/pathwaysRecyclerView" />
 
     <androidx.appcompat.widget.AppCompatButton
-        android:id = "@+id/no_thanks_button"
+        android:id="@+id/no_thanks_button"
         android:layout_width="match_parent"
         android:layout_height="48dp"
-        app:layout_constraintTop_toBottomOf="@id/show_me_button"
-        app:layout_constraintLeft_toLeftOf="parent"
-        android:textColor="@color/white"
-        android:text = "@string/no_thanks_button"
         android:background="@color/colorPrimary"
-        />
+        android:text="@string/no_thanks_button"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/show_me_button" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/pathways_item.xml b/app/src/main/res/layout/pathways_item.xml
index c2cb2622..216612bb 100644
--- a/app/src/main/res/layout/pathways_item.xml
+++ b/app/src/main/res/layout/pathways_item.xml
@@ -11,7 +11,6 @@
         android:layout_height="48dp"
         android:layout_gravity="center"
         android:layout_marginBottom="8dp"
-        android:background="@color/light_white"
         card_view:cardCornerRadius="2dp">
 
         <androidx.constraintlayout.widget.ConstraintLayout
@@ -28,7 +27,6 @@
                 android:layout_marginLeft="10dp"
                 android:layout_marginTop="12dp"
                 android:fontFamily="sans-serif"
-                android:textColor="#4a4a4a"
                 android:textSize="@dimen/font_list_item"
                 android:textStyle="normal"
                 card_view:layout_constraintStart_toStartOf="parent"
@@ -46,13 +44,12 @@
                 card_view:layout_constraintRight_toRightOf="parent">
 
                 <ImageView
-                    android:id ="@+id/star"
+                    android:id="@+id/star"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="10dp"
                     android:layout_marginLeft="10dp"
-                    android:layout_marginTop="5dp"
-                    />
+                    android:layout_marginTop="5dp" />
             </LinearLayout>
 
         </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/progress_dialog.xml b/app/src/main/res/layout/progress_dialog.xml
index 4f76db6b..6aa4263b 100644
--- a/app/src/main/res/layout/progress_dialog.xml
+++ b/app/src/main/res/layout/progress_dialog.xml
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/dialog_window"
-    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
     <ProgressBar
         android:id="@+id/determinateBar"
-        android:theme="@style/Animation.AppCompat.Dialog"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:progress="25"/>
+        android:progress="25"
+        android:theme="@style/Animation.AppCompat.Dialog" />
 
 </FrameLayout>
diff --git a/app/src/main/res/layout/rss_item_view.xml b/app/src/main/res/layout/rss_item_view.xml
index c75b5397..f1b797eb 100644
--- a/app/src/main/res/layout/rss_item_view.xml
+++ b/app/src/main/res/layout/rss_item_view.xml
@@ -3,7 +3,6 @@
     android:id="@+id/channel_item_view_foreground"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="#ffffff"
     android:orientation="vertical"
     android:padding="5dp"
     tools:ignore="MissingPrefix">
@@ -13,7 +12,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:fontFamily="sans-serif"
-        android:textColor="@android:color/black"
         android:textSize="@dimen/font_list_item"
         android:textStyle="normal" />
 
@@ -22,7 +20,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:fontFamily="sans-serif"
-        android:textColor="@android:color/black"
         android:textSize="14sp"
         android:textStyle="normal" />
 </LinearLayout>
diff --git a/app/src/main/res/layout/rss_view.xml b/app/src/main/res/layout/rss_view.xml
index d0f1df50..a84eba11 100644
--- a/app/src/main/res/layout/rss_view.xml
+++ b/app/src/main/res/layout/rss_view.xml
@@ -3,8 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/rssView"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="#ffffff">
+    android:layout_height="match_parent">
 
     <ProgressBar
         android:id="@+id/rss_indeterminate_bar"
diff --git a/app/src/main/res/layout/searching_view.xml b/app/src/main/res/layout/searching_view.xml
index a64bd124..574d3434 100644
--- a/app/src/main/res/layout/searching_view.xml
+++ b/app/src/main/res/layout/searching_view.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:aandroid="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
@@ -8,10 +8,8 @@
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/searchToolbar"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@color/colorPrimary"
-        android:theme="@style/ToolBarTheme"
-        app:titleTextColor="@color/white" />
+        android:layout_height="?actionBarSize"
+        aandroid:background="?colorPrimary" />
 
     <org.secfirst.advancedsearch.views.SearchResultView
         android:id="@+id/searchResultView"
diff --git a/app/src/main/res/layout/segment_detail.xml b/app/src/main/res/layout/segment_detail.xml
index 234a2dc8..942cf1ee 100644
--- a/app/src/main/res/layout/segment_detail.xml
+++ b/app/src/main/res/layout/segment_detail.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    android:layout_height="match_parent">
 
     <br.tiagohm.markdownview.MarkdownView
         android:id="@+id/markdownView"
-        app:escapeHtml="false"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginBottom="48dp" />
+        android:layout_marginBottom="48dp"
+        app:escapeHtml="false" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/segment_foot.xml b/app/src/main/res/layout/segment_foot.xml
index 91035df6..22717d0c 100644
--- a/app/src/main/res/layout/segment_foot.xml
+++ b/app/src/main/res/layout/segment_foot.xml
@@ -10,7 +10,6 @@
         android:layout_width="match_parent"
         android:layout_height="120dp"
         android:layout_gravity="center"
-        android:background="@color/light_white"
         card_view:cardCornerRadius="2dp"
         card_view:layout_constraintTop_toTopOf="parent">
 
@@ -30,7 +29,6 @@
                 android:fontFamily="sans-serif"
                 android:lineSpacingExtra="0sp"
                 android:text="@string/checklist_card_title"
-                android:textColor="@color/ms_white"
                 android:textSize="24sp"
                 android:textStyle="normal" />
         </FrameLayout>
diff --git a/app/src/main/res/layout/segment_item.xml b/app/src/main/res/layout/segment_item.xml
index b4934280..9ee45231 100644
--- a/app/src/main/res/layout/segment_item.xml
+++ b/app/src/main/res/layout/segment_item.xml
@@ -19,7 +19,7 @@
             android:id="@+id/segmentLayout"
             android:layout_width="match_parent"
             android:layout_height="@dimen/segment_item_card_height"
-            android:background="@color/umbrella_purple"
+            android:background="?colorPrimary"
             card_view:layout_constraintTop_toTopOf="parent" />
 
         <TextView
@@ -31,7 +31,6 @@
             android:layout_marginTop="8dp"
             android:fontFamily="sans-serif"
             android:lineSpacingExtra="0sp"
-            android:textColor="@color/ms_white"
             android:textSize="@dimen/text_size_larger"
             android:textStyle="normal"
             card_view:layout_constraintStart_toStartOf="parent"
@@ -47,7 +46,6 @@
             android:fontFamily="sans-serif"
             android:lineSpacingExtra="0sp"
             android:maxLines="3"
-            android:textColor="@color/ms_white"
             android:textSize="@dimen/text_size_smaller"
             android:textStyle="normal"
             card_view:layout_constraintStart_toStartOf="@+id/segmentIndex"
@@ -56,14 +54,16 @@
 
         <CheckBox
             android:id="@+id/segmentFavorite"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="20dp"
-            android:layout_marginRight="20dp"
+            android:layout_width="20dp"
+            android:layout_height="20dp"
+            android:layout_marginStart="20dp"
+            android:layout_marginLeft="20dp"
             android:background="@drawable/favorite_bg"
             android:button="@android:color/transparent"
+            android:minWidth="48dp"
+            android:minHeight="48dp"
             card_view:layout_constraintBottom_toBottomOf="parent"
-            card_view:layout_constraintEnd_toStartOf="@+id/segmentShare" />
+            card_view:layout_constraintStart_toStartOf="parent" />
 
         <ImageView
             android:id="@+id/segmentShare"
@@ -72,6 +72,7 @@
             android:layout_gravity="bottom|center"
             android:layout_marginEnd="20dp"
             android:layout_marginRight="20dp"
+            android:contentDescription="TODO"
             android:src="@drawable/ic_share_segment"
             card_view:layout_constraintBottom_toBottomOf="parent"
             card_view:layout_constraintEnd_toEndOf="parent" />
diff --git a/app/src/main/res/layout/segment_view.xml b/app/src/main/res/layout/segment_view.xml
index 42bc76be..37e29385 100644
--- a/app/src/main/res/layout/segment_view.xml
+++ b/app/src/main/res/layout/segment_view.xml
@@ -3,8 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="#e5e5e5">
+    android:layout_height="match_parent">
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/segmentRecyclerView"
diff --git a/app/src/main/res/layout/settings_export_dialog.xml b/app/src/main/res/layout/settings_export_dialog.xml
index 8bc9cabc..d787d4dc 100644
--- a/app/src/main/res/layout/settings_export_dialog.xml
+++ b/app/src/main/res/layout/settings_export_dialog.xml
@@ -24,7 +24,7 @@
             android:textSize="18sp"
             android:textStyle="bold" />
 
-        <EditText
+        <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/ExportDialogFileName"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/shake_device.xml b/app/src/main/res/layout/shake_device.xml
index a8a5abb3..0258f824 100644
--- a/app/src/main/res/layout/shake_device.xml
+++ b/app/src/main/res/layout/shake_device.xml
@@ -10,7 +10,6 @@
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="1"
-        android:background="@android:color/white"
         android:orientation="vertical"
         android:padding="10dp">
 
@@ -23,7 +22,7 @@
             android:layout_marginRight="15dp"
             app:hintTextAppearance="@style/TextAppearence.App.TextInputLayout">
 
-            <androidx.appcompat.widget.AppCompatEditText
+            <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/urlServer"
                 fontPath="fonts/Roboto-Regular.ttf"
                 android:layout_width="match_parent"
@@ -31,8 +30,8 @@
                 android:hint="@string/url_server"
                 android:imeOptions="actionDone"
                 android:inputType="textNoSuggestions"
-                android:textSize="16sp"
                 android:text="https://github.com/douglasalipio/umbrella-content"
+                android:textSize="16sp"
                 android:theme="@style/Autocomplete" />
         </com.google.android.material.textfield.TextInputLayout>
 
@@ -44,7 +43,7 @@
             android:paddingLeft="20dp"
             android:paddingRight="20dp">
 
-            <androidx.appcompat.widget.AppCompatTextView
+            <TextView
                 android:id="@+id/urlServerCancel"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -54,12 +53,10 @@
                 android:clickable="true"
                 android:focusable="true"
                 android:padding="10dp"
-                android:text="@android:string/cancel"
-                android:textColor="@color/grey_location" />
+                android:text="@android:string/cancel" />
 
-            <androidx.appcompat.widget.AppCompatTextView
+            <TextView
                 android:id="@+id/urlServerOk"
-                fontPath="fonts/Roboto-Medium.ttf"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentTop="true"
@@ -68,6 +65,7 @@
                 android:background="?android:attr/selectableItemBackground"
                 android:clickable="true"
                 android:focusable="true"
+                android:fontFamily="fonts/Roboto-Medium.ttf"
                 android:padding="10dp"
                 android:text="@android:string/ok"
                 android:textColor="@color/green_dashboard" />
diff --git a/app/src/main/res/layout/share_dialog.xml b/app/src/main/res/layout/share_dialog.xml
index 8a697239..c6de2669 100644
--- a/app/src/main/res/layout/share_dialog.xml
+++ b/app/src/main/res/layout/share_dialog.xml
@@ -5,7 +5,7 @@
     android:orientation="vertical">
 
 
-    <androidx.appcompat.widget.AppCompatTextView
+    <TextView
         android:id="@+id/share_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -15,7 +15,6 @@
         android:fontFamily="sans-serif-medium"
         android:padding="@dimen/dashboard_feed_normal_padding"
         android:text="@string/export_lesson"
-        android:textColor="#de000000"
         android:textSize="@dimen/font_large"
         android:textStyle="normal" />
 
@@ -25,7 +24,7 @@
         android:layout_height="1dp"
         android:layout_below="@id/share_title"
         android:layout_marginTop="@dimen/share_dialog_little_space"
-        android:background="#e0e0e0"
+        android:background="?android:attr/listDivider"
         android:padding="5dp" />
 
     <RadioGroup
@@ -59,7 +58,7 @@
         android:layout_height="1dp"
         android:layout_below="@id/shareGroup"
         android:layout_marginTop="@dimen/share_dialog_little_space"
-        android:background="#e0e0e0"
+        android:background="?android:attr/listDivider"
         android:padding="5dp" />
 
     <RelativeLayout
diff --git a/app/src/main/res/layout/simple_article_view.xml b/app/src/main/res/layout/simple_article_view.xml
index 1a3f3561..d95a5cec 100644
--- a/app/src/main/res/layout/simple_article_view.xml
+++ b/app/src/main/res/layout/simple_article_view.xml
@@ -4,8 +4,8 @@
     android:id="@+id/article_item"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginLeft="16dp"
     android:layout_marginStart="16dp"
+    android:layout_marginLeft="16dp"
     android:layout_marginTop="5dp"
     android:orientation="vertical"
     android:padding="8dp"
@@ -13,35 +13,33 @@
 
     <TextView
         android:id="@+id/title"
-        fontPath="fonts/Roboto-Medium.ttf"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:fontFamily="fonts/Roboto-Medium.ttf"
         android:text="Title"
-        android:textColor="@android:color/black"
         android:textSize="24sp" />
 
     <TextView
         android:id="@+id/lastUpdate"
-        fontPath="fonts/Roboto-Regular.ttf"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:fontFamily="fonts/Roboto-Regular.ttf"
         android:text="By Author name"
         android:textSize="12sp" />
 
     <TextView
         android:layout_width="match_parent"
-        android:layout_height="10dp"
-        android:textColor="@android:color/black" />
+        android:layout_height="10dp" />
 
     <TextView
         android:id="@+id/description"
-        fontPath="fonts/Roboto-Regular.ttf"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:ellipsize="end"
+        android:fontFamily="fonts/Roboto-Regular.ttf"
         android:maxLines="3"
         android:text="descriptions"
-        android:textColor="@android:color/black"
-        android:textSize="13sp" />
+        android:textSize="13sp"
+        tools:ignore="HardcodedText" />
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/spinner_text_view.xml b/app/src/main/res/layout/spinner_text_view.xml
index 24590c28..d635fb29 100644
--- a/app/src/main/res/layout/spinner_text_view.xml
+++ b/app/src/main/res/layout/spinner_text_view.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -9,6 +9,6 @@
         android:layout_height="wrap_content"
         android:gravity="start"
         android:padding="5dip"
-        android:textColor="#FF0000"
-        android:textSize="20sp"/>
+        android:textSize="20sp"
+        tools:ignore="MissingConstraints" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/switch_language_alert.xml b/app/src/main/res/layout/switch_language_alert.xml
index 910caed8..e554365c 100644
--- a/app/src/main/res/layout/switch_language_alert.xml
+++ b/app/src/main/res/layout/switch_language_alert.xml
@@ -13,7 +13,6 @@
         android:layout_height="wrap_content"
         android:fontFamily="sans-serif-medium"
         android:text="@string/switch_language_alert_message"
-        android:textColor="#de000000"
         android:textSize="18sp"
         android:textStyle="normal"
         app:layout_constraintLeft_toLeftOf="parent"
diff --git a/app/src/main/res/layout/switch_repo_alert.xml b/app/src/main/res/layout/switch_repo_alert.xml
index bffb68d0..7feab8f2 100644
--- a/app/src/main/res/layout/switch_repo_alert.xml
+++ b/app/src/main/res/layout/switch_repo_alert.xml
@@ -13,7 +13,6 @@
         android:layout_height="wrap_content"
         android:fontFamily="sans-serif-medium"
         android:text="@string/switch_repo_alert_text"
-        android:textColor="#de000000"
         android:textSize="18sp"
         android:textStyle="normal"
         app:layout_constraintLeft_toLeftOf="parent"
diff --git a/app/src/main/res/layout/tour_alert.xml b/app/src/main/res/layout/tour_alert.xml
index 7650f04e..605537f6 100644
--- a/app/src/main/res/layout/tour_alert.xml
+++ b/app/src/main/res/layout/tour_alert.xml
@@ -10,7 +10,6 @@
         android:layout_height="wrap_content"
         android:fontFamily="sans-serif-medium"
         android:text="@string/tour_warner_message"
-        android:textColor="#de000000"
         android:textSize="18sp"
         android:textStyle="normal" />
 
diff --git a/app/src/main/res/layout/tour_view.xml b/app/src/main/res/layout/tour_view.xml
index 3f205feb..e4950929 100644
--- a/app/src/main/res/layout/tour_view.xml
+++ b/app/src/main/res/layout/tour_view.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    android:id="@+id/tourView"
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:attrs="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/tourView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:layout_editor_absoluteY="25dp">
@@ -33,8 +32,6 @@
         app:piv_animationType="scale"
         app:piv_dynamicCount="true"
         app:piv_interactiveAnimation="true"
-        app:piv_selectedColor="@color/light_white"
-        app:piv_unselectedColor="@color/light_grey"
         app:piv_viewPager="@id/tourViewPager"
         attrs:piv_padding="12dp"
         attrs:piv_radius="8dp" />
@@ -43,15 +40,15 @@
         android:id="@+id/acceptButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="10dp"
         android:layout_marginEnd="25dp"
         android:layout_marginRight="25dp"
-        android:textColor="@color/ms_white"
+        android:layout_marginBottom="10dp"
+        android:elevation="2dp"
         android:text="@string/tour_view_accept_button"
-        android:visibility="invisible"
         android:textSize="18sp"
-        android:elevation="2dp"
+        android:visibility="invisible"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent" />
+        app:layout_constraintEnd_toEndOf="parent"
+        tools:targetApi="lollipop" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/web_view.xml b/app/src/main/res/layout/web_view.xml
index 472f0dd2..c0c911e0 100644
--- a/app/src/main/res/layout/web_view.xml
+++ b/app/src/main/res/layout/web_view.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -12,13 +11,14 @@
         <com.google.android.material.appbar.AppBarLayout
             android:id="@+id/segmentBarLayout"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:theme="@style/ActionBarStyle">
 
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/webViewToolbar"
                 android:layout_width="match_parent"
-                android:layout_height="?attr/actionBarSize"
-                android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" />
+                android:layout_height="?actionBarSize"
+                android:background="?colorPrimary" />
         </com.google.android.material.appbar.AppBarLayout>
 
         <ProgressBar
@@ -40,6 +40,7 @@
                 android:id="@+id/webView"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent" />
+
         </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
     </LinearLayout>
 
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..291878f7
--- /dev/null
+++ b/app/src/main/res/values-night/styles.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+
+    <style name="AppTheme" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/umbrella_purple_dark</item>
+        <item name="colorPrimaryDark">@color/umbrella_purple_dark</item>
+        <item name="colorAccent">@color/umbrella_green</item>
+        <item name="windowActionModeOverlay">true</item>
+        <item name="colorOnPrimary">@android:color/black</item>
+        <item name="colorOnSecondary">@android:color/black</item>
+        <item name="ms_stepperStyle">@style/DotStepperStyle</item>
+        <item name="materialCardViewStyle">@style/Widget.MaterialComponents.CardView.CardViewTheme</item>
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+    </style>
+
+    <style name="Widget.MaterialComponents.CardView.CardViewTheme">
+        <item name="android:backgroundTint" tools:targetApi="lollipop">@color/cardview_dark_background</item>
+    </style>
+
+    <style name="DotStepperStyle">
+        <item name="ms_stepperType">dots</item>
+        <item name="ms_activeStepColor">@color/umbrella_green</item>
+        <item name="ms_inactiveStepColor">@color/black_38</item>
+        <item name="ms_bottomNavigationBackground">@color/black_38</item>
+    </style>
+
+    <style name="EditTextStyle" parent="Theme.AppCompat.DayNight.DarkActionBar">
+        <item name="colorControlNormal">@color/grey_location</item>
+        <item name="colorControlActivated">@color/blue_light</item>
+    </style>
+
+
+    <style name="ContentText">
+        <item name="android:textSize">@dimen/font_small</item>
+        <item name="android:textColor">@color/dialog_background</item>
+    </style>
+
+
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 76d88ea2..0db5cc21 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -199,4 +199,6 @@
     <string name="pathways_text">Select a guide to start your security journey or \nbookmark any guide for later</string>
     <string name="pathways_title">What do you need most?</string>
     <string name="see_all">See all</string>
+    <string name="settings_label_dark_mode" translatable="false">Toggle between dark/light mode</string>
+    <string name="settings_title_dark_mode" translatable="false">Dark Mode</string>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index ad82c7d2..d0db3f3a 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,27 +1,44 @@
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
 
     <!-- Base application theme.-->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
+    <style name="AppTheme" parent="Theme.MaterialComponents.DayNight.NoActionBar">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
         <item name="windowActionModeOverlay">true</item>
+        <item name="colorOnPrimary">@color/white</item>
+        <item name="colorOnSecondary">@android:color/black</item>
         <item name="ms_stepperStyle">@style/DotStepperStyle</item>
-        <item name="android:textColor">#de000000</item>
-        <item name="android:itemBackground">@color/white</item>
+        <item name="toolbarStyle">@style/Widget.MaterialComponents.Toolbar.ToolbarTheme</item>
+        <item name="materialCardViewStyle">@style/Widget.MaterialComponents.CardView.CardViewTheme</item>
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
     </style>
 
+    <style name="Widget.MaterialComponents.CardView.CardViewTheme">
+        <item name="android:backgroundTint" tools:targetApi="lollipop">@color/form_background</item>
+    </style>
+
+    <style name="Widget.MaterialComponents.Toolbar.ToolbarTheme">
+        <item name="iconTint">@color/white</item>
+        <item name="titleTextColor">@color/white</item>
+    </style>
+
+    <style name="ActionBarStyle" parent="ThemeOverlay.AppCompat.Dark.ActionBar">
+        <item name="android:layout_height">?actionBarSize</item>
+    </style>
+
+
     <style name="DotStepperStyle">
         <item name="ms_stepperType">dots</item>
         <item name="ms_activeStepColor">@color/umbrella_green</item>
-        <item name="ms_inactiveStepColor">#cecece</item>
-        <item name="ms_bottomNavigationBackground">?attr/colorAccent</item>
+        <item name="ms_inactiveStepColor">@color/grey_location</item>
+        <item name="ms_bottomNavigationBackground">@color/white_transparent</item>
     </style>
 
-    <style name="EditTextStyle" parent="Theme.AppCompat.Light">
-        <item name="colorControlNormal">#030303</item>
-        <item name="colorControlActivated">#43a0ca</item>
+    <style name="textViewTheme" parent="Widget.MaterialComponents.TextView">
+        <item name="android:textColor">@color/grey_location</item>
     </style>
 
     <style name="ProgressDialogStyle" parent="Theme.AppCompat.Dialog.Alert">
@@ -36,7 +53,8 @@
 
     <style name="LinearProgress" parent="Theme.AppCompat.Light">
         <item name="colorAccent">@color/umbrella_purple_dark</item>
-        <!--<item name="android:progressBackgroundTint">@color/umbrella_purple_dark</item>-->
+        <item name="android:progressBackgroundTint" tools:targetApi="lollipop">
+            @color/umbrella_purple_dark</item>-=
     </style>
 
     <style name="TextAppearence.App.TextInputLayout" parent="@android:style/TextAppearance">
@@ -45,33 +63,25 @@
         <item name="android:textSize">12sp</item>
     </style>
 
-    <style name="Autocomplete" parent="Widget.AppCompat.Light.AutoCompleteTextView">
+    <style name="Autocomplete" parent="Widget.MaterialComponents.TextView">
         <item name="android:background">@android:color/transparent</item>
         <item name="colorControlNormal">@color/green_button</item>
         <item name="colorControlActivated">@color/green_button</item>
     </style>
 
-    <style name="ToolbarStyle" parent="ThemeOverlay.AppCompat.Dark.ActionBar">
-        <item name="android:background">?colorPrimary</item>
-        <item name="colorControlNormal">@color/white</item>
-    </style>
-
-    <style name="ToolBarTheme" parent="ThemeOverlay.AppCompat.ActionBar">
-        <item name="colorControlNormal">@color/white</item>
-    </style>
 
-    <style name="checkBoxStyle" parent="Theme.AppCompat.Light">
+    <style name="checkBoxStyle" parent="Theme.MaterialComponents.DayNight.NoActionBar">
         <item name="colorAccent">@color/umbrella_green</item>
         <item name="android:textColorSecondary">@color/dark_grey</item>
     </style>
 
-    <style name="radioStyle" parent="Theme.AppCompat.Light">
+    <style name="radioStyle" parent="Theme.MaterialComponents.DayNight.NoActionBar">
         <item name="colorAccent">@color/umbrella_green</item>
         <item name="android:textColorSecondary">@color/dark_grey</item>
     </style>
 
-    <style name="DialogTheme" parent="android:Theme.Dialog">
 
+    <style name="DialogTheme" parent="Theme.MaterialComponents.Dialog">
         <item name="android:layout_width">fill_parent</item>
         <item name="android:layout_height">fill_parent</item>
         <!-- No backgrounds, titles or window float -->
@@ -80,4 +90,4 @@
         <item name="android:windowIsFloating">false</item>
         <item name="android:background">@color/colorPrimary</item>
     </style>
-</resources>
+</resources>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 93160907..c9e5468f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -55,7 +55,7 @@ ext {
     targetSdkVersion = 28
     compileSdkVersion = 28
     buildToolsVersion = '26.0.2'
-
+    material_version = '1.4.0'
     support_library_version = '28.0.0'
     support_constraint_version = '1.1.3'
     dagger2_version = '2.27'