     barChart.noDataText = ""
     barChart.isUserInteractionEnabled = false
     barChart.extraBottomOffset = 2
+    barChart.drawValueAboveBarEnabled = true
 
     let xAxis = barChart.xAxis
-    xAxis.labelPosition = .bottom
-    xAxis.labelTextColor = .lightGray
+    xAxis.labelPosition = .bottomInside
+    xAxis.labelTextColor = .white
+    xAxis.setLabelsToSkip(0)
     xAxis.drawGridLinesEnabled = false
     xAxis.drawAxisLineEnabled = false
-    xAxis.valueFormatter = ChartXAxisDateFormatter()
+    xAxis.drawLabelsEnabled = true
 
     let dataSet = BarChartDataSet(yVals: nil, label: "kWh")
     dataSet.setColor(EmonCMSColors.Chart.Blue)
-    dataSet.valueTextColor = .lightGray
+    dataSet.valueTextColor = .white
 
     let data = BarChartData()
     data.addDataSet(dataSet)

        data.xVals = []
        dataSet.clear()

        for (i, point) in feedDataPoints.enumerated() {
          data.addXValue("\(point.time.timeIntervalSince1970)")

          let yDataEntry = BarChartDataEntry(value: point.value, xIndex: i)
          data.addEntry(yDataEntry, dataSetIndex: 0)

    let xAxis = lineChart.xAxis
    xAxis.drawAxisLineEnabled = false
    xAxis.drawGridLinesEnabled = false
    xAxis.drawLabelsEnabled = true
    xAxis.labelPosition = .bottom
    xAxis.labelTextColor = .white
    xAxis.spaceBetweenLabels = 0
    xAxis.valueFormatter = ChartXAxisDateFormatter(formatString: "HH:mm")

    let yAxis = lineChart.leftAxis
    yAxis.labelPosition = .insideChart
    yAxis.drawTopYLabelEntryEnabled = false
    yAxis.drawGridLinesEnabled = false
    yAxis.drawAxisLineEnabled = false
    yAxis.labelTextColor = .white

    let dataSet = LineChartDataSet()
    dataSet.setColor(EmonCMSColors.Chart.Blue)
    dataSet.fillColor = EmonCMSColors.Chart.Blue
    dataSet.valueTextColor = .white
    dataSet.drawFilledEnabled = true
    dataSet.drawCirclesEnabled = false
    dataSet.drawValuesEnabled = false
