diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index b90f01858..39e0e3987 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -133,7 +133,7 @@ dependencies {
     implementation("com.google.android.flexbox:flexbox:3.0.0")
 
     // Andromeda
-    val andromedaVersion = "c6ed873972"
+    val andromedaVersion = "81d7c0b694"
     implementation("com.github.kylecorry31.andromeda:core:$andromedaVersion")
     implementation("com.github.kylecorry31.andromeda:fragments:$andromedaVersion")
     implementation("com.github.kylecorry31.andromeda:forms:$andromedaVersion")
@@ -164,18 +164,11 @@ dependencies {
     implementation("com.github.kylecorry31.andromeda:exceptions:$andromedaVersion")
     implementation("com.github.kylecorry31.andromeda:print:$andromedaVersion")
     implementation("com.github.kylecorry31.andromeda:list:$andromedaVersion")
-
-    // Ceres
-    val ceresVersion = "ca2e86e350"
-    implementation("com.github.kylecorry31.ceres:list:$ceresVersion")
-    implementation("com.github.kylecorry31.ceres:toolbar:$ceresVersion")
-    implementation("com.github.kylecorry31.ceres:badge:$ceresVersion")
-    implementation("com.github.kylecorry31.ceres:chart:$ceresVersion")
-    implementation("com.github.kylecorry31.ceres:image:$ceresVersion")
+    implementation("com.github.kylecorry31.andromeda:views:$andromedaVersion")
 
     // Misc
     implementation("com.github.kylecorry31:subsampling-scale-image-view:3.11.9")
-    implementation("com.github.kylecorry31:sol:8.0.1")
+    implementation("com.github.kylecorry31:sol:9.1.1")
     implementation("com.github.kylecorry31:luna:6a88851e2b")
 //    debugImplementation("com.squareup.leakcanary:leakcanary-android:2.12")
 
diff --git a/app/src/main/java/com/kylecorry/trail_sense/astronomy/ui/AstroChart.kt b/app/src/main/java/com/kylecorry/trail_sense/astronomy/ui/AstroChart.kt
index 86fc310a7..d9cf350a1 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/astronomy/ui/AstroChart.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/astronomy/ui/AstroChart.kt
@@ -4,13 +4,13 @@ import android.graphics.Color
 import androidx.annotation.DrawableRes
 import com.kylecorry.andromeda.core.system.Resources
 import com.kylecorry.andromeda.core.ui.Colors.withAlpha
-import com.kylecorry.ceres.chart.Chart
-import com.kylecorry.ceres.chart.data.AreaChartLayer
-import com.kylecorry.ceres.chart.data.BitmapChartLayer
-import com.kylecorry.ceres.chart.data.FullAreaChartLayer
-import com.kylecorry.ceres.chart.data.HorizontalLineChartLayer
-import com.kylecorry.ceres.chart.data.LineChartLayer
-import com.kylecorry.ceres.chart.data.TextChartLayer
+import com.kylecorry.andromeda.views.chart.Chart
+import com.kylecorry.andromeda.views.chart.data.AreaChartLayer
+import com.kylecorry.andromeda.views.chart.data.BitmapChartLayer
+import com.kylecorry.andromeda.views.chart.data.FullAreaChartLayer
+import com.kylecorry.andromeda.views.chart.data.HorizontalLineChartLayer
+import com.kylecorry.andromeda.views.chart.data.LineChartLayer
+import com.kylecorry.andromeda.views.chart.data.TextChartLayer
 import com.kylecorry.sol.math.Vector2
 import com.kylecorry.sol.units.Reading
 import com.kylecorry.trail_sense.R
diff --git a/app/src/main/java/com/kylecorry/trail_sense/astronomy/ui/items/AstronomyListItemProducer.kt b/app/src/main/java/com/kylecorry/trail_sense/astronomy/ui/items/AstronomyListItemProducer.kt
index c7dc2033a..7fec3e53b 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/astronomy/ui/items/AstronomyListItemProducer.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/astronomy/ui/items/AstronomyListItemProducer.kt
@@ -1,6 +1,6 @@
 package com.kylecorry.trail_sense.astronomy.ui.items
 
-import com.kylecorry.ceres.list.ListItem
+import com.kylecorry.andromeda.views.list.ListItem
 import com.kylecorry.sol.units.Coordinate
 import java.time.LocalDate
 
diff --git a/app/src/main/java/com/kylecorry/trail_sense/astronomy/ui/items/BaseAstroListItemProducer.kt b/app/src/main/java/com/kylecorry/trail_sense/astronomy/ui/items/BaseAstroListItemProducer.kt
index 8ad3c94b3..eb61a8d8c 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/astronomy/ui/items/BaseAstroListItemProducer.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/astronomy/ui/items/BaseAstroListItemProducer.kt
@@ -10,11 +10,11 @@ import com.google.android.flexbox.JustifyContent
 import com.kylecorry.andromeda.core.math.DecimalFormatter
 import com.kylecorry.andromeda.core.system.Resources
 import com.kylecorry.andromeda.core.ui.Colors.withAlpha
-import com.kylecorry.ceres.list.ListIcon
-import com.kylecorry.ceres.list.ListItem
-import com.kylecorry.ceres.list.ListItemData
-import com.kylecorry.ceres.list.ListItemDataAlignment
-import com.kylecorry.ceres.list.ResourceListIcon
+import com.kylecorry.andromeda.views.list.ListIcon
+import com.kylecorry.andromeda.views.list.ListItem
+import com.kylecorry.andromeda.views.list.ListItemData
+import com.kylecorry.andromeda.views.list.ListItemDataAlignment
+import com.kylecorry.andromeda.views.list.ResourceListIcon
 import com.kylecorry.sol.science.astronomy.RiseSetTransitTimes
 import com.kylecorry.sol.units.Bearing
 import com.kylecorry.trail_sense.R
diff --git a/app/src/main/java/com/kylecorry/trail_sense/astronomy/ui/items/LunarEclipseListItemProducer.kt b/app/src/main/java/com/kylecorry/trail_sense/astronomy/ui/items/LunarEclipseListItemProducer.kt
index 4e8435b88..645b95937 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/astronomy/ui/items/LunarEclipseListItemProducer.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/astronomy/ui/items/LunarEclipseListItemProducer.kt
@@ -3,8 +3,8 @@ package com.kylecorry.trail_sense.astronomy.ui.items
 import android.content.Context
 import com.kylecorry.andromeda.core.coroutines.onDefault
 import com.kylecorry.andromeda.core.math.DecimalFormatter
-import com.kylecorry.ceres.list.ListItem
-import com.kylecorry.ceres.list.ResourceListIcon
+import com.kylecorry.andromeda.views.list.ListItem
+import com.kylecorry.andromeda.views.list.ResourceListIcon
 import com.kylecorry.sol.units.Coordinate
 import com.kylecorry.trail_sense.R
 import com.kylecorry.trail_sense.astronomy.ui.format.EclipseFormatter
diff --git a/app/src/main/java/com/kylecorry/trail_sense/astronomy/ui/items/MeteorShowerListItemProducer.kt b/app/src/main/java/com/kylecorry/trail_sense/astronomy/ui/items/MeteorShowerListItemProducer.kt
index c0b1c1e7e..82a66c820 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/astronomy/ui/items/MeteorShowerListItemProducer.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/astronomy/ui/items/MeteorShowerListItemProducer.kt
@@ -2,8 +2,8 @@ package com.kylecorry.trail_sense.astronomy.ui.items
 
 import android.content.Context
 import com.kylecorry.andromeda.core.coroutines.onDefault
-import com.kylecorry.ceres.list.ListItem
-import com.kylecorry.ceres.list.ResourceListIcon
+import com.kylecorry.andromeda.views.list.ListItem
+import com.kylecorry.andromeda.views.list.ResourceListIcon
 import com.kylecorry.sol.units.Coordinate
 import com.kylecorry.trail_sense.R
 import com.kylecorry.trail_sense.shared.readableName
diff --git a/app/src/main/java/com/kylecorry/trail_sense/astronomy/ui/items/MoonListItemProducer.kt b/app/src/main/java/com/kylecorry/trail_sense/astronomy/ui/items/MoonListItemProducer.kt
index 6f5a39511..ef5cb9bb5 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/astronomy/ui/items/MoonListItemProducer.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/astronomy/ui/items/MoonListItemProducer.kt
@@ -2,8 +2,8 @@ package com.kylecorry.trail_sense.astronomy.ui.items
 
 import android.content.Context
 import com.kylecorry.andromeda.core.coroutines.onDefault
-import com.kylecorry.ceres.list.ListItem
-import com.kylecorry.ceres.list.ResourceListIcon
+import com.kylecorry.andromeda.views.list.ListItem
+import com.kylecorry.andromeda.views.list.ResourceListIcon
 import com.kylecorry.sol.units.Coordinate
 import com.kylecorry.trail_sense.R
 import com.kylecorry.trail_sense.astronomy.ui.MoonPhaseImageMapper
diff --git a/app/src/main/java/com/kylecorry/trail_sense/astronomy/ui/items/SolarEclipseListItemProducer.kt b/app/src/main/java/com/kylecorry/trail_sense/astronomy/ui/items/SolarEclipseListItemProducer.kt
index 92f11b491..ff9e2958a 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/astronomy/ui/items/SolarEclipseListItemProducer.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/astronomy/ui/items/SolarEclipseListItemProducer.kt
@@ -2,8 +2,8 @@ package com.kylecorry.trail_sense.astronomy.ui.items
 
 import android.content.Context
 import com.kylecorry.andromeda.core.coroutines.onDefault
-import com.kylecorry.ceres.list.ListItem
-import com.kylecorry.ceres.list.ResourceListIcon
+import com.kylecorry.andromeda.views.list.ListItem
+import com.kylecorry.andromeda.views.list.ResourceListIcon
 import com.kylecorry.sol.units.Coordinate
 import com.kylecorry.trail_sense.R
 import com.kylecorry.trail_sense.astronomy.ui.format.EclipseFormatter
diff --git a/app/src/main/java/com/kylecorry/trail_sense/astronomy/ui/items/SunListItemProducer.kt b/app/src/main/java/com/kylecorry/trail_sense/astronomy/ui/items/SunListItemProducer.kt
index 78fa20062..9fc6aa134 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/astronomy/ui/items/SunListItemProducer.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/astronomy/ui/items/SunListItemProducer.kt
@@ -2,8 +2,8 @@ package com.kylecorry.trail_sense.astronomy.ui.items
 
 import android.content.Context
 import com.kylecorry.andromeda.core.coroutines.onDefault
-import com.kylecorry.ceres.list.ListItem
-import com.kylecorry.ceres.list.ResourceListIcon
+import com.kylecorry.andromeda.views.list.ListItem
+import com.kylecorry.andromeda.views.list.ResourceListIcon
 import com.kylecorry.sol.science.astronomy.SunTimesMode
 import com.kylecorry.sol.units.Coordinate
 import com.kylecorry.trail_sense.R
diff --git a/app/src/main/java/com/kylecorry/trail_sense/navigation/beacons/ui/list/BeaconGroupListItemMapper.kt b/app/src/main/java/com/kylecorry/trail_sense/navigation/beacons/ui/list/BeaconGroupListItemMapper.kt
index a9e44eb61..a515aa4e2 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/navigation/beacons/ui/list/BeaconGroupListItemMapper.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/navigation/beacons/ui/list/BeaconGroupListItemMapper.kt
@@ -1,10 +1,10 @@
 package com.kylecorry.trail_sense.navigation.beacons.ui.list
 
 import android.content.Context
-import com.kylecorry.ceres.list.ListItem
-import com.kylecorry.ceres.list.ListItemMapper
-import com.kylecorry.ceres.list.ListMenuItem
-import com.kylecorry.ceres.list.ResourceListIcon
+import com.kylecorry.andromeda.views.list.ListItem
+import com.kylecorry.andromeda.views.list.ListItemMapper
+import com.kylecorry.andromeda.views.list.ListMenuItem
+import com.kylecorry.andromeda.views.list.ResourceListIcon
 import com.kylecorry.trail_sense.R
 import com.kylecorry.trail_sense.navigation.beacons.domain.BeaconGroup
 import com.kylecorry.trail_sense.shared.colors.AppColor
diff --git a/app/src/main/java/com/kylecorry/trail_sense/navigation/beacons/ui/list/BeaconListItemMapper.kt b/app/src/main/java/com/kylecorry/trail_sense/navigation/beacons/ui/list/BeaconListItemMapper.kt
index 9f634ca27..1fbdba383 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/navigation/beacons/ui/list/BeaconListItemMapper.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/navigation/beacons/ui/list/BeaconListItemMapper.kt
@@ -7,11 +7,11 @@ import com.kylecorry.andromeda.core.sensors.Quality
 import com.kylecorry.andromeda.core.system.Resources
 import com.kylecorry.andromeda.core.ui.Colors
 import com.kylecorry.andromeda.sense.location.IGPS
-import com.kylecorry.ceres.list.ListIcon
-import com.kylecorry.ceres.list.ListItem
-import com.kylecorry.ceres.list.ListItemMapper
-import com.kylecorry.ceres.list.ListMenuItem
-import com.kylecorry.ceres.list.ResourceListIcon
+import com.kylecorry.andromeda.views.list.ListIcon
+import com.kylecorry.andromeda.views.list.ListItem
+import com.kylecorry.andromeda.views.list.ListItemMapper
+import com.kylecorry.andromeda.views.list.ListMenuItem
+import com.kylecorry.andromeda.views.list.ResourceListIcon
 import com.kylecorry.sol.units.Coordinate
 import com.kylecorry.sol.units.Distance
 import com.kylecorry.sol.units.DistanceUnits
diff --git a/app/src/main/java/com/kylecorry/trail_sense/navigation/beacons/ui/list/IBeaconListItemMapper.kt b/app/src/main/java/com/kylecorry/trail_sense/navigation/beacons/ui/list/IBeaconListItemMapper.kt
index 920112fc0..829122978 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/navigation/beacons/ui/list/IBeaconListItemMapper.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/navigation/beacons/ui/list/IBeaconListItemMapper.kt
@@ -2,8 +2,8 @@ package com.kylecorry.trail_sense.navigation.beacons.ui.list
 
 import android.content.Context
 import com.kylecorry.andromeda.sense.location.IGPS
-import com.kylecorry.ceres.list.ListItem
-import com.kylecorry.ceres.list.ListItemMapper
+import com.kylecorry.andromeda.views.list.ListItem
+import com.kylecorry.andromeda.views.list.ListItemMapper
 import com.kylecorry.trail_sense.navigation.beacons.domain.Beacon
 import com.kylecorry.trail_sense.navigation.beacons.domain.BeaconGroup
 import com.kylecorry.trail_sense.navigation.beacons.domain.IBeacon
diff --git a/app/src/main/java/com/kylecorry/trail_sense/navigation/paths/ui/IPathListItemMapper.kt b/app/src/main/java/com/kylecorry/trail_sense/navigation/paths/ui/IPathListItemMapper.kt
index 4bb4b333b..a178466b9 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/navigation/paths/ui/IPathListItemMapper.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/navigation/paths/ui/IPathListItemMapper.kt
@@ -1,8 +1,8 @@
 package com.kylecorry.trail_sense.navigation.paths.ui
 
 import android.content.Context
-import com.kylecorry.ceres.list.ListItem
-import com.kylecorry.ceres.list.ListItemMapper
+import com.kylecorry.andromeda.views.list.ListItem
+import com.kylecorry.andromeda.views.list.ListItemMapper
 import com.kylecorry.trail_sense.navigation.paths.domain.IPath
 import com.kylecorry.trail_sense.navigation.paths.domain.Path
 import com.kylecorry.trail_sense.navigation.paths.domain.PathGroup
diff --git a/app/src/main/java/com/kylecorry/trail_sense/navigation/paths/ui/PathElevationChart.kt b/app/src/main/java/com/kylecorry/trail_sense/navigation/paths/ui/PathElevationChart.kt
index f278c9e1f..8195c8681 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/navigation/paths/ui/PathElevationChart.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/navigation/paths/ui/PathElevationChart.kt
@@ -4,11 +4,11 @@ import android.graphics.Color
 import androidx.annotation.ColorInt
 import com.kylecorry.andromeda.core.system.Resources
 import com.kylecorry.andromeda.core.tryOrNothing
-import com.kylecorry.ceres.chart.Chart
-import com.kylecorry.ceres.chart.data.AreaChartLayer
-import com.kylecorry.ceres.chart.data.ChartLayer
-import com.kylecorry.ceres.chart.data.LineChartLayer
-import com.kylecorry.ceres.chart.data.ScatterChartLayer
+import com.kylecorry.andromeda.views.chart.Chart
+import com.kylecorry.andromeda.views.chart.data.AreaChartLayer
+import com.kylecorry.andromeda.views.chart.data.ChartLayer
+import com.kylecorry.andromeda.views.chart.data.LineChartLayer
+import com.kylecorry.andromeda.views.chart.data.ScatterChartLayer
 import com.kylecorry.sol.math.Vector2
 import com.kylecorry.sol.units.Distance
 import com.kylecorry.sol.units.DistanceUnits
diff --git a/app/src/main/java/com/kylecorry/trail_sense/navigation/paths/ui/PathGroupListItemMapper.kt b/app/src/main/java/com/kylecorry/trail_sense/navigation/paths/ui/PathGroupListItemMapper.kt
index 9393bc58d..d697db10e 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/navigation/paths/ui/PathGroupListItemMapper.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/navigation/paths/ui/PathGroupListItemMapper.kt
@@ -1,10 +1,10 @@
 package com.kylecorry.trail_sense.navigation.paths.ui
 
 import android.content.Context
-import com.kylecorry.ceres.list.ListItem
-import com.kylecorry.ceres.list.ListItemMapper
-import com.kylecorry.ceres.list.ListMenuItem
-import com.kylecorry.ceres.list.ResourceListIcon
+import com.kylecorry.andromeda.views.list.ListItem
+import com.kylecorry.andromeda.views.list.ListItemMapper
+import com.kylecorry.andromeda.views.list.ListMenuItem
+import com.kylecorry.andromeda.views.list.ResourceListIcon
 import com.kylecorry.trail_sense.R
 import com.kylecorry.trail_sense.navigation.paths.domain.PathGroup
 import com.kylecorry.trail_sense.shared.colors.AppColor
diff --git a/app/src/main/java/com/kylecorry/trail_sense/navigation/paths/ui/PathListItemMapper.kt b/app/src/main/java/com/kylecorry/trail_sense/navigation/paths/ui/PathListItemMapper.kt
index 031f2b0a0..53cb4f163 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/navigation/paths/ui/PathListItemMapper.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/navigation/paths/ui/PathListItemMapper.kt
@@ -3,10 +3,10 @@ package com.kylecorry.trail_sense.navigation.paths.ui
 import android.content.Context
 import androidx.core.text.bold
 import androidx.core.text.buildSpannedString
-import com.kylecorry.ceres.list.ListItem
-import com.kylecorry.ceres.list.ListItemMapper
-import com.kylecorry.ceres.list.ListMenuItem
-import com.kylecorry.ceres.list.ResourceListIcon
+import com.kylecorry.andromeda.views.list.ListItem
+import com.kylecorry.andromeda.views.list.ListItemMapper
+import com.kylecorry.andromeda.views.list.ListMenuItem
+import com.kylecorry.andromeda.views.list.ResourceListIcon
 import com.kylecorry.trail_sense.R
 import com.kylecorry.trail_sense.navigation.paths.domain.LineStyle
 import com.kylecorry.trail_sense.navigation.paths.domain.Path
diff --git a/app/src/main/java/com/kylecorry/trail_sense/navigation/ui/AltitudeBottomSheet.kt b/app/src/main/java/com/kylecorry/trail_sense/navigation/ui/AltitudeBottomSheet.kt
index 8a10be04b..0614843ef 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/navigation/ui/AltitudeBottomSheet.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/navigation/ui/AltitudeBottomSheet.kt
@@ -11,8 +11,8 @@ import com.kylecorry.andromeda.core.ui.Colors.withAlpha
 import com.kylecorry.andromeda.fragments.BoundBottomSheetDialogFragment
 import com.kylecorry.andromeda.fragments.inBackground
 import com.kylecorry.andromeda.fragments.observe
-import com.kylecorry.ceres.chart.Chart
-import com.kylecorry.ceres.chart.data.AreaChartLayer
+import com.kylecorry.andromeda.views.chart.Chart
+import com.kylecorry.andromeda.views.chart.data.AreaChartLayer
 import com.kylecorry.sol.units.Distance
 import com.kylecorry.sol.units.DistanceUnits
 import com.kylecorry.sol.units.Reading
diff --git a/app/src/main/java/com/kylecorry/trail_sense/settings/ui/PressureChartPreference.kt b/app/src/main/java/com/kylecorry/trail_sense/settings/ui/PressureChartPreference.kt
index 62892d9c3..4cdf86f52 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/settings/ui/PressureChartPreference.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/settings/ui/PressureChartPreference.kt
@@ -4,7 +4,7 @@ import android.content.Context
 import android.util.AttributeSet
 import androidx.preference.Preference
 import androidx.preference.PreferenceViewHolder
-import com.kylecorry.ceres.chart.Chart
+import com.kylecorry.andromeda.views.chart.Chart
 import com.kylecorry.sol.units.Pressure
 import com.kylecorry.sol.units.Reading
 import com.kylecorry.trail_sense.R
diff --git a/app/src/main/java/com/kylecorry/trail_sense/shared/CustomUiUtils.kt b/app/src/main/java/com/kylecorry/trail_sense/shared/CustomUiUtils.kt
index 39a223305..428b313ce 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/shared/CustomUiUtils.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/shared/CustomUiUtils.kt
@@ -20,9 +20,9 @@ import com.kylecorry.andromeda.core.ui.setState
 import com.kylecorry.andromeda.fragments.AndromedaFragment
 import com.kylecorry.andromeda.fragments.show
 import com.kylecorry.andromeda.pickers.Pickers
-import com.kylecorry.ceres.chart.Chart
-import com.kylecorry.ceres.list.CeresListView
-import com.kylecorry.ceres.list.ListItem
+import com.kylecorry.andromeda.views.chart.Chart
+import com.kylecorry.andromeda.views.list.AndromedaListView
+import com.kylecorry.andromeda.views.list.ListItem
 import com.kylecorry.sol.units.Distance
 import com.kylecorry.sol.units.DistanceUnits
 import com.kylecorry.trail_sense.R
@@ -416,7 +416,7 @@ object CustomUiUtils {
         emptyText: String? = null
     ) {
         val view = View.inflate(context, R.layout.view_list_dialog, null)
-        val list = view.findViewById<CeresListView>(R.id.list)
+        val list = view.findViewById<AndromedaListView>(R.id.list)
         val empty = view.findViewById<TextView>(R.id.empty_text)
 
         if (emptyText != null) {
diff --git a/app/src/main/java/com/kylecorry/trail_sense/shared/extensions/TopicExtensions.kt b/app/src/main/java/com/kylecorry/trail_sense/shared/extensions/TopicExtensions.kt
index 2ee4c62b0..2f5e56401 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/shared/extensions/TopicExtensions.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/shared/extensions/TopicExtensions.kt
@@ -2,7 +2,7 @@ package com.kylecorry.trail_sense.shared.extensions
 
 import com.kylecorry.andromeda.core.topics.generic.ITopic
 
-fun <T> ITopic<T>.getOrNull(): T? {
+fun <T: Any> ITopic<T>.getOrNull(): T? {
     val current = value
     return if (current.isPresent) {
         current.get()
diff --git a/app/src/main/java/com/kylecorry/trail_sense/shared/grouping/picker/GroupablePickers.kt b/app/src/main/java/com/kylecorry/trail_sense/shared/grouping/picker/GroupablePickers.kt
index 4e6210f09..59c5b8db3 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/shared/grouping/picker/GroupablePickers.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/shared/grouping/picker/GroupablePickers.kt
@@ -4,7 +4,7 @@ import android.content.Context
 import android.view.View
 import android.widget.FrameLayout
 import com.kylecorry.andromeda.alerts.Alerts
-import com.kylecorry.ceres.list.ListItemMapper
+import com.kylecorry.andromeda.views.list.ListItemMapper
 import com.kylecorry.trail_sense.R
 import com.kylecorry.trail_sense.shared.grouping.Groupable
 import com.kylecorry.trail_sense.shared.lists.GroupListManager
diff --git a/app/src/main/java/com/kylecorry/trail_sense/shared/grouping/picker/GroupableSelectView.kt b/app/src/main/java/com/kylecorry/trail_sense/shared/grouping/picker/GroupableSelectView.kt
index 64a6df07e..69e0b0ec2 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/shared/grouping/picker/GroupableSelectView.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/shared/grouping/picker/GroupableSelectView.kt
@@ -5,7 +5,7 @@ import android.content.Context
 import android.util.AttributeSet
 import android.widget.LinearLayout
 import androidx.core.view.isVisible
-import com.kylecorry.ceres.list.ListItemMapper
+import com.kylecorry.andromeda.views.list.ListItemMapper
 import com.kylecorry.trail_sense.R
 import com.kylecorry.trail_sense.databinding.ViewGroupableSelectorBinding
 import com.kylecorry.trail_sense.shared.grouping.Groupable
diff --git a/app/src/main/java/com/kylecorry/trail_sense/shared/lists/GroupListManagerExtensions.kt b/app/src/main/java/com/kylecorry/trail_sense/shared/lists/GroupListManagerExtensions.kt
index 5c8ed3bc0..21b8a7b46 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/shared/lists/GroupListManagerExtensions.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/shared/lists/GroupListManagerExtensions.kt
@@ -2,8 +2,8 @@ package com.kylecorry.trail_sense.shared.lists
 
 import android.widget.TextView
 import com.kylecorry.andromeda.core.tryOrLog
-import com.kylecorry.ceres.list.CeresListView
-import com.kylecorry.ceres.list.ListItemMapper
+import com.kylecorry.andromeda.views.list.AndromedaListView
+import com.kylecorry.andromeda.views.list.ListItemMapper
 import com.kylecorry.trail_sense.shared.grouping.Groupable
 
 fun <T : Groupable> GroupListManager<T>.bind(view: com.kylecorry.trail_sense.shared.views.SearchView) {
@@ -13,7 +13,7 @@ fun <T : Groupable> GroupListManager<T>.bind(view: com.kylecorry.trail_sense.sha
 }
 
 fun <T : Groupable> GroupListManager<T>.bind(
-    list: CeresListView,
+    list: AndromedaListView,
     title: TextView,
     mapper: ListItemMapper<T>,
     titleProvider: (root: T?) -> String
diff --git a/app/src/main/java/com/kylecorry/trail_sense/shared/views/NorthReferenceBadge.kt b/app/src/main/java/com/kylecorry/trail_sense/shared/views/NorthReferenceBadge.kt
index 46705f07d..a4ba9d8a6 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/shared/views/NorthReferenceBadge.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/shared/views/NorthReferenceBadge.kt
@@ -7,7 +7,7 @@ import android.widget.FrameLayout
 import androidx.navigation.findNavController
 import com.kylecorry.andromeda.alerts.Alerts
 import com.kylecorry.andromeda.core.system.Resources
-import com.kylecorry.ceres.badge.CeresBadge
+import com.kylecorry.andromeda.views.badge.Badge
 import com.kylecorry.trail_sense.R
 import com.kylecorry.trail_sense.shared.FormatService
 
@@ -16,7 +16,7 @@ class NorthReferenceBadge(
     attrs: AttributeSet? = null
 ) : FrameLayout(context, attrs) {
 
-    private val badge = CeresBadge(context, attrs)
+    private val badge = Badge(context, attrs)
     private val formatter = FormatService.getInstance(context)
 
     var useTrueNorth: Boolean = false
diff --git a/app/src/main/java/com/kylecorry/trail_sense/shared/views/chart/label/DistanceChartLabelFormatter.kt b/app/src/main/java/com/kylecorry/trail_sense/shared/views/chart/label/DistanceChartLabelFormatter.kt
index c88473ae2..dce607f0e 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/shared/views/chart/label/DistanceChartLabelFormatter.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/shared/views/chart/label/DistanceChartLabelFormatter.kt
@@ -1,6 +1,6 @@
 package com.kylecorry.trail_sense.shared.views.chart.label
 
-import com.kylecorry.ceres.chart.label.ChartLabelFormatter
+import com.kylecorry.andromeda.views.chart.label.ChartLabelFormatter
 import com.kylecorry.sol.units.Distance
 import com.kylecorry.sol.units.DistanceUnits
 import com.kylecorry.trail_sense.shared.FormatService
diff --git a/app/src/main/java/com/kylecorry/trail_sense/shared/views/chart/label/HourChartLabelFormatter.kt b/app/src/main/java/com/kylecorry/trail_sense/shared/views/chart/label/HourChartLabelFormatter.kt
index 482efa1fe..5f6d13b8c 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/shared/views/chart/label/HourChartLabelFormatter.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/shared/views/chart/label/HourChartLabelFormatter.kt
@@ -1,7 +1,7 @@
 package com.kylecorry.trail_sense.shared.views.chart.label
 
 import android.content.Context
-import com.kylecorry.ceres.chart.label.ChartLabelFormatter
+import com.kylecorry.andromeda.views.chart.label.ChartLabelFormatter
 import com.kylecorry.sol.time.Time
 import com.kylecorry.sol.time.Time.toZonedDateTime
 import com.kylecorry.trail_sense.shared.FormatService
diff --git a/app/src/main/java/com/kylecorry/trail_sense/tools/battery/ui/BatteryChart.kt b/app/src/main/java/com/kylecorry/trail_sense/tools/battery/ui/BatteryChart.kt
index 2e7a58aaf..71ef6d9f0 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/tools/battery/ui/BatteryChart.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/tools/battery/ui/BatteryChart.kt
@@ -2,8 +2,8 @@ package com.kylecorry.trail_sense.tools.battery.ui
 
 import com.kylecorry.andromeda.core.system.Resources
 import com.kylecorry.andromeda.core.ui.Colors.withAlpha
-import com.kylecorry.ceres.chart.Chart
-import com.kylecorry.ceres.chart.data.AreaChartLayer
+import com.kylecorry.andromeda.views.chart.Chart
+import com.kylecorry.andromeda.views.chart.data.AreaChartLayer
 import com.kylecorry.sol.units.Reading
 import com.kylecorry.trail_sense.R
 import com.kylecorry.trail_sense.shared.CustomUiUtils.getPrimaryColor
diff --git a/app/src/main/java/com/kylecorry/trail_sense/tools/light/ui/LightBarView.kt b/app/src/main/java/com/kylecorry/trail_sense/tools/light/ui/LightBarView.kt
index 27a49ba40..579165aee 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/tools/light/ui/LightBarView.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/tools/light/ui/LightBarView.kt
@@ -13,7 +13,7 @@ import android.view.View
 import androidx.core.graphics.drawable.toBitmap
 import androidx.core.math.MathUtils
 import com.kylecorry.andromeda.core.system.Resources
-import com.kylecorry.sol.science.physics.PhysicsService
+import com.kylecorry.sol.science.optics.Optics
 import com.kylecorry.sol.units.Distance
 import com.kylecorry.sol.units.DistanceUnits
 import com.kylecorry.trail_sense.R
@@ -30,7 +30,6 @@ class LightBarView : View {
     private var gradient: List<Int> = listOf()
     private var candela: Float = 0f
     var units: DistanceUnits = DistanceUnits.Meters
-    private val lightService = PhysicsService()
     private var imageSize = 0
 
     constructor(context: Context?) : super(context)
@@ -78,7 +77,7 @@ class LightBarView : View {
     private fun updateGradients(){
         val intensities = (1..100).map {
             val distance = if (units == DistanceUnits.Feet) it * 3 else it
-            lightService.luxAtDistance(candela, Distance(distance.toFloat(), units))
+            Optics.luxAtDistance(candela, Distance(distance.toFloat(), units))
         }
 
         // TODO: Calculate distance of each intensity description
diff --git a/app/src/main/java/com/kylecorry/trail_sense/tools/light/ui/ToolLightFragment.kt b/app/src/main/java/com/kylecorry/trail_sense/tools/light/ui/ToolLightFragment.kt
index 372f96b4d..2c0c39f3d 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/tools/light/ui/ToolLightFragment.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/tools/light/ui/ToolLightFragment.kt
@@ -7,7 +7,7 @@ import android.view.ViewGroup
 import com.kylecorry.andromeda.fragments.BoundFragment
 import com.kylecorry.andromeda.fragments.observe
 import com.kylecorry.andromeda.sense.light.LightSensor
-import com.kylecorry.sol.science.physics.PhysicsService
+import com.kylecorry.sol.science.optics.Optics
 import com.kylecorry.trail_sense.R
 import com.kylecorry.trail_sense.databinding.FragmentToolLightBinding
 import com.kylecorry.trail_sense.shared.DistanceUtils
@@ -17,7 +17,6 @@ import kotlin.math.max
 class ToolLightFragment : BoundFragment<FragmentToolLightBinding>() {
 
     private val lightSensor by lazy { LightSensor(requireContext()) }
-    private val lightService = PhysicsService()
     private val formatService by lazy { FormatService.getInstance(requireContext()) }
     private var maxLux = 0f
 
@@ -62,8 +61,8 @@ class ToolLightFragment : BoundFragment<FragmentToolLightBinding>() {
             return
         }
 
-        val candela = lightService.luxToCandela(maxLux, distance)
-        val beamDist = lightService.lightBeamDistance(candela).convertTo(distance.units)
+        val candela = Optics.luxToCandela(maxLux, distance)
+        val beamDist = Optics.lightBeamDistance(candela).convertTo(distance.units)
 
         binding.lightTitle.subtitle.text = formatService.formatCandela(candela)
         binding.beamDistanceText.text =
diff --git a/app/src/main/java/com/kylecorry/trail_sense/tools/maps/ui/MapDistanceSheet.kt b/app/src/main/java/com/kylecorry/trail_sense/tools/maps/ui/MapDistanceSheet.kt
index c9a7b9e92..1bd22d6dd 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/tools/maps/ui/MapDistanceSheet.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/tools/maps/ui/MapDistanceSheet.kt
@@ -5,7 +5,7 @@ import android.util.AttributeSet
 import android.widget.Button
 import android.widget.FrameLayout
 import androidx.core.view.isVisible
-import com.kylecorry.ceres.toolbar.CeresToolbar
+import com.kylecorry.andromeda.views.toolbar.Toolbar
 import com.kylecorry.sol.units.Distance
 import com.kylecorry.trail_sense.R
 import com.kylecorry.trail_sense.shared.FormatService
@@ -20,7 +20,7 @@ class MapDistanceSheet(context: Context, attrs: AttributeSet?) : FrameLayout(con
     var undoListener: (() -> Unit)? = null
     var createPathListener: (() -> Unit)? = null
 
-    private val toolbar: CeresToolbar
+    private val toolbar: Toolbar
 
     init {
         inflate(context, R.layout.view_map_distance_sheet, this)
diff --git a/app/src/main/java/com/kylecorry/trail_sense/tools/maps/ui/mappers/IMapMapper.kt b/app/src/main/java/com/kylecorry/trail_sense/tools/maps/ui/mappers/IMapMapper.kt
index 401ee7d2b..db1ac006e 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/tools/maps/ui/mappers/IMapMapper.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/tools/maps/ui/mappers/IMapMapper.kt
@@ -3,8 +3,8 @@ package com.kylecorry.trail_sense.tools.maps.ui.mappers
 import android.content.Context
 import androidx.lifecycle.LifecycleOwner
 import com.kylecorry.andromeda.sense.location.IGPS
-import com.kylecorry.ceres.list.ListItem
-import com.kylecorry.ceres.list.ListItemMapper
+import com.kylecorry.andromeda.views.list.ListItem
+import com.kylecorry.andromeda.views.list.ListItemMapper
 import com.kylecorry.trail_sense.tools.maps.domain.IMap
 import com.kylecorry.trail_sense.tools.maps.domain.MapGroup
 import com.kylecorry.trail_sense.tools.maps.domain.PhotoMap
diff --git a/app/src/main/java/com/kylecorry/trail_sense/tools/maps/ui/mappers/MapGroupMapper.kt b/app/src/main/java/com/kylecorry/trail_sense/tools/maps/ui/mappers/MapGroupMapper.kt
index 310fffe9a..d171816fb 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/tools/maps/ui/mappers/MapGroupMapper.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/tools/maps/ui/mappers/MapGroupMapper.kt
@@ -1,10 +1,10 @@
 package com.kylecorry.trail_sense.tools.maps.ui.mappers
 
 import android.content.Context
-import com.kylecorry.ceres.list.ListItem
-import com.kylecorry.ceres.list.ListItemMapper
-import com.kylecorry.ceres.list.ListMenuItem
-import com.kylecorry.ceres.list.ResourceListIcon
+import com.kylecorry.andromeda.views.list.ListItem
+import com.kylecorry.andromeda.views.list.ListItemMapper
+import com.kylecorry.andromeda.views.list.ListMenuItem
+import com.kylecorry.andromeda.views.list.ResourceListIcon
 import com.kylecorry.trail_sense.R
 import com.kylecorry.trail_sense.shared.colors.AppColor
 import com.kylecorry.trail_sense.tools.maps.domain.IMap
diff --git a/app/src/main/java/com/kylecorry/trail_sense/tools/maps/ui/mappers/MapMapper.kt b/app/src/main/java/com/kylecorry/trail_sense/tools/maps/ui/mappers/MapMapper.kt
index 3a89470ef..9a69243e7 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/tools/maps/ui/mappers/MapMapper.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/tools/maps/ui/mappers/MapMapper.kt
@@ -8,12 +8,12 @@ import com.kylecorry.andromeda.core.bitmap.BitmapUtils.rotate
 import com.kylecorry.andromeda.core.system.Resources
 import com.kylecorry.andromeda.sense.location.IGPS
 import com.kylecorry.andromeda.print.Printer
-import com.kylecorry.ceres.list.AsyncListIcon
-import com.kylecorry.ceres.list.ListItem
-import com.kylecorry.ceres.list.ListItemMapper
-import com.kylecorry.ceres.list.ListItemTag
-import com.kylecorry.ceres.list.ListMenuItem
-import com.kylecorry.ceres.list.ResourceListIcon
+import com.kylecorry.andromeda.views.list.AsyncListIcon
+import com.kylecorry.andromeda.views.list.ListItem
+import com.kylecorry.andromeda.views.list.ListItemMapper
+import com.kylecorry.andromeda.views.list.ListItemTag
+import com.kylecorry.andromeda.views.list.ListMenuItem
+import com.kylecorry.andromeda.views.list.ResourceListIcon
 import com.kylecorry.trail_sense.R
 import com.kylecorry.trail_sense.shared.CustomUiUtils.getPrimaryColor
 import com.kylecorry.trail_sense.shared.FormatService
diff --git a/app/src/main/java/com/kylecorry/trail_sense/tools/metaldetector/ui/MetalDetectorChart.kt b/app/src/main/java/com/kylecorry/trail_sense/tools/metaldetector/ui/MetalDetectorChart.kt
index b872ea9b3..1b3d84eee 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/tools/metaldetector/ui/MetalDetectorChart.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/tools/metaldetector/ui/MetalDetectorChart.kt
@@ -1,9 +1,9 @@
 package com.kylecorry.trail_sense.tools.metaldetector.ui
 
 import com.kylecorry.andromeda.core.ui.Colors.withAlpha
-import com.kylecorry.ceres.chart.Chart
-import com.kylecorry.ceres.chart.data.BoundsChartLayer
-import com.kylecorry.ceres.chart.data.LineChartLayer
+import com.kylecorry.andromeda.views.chart.Chart
+import com.kylecorry.andromeda.views.chart.data.BoundsChartLayer
+import com.kylecorry.andromeda.views.chart.data.LineChartLayer
 import com.kylecorry.sol.math.Vector2
 import com.kylecorry.trail_sense.R
 import com.kylecorry.trail_sense.shared.colors.AppColor
diff --git a/app/src/main/java/com/kylecorry/trail_sense/tools/notes/ui/NoteListItemMapper.kt b/app/src/main/java/com/kylecorry/trail_sense/tools/notes/ui/NoteListItemMapper.kt
index 918a86cf0..c80c8656b 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/tools/notes/ui/NoteListItemMapper.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/tools/notes/ui/NoteListItemMapper.kt
@@ -1,9 +1,9 @@
 package com.kylecorry.trail_sense.tools.notes.ui
 
 import android.content.Context
-import com.kylecorry.ceres.list.ListItem
-import com.kylecorry.ceres.list.ListItemMapper
-import com.kylecorry.ceres.list.ListMenuItem
+import com.kylecorry.andromeda.views.list.ListItem
+import com.kylecorry.andromeda.views.list.ListItemMapper
+import com.kylecorry.andromeda.views.list.ListMenuItem
 import com.kylecorry.trail_sense.R
 import com.kylecorry.trail_sense.tools.notes.domain.Note
 
diff --git a/app/src/main/java/com/kylecorry/trail_sense/tools/packs/ui/mappers/PackItemListItemMapper.kt b/app/src/main/java/com/kylecorry/trail_sense/tools/packs/ui/mappers/PackItemListItemMapper.kt
index 1e0d821e6..f369aecdf 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/tools/packs/ui/mappers/PackItemListItemMapper.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/tools/packs/ui/mappers/PackItemListItemMapper.kt
@@ -3,13 +3,13 @@ package com.kylecorry.trail_sense.tools.packs.ui.mappers
 import android.content.Context
 import com.kylecorry.andromeda.core.math.DecimalFormatter
 import com.kylecorry.andromeda.core.system.Resources
-import com.kylecorry.ceres.list.ListItem
-import com.kylecorry.ceres.list.ListItemCheckbox
-import com.kylecorry.ceres.list.ListItemData
-import com.kylecorry.ceres.list.ListItemMapper
-import com.kylecorry.ceres.list.ListItemTag
-import com.kylecorry.ceres.list.ListMenuItem
-import com.kylecorry.ceres.list.ResourceListIcon
+import com.kylecorry.andromeda.views.list.ListItem
+import com.kylecorry.andromeda.views.list.ListItemCheckbox
+import com.kylecorry.andromeda.views.list.ListItemData
+import com.kylecorry.andromeda.views.list.ListItemMapper
+import com.kylecorry.andromeda.views.list.ListItemTag
+import com.kylecorry.andromeda.views.list.ListMenuItem
+import com.kylecorry.andromeda.views.list.ResourceListIcon
 import com.kylecorry.trail_sense.R
 import com.kylecorry.trail_sense.shared.FormatService
 import com.kylecorry.trail_sense.tools.packs.domain.PackItem
diff --git a/app/src/main/java/com/kylecorry/trail_sense/tools/packs/ui/mappers/PackListItemMapper.kt b/app/src/main/java/com/kylecorry/trail_sense/tools/packs/ui/mappers/PackListItemMapper.kt
index b37a95849..d12a14831 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/tools/packs/ui/mappers/PackListItemMapper.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/tools/packs/ui/mappers/PackListItemMapper.kt
@@ -2,10 +2,10 @@ package com.kylecorry.trail_sense.tools.packs.ui.mappers
 
 import android.content.Context
 import com.kylecorry.andromeda.core.system.Resources
-import com.kylecorry.ceres.list.ListItem
-import com.kylecorry.ceres.list.ListItemMapper
-import com.kylecorry.ceres.list.ListMenuItem
-import com.kylecorry.ceres.list.ResourceListIcon
+import com.kylecorry.andromeda.views.list.ListItem
+import com.kylecorry.andromeda.views.list.ListItemMapper
+import com.kylecorry.andromeda.views.list.ListMenuItem
+import com.kylecorry.andromeda.views.list.ResourceListIcon
 import com.kylecorry.trail_sense.R
 import com.kylecorry.trail_sense.tools.packs.domain.Pack
 
diff --git a/app/src/main/java/com/kylecorry/trail_sense/tools/tides/ui/TideChart.kt b/app/src/main/java/com/kylecorry/trail_sense/tools/tides/ui/TideChart.kt
index 37bcb25bd..52fce755d 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/tools/tides/ui/TideChart.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/tools/tides/ui/TideChart.kt
@@ -2,9 +2,9 @@ package com.kylecorry.trail_sense.tools.tides.ui
 
 import com.kylecorry.andromeda.core.system.Resources
 import com.kylecorry.andromeda.core.ui.Colors.withAlpha
-import com.kylecorry.ceres.chart.Chart
-import com.kylecorry.ceres.chart.data.AreaChartLayer
-import com.kylecorry.ceres.chart.data.ScatterChartLayer
+import com.kylecorry.andromeda.views.chart.Chart
+import com.kylecorry.andromeda.views.chart.data.AreaChartLayer
+import com.kylecorry.andromeda.views.chart.data.ScatterChartLayer
 import com.kylecorry.sol.math.Range
 import com.kylecorry.sol.math.SolMath.norm
 import com.kylecorry.sol.math.Vector2
diff --git a/app/src/main/java/com/kylecorry/trail_sense/tools/tides/ui/mappers/TideListItemMapper.kt b/app/src/main/java/com/kylecorry/trail_sense/tools/tides/ui/mappers/TideListItemMapper.kt
index 7189bf9ed..3a6582636 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/tools/tides/ui/mappers/TideListItemMapper.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/tools/tides/ui/mappers/TideListItemMapper.kt
@@ -2,9 +2,9 @@ package com.kylecorry.trail_sense.tools.tides.ui.mappers
 
 import android.content.Context
 import com.kylecorry.andromeda.alerts.Alerts
-import com.kylecorry.ceres.list.ListItem
-import com.kylecorry.ceres.list.ListItemMapper
-import com.kylecorry.ceres.list.ResourceListIcon
+import com.kylecorry.andromeda.views.list.ListItem
+import com.kylecorry.andromeda.views.list.ListItemMapper
+import com.kylecorry.andromeda.views.list.ResourceListIcon
 import com.kylecorry.sol.science.oceanography.Tide
 import com.kylecorry.sol.units.Distance
 import com.kylecorry.trail_sense.R
diff --git a/app/src/main/java/com/kylecorry/trail_sense/tools/tides/ui/mappers/TideTableListItemMapper.kt b/app/src/main/java/com/kylecorry/trail_sense/tools/tides/ui/mappers/TideTableListItemMapper.kt
index 25bbd2162..612911952 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/tools/tides/ui/mappers/TideTableListItemMapper.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/tools/tides/ui/mappers/TideTableListItemMapper.kt
@@ -3,11 +3,11 @@ package com.kylecorry.trail_sense.tools.tides.ui.mappers
 import android.content.Context
 import androidx.annotation.DrawableRes
 import com.kylecorry.andromeda.core.system.Resources
-import com.kylecorry.ceres.list.ListIcon
-import com.kylecorry.ceres.list.ListItem
-import com.kylecorry.ceres.list.ListItemMapper
-import com.kylecorry.ceres.list.ListMenuItem
-import com.kylecorry.ceres.list.ResourceListIcon
+import com.kylecorry.andromeda.views.list.ListIcon
+import com.kylecorry.andromeda.views.list.ListItem
+import com.kylecorry.andromeda.views.list.ListItemMapper
+import com.kylecorry.andromeda.views.list.ListMenuItem
+import com.kylecorry.andromeda.views.list.ResourceListIcon
 import com.kylecorry.sol.science.oceanography.TideType
 import com.kylecorry.trail_sense.R
 import com.kylecorry.trail_sense.shared.FormatService
diff --git a/app/src/main/java/com/kylecorry/trail_sense/weather/ui/charts/HumidityChart.kt b/app/src/main/java/com/kylecorry/trail_sense/weather/ui/charts/HumidityChart.kt
index b2ffa30f0..af06396fe 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/weather/ui/charts/HumidityChart.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/weather/ui/charts/HumidityChart.kt
@@ -1,8 +1,8 @@
 package com.kylecorry.trail_sense.weather.ui.charts
 
 import com.kylecorry.andromeda.core.system.Resources
-import com.kylecorry.ceres.chart.Chart
-import com.kylecorry.ceres.chart.data.LineChartLayer
+import com.kylecorry.andromeda.views.chart.Chart
+import com.kylecorry.andromeda.views.chart.data.LineChartLayer
 import com.kylecorry.sol.units.Reading
 import com.kylecorry.trail_sense.R
 import com.kylecorry.trail_sense.shared.CustomUiUtils.getPrimaryColor
diff --git a/app/src/main/java/com/kylecorry/trail_sense/weather/ui/charts/MonthChartLabelFormatter.kt b/app/src/main/java/com/kylecorry/trail_sense/weather/ui/charts/MonthChartLabelFormatter.kt
index 7673024bb..f627159ab 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/weather/ui/charts/MonthChartLabelFormatter.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/weather/ui/charts/MonthChartLabelFormatter.kt
@@ -1,7 +1,7 @@
 package com.kylecorry.trail_sense.weather.ui.charts
 
 import android.content.Context
-import com.kylecorry.ceres.chart.label.ChartLabelFormatter
+import com.kylecorry.andromeda.views.chart.label.ChartLabelFormatter
 import com.kylecorry.trail_sense.shared.FormatService
 import java.time.LocalDate
 
diff --git a/app/src/main/java/com/kylecorry/trail_sense/weather/ui/charts/PressureChart.kt b/app/src/main/java/com/kylecorry/trail_sense/weather/ui/charts/PressureChart.kt
index 7c6484bdc..3b8821197 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/weather/ui/charts/PressureChart.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/weather/ui/charts/PressureChart.kt
@@ -2,10 +2,10 @@ package com.kylecorry.trail_sense.weather.ui.charts
 
 import com.kylecorry.andromeda.core.system.Resources
 import com.kylecorry.andromeda.core.ui.Colors.withAlpha
-import com.kylecorry.ceres.chart.Chart
-import com.kylecorry.ceres.chart.data.LineChartLayer
-import com.kylecorry.ceres.chart.data.ScatterChartLayer
-import com.kylecorry.ceres.chart.label.NumberChartLabelFormatter
+import com.kylecorry.andromeda.views.chart.Chart
+import com.kylecorry.andromeda.views.chart.data.LineChartLayer
+import com.kylecorry.andromeda.views.chart.data.ScatterChartLayer
+import com.kylecorry.andromeda.views.chart.label.NumberChartLabelFormatter
 import com.kylecorry.sol.math.SolMath.roundPlaces
 import com.kylecorry.sol.math.Vector2
 import com.kylecorry.sol.units.Pressure
diff --git a/app/src/main/java/com/kylecorry/trail_sense/weather/ui/charts/TemperatureChart.kt b/app/src/main/java/com/kylecorry/trail_sense/weather/ui/charts/TemperatureChart.kt
index 6485977f9..3e88259ec 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/weather/ui/charts/TemperatureChart.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/weather/ui/charts/TemperatureChart.kt
@@ -2,9 +2,9 @@ package com.kylecorry.trail_sense.weather.ui.charts
 
 import com.kylecorry.andromeda.core.system.Resources
 import com.kylecorry.andromeda.core.ui.Colors.withAlpha
-import com.kylecorry.ceres.chart.Chart
-import com.kylecorry.ceres.chart.data.FullAreaChartLayer
-import com.kylecorry.ceres.chart.data.LineChartLayer
+import com.kylecorry.andromeda.views.chart.Chart
+import com.kylecorry.andromeda.views.chart.data.FullAreaChartLayer
+import com.kylecorry.andromeda.views.chart.data.LineChartLayer
 import com.kylecorry.sol.units.Reading
 import com.kylecorry.sol.units.Temperature
 import com.kylecorry.trail_sense.R
diff --git a/app/src/main/java/com/kylecorry/trail_sense/weather/ui/charts/TemperatureChartPreference.kt b/app/src/main/java/com/kylecorry/trail_sense/weather/ui/charts/TemperatureChartPreference.kt
index 29d44835a..9f339e66b 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/weather/ui/charts/TemperatureChartPreference.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/weather/ui/charts/TemperatureChartPreference.kt
@@ -4,7 +4,7 @@ import android.content.Context
 import android.util.AttributeSet
 import androidx.preference.Preference
 import androidx.preference.PreferenceViewHolder
-import com.kylecorry.ceres.chart.Chart
+import com.kylecorry.andromeda.views.chart.Chart
 import com.kylecorry.sol.units.Reading
 import com.kylecorry.trail_sense.R
 
diff --git a/app/src/main/java/com/kylecorry/trail_sense/weather/ui/charts/YearlyTemperatureRangeChart.kt b/app/src/main/java/com/kylecorry/trail_sense/weather/ui/charts/YearlyTemperatureRangeChart.kt
index 6506ba376..dc07b5d89 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/weather/ui/charts/YearlyTemperatureRangeChart.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/weather/ui/charts/YearlyTemperatureRangeChart.kt
@@ -2,10 +2,10 @@ package com.kylecorry.trail_sense.weather.ui.charts
 
 import com.kylecorry.andromeda.core.system.Resources
 import com.kylecorry.andromeda.core.ui.Colors.withAlpha
-import com.kylecorry.ceres.chart.Chart
-import com.kylecorry.ceres.chart.data.FullAreaChartLayer
-import com.kylecorry.ceres.chart.data.LineChartLayer
-import com.kylecorry.ceres.chart.data.ScatterChartLayer
+import com.kylecorry.andromeda.views.chart.Chart
+import com.kylecorry.andromeda.views.chart.data.FullAreaChartLayer
+import com.kylecorry.andromeda.views.chart.data.LineChartLayer
+import com.kylecorry.andromeda.views.chart.data.ScatterChartLayer
 import com.kylecorry.sol.math.Range
 import com.kylecorry.sol.math.Vector2
 import com.kylecorry.sol.units.Temperature
diff --git a/app/src/main/java/com/kylecorry/trail_sense/weather/ui/clouds/CloudReadingListItemMapper.kt b/app/src/main/java/com/kylecorry/trail_sense/weather/ui/clouds/CloudReadingListItemMapper.kt
index 862e448ff..3a8e829f6 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/weather/ui/clouds/CloudReadingListItemMapper.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/weather/ui/clouds/CloudReadingListItemMapper.kt
@@ -2,11 +2,11 @@ package com.kylecorry.trail_sense.weather.ui.clouds
 
 import android.content.Context
 import com.kylecorry.andromeda.core.system.Resources
-import com.kylecorry.ceres.list.ListItem
-import com.kylecorry.ceres.list.ListItemData
-import com.kylecorry.ceres.list.ListItemMapper
-import com.kylecorry.ceres.list.ListMenuItem
-import com.kylecorry.ceres.list.ResourceListIcon
+import com.kylecorry.andromeda.views.list.ListItem
+import com.kylecorry.andromeda.views.list.ListItemData
+import com.kylecorry.andromeda.views.list.ListItemMapper
+import com.kylecorry.andromeda.views.list.ListMenuItem
+import com.kylecorry.andromeda.views.list.ResourceListIcon
 import com.kylecorry.sol.time.Time.toZonedDateTime
 import com.kylecorry.sol.units.Reading
 import com.kylecorry.trail_sense.R
diff --git a/app/src/main/java/com/kylecorry/trail_sense/weather/ui/clouds/CloudSelectionListItemMapper.kt b/app/src/main/java/com/kylecorry/trail_sense/weather/ui/clouds/CloudSelectionListItemMapper.kt
index 69a587de7..d3be938db 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/weather/ui/clouds/CloudSelectionListItemMapper.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/weather/ui/clouds/CloudSelectionListItemMapper.kt
@@ -2,11 +2,11 @@ package com.kylecorry.trail_sense.weather.ui.clouds
 
 import android.content.Context
 import com.kylecorry.andromeda.core.system.Resources
-import com.kylecorry.ceres.list.ListItem
-import com.kylecorry.ceres.list.ListItemCheckbox
-import com.kylecorry.ceres.list.ListItemData
-import com.kylecorry.ceres.list.ListItemMapper
-import com.kylecorry.ceres.list.ResourceListIcon
+import com.kylecorry.andromeda.views.list.ListItem
+import com.kylecorry.andromeda.views.list.ListItemCheckbox
+import com.kylecorry.andromeda.views.list.ListItemData
+import com.kylecorry.andromeda.views.list.ListItemMapper
+import com.kylecorry.andromeda.views.list.ResourceListIcon
 import com.kylecorry.sol.science.meteorology.clouds.CloudGenus
 import com.kylecorry.trail_sense.R
 import com.kylecorry.trail_sense.shared.FormatService
diff --git a/app/src/main/java/com/kylecorry/trail_sense/weather/ui/fields/AlertWeatherField.kt b/app/src/main/java/com/kylecorry/trail_sense/weather/ui/fields/AlertWeatherField.kt
index e22801166..6949d2472 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/weather/ui/fields/AlertWeatherField.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/weather/ui/fields/AlertWeatherField.kt
@@ -2,8 +2,8 @@ package com.kylecorry.trail_sense.weather.ui.fields
 
 import android.content.Context
 import com.kylecorry.andromeda.alerts.Alerts
-import com.kylecorry.ceres.list.ListItem
-import com.kylecorry.ceres.list.ResourceListIcon
+import com.kylecorry.andromeda.views.list.ListItem
+import com.kylecorry.andromeda.views.list.ResourceListIcon
 import com.kylecorry.trail_sense.R
 import com.kylecorry.trail_sense.shared.colors.AppColor
 import com.kylecorry.trail_sense.weather.domain.WeatherAlert
diff --git a/app/src/main/java/com/kylecorry/trail_sense/weather/ui/fields/CloudWeatherField.kt b/app/src/main/java/com/kylecorry/trail_sense/weather/ui/fields/CloudWeatherField.kt
index 21fc739cc..c16d64f72 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/weather/ui/fields/CloudWeatherField.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/weather/ui/fields/CloudWeatherField.kt
@@ -1,8 +1,8 @@
 package com.kylecorry.trail_sense.weather.ui.fields
 
 import android.content.Context
-import com.kylecorry.ceres.list.ListItem
-import com.kylecorry.ceres.list.ResourceListIcon
+import com.kylecorry.andromeda.views.list.ListItem
+import com.kylecorry.andromeda.views.list.ResourceListIcon
 import com.kylecorry.sol.science.meteorology.clouds.CloudGenus
 import com.kylecorry.sol.units.Reading
 import com.kylecorry.trail_sense.R
diff --git a/app/src/main/java/com/kylecorry/trail_sense/weather/ui/fields/FrontWeatherField.kt b/app/src/main/java/com/kylecorry/trail_sense/weather/ui/fields/FrontWeatherField.kt
index 1433c6f40..f9434d911 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/weather/ui/fields/FrontWeatherField.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/weather/ui/fields/FrontWeatherField.kt
@@ -1,8 +1,8 @@
 package com.kylecorry.trail_sense.weather.ui.fields
 
 import android.content.Context
-import com.kylecorry.ceres.list.ListItem
-import com.kylecorry.ceres.list.ResourceListIcon
+import com.kylecorry.andromeda.views.list.ListItem
+import com.kylecorry.andromeda.views.list.ResourceListIcon
 import com.kylecorry.sol.science.meteorology.WeatherFront
 import com.kylecorry.trail_sense.R
 
diff --git a/app/src/main/java/com/kylecorry/trail_sense/weather/ui/fields/HistoricTemperatureRangeWeatherField.kt b/app/src/main/java/com/kylecorry/trail_sense/weather/ui/fields/HistoricTemperatureRangeWeatherField.kt
index cd2f5fc73..0f11aaaf5 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/weather/ui/fields/HistoricTemperatureRangeWeatherField.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/weather/ui/fields/HistoricTemperatureRangeWeatherField.kt
@@ -2,8 +2,8 @@ package com.kylecorry.trail_sense.weather.ui.fields
 
 import android.content.Context
 import com.kylecorry.andromeda.core.system.Resources
-import com.kylecorry.ceres.list.ListItem
-import com.kylecorry.ceres.list.ResourceListIcon
+import com.kylecorry.andromeda.views.list.ListItem
+import com.kylecorry.andromeda.views.list.ResourceListIcon
 import com.kylecorry.sol.units.Temperature
 import com.kylecorry.trail_sense.R
 import com.kylecorry.trail_sense.shared.FormatService
diff --git a/app/src/main/java/com/kylecorry/trail_sense/weather/ui/fields/HumidityWeatherField.kt b/app/src/main/java/com/kylecorry/trail_sense/weather/ui/fields/HumidityWeatherField.kt
index b48b81de1..98ce50add 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/weather/ui/fields/HumidityWeatherField.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/weather/ui/fields/HumidityWeatherField.kt
@@ -2,8 +2,8 @@ package com.kylecorry.trail_sense.weather.ui.fields
 
 import android.content.Context
 import com.kylecorry.andromeda.sense.Sensors
-import com.kylecorry.ceres.list.ListItem
-import com.kylecorry.ceres.list.ResourceListIcon
+import com.kylecorry.andromeda.views.list.ListItem
+import com.kylecorry.andromeda.views.list.ResourceListIcon
 import com.kylecorry.trail_sense.R
 import com.kylecorry.trail_sense.shared.FormatService
 import com.kylecorry.trail_sense.shared.colors.AppColor
diff --git a/app/src/main/java/com/kylecorry/trail_sense/weather/ui/fields/PressureSystemWeatherField.kt b/app/src/main/java/com/kylecorry/trail_sense/weather/ui/fields/PressureSystemWeatherField.kt
index 6733b3b6c..6e0a0030b 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/weather/ui/fields/PressureSystemWeatherField.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/weather/ui/fields/PressureSystemWeatherField.kt
@@ -2,8 +2,8 @@ package com.kylecorry.trail_sense.weather.ui.fields
 
 import android.content.Context
 import com.kylecorry.andromeda.alerts.Alerts
-import com.kylecorry.ceres.list.ListItem
-import com.kylecorry.ceres.list.ResourceListIcon
+import com.kylecorry.andromeda.views.list.ListItem
+import com.kylecorry.andromeda.views.list.ResourceListIcon
 import com.kylecorry.sol.units.Pressure
 import com.kylecorry.trail_sense.R
 import com.kylecorry.trail_sense.weather.domain.isHigh
diff --git a/app/src/main/java/com/kylecorry/trail_sense/weather/ui/fields/PressureTendencyWeatherField.kt b/app/src/main/java/com/kylecorry/trail_sense/weather/ui/fields/PressureTendencyWeatherField.kt
index a99491cfa..6c8ce1fd4 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/weather/ui/fields/PressureTendencyWeatherField.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/weather/ui/fields/PressureTendencyWeatherField.kt
@@ -2,8 +2,8 @@ package com.kylecorry.trail_sense.weather.ui.fields
 
 import android.content.Context
 import com.kylecorry.andromeda.core.system.Resources
-import com.kylecorry.ceres.list.ListItem
-import com.kylecorry.ceres.list.ResourceListIcon
+import com.kylecorry.andromeda.views.list.ListItem
+import com.kylecorry.andromeda.views.list.ResourceListIcon
 import com.kylecorry.sol.science.meteorology.PressureTendency
 import com.kylecorry.sol.units.Pressure
 import com.kylecorry.trail_sense.R
diff --git a/app/src/main/java/com/kylecorry/trail_sense/weather/ui/fields/PressureWeatherField.kt b/app/src/main/java/com/kylecorry/trail_sense/weather/ui/fields/PressureWeatherField.kt
index 65d1fcf26..c36759379 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/weather/ui/fields/PressureWeatherField.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/weather/ui/fields/PressureWeatherField.kt
@@ -2,8 +2,8 @@ package com.kylecorry.trail_sense.weather.ui.fields
 
 import android.content.Context
 import com.kylecorry.andromeda.core.system.Resources
-import com.kylecorry.ceres.list.ListItem
-import com.kylecorry.ceres.list.ResourceListIcon
+import com.kylecorry.andromeda.views.list.ListItem
+import com.kylecorry.andromeda.views.list.ResourceListIcon
 import com.kylecorry.sol.units.Pressure
 import com.kylecorry.trail_sense.R
 import com.kylecorry.trail_sense.shared.FormatService
diff --git a/app/src/main/java/com/kylecorry/trail_sense/weather/ui/fields/TemperatureWeatherField.kt b/app/src/main/java/com/kylecorry/trail_sense/weather/ui/fields/TemperatureWeatherField.kt
index ecd1f2e12..fba7a4336 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/weather/ui/fields/TemperatureWeatherField.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/weather/ui/fields/TemperatureWeatherField.kt
@@ -2,8 +2,8 @@ package com.kylecorry.trail_sense.weather.ui.fields
 
 import android.content.Context
 import com.kylecorry.andromeda.core.system.Resources
-import com.kylecorry.ceres.list.ListItem
-import com.kylecorry.ceres.list.ResourceListIcon
+import com.kylecorry.andromeda.views.list.ListItem
+import com.kylecorry.andromeda.views.list.ResourceListIcon
 import com.kylecorry.sol.units.Temperature
 import com.kylecorry.trail_sense.R
 import com.kylecorry.trail_sense.shared.FormatService
diff --git a/app/src/main/java/com/kylecorry/trail_sense/weather/ui/fields/WeatherField.kt b/app/src/main/java/com/kylecorry/trail_sense/weather/ui/fields/WeatherField.kt
index 2b3baceb4..6c1e3e2b8 100644
--- a/app/src/main/java/com/kylecorry/trail_sense/weather/ui/fields/WeatherField.kt
+++ b/app/src/main/java/com/kylecorry/trail_sense/weather/ui/fields/WeatherField.kt
@@ -1,7 +1,7 @@
 package com.kylecorry.trail_sense.weather.ui.fields
 
 import android.content.Context
-import com.kylecorry.ceres.list.ListItem
+import com.kylecorry.andromeda.views.list.ListItem
 
 interface WeatherField {
 
diff --git a/app/src/main/res/layout/activity_astronomy.xml b/app/src/main/res/layout/activity_astronomy.xml
index b03c881ae..b162974dc 100644
--- a/app/src/main/res/layout/activity_astronomy.xml
+++ b/app/src/main/res/layout/activity_astronomy.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <com.kylecorry.ceres.toolbar.CeresToolbar
+    <com.kylecorry.andromeda.views.toolbar.Toolbar
         android:id="@+id/astronomy_title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -24,7 +24,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/astronomy_title" />
 
-    <com.kylecorry.ceres.chart.Chart
+    <com.kylecorry.andromeda.views.chart.Chart
         android:id="@+id/sunMoonChart"
         android:layout_width="0dp"
         android:layout_height="@dimen/chart_height"
@@ -120,7 +120,7 @@
     </ScrollView>
 
 
-    <com.kylecorry.ceres.list.CeresListView
+    <com.kylecorry.andromeda.views.list.AndromedaListView
         android:id="@+id/astronomy_detail_list"
         android:layout_width="0dp"
         android:layout_height="0dp"
diff --git a/app/src/main/res/layout/activity_navigator.xml b/app/src/main/res/layout/activity_navigator.xml
index 6b5bb400e..54b75f6ac 100644
--- a/app/src/main/res/layout/activity_navigator.xml
+++ b/app/src/main/res/layout/activity_navigator.xml
@@ -7,7 +7,7 @@
     android:layout_height="match_parent"
     tools:context=".navigation.ui.NavigatorFragment">
 
-    <com.kylecorry.ceres.toolbar.CeresToolbar
+    <com.kylecorry.andromeda.views.toolbar.Toolbar
         android:id="@+id/navigation_title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -162,7 +162,7 @@
         app:layout_constraintBottom_toTopOf="@+id/navigation_sheet"
         app:layout_constraintStart_toStartOf="parent">
 
-        <com.kylecorry.ceres.badge.CeresBadge
+        <com.kylecorry.andromeda.views.badge.Badge
             android:id="@+id/gps_status"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -170,7 +170,7 @@
             app:foregroundTint="@android:color/black"
             app:icon="@drawable/satellite" />
 
-        <com.kylecorry.ceres.badge.CeresBadge
+        <com.kylecorry.andromeda.views.badge.Badge
             android:id="@+id/compass_status"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/activity_onboarding.xml b/app/src/main/res/layout/activity_onboarding.xml
index 31e05fe4f..8279751b9 100644
--- a/app/src/main/res/layout/activity_onboarding.xml
+++ b/app/src/main/res/layout/activity_onboarding.xml
@@ -25,7 +25,7 @@
             android:paddingStart="16dp"
             android:paddingEnd="16dp">
 
-            <com.kylecorry.ceres.toolbar.CeresToolbar
+            <com.kylecorry.andromeda.views.toolbar.Toolbar
                 android:id="@+id/page_name"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/activity_weather.xml b/app/src/main/res/layout/activity_weather.xml
index 071b680ac..3e21a32d5 100644
--- a/app/src/main/res/layout/activity_weather.xml
+++ b/app/src/main/res/layout/activity_weather.xml
@@ -7,13 +7,13 @@
     android:orientation="vertical">
 
 
-    <com.kylecorry.ceres.toolbar.CeresToolbar
+    <com.kylecorry.andromeda.views.toolbar.Toolbar
         android:id="@+id/weather_title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content" />
 
 
-    <com.kylecorry.ceres.chart.Chart
+    <com.kylecorry.andromeda.views.chart.Chart
         android:id="@+id/chart"
         android:layout_width="match_parent"
         android:layout_height="@dimen/chart_height"
@@ -30,7 +30,7 @@
         tools:text="999 hPa, 3h ago"
         tools:visibility="visible" />
 
-    <com.kylecorry.ceres.list.CeresListView
+    <com.kylecorry.andromeda.views.list.AndromedaListView
         android:id="@+id/weather_list"
         android:layout_width="match_parent"
         android:layout_height="0dp"
diff --git a/app/src/main/res/layout/fragment_altitude_history.xml b/app/src/main/res/layout/fragment_altitude_history.xml
index e9d2c5a1f..23a1caa8b 100644
--- a/app/src/main/res/layout/fragment_altitude_history.xml
+++ b/app/src/main/res/layout/fragment_altitude_history.xml
@@ -23,7 +23,7 @@
         app:drawableEndCompat="@drawable/ic_drop_down"
         tools:text="Last 14 hours" />
 
-    <com.kylecorry.ceres.chart.Chart
+    <com.kylecorry.andromeda.views.chart.Chart
         android:id="@+id/chart"
         android:layout_width="match_parent"
         android:layout_height="@dimen/chart_height"
diff --git a/app/src/main/res/layout/fragment_beacon_details.xml b/app/src/main/res/layout/fragment_beacon_details.xml
index 593ab6022..ce3b23f03 100644
--- a/app/src/main/res/layout/fragment_beacon_details.xml
+++ b/app/src/main/res/layout/fragment_beacon_details.xml
@@ -6,7 +6,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <com.kylecorry.ceres.toolbar.CeresToolbar
+    <com.kylecorry.andromeda.views.toolbar.Toolbar
         android:id="@+id/beacon_title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/fragment_beacon_list.xml b/app/src/main/res/layout/fragment_beacon_list.xml
index 4fac8c583..15f4dd506 100644
--- a/app/src/main/res/layout/fragment_beacon_list.xml
+++ b/app/src/main/res/layout/fragment_beacon_list.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <com.kylecorry.ceres.toolbar.CeresToolbar
+    <com.kylecorry.andromeda.views.toolbar.Toolbar
         android:id="@+id/beacon_title"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -27,7 +27,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/beacon_title" />
 
-    <com.kylecorry.ceres.list.CeresListView
+    <com.kylecorry.andromeda.views.list.AndromedaListView
         android:id="@+id/beacon_recycler"
         style="@style/AppTheme.ListViewWithFab"
         android:layout_width="0dp"
diff --git a/app/src/main/res/layout/fragment_climate.xml b/app/src/main/res/layout/fragment_climate.xml
index 2637b68c6..b1aa48e12 100644
--- a/app/src/main/res/layout/fragment_climate.xml
+++ b/app/src/main/res/layout/fragment_climate.xml
@@ -5,7 +5,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <com.kylecorry.ceres.toolbar.CeresToolbar
+    <com.kylecorry.andromeda.views.toolbar.Toolbar
         android:id="@+id/climate_title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -28,7 +28,7 @@
                 android:layout_marginStart="16dp"
                 android:layout_marginEnd="16dp" />
 
-            <com.kylecorry.ceres.chart.Chart
+            <com.kylecorry.andromeda.views.chart.Chart
                 android:id="@+id/temperature_chart"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/chart_height"
diff --git a/app/src/main/res/layout/fragment_clinometer.xml b/app/src/main/res/layout/fragment_clinometer.xml
index f8cdc7af3..9ec461850 100644
--- a/app/src/main/res/layout/fragment_clinometer.xml
+++ b/app/src/main/res/layout/fragment_clinometer.xml
@@ -6,7 +6,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <com.kylecorry.ceres.toolbar.CeresToolbar
+    <com.kylecorry.andromeda.views.toolbar.Toolbar
         android:id="@+id/clinometer_title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/fragment_cloud_results.xml b/app/src/main/res/layout/fragment_cloud_results.xml
index 3103eb9e6..842cd6994 100644
--- a/app/src/main/res/layout/fragment_cloud_results.xml
+++ b/app/src/main/res/layout/fragment_cloud_results.xml
@@ -6,7 +6,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <com.kylecorry.ceres.toolbar.CeresToolbar
+    <com.kylecorry.andromeda.views.toolbar.Toolbar
         android:id="@+id/cloud_title"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -28,7 +28,7 @@
         app:scaleType="fitCenter"
         tools:visibility="visible" />
 
-    <com.kylecorry.ceres.list.CeresListView
+    <com.kylecorry.andromeda.views.list.AndromedaListView
         android:id="@+id/cloud_list"
         android:layout_width="0dp"
         android:layout_height="0dp"
diff --git a/app/src/main/res/layout/fragment_clouds.xml b/app/src/main/res/layout/fragment_clouds.xml
index e3102d1e4..138a9b527 100644
--- a/app/src/main/res/layout/fragment_clouds.xml
+++ b/app/src/main/res/layout/fragment_clouds.xml
@@ -6,7 +6,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <com.kylecorry.ceres.toolbar.CeresToolbar
+    <com.kylecorry.andromeda.views.toolbar.Toolbar
         android:id="@+id/cloud_list_title"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -28,7 +28,7 @@
         app:layout_constraintStart_toStartOf="@id/cloud_list"
         app:layout_constraintTop_toTopOf="@id/cloud_list" />
 
-    <com.kylecorry.ceres.list.CeresListView
+    <com.kylecorry.andromeda.views.list.AndromedaListView
         android:id="@+id/cloud_list"
         style="@style/AppTheme.ListViewWithFab"
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_create_beacon.xml b/app/src/main/res/layout/fragment_create_beacon.xml
index b52e44d38..0f16646fb 100644
--- a/app/src/main/res/layout/fragment_create_beacon.xml
+++ b/app/src/main/res/layout/fragment_create_beacon.xml
@@ -7,7 +7,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <com.kylecorry.ceres.toolbar.CeresToolbar
+    <com.kylecorry.andromeda.views.toolbar.Toolbar
         android:id="@+id/create_beacon_title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/fragment_create_item.xml b/app/src/main/res/layout/fragment_create_item.xml
index ff766bcf1..16f5ff1fc 100644
--- a/app/src/main/res/layout/fragment_create_item.xml
+++ b/app/src/main/res/layout/fragment_create_item.xml
@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <com.kylecorry.ceres.toolbar.CeresToolbar
+    <com.kylecorry.andromeda.views.toolbar.Toolbar
         android:id="@+id/create_item_title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/fragment_create_tide.xml b/app/src/main/res/layout/fragment_create_tide.xml
index 253a7d25f..8d906ea72 100644
--- a/app/src/main/res/layout/fragment_create_tide.xml
+++ b/app/src/main/res/layout/fragment_create_tide.xml
@@ -6,7 +6,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <com.kylecorry.ceres.toolbar.CeresToolbar
+    <com.kylecorry.andromeda.views.toolbar.Toolbar
         android:id="@+id/create_tide_title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/fragment_diagnostics.xml b/app/src/main/res/layout/fragment_diagnostics.xml
index 65c637d61..3132ee871 100644
--- a/app/src/main/res/layout/fragment_diagnostics.xml
+++ b/app/src/main/res/layout/fragment_diagnostics.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <com.kylecorry.ceres.toolbar.CeresToolbar
+    <com.kylecorry.andromeda.views.toolbar.Toolbar
         android:id="@+id/diagnostics_title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/fragment_guide.xml b/app/src/main/res/layout/fragment_guide.xml
index 9f7ee1130..5b7e31bcd 100644
--- a/app/src/main/res/layout/fragment_guide.xml
+++ b/app/src/main/res/layout/fragment_guide.xml
@@ -6,7 +6,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <com.kylecorry.ceres.toolbar.CeresToolbar
+    <com.kylecorry.andromeda.views.toolbar.Toolbar
         android:id="@+id/guide_name"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/fragment_item_list.xml b/app/src/main/res/layout/fragment_item_list.xml
index 49316514b..f7f7e0d80 100644
--- a/app/src/main/res/layout/fragment_item_list.xml
+++ b/app/src/main/res/layout/fragment_item_list.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <com.kylecorry.ceres.toolbar.CeresToolbar
+    <com.kylecorry.andromeda.views.toolbar.Toolbar
         android:id="@+id/inventory_list_title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -76,7 +76,7 @@
 
     </androidx.appcompat.widget.LinearLayoutCompat>
 
-    <com.kylecorry.ceres.list.CeresListView
+    <com.kylecorry.andromeda.views.list.AndromedaListView
         android:id="@+id/inventory_list"
         android:layout_width="match_parent"
         android:layout_height="0dp"
diff --git a/app/src/main/res/layout/fragment_level.xml b/app/src/main/res/layout/fragment_level.xml
index 8b37c9b73..7cb7474c4 100644
--- a/app/src/main/res/layout/fragment_level.xml
+++ b/app/src/main/res/layout/fragment_level.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <com.kylecorry.ceres.toolbar.CeresToolbar
+    <com.kylecorry.andromeda.views.toolbar.Toolbar
         android:id="@+id/level_title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/fragment_location.xml b/app/src/main/res/layout/fragment_location.xml
index ebd44e2b4..f1ea93478 100644
--- a/app/src/main/res/layout/fragment_location.xml
+++ b/app/src/main/res/layout/fragment_location.xml
@@ -6,7 +6,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <com.kylecorry.ceres.toolbar.CeresToolbar
+    <com.kylecorry.andromeda.views.toolbar.Toolbar
         android:id="@+id/location_title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/fragment_map_list.xml b/app/src/main/res/layout/fragment_map_list.xml
index 6ff08deb0..3fcb483cc 100644
--- a/app/src/main/res/layout/fragment_map_list.xml
+++ b/app/src/main/res/layout/fragment_map_list.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <com.kylecorry.ceres.toolbar.CeresToolbar
+    <com.kylecorry.andromeda.views.toolbar.Toolbar
         android:id="@+id/map_list_title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -28,7 +28,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/map_list_title" />
 
-    <com.kylecorry.ceres.list.CeresListView
+    <com.kylecorry.andromeda.views.list.AndromedaListView
         android:id="@+id/map_list"
         style="@style/AppTheme.ListViewWithFab"
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_maps.xml b/app/src/main/res/layout/fragment_maps.xml
index c1b71229b..b97510197 100644
--- a/app/src/main/res/layout/fragment_maps.xml
+++ b/app/src/main/res/layout/fragment_maps.xml
@@ -6,7 +6,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <com.kylecorry.ceres.toolbar.CeresToolbar
+    <com.kylecorry.andromeda.views.toolbar.Toolbar
         android:id="@+id/map_title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/fragment_pack_list.xml b/app/src/main/res/layout/fragment_pack_list.xml
index 752523ea0..431273013 100644
--- a/app/src/main/res/layout/fragment_pack_list.xml
+++ b/app/src/main/res/layout/fragment_pack_list.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <com.kylecorry.ceres.toolbar.CeresToolbar
+    <com.kylecorry.andromeda.views.toolbar.Toolbar
         android:id="@+id/pack_list_title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -15,7 +15,7 @@
         app:showSubtitle="false"
         app:title="@string/packing_lists" />
 
-    <com.kylecorry.ceres.list.CeresListView
+    <com.kylecorry.andromeda.views.list.AndromedaListView
         android:id="@+id/pack_list"
         style="@style/AppTheme.ListViewWithFab"
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_path_overview.xml b/app/src/main/res/layout/fragment_path_overview.xml
index 1415c8140..396ddff14 100644
--- a/app/src/main/res/layout/fragment_path_overview.xml
+++ b/app/src/main/res/layout/fragment_path_overview.xml
@@ -11,7 +11,7 @@
         android:layout_height="wrap_content"
         android:orientation="vertical">
 
-        <com.kylecorry.ceres.toolbar.CeresToolbar
+        <com.kylecorry.andromeda.views.toolbar.Toolbar
             android:id="@+id/path_title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -200,7 +200,7 @@
             android:layout_marginTop="16dp"
             android:text="@string/elevation" />
 
-        <com.kylecorry.ceres.chart.Chart
+        <com.kylecorry.andromeda.views.chart.Chart
             android:id="@+id/chart"
             android:layout_width="match_parent"
             android:layout_height="@dimen/chart_height"
diff --git a/app/src/main/res/layout/fragment_paths.xml b/app/src/main/res/layout/fragment_paths.xml
index e1371f7c6..17203bb7a 100644
--- a/app/src/main/res/layout/fragment_paths.xml
+++ b/app/src/main/res/layout/fragment_paths.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <com.kylecorry.ceres.toolbar.CeresToolbar
+    <com.kylecorry.andromeda.views.toolbar.Toolbar
         android:id="@+id/paths_title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -27,7 +27,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/paths_title" />
 
-    <com.kylecorry.ceres.list.CeresListView
+    <com.kylecorry.andromeda.views.list.AndromedaListView
         android:id="@+id/paths_list"
         style="@style/AppTheme.ListViewWithFab"
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_photo_import_sheet.xml b/app/src/main/res/layout/fragment_photo_import_sheet.xml
index 30697e92b..c7fe29d75 100644
--- a/app/src/main/res/layout/fragment_photo_import_sheet.xml
+++ b/app/src/main/res/layout/fragment_photo_import_sheet.xml
@@ -5,7 +5,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <com.kylecorry.ceres.toolbar.CeresToolbar
+    <com.kylecorry.andromeda.views.toolbar.Toolbar
         android:id="@+id/tool_title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/fragment_qr_import_sheet.xml b/app/src/main/res/layout/fragment_qr_import_sheet.xml
index 0abcdc0bc..bccdcbe76 100644
--- a/app/src/main/res/layout/fragment_qr_import_sheet.xml
+++ b/app/src/main/res/layout/fragment_qr_import_sheet.xml
@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <com.kylecorry.ceres.toolbar.CeresToolbar
+    <com.kylecorry.andromeda.views.toolbar.Toolbar
         android:id="@+id/tool_title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/fragment_sensor_details.xml b/app/src/main/res/layout/fragment_sensor_details.xml
index b9d77617d..7cee2ef1e 100644
--- a/app/src/main/res/layout/fragment_sensor_details.xml
+++ b/app/src/main/res/layout/fragment_sensor_details.xml
@@ -4,7 +4,7 @@
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <com.kylecorry.ceres.toolbar.CeresToolbar
+    <com.kylecorry.andromeda.views.toolbar.Toolbar
         android:id="@+id/sensor_details_title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/fragment_sighting_compass_sheet.xml b/app/src/main/res/layout/fragment_sighting_compass_sheet.xml
index 451a11a2f..12c8e5fea 100644
--- a/app/src/main/res/layout/fragment_sighting_compass_sheet.xml
+++ b/app/src/main/res/layout/fragment_sighting_compass_sheet.xml
@@ -5,7 +5,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <com.kylecorry.ceres.toolbar.CeresToolbar
+    <com.kylecorry.andromeda.views.toolbar.Toolbar
         android:id="@+id/tool_title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/fragment_stride_length_estimation.xml b/app/src/main/res/layout/fragment_stride_length_estimation.xml
index c5f88bf05..d4dd82e2b 100644
--- a/app/src/main/res/layout/fragment_stride_length_estimation.xml
+++ b/app/src/main/res/layout/fragment_stride_length_estimation.xml
@@ -6,7 +6,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <com.kylecorry.ceres.toolbar.CeresToolbar
+    <com.kylecorry.andromeda.views.toolbar.Toolbar
         android:id="@+id/stride_length_title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/fragment_temperature_estimation.xml b/app/src/main/res/layout/fragment_temperature_estimation.xml
index a2356a466..01056ae6f 100644
--- a/app/src/main/res/layout/fragment_temperature_estimation.xml
+++ b/app/src/main/res/layout/fragment_temperature_estimation.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <com.kylecorry.ceres.toolbar.CeresToolbar
+    <com.kylecorry.andromeda.views.toolbar.Toolbar
         android:id="@+id/temperature_title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/fragment_tide.xml b/app/src/main/res/layout/fragment_tide.xml
index 83994c87f..6e4cf3905 100644
--- a/app/src/main/res/layout/fragment_tide.xml
+++ b/app/src/main/res/layout/fragment_tide.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <com.kylecorry.ceres.toolbar.CeresToolbar
+    <com.kylecorry.andromeda.views.toolbar.Toolbar
         android:id="@+id/tide_title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -38,7 +38,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tide_title" />
 
-    <com.kylecorry.ceres.chart.Chart
+    <com.kylecorry.andromeda.views.chart.Chart
         android:id="@+id/chart"
         android:layout_width="0dp"
         android:layout_height="@dimen/chart_height"
@@ -49,7 +49,7 @@
         app:layout_constraintTop_toBottomOf="@id/tide_list_date" />
 
 
-    <com.kylecorry.ceres.list.CeresListView
+    <com.kylecorry.andromeda.views.list.AndromedaListView
         android:id="@+id/tide_list"
         android:layout_width="match_parent"
         android:layout_height="0dp"
diff --git a/app/src/main/res/layout/fragment_tide_list.xml b/app/src/main/res/layout/fragment_tide_list.xml
index a35a28513..5ab282528 100644
--- a/app/src/main/res/layout/fragment_tide_list.xml
+++ b/app/src/main/res/layout/fragment_tide_list.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <com.kylecorry.ceres.toolbar.CeresToolbar
+    <com.kylecorry.andromeda.views.toolbar.Toolbar
         android:id="@+id/tide_list_title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -15,7 +15,7 @@
         app:showSubtitle="false"
         app:title="@string/tides" />
 
-    <com.kylecorry.ceres.list.CeresListView
+    <com.kylecorry.andromeda.views.list.AndromedaListView
         android:id="@+id/tide_list"
         android:layout_width="match_parent"
         android:layout_height="0dp"
diff --git a/app/src/main/res/layout/fragment_tool_battery.xml b/app/src/main/res/layout/fragment_tool_battery.xml
index a67695043..29d7cfbf8 100644
--- a/app/src/main/res/layout/fragment_tool_battery.xml
+++ b/app/src/main/res/layout/fragment_tool_battery.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <com.kylecorry.ceres.toolbar.CeresToolbar
+    <com.kylecorry.andromeda.views.toolbar.Toolbar
         android:id="@+id/battery_title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/fragment_tool_cliff_height.xml b/app/src/main/res/layout/fragment_tool_cliff_height.xml
index 4a2d0ca1d..2cbef26f1 100644
--- a/app/src/main/res/layout/fragment_tool_cliff_height.xml
+++ b/app/src/main/res/layout/fragment_tool_cliff_height.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <com.kylecorry.ceres.toolbar.CeresToolbar
+    <com.kylecorry.andromeda.views.toolbar.Toolbar
         android:id="@+id/cliff_height_title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/fragment_tool_clock.xml b/app/src/main/res/layout/fragment_tool_clock.xml
index df3d51a69..2989f2b3d 100644
--- a/app/src/main/res/layout/fragment_tool_clock.xml
+++ b/app/src/main/res/layout/fragment_tool_clock.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <com.kylecorry.ceres.toolbar.CeresToolbar
+    <com.kylecorry.andromeda.views.toolbar.Toolbar
         android:id="@+id/clock_title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/fragment_tool_light.xml b/app/src/main/res/layout/fragment_tool_light.xml
index 6cb9533a0..fd377b7c1 100644
--- a/app/src/main/res/layout/fragment_tool_light.xml
+++ b/app/src/main/res/layout/fragment_tool_light.xml
@@ -7,7 +7,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <com.kylecorry.ceres.toolbar.CeresToolbar
+    <com.kylecorry.andromeda.views.toolbar.Toolbar
         android:id="@+id/light_title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/fragment_tool_lightning.xml b/app/src/main/res/layout/fragment_tool_lightning.xml
index 7753bbbd6..effdce737 100644
--- a/app/src/main/res/layout/fragment_tool_lightning.xml
+++ b/app/src/main/res/layout/fragment_tool_lightning.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <com.kylecorry.ceres.toolbar.CeresToolbar
+    <com.kylecorry.andromeda.views.toolbar.Toolbar
         android:id="@+id/lightning_title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/fragment_tool_metal_detector.xml b/app/src/main/res/layout/fragment_tool_metal_detector.xml
index e32401b9d..464da0c2d 100644
--- a/app/src/main/res/layout/fragment_tool_metal_detector.xml
+++ b/app/src/main/res/layout/fragment_tool_metal_detector.xml
@@ -6,7 +6,7 @@
     android:layout_height="match_parent"
     android:keepScreenOn="true">
 
-    <com.kylecorry.ceres.toolbar.CeresToolbar
+    <com.kylecorry.andromeda.views.toolbar.Toolbar
         android:id="@+id/metal_detector_title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -79,7 +79,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/high_sensitivity_toggle" />
 
-    <com.kylecorry.ceres.chart.Chart
+    <com.kylecorry.andromeda.views.chart.Chart
         android:id="@+id/metal_chart"
         android:layout_width="0dp"
         android:layout_height="@dimen/chart_height"
diff --git a/app/src/main/res/layout/fragment_tool_notes.xml b/app/src/main/res/layout/fragment_tool_notes.xml
index 1583809fe..0decf4910 100644
--- a/app/src/main/res/layout/fragment_tool_notes.xml
+++ b/app/src/main/res/layout/fragment_tool_notes.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <com.kylecorry.ceres.toolbar.CeresToolbar
+    <com.kylecorry.andromeda.views.toolbar.Toolbar
         android:id="@+id/notes_title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -15,7 +15,7 @@
         app:showSubtitle="false"
         app:title="@string/tool_notes_title" />
 
-    <com.kylecorry.ceres.list.CeresListView
+    <com.kylecorry.andromeda.views.list.AndromedaListView
         android:id="@+id/note_list"
         style="@style/AppTheme.ListViewWithFab"
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_tool_pedometer.xml b/app/src/main/res/layout/fragment_tool_pedometer.xml
index c06c2c035..4d586a2b4 100644
--- a/app/src/main/res/layout/fragment_tool_pedometer.xml
+++ b/app/src/main/res/layout/fragment_tool_pedometer.xml
@@ -6,7 +6,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <com.kylecorry.ceres.toolbar.CeresToolbar
+    <com.kylecorry.andromeda.views.toolbar.Toolbar
         android:id="@+id/pedometer_title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/fragment_tool_triangulate.xml b/app/src/main/res/layout/fragment_tool_triangulate.xml
index 5c52361a2..bbcc94574 100644
--- a/app/src/main/res/layout/fragment_tool_triangulate.xml
+++ b/app/src/main/res/layout/fragment_tool_triangulate.xml
@@ -12,7 +12,7 @@
         android:paddingBottom="@dimen/default_bottom_margin"
         android:orientation="vertical">
 
-        <com.kylecorry.ceres.toolbar.CeresToolbar
+        <com.kylecorry.andromeda.views.toolbar.Toolbar
             android:id="@+id/triangulate_title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/list_item_sensor.xml b/app/src/main/res/layout/list_item_sensor.xml
index 077c82aab..330098fd7 100644
--- a/app/src/main/res/layout/list_item_sensor.xml
+++ b/app/src/main/res/layout/list_item_sensor.xml
@@ -19,7 +19,7 @@
         app:layout_constraintTop_toTopOf="parent"
         tools:text="Compass" />
 
-    <com.kylecorry.ceres.badge.CeresBadge
+    <com.kylecorry.andromeda.views.badge.Badge
         android:id="@+id/sensor_status"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/list_item_waypoint.xml b/app/src/main/res/layout/list_item_waypoint.xml
index 4dce45e08..cbeadd561 100644
--- a/app/src/main/res/layout/list_item_waypoint.xml
+++ b/app/src/main/res/layout/list_item_waypoint.xml
@@ -19,7 +19,7 @@
         app:layout_constraintTop_toTopOf="parent"
         tools:text="Saturday, 5:00" />
 
-    <com.kylecorry.ceres.badge.CeresBadge
+    <com.kylecorry.andromeda.views.badge.Badge
         android:id="@+id/signal_strength"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/preference_chart.xml b/app/src/main/res/layout/preference_chart.xml
index 673b1268d..866eff7ec 100644
--- a/app/src/main/res/layout/preference_chart.xml
+++ b/app/src/main/res/layout/preference_chart.xml
@@ -8,7 +8,7 @@
     android:layout_marginStart="16dp"
     android:layout_marginEnd="16dp">
 
-    <com.kylecorry.ceres.chart.Chart
+    <com.kylecorry.andromeda.views.chart.Chart
         android:id="@+id/chart"
         android:layout_width="match_parent"
         android:layout_height="@dimen/chart_height" />
diff --git a/app/src/main/res/layout/view_chart_prompt.xml b/app/src/main/res/layout/view_chart_prompt.xml
index baa580ea4..f21bc234f 100644
--- a/app/src/main/res/layout/view_chart_prompt.xml
+++ b/app/src/main/res/layout/view_chart_prompt.xml
@@ -13,7 +13,7 @@
         android:layout_marginBottom="16dp"
         tools:text="Content" />
 
-    <com.kylecorry.ceres.chart.Chart
+    <com.kylecorry.andromeda.views.chart.Chart
         android:id="@+id/chart"
         android:layout_width="match_parent"
         android:layout_height="@dimen/chart_height" />
diff --git a/app/src/main/res/layout/view_groupable_selector.xml b/app/src/main/res/layout/view_groupable_selector.xml
index 31b91e48f..3cb5867fb 100644
--- a/app/src/main/res/layout/view_groupable_selector.xml
+++ b/app/src/main/res/layout/view_groupable_selector.xml
@@ -6,7 +6,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <com.kylecorry.ceres.toolbar.CeresToolbar
+    <com.kylecorry.andromeda.views.toolbar.Toolbar
         android:id="@+id/group_title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -34,7 +34,7 @@
         tools:text="@string/no_beacons"
         tools:visibility="visible" />
 
-    <com.kylecorry.ceres.list.CeresListView
+    <com.kylecorry.andromeda.views.list.AndromedaListView
         android:id="@+id/list"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/view_list_dialog.xml b/app/src/main/res/layout/view_list_dialog.xml
index c4019572e..ba4bf6541 100644
--- a/app/src/main/res/layout/view_list_dialog.xml
+++ b/app/src/main/res/layout/view_list_dialog.xml
@@ -16,7 +16,7 @@
         tools:text="@string/no_beacons"
         tools:visibility="visible" />
 
-    <com.kylecorry.ceres.list.CeresListView
+    <com.kylecorry.andromeda.views.list.AndromedaListView
         android:id="@+id/list"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/view_map_distance_sheet.xml b/app/src/main/res/layout/view_map_distance_sheet.xml
index 7309565a9..8cd5b4747 100644
--- a/app/src/main/res/layout/view_map_distance_sheet.xml
+++ b/app/src/main/res/layout/view_map_distance_sheet.xml
@@ -6,7 +6,7 @@
     android:background="?attr/colorBackgroundFloating"
     android:orientation="vertical">
 
-    <com.kylecorry.ceres.toolbar.CeresToolbar
+    <com.kylecorry.andromeda.views.toolbar.Toolbar
         android:id="@+id/map_distance_title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/view_path_group_select.xml b/app/src/main/res/layout/view_path_group_select.xml
index 35f9dcc17..0ce97f709 100644
--- a/app/src/main/res/layout/view_path_group_select.xml
+++ b/app/src/main/res/layout/view_path_group_select.xml
@@ -6,7 +6,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <com.kylecorry.ceres.toolbar.CeresToolbar
+    <com.kylecorry.andromeda.views.toolbar.Toolbar
         android:id="@+id/path_group_title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -14,7 +14,7 @@
         app:leftButtonIcon="@drawable/ic_prev"
         app:showSubtitle="false" />
 
-    <com.kylecorry.ceres.list.CeresListView
+    <com.kylecorry.andromeda.views.list.AndromedaListView
         android:id="@+id/path_list"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"